archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-11 10:18:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge master to miami

Browse Source
This commit is contained in:
Nikolay Korolev
2021-01-01 14:53:20 +03:00
parent c74c7ce1d4 2f05c64470
commit 9fd93e8e57
18 changed files with 1173 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/control/Script.cpp
View File

@ -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;