diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-01 12:55:00 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-01 12:55:00 +0100 |
| commit | b4b9f9601b6c578668e1535fd44bcc3f31491090 (patch) | |
| tree | 06e4534e9d918aacbd5611dcfedc8956eadbbd8d /src/control/Script.cpp | |
| parent | Merge branch 'miami' into lcs-dev (diff) | |
| parent | Merge remote-tracking branch 'upstream/miami' into miami (diff) | |
| download | re3-b4b9f9601b6c578668e1535fd44bcc3f31491090.tar re3-b4b9f9601b6c578668e1535fd44bcc3f31491090.tar.gz re3-b4b9f9601b6c578668e1535fd44bcc3f31491090.tar.bz2 re3-b4b9f9601b6c578668e1535fd44bcc3f31491090.tar.lz re3-b4b9f9601b6c578668e1535fd44bcc3f31491090.tar.xz re3-b4b9f9601b6c578668e1535fd44bcc3f31491090.tar.zst re3-b4b9f9601b6c578668e1535fd44bcc3f31491090.zip | |
Diffstat (limited to 'src/control/Script.cpp')
| -rw-r--r-- | src/control/Script.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 9d5e347b..c022cfe8 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -72,7 +72,7 @@ int32 CTheScripts::StoreVehicleIndex; bool CTheScripts::StoreVehicleWasRandom; CRunningScript *CTheScripts::pIdleScripts; CRunningScript *CTheScripts::pActiveScripts; -uint32 CTheScripts::NextFreeCollectiveIndex; +int32 CTheScripts::NextFreeCollectiveIndex; int32 CTheScripts::LastRandomPedId; uint16 CTheScripts::NumberOfUsedObjects; bool CTheScripts::bAlreadyRunningAMissionScript; @@ -1673,7 +1673,7 @@ void CMissionCleanup::Init() } } -CMissionCleanupEntity* CMissionCleanup::FindFree() +cleanup_entity_struct* CMissionCleanup::FindFree() { for (int i = 0; i < MAX_CLEANUP; i++){ if (m_sEntities[i].type == CLEANUP_UNUSED) @@ -1685,7 +1685,7 @@ CMissionCleanupEntity* CMissionCleanup::FindFree() void CMissionCleanup::AddEntityToList(int32 id, uint8 type) { - CMissionCleanupEntity* pNew = FindFree(); + cleanup_entity_struct* pNew = FindFree(); if (!pNew) return; pNew->id = id; |