summaryrefslogtreecommitdiffstats
path: root/src/control/Script.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2021-07-25 20:44:21 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2021-07-25 20:44:21 +0200
commitbf4b39781ba64076c06e00825277a6c7f67c0949 (patch)
tree7a5bb0cbbbd0b58f168cfd9b792a74d78d039eee /src/control/Script.cpp
parentMerge remote-tracking branch 'upstream/lcs' into lcs (diff)
downloadre3-bf4b39781ba64076c06e00825277a6c7f67c0949.tar
re3-bf4b39781ba64076c06e00825277a6c7f67c0949.tar.gz
re3-bf4b39781ba64076c06e00825277a6c7f67c0949.tar.bz2
re3-bf4b39781ba64076c06e00825277a6c7f67c0949.tar.lz
re3-bf4b39781ba64076c06e00825277a6c7f67c0949.tar.xz
re3-bf4b39781ba64076c06e00825277a6c7f67c0949.tar.zst
re3-bf4b39781ba64076c06e00825277a6c7f67c0949.zip
Diffstat (limited to 'src/control/Script.cpp')
-rw-r--r--src/control/Script.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index fbb7024c..233f5d5d 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -1853,7 +1853,7 @@ void FlushLog()
const uint32 CRunningScript::nSaveStructSize =
#ifdef COMPATIBLE_SAVES
- 136;
+ 536;
#else
sizeof(CRunningScript);
#endif
@@ -2691,7 +2691,7 @@ bool CTheScripts::Init(bool loaddata)
InvisibilitySettingArray[i] = nil;
if (loaddata) {
printf("loaddata = true\n");
- //retval = GenericLoad(); // TODO
+ retval = GenericLoad();
}
for (int i = 0; i < MAX_ALLOWED_COLLISIONS; i++)
AllowedCollision[i] = 0;