1 files changed, 345 insertions, 42 deletions

diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index 3636e5e8..73bf45e8 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -820,15 +820,16 @@ int8 CRunningScript::ProcessOneCommand()
 		return ProcessCommands800To899(command);
 	if (command < 1000)
 		return ProcessCommands900To999(command);
-#ifdef GTA_PS2
-	if (command < 1200)
-		return ProcessCommands1000To1099(command);
-#else
 	if (command < 1100)
 		return ProcessCommands1000To1099(command);
 	if (command < 1200)
 		return ProcessCommands1100To1199(command);
-#endif
+	if (command < 1300)
+		return ProcessCommands1200To1299(command);
+	if (command < 1400)
+		return ProcessCommands1300To1399(command);
+	if (command < 1500)
+		return ProcessCommands1400To1499(command);
 	return -1;
 }
 
@@ -8412,10 +8413,15 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
 		ScriptParams[0] = CWorld::Players[CWorld::PlayerInFocus].m_nCollectedPackages;
 		StoreParameters(&m_nIp, 1);
 		return 0;
-	case COMMAND_REGISTER_EL_BURRO_TIME:
+	case COMMAND_SET_CHAR_OBJ_LEAVE_ANY_CAR:
+	{
 		CollectParameters(&m_nIp, 1);
-		CStats::RegisterElBurroTime(ScriptParams[0]);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		pPed->bScriptObjectiveCompleted = false;
+		pPed->SetObjective(OBJECTIVE_LEAVE_VEHICLE, pPed->m_pMyVehicle);
 		return 0;
+	}
 	case COMMAND_SET_SPRITES_DRAW_BEFORE_FADE:
 		CollectParameters(&m_nIp, 1);
 		CTheScripts::IntroRectangles[CTheScripts::NumberOfIntroRectanglesThisFrame].m_bBeforeFade = ScriptParams[0] != 0;
@@ -8590,21 +8596,17 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 			pPed->m_nZoneLevel = LEVEL_NONE;
 		return 0;
 	}
-	case COMMAND_REGISTER_4X4_ONE_TIME:
-		CollectParameters(&m_nIp, 1);
-		CStats::Register4x4OneTime(ScriptParams[0]);
+	case COMMAND_SET_DRUNK_INPUT_DELAY:
+		assert(0 && "SET_DRUNK_INPUT_DELAY not yet implemented");
 		return 0;
-	case COMMAND_REGISTER_4X4_TWO_TIME:
-		CollectParameters(&m_nIp, 1);
-		CStats::Register4x4TwoTime(ScriptParams[0]);
+	case COMMAND_SET_CHAR_MONEY:
+		assert(0 && "SET_CHAR_MONEY not yet implemented");
 		return 0;
-	case COMMAND_REGISTER_4X4_THREE_TIME:
-		CollectParameters(&m_nIp, 1);
-		CStats::Register4x4ThreeTime(ScriptParams[0]);
+	case COMMAND_INCREASE_CHAR_MONEY:
+		assert(0 && "INCREASE_CHAR_MONEY not yet implemented");
 		return 0;
-	case COMMAND_REGISTER_4X4_MAYHEM_TIME:
-		CollectParameters(&m_nIp, 1);
-		CStats::Register4x4MayhemTime(ScriptParams[0]);
+	case COMMAND_GET_OFFSET_FROM_OBJECT_IN_WORLD_COORDS:
+		assert(0 && "GET_OFFSET_FROM_OBJECT_IN_WORLD_COORDS not yet implemented");
 		return 0;
 	case COMMAND_REGISTER_LIFE_SAVED:
 		CStats::AnotherLifeSavedWithAmbulance();
@@ -8627,9 +8629,8 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 		CollectParameters(&m_nIp, 1);
 		CStats::RegisterLongestFlightInDodo(ScriptParams[0]);
 		return 0;
-	case COMMAND_REGISTER_DEFUSE_BOMB_TIME:
-		CollectParameters(&m_nIp, 1);
-		CStats::RegisterTimeTakenDefuseMission(ScriptParams[0]);
+	case COMMAND_GET_OFFSET_FROM_CAR_IN_WORLD_COORDS:
+		assert(0 && "GET_OFFSET_FROM_CAR_IN_WORLD_COORDS not yet implemented");
 		return 0;
 	case COMMAND_SET_TOTAL_NUMBER_OF_KILL_FRENZIES:
 		CollectParameters(&m_nIp, 1);
@@ -9142,7 +9143,6 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
 			pPed->m_objective != OBJECTIVE_ENTER_CAR_AS_DRIVER);
 		return 0;
 	}
-#ifndef GTA_PS2
 	default:
 		assert(0);
 	}
@@ -9153,7 +9153,6 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 {
 	char tmp[48];
 	switch (command) {
-#endif
 	case COMMAND_LOAD_COLLISION_WITH_SCREEN:
 		CollectParameters(&m_nIp, 1);
 		CTimer::Stop();
@@ -9219,9 +9218,6 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 	case COMMAND_ENABLE_PLAYER_CONTROL_CAMERA:
 		CPad::GetPad(0)->DisablePlayerControls &= PLAYERCONTROL_DISABLED_1;
 		return 0;
-#ifndef GTA_PS2
-	// To be precise, on PS2 previous handlers were in 1000-1099 function
-	// These are "beta" VC commands (with bugs)
 	case COMMAND_SET_OBJECT_ROTATION:
 	{
 		CollectParameters(&m_nIp, 4);
@@ -9631,13 +9627,13 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 	case COMMAND_LOCATE_CHAR_IN_CAR_OBJECT_3D:
 		LocateCharObjectCommand(command, &m_nIp);
 		return 0;
-	case COMMAND_SET_CAR_HANDBRAKE_TURN_LEFT: // this will be changed in final VC version to a more general SET_TEMP_ACTION
+	case COMMAND_SET_CAR_TEMP_ACTION:
 	{
-		CollectParameters(&m_nIp, 2);
+		CollectParameters(&m_nIp, 3);
 		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
 		assert(pVehicle);
-		pVehicle->AutoPilot.m_nTempAction = TEMPACT_HANDBRAKETURNLEFT;
-		pVehicle->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + ScriptParams[1];
+		pVehicle->AutoPilot.m_nTempAction = (eCarTempAction)ScriptParams[1];
+		pVehicle->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + ScriptParams[2];
 		return 0;
 	}
 	case COMMAND_SET_CAR_HANDBRAKE_TURN_RIGHT:
@@ -9708,23 +9704,330 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
 	}
 	case COMMAND_SET_ENTER_CAR_RANGE_MULTIPLIER:
 		CollectParameters(&m_nIp, 1);
-#ifdef FIX_BUGS
 		CPed::nEnterCarRangeMultiplier = *(float*)&ScriptParams[0];
-#else
-		CPed::nEnterCarRangeMultiplier = (float)ScriptParams[0];
-#endif
 		return 0;
-#endif
-#ifndef GTA3_1_1_PATCH
 	case COMMAND_SET_THREAT_REACTION_RANGE_MULTIPLIER:
 		CollectParameters(&m_nIp, 1);
-#ifdef FIX_BUGS
 		CPed::nThreatReactionRangeMultiplier = *(float*)&ScriptParams[0];
-#else
-		CPed::nThreatReactionRangeMultiplier = (float)ScriptParams[0];
-#endif
 		return 0;
-#endif
+	case COMMAND_SET_CHAR_CEASE_ATTACK_TIMER:
+	case COMMAND_GET_REMOTE_CONTROLLED_CAR:
+	case COMMAND_IS_PC_VERSION:
+	case COMMAND_REPLAY:
+	case COMMAND_IS_REPLAY_PLAYING:
+	case COMMAND_IS_MODEL_AVAILABLE:
+	case COMMAND_SHUT_CHAR_UP:
+	case COMMAND_SET_ENABLE_RC_DETONATE:
+	case COMMAND_SET_CAR_RANDOM_ROUTE_SEED:
+	case COMMAND_IS_ANY_PICKUP_AT_COORDS:
+	case COMMAND_GET_FIRST_PICKUP_COORDS:
+	case COMMAND_GET_NEXT_PICKUP_COORDS:
+	case COMMAND_REMOVE_ALL_CHAR_WEAPONS:
+	case COMMAND_HAS_PLAYER_GOT_WEAPON:
+	case COMMAND_HAS_CHAR_GOT_WEAPON:
+	case COMMAND_IS_PLAYER_FACING_CHAR:
+	case COMMAND_SET_TANK_DETONATE_CARS:
+	case COMMAND_GET_POSITION_OF_ANALOGUE_STICKS:
+	case COMMAND_IS_CAR_ON_FIRE:
+	case COMMAND_IS_CAR_TYRE_BURST:
+	case COMMAND_SET_CAR_DRIVE_STRAIGHT_AHEAD:
+	case COMMAND_SET_CAR_WAIT:
+	case COMMAND_IS_PLAYER_STANDING_ON_A_VEHICLE:
+	case COMMAND_IS_PLAYER_FOOT_DOWN:
+	case COMMAND_IS_CHAR_FOOT_DOWN:
+	case COMMAND_INITIALISE_OBJECT_PATH:
+	case COMMAND_START_OBJECT_ON_PATH:
+	case COMMAND_SET_OBJECT_PATH_SPEED:
+	case COMMAND_SET_OBJECT_PATH_POSITION:
+	case COMMAND_GET_OBJECT_DISTANCE_ALONG_PATH:
+	case COMMAND_CLEAR_OBJECT_PATH:
+	case COMMAND_HELI_GOTO_COORDS:
+	case COMMAND_IS_INT_VAR_EQUAL_TO_CONSTANT:
+	case COMMAND_IS_INT_LVAR_EQUAL_TO_CONSTANT:
+	case COMMAND_GET_DEAD_CHAR_PICKUP_COORDS:
+	case COMMAND_CREATE_PROTECTION_PICKUP:
+	case COMMAND_IS_CHAR_IN_ANY_BOAT:
+	case COMMAND_IS_PLAYER_IN_ANY_BOAT:
+	case COMMAND_IS_CHAR_IN_ANY_HELI:
+	case COMMAND_IS_PLAYER_IN_ANY_HELI:
+	case COMMAND_IS_CHAR_IN_ANY_PLANE:
+	case COMMAND_IS_PLAYER_IN_ANY_PLANE:
+	case COMMAND_IS_CHAR_IN_WATER:
+	case COMMAND_SET_VAR_INT_TO_CONSTANT:
+	case COMMAND_SET_LVAR_INT_TO_CONSTANT:
+	default:
+		assert(0);
+	}
+	return -1;
+}
+
+
+int8 CRunningScript::ProcessCommands1200To1299(int32 command)
+{
+	switch (command) {
+	case COMMAND_IS_INT_VAR_GREATER_THAN_CONSTANT:
+	case COMMAND_IS_INT_LVAR_GREATER_THAN_CONSTANT:
+	case COMMAND_IS_CONSTANT_GREATER_THAN_INT_VAR:
+	case COMMAND_IS_CONSTANT_GREATER_THAN_INT_LVAR:
+	case COMMAND_IS_INT_VAR_GREATER_OR_EQUAL_TO_CONSTANT:
+	case COMMAND_IS_INT_LVAR_GREATER_OR_EQUAL_TO_CONSTANT:
+	case COMMAND_IS_CONSTANT_GREATER_OR_EQUAL_TO_INT_VAR:
+	case COMMAND_IS_CONSTANT_GREATER_OR_EQUAL_TO_INT_LVAR:
+	case COMMAND_GET_CHAR_WEAPON_IN_SLOT:
+	case COMMAND_GET_CLOSEST_STRAIGHT_ROAD:
+	case COMMAND_SET_CAR_FORWARD_SPEED:
+	case COMMAND_SET_AREA_VISIBLE:
+	case COMMAND_SET_CUTSCENE_ANIM_TO_LOOP:
+	case COMMAND_MARK_CAR_AS_CONVOY_CAR:
+	case COMMAND_RESET_HAVOC_CAUSED_BY_PLAYER:
+	case COMMAND_GET_HAVOC_CAUSED_BY_PLAYER:
+	case COMMAND_CREATE_SCRIPT_ROADBLOCK:
+	case COMMAND_CLEAR_ALL_SCRIPT_ROADBLOCKS:
+	case COMMAND_SET_CHAR_OBJ_WALK_TO_CHAR:
+	case COMMAND_IS_PICKUP_IN_ZONE:
+	case COMMAND_GET_OFFSET_FROM_CHAR_IN_WORLD_COORDS:
+	case COMMAND_HAS_CHAR_BEEN_PHOTOGRAPHED:
+	case COMMAND_SET_CHAR_OBJ_AIM_GUN_AT_CHAR:
+	case COMMAND_SWITCH_SECURITY_CAMERA:
+	case COMMAND_IS_CHAR_IN_FLYING_VEHICLE:
+	case COMMAND_IS_PLAYER_IN_FLYING_VEHICLE:
+	case COMMAND_HAS_SONY_CD_BEEN_READ:
+	case COMMAND_GET_NUMBER_OF_SONY_CDS_READ:
+	case COMMAND_ADD_SHORT_RANGE_BLIP_FOR_COORD_OLD:
+	case COMMAND_ADD_SHORT_RANGE_BLIP_FOR_COORD:
+	case COMMAND_ADD_SHORT_RANGE_SPRITE_BLIP_FOR_COORD:
+	case COMMAND_ADD_MONEY_SPENT_ON_CLOTHES:
+	case COMMAND_SET_HELI_ORIENTATION:
+	case COMMAND_CLEAR_HELI_ORIENTATION:
+	case COMMAND_PLANE_GOTO_COORDS:
+	case COMMAND_GET_NTH_CLOSEST_CAR_NODE:
+	case COMMAND_GET_NTH_CLOSEST_CHAR_NODE:
+	case COMMAND_DRAW_WEAPONSHOP_CORONA:
+	case COMMAND_SET_ENABLE_RC_DETONATE_ON_CONTACT:
+	case COMMAND_FREEZE_CHAR_POSITION:
+	case COMMAND_SET_CHAR_DROWNS_IN_WATER:
+	case COMMAND_SET_OBJECT_RECORDS_COLLISIONS:
+	case COMMAND_HAS_OBJECT_COLLIDED_WITH_ANYTHING:
+	case COMMAND_REMOVE_RC_BUGGY:
+	case COMMAND_HAS_PHOTOGRAPH_BEEN_TAKEN:
+	case COMMAND_GET_CHAR_ARMOUR:
+	case COMMAND_SET_CHAR_ARMOUR:
+	case COMMAND_SET_HELI_STABILISER:
+	case COMMAND_SET_CAR_STRAIGHT_LINE_DISTANCE:
+	case COMMAND_POP_CAR_BOOT:
+	case COMMAND_SHUT_PLAYER_UP:
+	case COMMAND_SET_PLAYER_MOOD:
+		assert(0);
+	case COMMAND_REQUEST_COLLISION:
+	{
+		CollectParameters(&m_nIp, 2);
+		CVector2D pos;
+		pos.x = *(float*)&ScriptParams[0];
+		pos.y = *(float*)&ScriptParams[1];
+		CColStore::RequestCollision(pos);
+		return 0;
+	}
+	case COMMAND_LOCATE_OBJECT_2D:
+	case COMMAND_LOCATE_OBJECT_3D:
+	case COMMAND_IS_OBJECT_IN_WATER:
+	case COMMAND_SET_CHAR_OBJ_STEAL_ANY_CAR_EVEN_MISSION_CAR:
+	case COMMAND_IS_OBJECT_IN_AREA_2D:
+	case COMMAND_IS_OBJECT_IN_AREA_3D:
+	case COMMAND_TASK_TOGGLE_DUCK:
+	case COMMAND_SET_ZONE_CIVILIAN_CAR_INFO:
+	case COMMAND_REQUEST_ANIMATION:
+	case COMMAND_HAS_ANIMATION_LOADED:
+	case COMMAND_REMOVE_ANIMATION:
+	case COMMAND_IS_CHAR_WAITING_FOR_WORLD_COLLISION:
+	case COMMAND_IS_CAR_WAITING_FOR_WORLD_COLLISION:
+	case COMMAND_IS_OBJECT_WAITING_FOR_WORLD_COLLISION:
+	case COMMAND_SET_CHAR_SHUFFLE_INTO_DRIVERS_SEAT:
+	case COMMAND_ATTACH_CHAR_TO_OBJECT:
+	case COMMAND_SET_CHAR_AS_PLAYER_FRIEND:
+	case COMMAND_DISPLAY_NTH_ONSCREEN_COUNTER:
+	case COMMAND_DISPLAY_NTH_ONSCREEN_COUNTER_WITH_STRING:
+	case COMMAND_ADD_SET_PIECE:
+	case COMMAND_SET_EXTRA_COLOURS:
+	case COMMAND_CLEAR_EXTRA_COLOURS:
+	case COMMAND_CLOSE_CAR_BOOT:
+	case COMMAND_GET_WHEELIE_STATS:
+	case COMMAND_DISARM_CHAR:
+	case COMMAND_BURST_CAR_TYRE:
+	case COMMAND_IS_CHAR_OBJ_NO_OBJ:
+	case COMMAND_IS_PLAYER_WEARING:
+	case COMMAND_SET_PLAYER_CAN_DO_DRIVE_BY:
+	case COMMAND_SET_CHAR_OBJ_SPRINT_TO_COORD:
+	case COMMAND_CREATE_SWAT_ROPE:
+	case COMMAND_SET_FIRST_PERSON_CONTROL_CAMERA:
+	case COMMAND_GET_NEAREST_TYRE_TO_POINT:
+	case COMMAND_SET_CAR_MODEL_COMPONENTS:
+	case COMMAND_SWITCH_LIFT_CAMERA:
+	case COMMAND_CLOSE_ALL_CAR_DOORS:
+	case COMMAND_GET_DISTANCE_BETWEEN_COORDS_2D:
+	case COMMAND_GET_DISTANCE_BETWEEN_COORDS_3D:
+	case COMMAND_POP_CAR_BOOT_USING_PHYSICS:
+	case COMMAND_SET_FIRST_PERSON_WEAPON_CAMERA:
+	case COMMAND_IS_CHAR_LEAVING_VEHICLE_TO_DIE:
+	case COMMAND_SORT_OUT_OBJECT_COLLISION_WITH_CAR:
+	case COMMAND_GET_MAX_WANTED_LEVEL:
+	case COMMAND_IS_CHAR_WANDER_PATH_CLEAR:
+	case COMMAND_PRINT_HELP_WITH_NUMBER:
+	case COMMAND_PRINT_HELP_FOREVER:
+	case COMMAND_PRINT_HELP_FOREVER_WITH_NUMBER:
+	default:
+		assert(0);
+	}
+	return -1;
+}
+
+int8 CRunningScript::ProcessCommands1300To1399(int32 command)
+{
+	switch (command) {
+	case COMMAND_SET_CHAR_CAN_BE_DAMAGED_BY_MEMBERS_OF_GANG:
+	case COMMAND_LOAD_AND_LAUNCH_MISSION_EXCLUSIVE:
+	case COMMAND_IS_MISSION_AUDIO_PLAYING:
+	case COMMAND_CREATE_LOCKED_PROPERTY_PICKUP:
+	case COMMAND_CREATE_FORSALE_PROPERTY_PICKUP:
+	case COMMAND_FREEZE_CAR_POSITION:
+	case COMMAND_HAS_CHAR_BEEN_DAMAGED_BY_CHAR:
+	case COMMAND_HAS_CHAR_BEEN_DAMAGED_BY_CAR:
+	case COMMAND_HAS_CAR_BEEN_DAMAGED_BY_CHAR:
+	case COMMAND_HAS_CAR_BEEN_DAMAGED_BY_CAR:
+	case COMMAND_GET_RADIO_CHANNEL:
+	case COMMAND_DISPLAY_TEXT_WITH_3_NUMBERS:
+	case COMMAND_IS_CAR_DROWNING_IN_WATER:
+	case COMMAND_IS_CHAR_DROWNING_IN_WATER:
+	case COMMAND_DISABLE_CUTSCENE_SHADOWS:
+	case COMMAND_HAS_GLASS_BEEN_SHATTERED_NEARBY:
+	case COMMAND_ATTACH_CUTSCENE_OBJECT_TO_BONE:
+	case COMMAND_ATTACH_CUTSCENE_OBJECT_TO_COMPONENT:
+	case COMMAND_SET_CHAR_STAY_IN_CAR_WHEN_JACKED:
+	case COMMAND_IS_MISSION_AUDIO_LOADING:
+	case COMMAND_ADD_MONEY_SPENT_ON_WEAPONS:
+	case COMMAND_ADD_MONEY_SPENT_ON_PROPERTY:
+	case COMMAND_ADD_MONEY_SPENT_ON_AUTO_PAINTING:
+	case COMMAND_SET_CHAR_ANSWERING_MOBILE:
+	case COMMAND_SET_PLAYER_DRUNKENNESS:
+	case COMMAND_GET_PLAYER_DRUNKENNESS:
+	case COMMAND_SET_PLAYER_DRUG_LEVEL:
+	case COMMAND_GET_PLAYER_DRUG_LEVEL:
+	case COMMAND_ADD_LOAN_SHARK_VISITS:
+	case COMMAND_ADD_STORES_KNOCKED_OFF:
+	case COMMAND_ADD_MOVIE_STUNTS:
+	case COMMAND_ADD_NUMBER_OF_ASSASSINATIONS:
+	case COMMAND_ADD_PIZZAS_DELIVERED:
+	case COMMAND_ADD_GARBAGE_PICKUPS:
+	case COMMAND_ADD_ICE_CREAMS_SOLD:
+	case COMMAND_SET_TOP_SHOOTING_RANGE_SCORE:
+	case COMMAND_ADD_SHOOTING_RANGE_RANK:
+	case COMMAND_ADD_MONEY_SPENT_ON_GAMBLING:
+	case COMMAND_ADD_MONEY_WON_ON_GAMBLING:
+	case COMMAND_SET_LARGEST_GAMBLING_WIN:
+	case COMMAND_SET_CHAR_IN_PLAYERS_GROUP_CAN_FIGHT:
+	case COMMAND_CLEAR_CHAR_WAIT_STATE:
+	case COMMAND_GET_RANDOM_CAR_OF_TYPE_IN_AREA_NO_SAVE:
+	case COMMAND_SET_CAN_BURST_CAR_TYRES:
+	case COMMAND_SET_PLAYER_AUTO_AIM:
+	case COMMAND_FIRE_HUNTER_GUN:
+	case COMMAND_SET_PROPERTY_AS_OWNED:
+	case COMMAND_ADD_BLOOD_RING_KILLS:
+	case COMMAND_SET_LONGEST_TIME_IN_BLOOD_RING:
+	case COMMAND_REMOVE_EVERYTHING_FOR_HUGE_CUTSCENE:
+	case COMMAND_IS_PLAYER_TOUCHING_VEHICLE:
+	case COMMAND_IS_CHAR_TOUCHING_VEHICLE:
+	case COMMAND_CHECK_FOR_PED_MODEL_AROUND_PLAYER:
+	case COMMAND_CLEAR_CHAR_FOLLOW_PATH:
+	case COMMAND_SET_CHAR_CAN_BE_SHOT_IN_VEHICLE:
+	case COMMAND_ATTACH_CUTSCENE_OBJECT_TO_VEHICLE:
+	case COMMAND_LOAD_MISSION_TEXT:
+	case COMMAND_SET_TONIGHTS_EVENT:
+	case COMMAND_CLEAR_CHAR_LAST_DAMAGE_ENTITY:
+	case COMMAND_CLEAR_CAR_LAST_DAMAGE_ENTITY:
+	case COMMAND_FREEZE_OBJECT_POSITION:
+	case COMMAND_SET_PLAYER_HAS_MET_DEBBIE_HARRY:
+	case COMMAND_SET_RIOT_INTENSITY:
+	case COMMAND_IS_CAR_IN_ANGLED_AREA_2D:
+	case COMMAND_IS_CAR_IN_ANGLED_AREA_3D:
+	case COMMAND_REMOVE_WEAPON_FROM_CHAR:
+	case COMMAND_SET_UP_TAXI_SHORTCUT:
+	case COMMAND_CLEAR_TAXI_SHORTCUT:
+	case COMMAND_SET_CHAR_OBJ_GOTO_CAR_ON_FOOT:
+	case COMMAND_GET_CLOSEST_WATER_NODE:
+	case COMMAND_ADD_PORN_LEAFLET_TO_RUBBISH:
+	case COMMAND_CREATE_CLOTHES_PICKUP:
+	case COMMAND_CHANGE_BLIP_THRESHOLD:
+	case COMMAND_MAKE_PLAYER_FIRE_PROOF:
+	case COMMAND_INCREASE_PLAYER_MAX_HEALTH:
+	case COMMAND_INCREASE_PLAYER_MAX_ARMOUR:
+	case COMMAND_CREATE_RANDOM_CHAR_AS_DRIVER:
+	case COMMAND_CREATE_RANDOM_CHAR_AS_PASSENGER:
+	case COMMAND_SET_CHAR_IGNORE_THREATS_BEHIND_OBJECTS:
+	case COMMAND_ENSURE_PLAYER_HAS_DRIVE_BY_WEAPON:
+	case COMMAND_MAKE_HELI_COME_CRASHING_DOWN:
+	case COMMAND_ADD_EXPLOSION_NO_SOUND:
+	case COMMAND_SET_OBJECT_AREA_VISIBLE:
+	case COMMAND_WAS_VEHICLE_EVER_POLICE:
+	case COMMAND_SET_CHAR_NEVER_TARGETTED:
+	case COMMAND_LOAD_UNCOMPRESSED_ANIM:
+	case COMMAND_WAS_CUTSCENE_SKIPPED:
+	case COMMAND_SET_CHAR_CROUCH_WHEN_THREATENED:
+	case COMMAND_IS_CHAR_IN_ANY_POLICE_VEHICLE:
+	case COMMAND_DOES_CHAR_EXIST:
+	case COMMAND_DOES_VEHICLE_EXIST:
+	case COMMAND_ADD_SHORT_RANGE_BLIP_FOR_CONTACT_POINT:
+	case COMMAND_ADD_SHORT_RANGE_SPRITE_BLIP_FOR_CONTACT_POINT:
+	case COMMAND_IS_CHAR_STUCK:
+	case COMMAND_SET_ALL_TAXIS_HAVE_NITRO:
+	case COMMAND_SET_CHAR_STOP_SHOOT_DONT_SEEK_ENTITY:
+	case COMMAND_FREEZE_CAR_POSITION_AND_DONT_LOAD_COLLISION:
+	case COMMAND_FREEZE_CHAR_POSITION_AND_DONT_LOAD_COLLISION:
+	case COMMAND_FREEZE_OBJECT_POSITION_AND_DONT_LOAD_COLLISION:
+	case COMMAND_SET_FADE_AND_JUMPCUT_AFTER_RC_EXPLOSION:
+	default:
+		assert(0);
+	}
+	return -1;
+}
+
+int8 CRunningScript::ProcessCommands1400To1499(int32 command)
+{
+	switch (command) {
+	case COMMAND_REGISTER_VIGILANTE_LEVEL:
+	case COMMAND_CLEAR_ALL_CHAR_ANIMS:
+	case COMMAND_SET_MAXIMUM_NUMBER_OF_CARS_IN_GARAGE:
+	case COMMAND_WANTED_STARS_ARE_FLASHING:
+	case COMMAND_SET_ALLOW_HURRICANES:
+	case COMMAND_PLAY_ANNOUNCEMENT:
+	case COMMAND_SET_PLAYER_IS_IN_STADIUM:
+	case COMMAND_GET_BUS_FARES_COLLECTED_BY_PLAYER:
+	case COMMAND_SET_CHAR_OBJ_BUY_ICE_CREAM:
+	case COMMAND_DISPLAY_RADAR:
+	case COMMAND_REGISTER_BEST_POSITION:
+	case COMMAND_IS_PLAYER_IN_INFO_ZONE:
+	case COMMAND_CLEAR_CHAR_ICE_CREAM_PURCHASE:
+	case COMMAND_IS_IN_CAR_FIRE_BUTTON_PRESSED:
+	case COMMAND_HAS_CHAR_ATTEMPTED_ATTRACTOR:
+	case COMMAND_SET_LOAD_COLLISION_FOR_CAR_FLAG:
+	case COMMAND_SET_LOAD_COLLISION_FOR_CHAR_FLAG:
+	case COMMAND_SET_LOAD_COLLISION_FOR_OBJECT_FLAG:
+	case COMMAND_ADD_BIG_GUN_FLASH:
+	case COMMAND_HAS_CHAR_BOUGHT_ICE_CREAM:
+	case COMMAND_GET_PROGRESS_PERCENTAGE:
+	case COMMAND_SET_SHORTCUT_PICKUP_POINT:
+	case COMMAND_SET_SHORTCUT_DROPOFF_POINT_FOR_MISSION:
+	case COMMAND_GET_RANDOM_ICE_CREAM_CUSTOMER_IN_AREA:
+	case COMMAND_GET_RANDOM_ICE_CREAM_CUSTOMER_IN_ZONE:
+	case COMMAND_UNLOCK_ALL_CAR_DOORS_IN_AREA:
+	case COMMAND_SET_GANG_ATTACK_PLAYER_WITH_COPS:
+	case COMMAND_SET_CHAR_FRIGHTENED_IN_JACKED_CAR:
+	case COMMAND_SET_VEHICLE_TO_FADE_IN:
+	case COMMAND_REGISTER_ODDJOB_MISSION_PASSED:
+	case COMMAND_IS_PLAYER_IN_SHORTCUT_TAXI:
+	case COMMAND_IS_CHAR_DUCKING:
+	case COMMAND_CREATE_DUST_EFFECT_FOR_CUTSCENE_HELI:
+	case COMMAND_REGISTER_FIRE_LEVEL:
+	case COMMAND_IS_AUSTRALIAN_GAME:
+	case COMMAND_DISARM_CAR_BOMB:
 	default:
 		assert(0);
 	}