summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-04-16 09:23:31 +0200
committeraap <aap@papnet.eu>2020-04-16 09:23:31 +0200
commit89b7085353f9ade38c2f2d4cac4aa9caf9db6a9d (patch)
treecbecbce7d638d7175ea4ee5c8b402c00564c017e /src/control
parentMerge branch 'master' of github.com:gtamodding/re3 (diff)
parentMerge pull request #453 from Fire-Head/master (diff)
downloadre3-89b7085353f9ade38c2f2d4cac4aa9caf9db6a9d.tar
re3-89b7085353f9ade38c2f2d4cac4aa9caf9db6a9d.tar.gz
re3-89b7085353f9ade38c2f2d4cac4aa9caf9db6a9d.tar.bz2
re3-89b7085353f9ade38c2f2d4cac4aa9caf9db6a9d.tar.lz
re3-89b7085353f9ade38c2f2d4cac4aa9caf9db6a9d.tar.xz
re3-89b7085353f9ade38c2f2d4cac4aa9caf9db6a9d.tar.zst
re3-89b7085353f9ade38c2f2d4cac4aa9caf9db6a9d.zip
Diffstat (limited to 'src/control')
-rw-r--r--src/control/Script.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index 83d072f3..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: