Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

ARRAY_SIZE

Browse Source
This commit is contained in:
Nikolay Korolev 2020-02-22 17:53:28 +03:00
parent 1366c58d59
commit bc139e0702
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/control/Script.cpp
View File

@ -8952,7 +8952,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
CollectParameters(&m_nIp, 2); CollectParameters(&m_nIp, 2);
CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]); CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
assert(pVehicle); assert(pVehicle);
assert(ScriptParams[1] >= 0 && ScriptParams[1] < 8); assert(ScriptParams[1] >= 0 && ScriptParams[1] < ARRAY_SIZE(pVehicle->pPassengers));
CPed* pPassenger = pVehicle->pPassengers[ScriptParams[1]]; CPed* pPassenger = pVehicle->pPassengers[ScriptParams[1]];
ScriptParams[0] = CPools::GetPedPool()->GetIndex(pPassenger); ScriptParams[0] = CPools::GetPedPool()->GetIndex(pPassenger);
StoreParameters(&m_nIp, 1); StoreParameters(&m_nIp, 1);
@ -9380,7 +9380,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
pVehicle->pDriver->bScriptObjectiveCompleted = false; pVehicle->pDriver->bScriptObjectiveCompleted = false;
pVehicle->pDriver->SetObjective(OBJECTIVE_LEAVE_VEHICLE, pVehicle); pVehicle->pDriver->SetObjective(OBJECTIVE_LEAVE_VEHICLE, pVehicle);
} }
for (int i = 0; i < 8; i++) for (int i = 0; i < ARRAY_SIZE(pVehicle->pPassengers); i++)
{ {
if (pVehicle->pPassengers[i]) { if (pVehicle->pPassengers[i]) {
pVehicle->pPassengers[i]->bScriptObjectiveCompleted = false; pVehicle->pPassengers[i]->bScriptObjectiveCompleted = false;