summaryrefslogtreecommitdiffstats
path: root/src/FileLoader.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-06-30 21:06:55 +0200
committeraap <aap@papnet.eu>2019-06-30 21:06:55 +0200
commitaf2e764d81d6a5981bab0a0d1fd0c79cf2465f69 (patch)
tree7b3202766bcbe9711d4a0a24952bca3c4e39d6ae /src/FileLoader.cpp
parentMerge pull request #79 from Nick007J/master (diff)
downloadre3-af2e764d81d6a5981bab0a0d1fd0c79cf2465f69.tar
re3-af2e764d81d6a5981bab0a0d1fd0c79cf2465f69.tar.gz
re3-af2e764d81d6a5981bab0a0d1fd0c79cf2465f69.tar.bz2
re3-af2e764d81d6a5981bab0a0d1fd0c79cf2465f69.tar.lz
re3-af2e764d81d6a5981bab0a0d1fd0c79cf2465f69.tar.xz
re3-af2e764d81d6a5981bab0a0d1fd0c79cf2465f69.tar.zst
re3-af2e764d81d6a5981bab0a0d1fd0c79cf2465f69.zip
Diffstat (limited to '')
-rw-r--r--src/FileLoader.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/FileLoader.cpp b/src/FileLoader.cpp
index 8bc6ad11..d87964ac 100644
--- a/src/FileLoader.cpp
+++ b/src/FileLoader.cpp
@@ -855,7 +855,7 @@ CFileLoader::Load2dEffect(const char *line)
int id, r, g, b, a, type;
float x, y, z;
char corona[32], shadow[32];
- int shadowIntens, flash, roadReflection, flare, flags, probability;
+ int shadowIntens, lightType, roadReflection, flare, flags, probability;
CBaseModelInfo *mi;
C2dEffect *effect;
char *p;
@@ -888,14 +888,14 @@ CFileLoader::Load2dEffect(const char *line)
sscanf(line, "%f %f %f %f %d %d %d %d %d",
&effect->light.dist,
- &effect->light.outerRange,
+ &effect->light.range,
&effect->light.size,
- &effect->light.innerRange,
- &shadowIntens, &flash, &roadReflection, &flare, &flags);
+ &effect->light.shadowRange,
+ &shadowIntens, &lightType, &roadReflection, &flare, &flags);
effect->light.corona = RwTextureRead(corona, nil);
effect->light.shadow = RwTextureRead(shadow, nil);
effect->light.shadowIntensity = shadowIntens;
- effect->light.flash = flash;
+ effect->light.lightType = lightType;
effect->light.roadReflection = roadReflection;
effect->light.flareType = flare;
// TODO: check out the flags