summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-06-28 12:05:31 +0200
committeraap <aap@papnet.eu>2020-06-28 12:08:46 +0200
commit3370ae04cbb051aa5f853de64c8f7956530a4ea7 (patch)
treefd966f9198367d33a8623e537dba46aee14f0c30 /src
parentfix anims again (diff)
downloadre3-3370ae04cbb051aa5f853de64c8f7956530a4ea7.tar
re3-3370ae04cbb051aa5f853de64c8f7956530a4ea7.tar.gz
re3-3370ae04cbb051aa5f853de64c8f7956530a4ea7.tar.bz2
re3-3370ae04cbb051aa5f853de64c8f7956530a4ea7.tar.lz
re3-3370ae04cbb051aa5f853de64c8f7956530a4ea7.tar.xz
re3-3370ae04cbb051aa5f853de64c8f7956530a4ea7.tar.zst
re3-3370ae04cbb051aa5f853de64c8f7956530a4ea7.zip
Diffstat (limited to '')
-rw-r--r--src/core/FileLoader.cpp2
-rw-r--r--src/entities/Entity.cpp10
-rw-r--r--src/render/2dEffect.h2
3 files changed, 7 insertions, 7 deletions
diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp
index 6d810cf0..08126081 100644
--- a/src/core/FileLoader.cpp
+++ b/src/core/FileLoader.cpp
@@ -1000,7 +1000,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
index 41a2e2bd..8938b49a 100644
--- a/src/entities/Entity.cpp
+++ b/src/entities/Entity.cpp
@@ -878,12 +878,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,
@@ -892,8 +892,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
index 022cabcc..baf07342 100644
--- a/src/render/2dEffect.h
+++ b/src/render/2dEffect.h
@@ -48,7 +48,7 @@ public:
float dist;
float range; // of pointlight
float size;
- float shadowRange;
+ float shadowSize;
uint8 lightType; // LIGHT_
uint8 roadReflection;
uint8 flareType;