summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshfil <filip.gawin@zoho.com>2020-12-14 15:34:05 +0100
committerGitHub <noreply@github.com>2020-12-14 15:34:05 +0100
commit3c8c20ea0b5e13bac468fbf40e5845bca272b568 (patch)
tree94bd71e13d6f5779146f3109c7b8b034a620b771
parentMerge pull request #876 from IlDucci/master (diff)
parentImplement COMMAND_IS_CAR_PASSENGER_SEAT_FREE (diff)
downloadre3-3c8c20ea0b5e13bac468fbf40e5845bca272b568.tar
re3-3c8c20ea0b5e13bac468fbf40e5845bca272b568.tar.gz
re3-3c8c20ea0b5e13bac468fbf40e5845bca272b568.tar.bz2
re3-3c8c20ea0b5e13bac468fbf40e5845bca272b568.tar.lz
re3-3c8c20ea0b5e13bac468fbf40e5845bca272b568.tar.xz
re3-3c8c20ea0b5e13bac468fbf40e5845bca272b568.tar.zst
re3-3c8c20ea0b5e13bac468fbf40e5845bca272b568.zip
Diffstat (limited to '')
-rw-r--r--src/control/Script6.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/control/Script6.cpp b/src/control/Script6.cpp
index acd9e424..c2937e1d 100644
--- a/src/control/Script6.cpp
+++ b/src/control/Script6.cpp
@@ -545,7 +545,14 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
CStats::RegisterHighestScore(ScriptParams[0], ScriptParams[1]);
return 0;
//case COMMAND_WARP_CHAR_INTO_CAR_AS_PASSENGER:
- //case COMMAND_IS_CAR_PASSENGER_SEAT_FREE:
+ case COMMAND_IS_CAR_PASSENGER_SEAT_FREE:
+ {
+ CollectParameters(&m_nIp, 2);
+ CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+ script_assert(pVehicle);
+ UpdateCompareFlag(ScriptParams[1] < pVehicle->m_nNumMaxPassengers && pVehicle->pPassengers[ScriptParams[1]] == nil);
+ return 0;
+ }
case COMMAND_GET_CHAR_IN_CAR_PASSENGER_SEAT:
{
CollectParameters(&m_nIp, 2);