diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-01 14:53:20 +0300 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-01 14:53:20 +0300 |
| commit | 9fd93e8e5792781b1bce0eb5d75aa6eff00d9f69 (patch) | |
| tree | 49f4d64c4ee48b03e9ac032fca6b97259d181935 /src/control/Script.cpp | |
| parent | c74c7ce1d4ad0c4ec72d5ea4cc22f265d89edce7 (diff) | |
| parent | 2f05c64470a2b04439a07646662ac6afb57901f5 (diff) | |
merge master to miami
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; |