summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-09-02 13:13:52 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-09-02 13:13:52 +0200
commit3e4f7b7bdf52752b77b098c97693f2b3e1fba9bb (patch)
tree4e4bbdf9accec8ad37728d459933391a1deede83
parentmore fix (diff)
downloadre3-3e4f7b7bdf52752b77b098c97693f2b3e1fba9bb.tar
re3-3e4f7b7bdf52752b77b098c97693f2b3e1fba9bb.tar.gz
re3-3e4f7b7bdf52752b77b098c97693f2b3e1fba9bb.tar.bz2
re3-3e4f7b7bdf52752b77b098c97693f2b3e1fba9bb.tar.lz
re3-3e4f7b7bdf52752b77b098c97693f2b3e1fba9bb.tar.xz
re3-3e4f7b7bdf52752b77b098c97693f2b3e1fba9bb.tar.zst
re3-3e4f7b7bdf52752b77b098c97693f2b3e1fba9bb.zip
Diffstat (limited to '')
-rw-r--r--src/control/Script.cpp3
-rw-r--r--src/control/Script.h6
2 files changed, 6 insertions, 3 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index b313e308..b99110b0 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -2239,7 +2239,6 @@ void CTheScripts::Init()
StoreVehicleWasRandom = true;
OnAMissionFlag = 0;
LastMissionPassedTime = (uint32)-1;
- NextFreeCollectiveIndex = 0;
LastRandomPedId = -1;
for (int i = 0; i < MAX_NUM_USED_OBJECTS; i++){
memset(&UsedObjectArray[i].name, 0, sizeof(UsedObjectArray[i].name));
@@ -16138,7 +16137,7 @@ void CTheScripts::ReadMultiScriptFileOffsetsFromScript()
MainScriptSize = Read4BytesFromScript(&ip);
LargestMissionScriptSize = Read4BytesFromScript(&ip);
NumberOfMissionScripts = Read2BytesFromScript(&ip);
- ip += 2;
+ NumberOfExclusiveMissionScripts = Read2BytesFromScript(&ip);
for (int i = 0; i < NumberOfMissionScripts; i++) {
MultiScriptArray[i] = Read4BytesFromScript(&ip);
}
diff --git a/src/control/Script.h b/src/control/Script.h
index 4493ade3..17f34d42 100644
--- a/src/control/Script.h
+++ b/src/control/Script.h
@@ -37,7 +37,7 @@ struct intro_script_rectangle
VALIDATE_SIZE(intro_script_rectangle, 0x18);
enum {
- SCRIPT_TEXT_MAX_LENGTH = 500
+ SCRIPT_TEXT_MAX_LENGTH = 100
};
struct intro_text_line
@@ -227,7 +227,11 @@ enum {
};
enum {
+#ifdef PS2
+ SIZE_MAIN_SCRIPT = 205512,
+#else
SIZE_MAIN_SCRIPT = 225512,
+#endif
SIZE_MISSION_SCRIPT = 35000,
SIZE_SCRIPT_SPACE = SIZE_MAIN_SCRIPT + SIZE_MISSION_SCRIPT
};