diff options
| author | Roman Masanin <36927roma@gmail.com> | 2020-09-26 20:38:37 +0200 |
|---|---|---|
| committer | Roman Masanin <36927roma@gmail.com> | 2020-09-26 20:38:37 +0200 |
| commit | bb2e601e13bfdfae697cd0188604bb4481769285 (patch) | |
| tree | 253fdf6bf532ffd362ad5fdeaac7dfddb43f1afe /src/control | |
| parent | return bridge, crane and fix structures in fluff.h (diff) | |
| parent | Fix coronas reflections (diff) | |
| download | re3-bb2e601e13bfdfae697cd0188604bb4481769285.tar re3-bb2e601e13bfdfae697cd0188604bb4481769285.tar.gz re3-bb2e601e13bfdfae697cd0188604bb4481769285.tar.bz2 re3-bb2e601e13bfdfae697cd0188604bb4481769285.tar.lz re3-bb2e601e13bfdfae697cd0188604bb4481769285.tar.xz re3-bb2e601e13bfdfae697cd0188604bb4481769285.tar.zst re3-bb2e601e13bfdfae697cd0188604bb4481769285.zip | |
Diffstat (limited to 'src/control')
| -rw-r--r-- | src/control/Script.cpp | 3 | ||||
| -rw-r--r-- | src/control/Script.h | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp index c560e500..5cd20001 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 f3455797..c7218847 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 }; |