Merge remote-tracking branch 'upstream/master'

GTAmodding · Jun 28, 2020 · 209b7891d10f93754540114de34b0e4734c26630 · 209b789
2 parents 920bc0a + 418bee9
commit 209b7891d10f93754540114de34b0e4734c26630
Unified Split

Showing with 7 additions and 7 deletions.

+1 −1 src/core/FileLoader.cpp

+5 −5 src/entities/Entity.cpp

+1 −1 src/render/2dEffect.h
diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp
@@ -945,7 +945,7 @@ CFileLoader::Load2dEffect(const char *line)
 			&effect->light.dist,
 			&effect->light.range,
 			&effect->light.size,
-			&effect->light.shadowRange,
+			&effect->light.shadowSize,
 			&shadowIntens, &lightType, &roadReflection, &flare, &flags);
 		effect->light.corona = RwTextureRead(corona, nil);
 		effect->light.shadow = RwTextureRead(shadow, nil);

diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp
@@ -803,12 +803,12 @@ CEntity::ProcessLightsForEntity(void)
 		}
 
 		// Light shadow
-		if(effect->light.shadowRange != 0.0f){
+		if(effect->light.shadowSize != 0.0f){
 			if(lightOn){
 				CShadows::StoreStaticShadow((uintptr)this + i, SHADOWTYPE_ADDITIVE,
 					effect->light.shadow, &pos,
-					effect->light.shadowRange, 0.0f,
-					0.0f, -effect->light.shadowRange,
+					effect->light.shadowSize, 0.0f,
+					0.0f, -effect->light.shadowSize,
 					128,
 					effect->col.r*CTimeCycle::GetSpriteBrightness()*effect->light.shadowIntensity/255.0f,
 					effect->col.g*CTimeCycle::GetSpriteBrightness()*effect->light.shadowIntensity/255.0f,
@@ -817,8 +817,8 @@ CEntity::ProcessLightsForEntity(void)
 			}else if(lightFlickering){
 				CShadows::StoreStaticShadow((uintptr)this + i, SHADOWTYPE_ADDITIVE,
 					effect->light.shadow, &pos,
-					effect->light.shadowRange, 0.0f,
-					0.0f, -effect->light.shadowRange,
+					effect->light.shadowSize, 0.0f,
+					0.0f, -effect->light.shadowSize,
 					0, 0.0f, 0.0f, 0.0f,
 					15.0f, 1.0f, 40.0f, false, 0.0f);
 			}

diff --git a/src/render/2dEffect.h b/src/render/2dEffect.h
@@ -44,7 +44,7 @@ class C2dEffect
 		float dist;
 		float range;	// of pointlight
 		float size;
-		float shadowRange;
+		float shadowSize;
 		uint8 lightType;	// LIGHT_
 		uint8 roadReflection;
 		uint8 flareType;