summaryrefslogtreecommitdiffstats
path: root/src/control/Script.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-05-10 11:25:30 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-05-10 11:25:30 +0200
commit2f7d2fa3ad697b6fa1896ac75f97c23f52ed843e (patch)
tree24ca53597b1ebf632b12fb315ef91e899807d47d /src/control/Script.cpp
parentMerge pull request #528 from Nick007J/miami (diff)
downloadre3-2f7d2fa3ad697b6fa1896ac75f97c23f52ed843e.tar
re3-2f7d2fa3ad697b6fa1896ac75f97c23f52ed843e.tar.gz
re3-2f7d2fa3ad697b6fa1896ac75f97c23f52ed843e.tar.bz2
re3-2f7d2fa3ad697b6fa1896ac75f97c23f52ed843e.tar.lz
re3-2f7d2fa3ad697b6fa1896ac75f97c23f52ed843e.tar.xz
re3-2f7d2fa3ad697b6fa1896ac75f97c23f52ed843e.tar.zst
re3-2f7d2fa3ad697b6fa1896ac75f97c23f52ed843e.zip
Diffstat (limited to 'src/control/Script.cpp')
-rw-r--r--src/control/Script.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index 307cb536..90bde151 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -9784,7 +9784,15 @@ int8 CRunningScript::ProcessCommands1200To1299(int32 command)
case COMMAND_SET_CAR_FORWARD_SPEED:
case COMMAND_SET_AREA_VISIBLE:
case COMMAND_SET_CUTSCENE_ANIM_TO_LOOP:
+ assert(0);
case COMMAND_MARK_CAR_AS_CONVOY_CAR:
+ {
+ CollectParameters(&m_nIp, 2);
+ CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+ assert(pVehicle);
+ pVehicle->bPartOfConvoy = ScriptParams[1];
+ return 0;
+ }
case COMMAND_RESET_HAVOC_CAUSED_BY_PLAYER:
case COMMAND_GET_HAVOC_CAUSED_BY_PLAYER:
case COMMAND_CREATE_SCRIPT_ROADBLOCK: