diff options
author | saml1er <danishroar@gmail.com> | 2020-04-16 21:01:53 +0200 |
---|---|---|
committer | saml1er <danishroar@gmail.com> | 2020-04-16 21:01:53 +0200 |
commit | e52a02fb9e1dd5602e80d88691f2ee2291d1fa52 (patch) | |
tree | 333caa1599e2f0c6b91bdae2092cf085eaf8238a /src/control/Script.cpp | |
parent | Reverse CWorld (diff) | |
parent | More refs removed (diff) | |
download | re3-e52a02fb9e1dd5602e80d88691f2ee2291d1fa52.tar re3-e52a02fb9e1dd5602e80d88691f2ee2291d1fa52.tar.gz re3-e52a02fb9e1dd5602e80d88691f2ee2291d1fa52.tar.bz2 re3-e52a02fb9e1dd5602e80d88691f2ee2291d1fa52.tar.lz re3-e52a02fb9e1dd5602e80d88691f2ee2291d1fa52.tar.xz re3-e52a02fb9e1dd5602e80d88691f2ee2291d1fa52.tar.zst re3-e52a02fb9e1dd5602e80d88691f2ee2291d1fa52.zip |
Diffstat (limited to 'src/control/Script.cpp')
-rw-r--r-- | src/control/Script.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 1f085d32..428ac66a 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -9147,7 +9147,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command) } case COMMAND_SET_JAMES_CAR_ON_PATH_TO_PLAYER: { - CollectParameters(&m_nIp, 2); + CollectParameters(&m_nIp, 1); CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]); assert(pVehicle); CCarCtrl::JoinCarWithRoadSystemGotoCoors(pVehicle, FindPlayerCoors(), false); @@ -10076,8 +10076,8 @@ void CRunningScript::LocatePlayerCarCommand(int32 command, uint32* pIp) case COMMAND_LOCATE_PLAYER_ON_FOOT_CAR_3D: result = !pPlayerInfo->m_pPed->bInVehicle; break; - case COMMAND_LOCATE_PLAYER_IN_CAR_CHAR_2D: - case COMMAND_LOCATE_PLAYER_IN_CAR_CHAR_3D: + case COMMAND_LOCATE_PLAYER_IN_CAR_CAR_2D: + case COMMAND_LOCATE_PLAYER_IN_CAR_CAR_3D: result = pPlayerInfo->m_pPed->bInVehicle; break; default: @@ -11359,7 +11359,7 @@ VALIDATESAVEBUF(size) void CTheScripts::ClearSpaceForMissionEntity(const CVector& pos, CEntity* pEntity) { - static CColPoint aTempColPoints[32]; + static CColPoint aTempColPoints[MAX_COLLISION_POINTS]; int16 entities = 0; CEntity* aEntities[16]; CWorld::FindObjectsKindaColliding(pos, pEntity->GetBoundRadius(), false, &entities, 16, aEntities, false, true, true, false, false); |