diff options
| author | aap <aap@papnet.eu> | 2021-01-23 12:40:23 +0100 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2021-01-23 12:40:23 +0100 |
| commit | 20bcd4bd69c601cfccd6ec8b319f26fddbae9e9f (patch) | |
| tree | fa4adbfea0ee59098876151fcab206e71ad12ca5 /src/control | |
| parent | fix (diff) | |
| download | re3-20bcd4bd69c601cfccd6ec8b319f26fddbae9e9f.tar re3-20bcd4bd69c601cfccd6ec8b319f26fddbae9e9f.tar.gz re3-20bcd4bd69c601cfccd6ec8b319f26fddbae9e9f.tar.bz2 re3-20bcd4bd69c601cfccd6ec8b319f26fddbae9e9f.tar.lz re3-20bcd4bd69c601cfccd6ec8b319f26fddbae9e9f.tar.xz re3-20bcd4bd69c601cfccd6ec8b319f26fddbae9e9f.tar.zst re3-20bcd4bd69c601cfccd6ec8b319f26fddbae9e9f.zip | |
Diffstat (limited to 'src/control')
| -rw-r--r-- | src/control/Garages.h | 2 | ||||
| -rw-r--r-- | src/control/Script.h | 2 | ||||
| -rw-r--r-- | src/control/Script7.cpp | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/control/Garages.h b/src/control/Garages.h index 3d12d4a2..47de898f 100644 --- a/src/control/Garages.h +++ b/src/control/Garages.h @@ -293,4 +293,6 @@ public: } static bool IsThisGarageTypeSafehouse(uint8 type) { return FindSafeHouseIndexForGarageType(type) >= 0; } + static void SetupAnyGaragesForThisIsland(void) {} // TODO(LCS) + }; diff --git a/src/control/Script.h b/src/control/Script.h index c30768b3..fa8a64cd 100644 --- a/src/control/Script.h +++ b/src/control/Script.h @@ -485,7 +485,7 @@ public: static void SetObjectiveForAllPedsInCollective(int, eObjective); #endif - bool IsFortStauntonDestroyed() { return *(int32*)&ScriptSpace[FSDestroyedFlag] == 1; } + static bool IsFortStauntonDestroyed() { return FSDestroyedFlag && *(int32*)&ScriptSpace[FSDestroyedFlag] == 1; } }; diff --git a/src/control/Script7.cpp b/src/control/Script7.cpp index 601a979d..c50f0dea 100644 --- a/src/control/Script7.cpp +++ b/src/control/Script7.cpp @@ -423,9 +423,10 @@ int8 CRunningScript::ProcessCommands1200To1299(int32 command) case COMMAND_REQUEST_COLLISION: { CollectParameters(&m_nIp, 2); - CVector2D pos; + CVector pos; pos.x = GET_FLOAT_PARAM(0); pos.y = GET_FLOAT_PARAM(1); + pos.z = 0.0f; CColStore::RequestCollision(pos); return 0; } |