summaryrefslogtreecommitdiffstats
path: root/src/control/Script.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-07-27 19:59:08 +0200
committerGitHub <noreply@github.com>2021-07-27 19:59:08 +0200
commitec7d70218595fe9c9c6c65a71893e48dc3d3ec38 (patch)
tree764e32edbee11892578765e045fe56b2ca9c70f8 /src/control/Script.cpp
parentMerge branch 'miami' into lcs (diff)
parentfix (diff)
downloadre3-ec7d70218595fe9c9c6c65a71893e48dc3d3ec38.tar
re3-ec7d70218595fe9c9c6c65a71893e48dc3d3ec38.tar.gz
re3-ec7d70218595fe9c9c6c65a71893e48dc3d3ec38.tar.bz2
re3-ec7d70218595fe9c9c6c65a71893e48dc3d3ec38.tar.lz
re3-ec7d70218595fe9c9c6c65a71893e48dc3d3ec38.tar.xz
re3-ec7d70218595fe9c9c6c65a71893e48dc3d3ec38.tar.zst
re3-ec7d70218595fe9c9c6c65a71893e48dc3d3ec38.zip
Diffstat (limited to 'src/control/Script.cpp')
-rw-r--r--src/control/Script.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index fbb7024c..f52dda03 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -18,9 +18,7 @@
#include "FileMgr.h"
#include "Frontend.h"
#include "General.h"
-#ifdef MISSION_REPLAY
#include "GenericGameStorage.h"
-#endif
#include "HandlingMgr.h"
#include "Heli.h"
#include "Hud.h"
@@ -1853,7 +1851,7 @@ void FlushLog()
const uint32 CRunningScript::nSaveStructSize =
#ifdef COMPATIBLE_SAVES
- 136;
+ 536;
#else
sizeof(CRunningScript);
#endif
@@ -2691,7 +2689,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;