summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-06-28 12:05:31 +0200
committeraap <aap@papnet.eu>2020-06-28 12:05:42 +0200
commit418bee9c2207b7f362e7a6360e77184d0cdbc35c (patch)
treecadc87dd79b8c387f522200e4d573e74598b8791
parentscript logging fixes (diff)
downloadre3-418bee9c2207b7f362e7a6360e77184d0cdbc35c.tar
re3-418bee9c2207b7f362e7a6360e77184d0cdbc35c.tar.gz
re3-418bee9c2207b7f362e7a6360e77184d0cdbc35c.tar.bz2
re3-418bee9c2207b7f362e7a6360e77184d0cdbc35c.tar.lz
re3-418bee9c2207b7f362e7a6360e77184d0cdbc35c.tar.xz
re3-418bee9c2207b7f362e7a6360e77184d0cdbc35c.tar.zst
re3-418bee9c2207b7f362e7a6360e77184d0cdbc35c.zip
-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 a1fb5ace..3c4ed040 100644
--- 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
index a9b6b2b8..31da489f 100644
--- 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
index 4256a0ac..628d64c2 100644
--- a/src/render/2dEffect.h
+++ b/src/render/2dEffect.h
@@ -44,7 +44,7 @@ public:
float dist;
float range; // of pointlight
float size;
- float shadowRange;
+ float shadowSize;
uint8 lightType; // LIGHT_
uint8 roadReflection;
uint8 flareType;