mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-11-16 03:39:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Nikolay Korolev 2020-02-02 14:47:16 +03:00
commit 2baacf0e9e
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

@ -4406,7 +4406,7 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
CollectParameters(&m_nIp, 2); CollectParameters(&m_nIp, 2);
CPlayerPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed; CPlayerPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
assert(pPed); assert(pPed);
if (ScriptParams[0]) { if (ScriptParams[1]) {
pPed->m_pWanted->m_bIgnoredByCops = true; pPed->m_pWanted->m_bIgnoredByCops = true;
CWorld::StopAllLawEnforcersInTheirTracks(); CWorld::StopAllLawEnforcersInTheirTracks();
} }
@ -5828,7 +5828,7 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
assert(pVehicle); assert(pVehicle);
assert(pVehicle->m_vehType == VEHICLE_TYPE_BOAT); assert(pVehicle->m_vehType == VEHICLE_TYPE_BOAT);
CBoat* pBoat = (CBoat*)pVehicle; CBoat* pBoat = (CBoat*)pVehicle;
pBoat->AutoPilot.m_nCruiseSpeed = ScriptParams[1]; pBoat->AutoPilot.m_nCruiseSpeed = *(float*)&ScriptParams[1];
return 0; return 0;
} }
case COMMAND_GET_RANDOM_CHAR_IN_AREA: case COMMAND_GET_RANDOM_CHAR_IN_AREA: