12 files changed, 854 insertions, 12 deletions

diff --git a/src/control/Cranes.cpp b/src/control/Cranes.cpp
index 9610e37a..ebdbf957 100644
--- a/src/control/Cranes.cpp
+++ b/src/control/Cranes.cpp
@@ -3,4 +3,6 @@
 #include "Cranes.h"
 
 WRAPPER bool CCranes::IsThisCarBeingTargettedByAnyCrane(CVehicle*) { EAXJMP(0x5451E0); }
-WRAPPER bool CCranes::IsThisCarBeingCarriedByAnyCrane(CVehicle*) { EAXJMP(0x545190); }
\ No newline at end of file
+WRAPPER bool CCranes::IsThisCarBeingCarriedByAnyCrane(CVehicle*) { EAXJMP(0x545190); }
+WRAPPER void CCranes::ActivateCrane(float, float, float, float, float, float, float, float, bool, bool, float, float) { EAXJMP(0x543650); }
+WRAPPER void CCranes::DeActivateCrane(float, float) { EAXJMP(0x543890); }
\ No newline at end of file
diff --git a/src/control/Cranes.h b/src/control/Cranes.h
index 3af2c9bc..be586398 100644
--- a/src/control/Cranes.h
+++ b/src/control/Cranes.h
@@ -8,4 +8,6 @@ class CCranes
 public:
 	static bool IsThisCarBeingTargettedByAnyCrane(CVehicle*);
 	static bool IsThisCarBeingCarriedByAnyCrane(CVehicle*);
+	static void ActivateCrane(float, float, float, float, float, float, float, float, bool, bool, float, float);
+	static void DeActivateCrane(float, float);
 };
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index 5885b310..777acb12 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -11,6 +11,7 @@
 #include "CivilianPed.h"
 #include "Clock.h"
 #include "CopPed.h"
+#include "Cranes.h"
 #include "DMAudio.h"
 #include "EmergencyPed.h"
 #include "FileMgr.h"
@@ -21,6 +22,7 @@
 #include "Messages.h"
 #include "ModelIndices.h"
 #include "Pad.h"
+#include "PedRoutes.h"
 #include "Pickups.h"
 #include "PlayerInfo.h"
 #include "PlayerPed.h"
@@ -534,7 +536,7 @@ void CTheScripts::Init()
 	FailCurrentMission = 0;
 	CountdownToMakePlayerUnsafe = 0;
 	DbgFlag = 0;
-	DelayMakingPlayerUnsafeThisTime = 0;
+	DelayMakingPlayerUnsafeThisTime = 1;
 	NumScriptDebugLines = 0;
 	for (int i = 0; i < MAX_NUM_SCRIPT_SPHERES; i++){
 		ScriptSphereArray[i].m_bInUse = false;
@@ -3543,6 +3545,792 @@ int8 CRunningScript::ProcessCommandsFrom300To399(int32 command)
 }
 #endif
 
+#if 0
+WRAPPER int8 CRunningScript::ProcessCommandsFrom400To499(int32 command) { EAXJMP(0x440CB0); }
+#else
+int8 CRunningScript::ProcessCommandsFrom400To499(int32 command)
+{
+	switch (command) {
+	case COMMAND_ADD_UPSIDEDOWN_CAR_CHECK:
+	{
+		CollectParameters(&m_nIp, 1);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle);
+		CTheScripts::UpsideDownCars.AddCarToCheck(ScriptParams[0]);
+		return 0;
+	}
+	case COMMAND_REMOVE_UPSIDEDOWN_CAR_CHECK:
+	{
+		CollectParameters(&m_nIp, 1);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle);
+		CTheScripts::UpsideDownCars.RemoveCarFromCheck(ScriptParams[0]);
+		return 0;
+	}
+	case COMMAND_SET_CHAR_OBJ_WAIT_ON_FOOT:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		pPed->bObjectiveCompleted = false;
+		pPed->SetObjective(OBJECTIVE_IDLE);
+		return 0;
+	}
+	case COMMAND_SET_CHAR_OBJ_FLEE_ON_FOOT_TILL_SAFE:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		pPed->bObjectiveCompleted = false;
+		pPed->SetObjective(OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE);
+		return 0;
+	}
+	case COMMAND_SET_CHAR_OBJ_GUARD_SPOT:
+	{
+		CollectParameters(&m_nIp, 4);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		CVector pos = *(CVector*)&ScriptParams[1];
+		if (pos.z <= -100.0f)
+			pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y);
+		pPed->bObjectiveCompleted = false;
+		pPed->SetObjective(OBJECTIVE_GUARD_SPOT, pos);
+		return 0;
+	}
+	case COMMAND_SET_CHAR_OBJ_GUARD_AREA:
+	{
+		CollectParameters(&m_nIp, 5);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		float infX = *(float*)&ScriptParams[1];
+		float infY = *(float*)&ScriptParams[2];
+		float supX = *(float*)&ScriptParams[3];
+		float supY = *(float*)&ScriptParams[4];
+		if (infX > supX){
+			infX = *(float*)&ScriptParams[3];
+			supX = *(float*)&ScriptParams[1];
+		}
+		if (infY > supY) {
+			infY = *(float*)&ScriptParams[4];
+			supY = *(float*)&ScriptParams[2];
+		}
+		CVector pos;
+		pos.x = (infX + supX) / 2;
+		pos.y = (infY + supY) / 2;
+		pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y);
+		float radius = max(pos.x - infX, pos.y - infY);
+		pPed->bObjectiveCompleted = false;
+		pPed->SetObjective(OBJECTIVE_GUARD_SPOT, pos, radius);
+		return 0;
+	}
+	case COMMAND_SET_CHAR_OBJ_WAIT_IN_CAR:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		pPed->bObjectiveCompleted = false;
+		pPed->SetObjective(OBJECTIVE_WAIT_IN_CAR);
+		return 0;
+	}
+	case COMMAND_IS_PLAYER_IN_AREA_ON_FOOT_2D:
+	case COMMAND_IS_PLAYER_IN_AREA_IN_CAR_2D:
+	case COMMAND_IS_PLAYER_STOPPED_IN_AREA_2D:
+	case COMMAND_IS_PLAYER_STOPPED_IN_AREA_ON_FOOT_2D:
+	case COMMAND_IS_PLAYER_STOPPED_IN_AREA_IN_CAR_2D:
+	case COMMAND_IS_PLAYER_IN_AREA_ON_FOOT_3D:
+	case COMMAND_IS_PLAYER_IN_AREA_IN_CAR_3D:
+	case COMMAND_IS_PLAYER_STOPPED_IN_AREA_3D:
+	case COMMAND_IS_PLAYER_STOPPED_IN_AREA_ON_FOOT_3D:
+	case COMMAND_IS_PLAYER_STOPPED_IN_AREA_IN_CAR_3D:
+		PlayerInAreaCheckCommand(command, &m_nIp);
+		return 0;
+	case COMMAND_IS_CHAR_IN_AREA_ON_FOOT_2D:
+	case COMMAND_IS_CHAR_IN_AREA_IN_CAR_2D:
+	case COMMAND_IS_CHAR_STOPPED_IN_AREA_2D:
+	case COMMAND_IS_CHAR_STOPPED_IN_AREA_ON_FOOT_2D:
+	case COMMAND_IS_CHAR_STOPPED_IN_AREA_IN_CAR_2D:
+	case COMMAND_IS_CHAR_IN_AREA_ON_FOOT_3D:
+	case COMMAND_IS_CHAR_IN_AREA_IN_CAR_3D:
+	case COMMAND_IS_CHAR_STOPPED_IN_AREA_3D:
+	case COMMAND_IS_CHAR_STOPPED_IN_AREA_ON_FOOT_3D:
+	case COMMAND_IS_CHAR_STOPPED_IN_AREA_IN_CAR_3D:
+		CharInAreaCheckCommand(command, &m_nIp);
+		return 0;
+	case COMMAND_IS_CAR_STOPPED_IN_AREA_2D:
+	case COMMAND_IS_CAR_STOPPED_IN_AREA_3D:
+		CarInAreaCheckCommand(command, &m_nIp);
+		return 0;
+	case COMMAND_LOCATE_CAR_2D:
+	case COMMAND_LOCATE_STOPPED_CAR_2D:
+	case COMMAND_LOCATE_CAR_3D:
+	case COMMAND_LOCATE_STOPPED_CAR_3D:
+		LocateCarCommand(command, &m_nIp);
+		return 0;
+	case COMMAND_GIVE_WEAPON_TO_PLAYER:
+	{
+		CollectParameters(&m_nIp, 3);
+		CPlayerPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
+		assert(pPed);
+		pPed->m_nSelectedWepSlot = pPed->GiveWeapon((eWeaponType)ScriptParams[1], ScriptParams[2]);
+	}
+	case COMMAND_GIVE_WEAPON_TO_CHAR:
+	{
+		CollectParameters(&m_nIp, 3);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		pPed->SetCurrentWeapon(pPed->GiveWeapon((eWeaponType)ScriptParams[1], ScriptParams[2]));
+		if (pPed->bInVehicle)
+			pPed->RemoveWeaponModel(CWeaponInfo::GetWeaponInfo(pPed->m_weapons[pPed->m_currentWeapon].m_eWeaponType)->m_nModelId);
+		return 0;
+	}
+	/* Not implemented */
+	//case COMMAND_GIVE_WEAPON_TO_CAR:
+	case COMMAND_SET_PLAYER_CONTROL:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPlayerInfo* pPlayer = &CWorld::Players[ScriptParams[0]];
+		if (ScriptParams[1]){
+			if (CReplay::IsPlayingBack() || CTheScripts::DelayMakingPlayerUnsafeThisTime){
+				CTheScripts::CountdownToMakePlayerUnsafe = 50;
+				if (CTheScripts::DelayMakingPlayerUnsafeThisTime)
+					CTheScripts::DelayMakingPlayerUnsafeThisTime--;
+			}else{
+				pPlayer->MakePlayerSafe(false);
+			}
+		}else{
+			pPlayer->MakePlayerSafe(true);
+			if (strcmp(m_abScriptName, "camera") == 0){
+				pPlayer->m_pPed->SetMoveSpeed(0.0f, 0.0f, 0.0f);
+				pPlayer->m_pPed->SetTurnSpeed(0.0f, 0.0f, 0.0f);
+				CAnimManager::BlendAnimation((RpClump*)pPlayer->m_pPed->m_rwObject, pPlayer->m_pPed->m_animGroup, ANIM_IDLE_STANCE, 1000.0f);
+			}
+		}
+		return 0;
+	}
+	case COMMAND_FORCE_WEATHER:
+		CollectParameters(&m_nIp, 1);
+		CWeather::ForceWeather(ScriptParams[0]);
+		return 0;
+	case COMMAND_FORCE_WEATHER_NOW:
+		CollectParameters(&m_nIp, 1);
+		CWeather::ForceWeatherNow(ScriptParams[0]);
+		return 0;
+	case COMMAND_RELEASE_WEATHER:
+		CWeather::ReleaseWeather();
+		return 0;
+	case COMMAND_SET_CURRENT_PLAYER_WEAPON:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
+		for (int i = 0; i < WEAPONTYPE_TOTAL_INVENTORY_WEAPONS; i++){
+			if (pPed->m_weapons[i].m_eWeaponType == ScriptParams[1])
+				pPed->m_currentWeapon = i;
+		}
+		return 0;
+	}
+	case COMMAND_SET_CURRENT_CHAR_WEAPON:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		for (int i = 0; i < WEAPONTYPE_TOTAL_INVENTORY_WEAPONS; i++) {
+			if (pPed->m_weapons[i].m_eWeaponType == ScriptParams[1])
+				pPed->m_currentWeapon = i;
+		}
+		return 0;
+	}
+	/* Not implemented */
+	//case COMMAND_SET_CURRENT_CAR_WEAPON:
+	case COMMAND_GET_OBJECT_COORDINATES:
+	{
+		CollectParameters(&m_nIp, 1);
+		CObject* pObject = CPools::GetObjectPool()->GetAt(ScriptParams[0]);
+		assert(pObject);
+		*(CVector*)&ScriptParams[0] = pObject->GetPosition();
+		StoreParameters(&m_nIp, 3);
+		return 0;
+	}
+	case COMMAND_SET_OBJECT_COORDINATES:
+	{
+		CollectParameters(&m_nIp, 4);
+		CObject* pObject = CPools::GetObjectPool()->GetAt(ScriptParams[0]);
+		assert(pObject);
+		CVector pos = *(CVector*)&ScriptParams[1];
+		if (pos.z <= -100.0f)
+			pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y);
+		pObject->Teleport(pos);
+		CTheScripts::ClearSpaceForMissionEntity(pos, pObject);
+		return 0;
+	}
+	case COMMAND_GET_GAME_TIMER:
+		ScriptParams[0] = CTimer::GetTimeInMilliseconds();
+		StoreParameters(&m_nIp, 1);
+		return 0;
+	case COMMAND_TURN_CHAR_TO_FACE_COORD:
+	{
+		CollectParameters(&m_nIp, 4);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		CVehicle* pVehicle;
+		CVector pos;
+		if (pPed->bInVehicle)
+			pVehicle = pPed->m_pMyVehicle;
+		else
+			pVehicle = nil;
+		if (pVehicle)
+			pos = pVehicle->GetPosition();
+		else
+			pos = pPed->GetPosition();
+		float heading = CGeneral::GetATanOfXY(pos.x - *(float*)&ScriptParams[1], pos.y - *(float*)&ScriptParams[2]);
+		heading += HALFPI;
+		if (heading > TWOPI)
+			heading -= TWOPI;
+		if (!pVehicle){
+			pPed->m_fRotationCur = heading;
+			pPed->m_fRotationDest = heading;
+			pPed->SetHeading(heading);
+		}
+		return 0;
+	}
+	case COMMAND_TURN_PLAYER_TO_FACE_COORD:
+	{
+		CollectParameters(&m_nIp, 4);
+		CPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
+		assert(pPed);
+		CVehicle* pVehicle;
+		CVector pos;
+		if (pPed->bInVehicle)
+			pVehicle = pPed->m_pMyVehicle;
+		else
+			pVehicle = nil;
+		if (pVehicle)
+			pos = pVehicle->GetPosition();
+		else
+			pos = pPed->GetPosition();
+		float heading = CGeneral::GetATanOfXY(pos.x - *(float*)&ScriptParams[1], pos.y - *(float*)&ScriptParams[2]);
+		heading += HALFPI;
+		if (heading > TWOPI)
+			heading -= TWOPI;
+		if (!pVehicle) {
+			pPed->m_fRotationCur = heading;
+			pPed->m_fRotationDest = heading;
+			pPed->SetHeading(heading);
+		}
+		return 0;
+	}
+	case COMMAND_STORE_WANTED_LEVEL:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPlayerPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
+		assert(pPed);
+		ScriptParams[0] = pPed->m_pWanted->m_nWantedLevel;
+		StoreParameters(&m_nIp, 1);
+		return 0;
+	}
+	case COMMAND_IS_CAR_STOPPED:
+	{
+		CollectParameters(&m_nIp, 1);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle);
+		UpdateCompareFlag(CTheScripts::IsVehicleStopped(pVehicle));
+		return 0;
+	}
+	case COMMAND_MARK_CHAR_AS_NO_LONGER_NEEDED:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		CTheScripts::CleanUpThisPed(pPed);
+		if (m_bIsMissionScript)
+			CTheScripts::MissionCleanup.RemoveEntityFromList(ScriptParams[0], CLEANUP_CHAR);
+		return 0;
+	}
+	case COMMAND_MARK_CAR_AS_NO_LONGER_NEEDED:
+	{
+		CollectParameters(&m_nIp, 1);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		CTheScripts::CleanUpThisVehicle(pVehicle);
+		if (m_bIsMissionScript)
+			CTheScripts::MissionCleanup.RemoveEntityFromList(ScriptParams[0], CLEANUP_CAR);
+		return 0;
+	}
+	case COMMAND_MARK_OBJECT_AS_NO_LONGER_NEEDED:
+	{
+		CollectParameters(&m_nIp, 1);
+		CObject* pObject = CPools::GetObjectPool()->GetAt(ScriptParams[0]);
+		CTheScripts::CleanUpThisObject(pObject);
+		if (m_bIsMissionScript)
+			CTheScripts::MissionCleanup.RemoveEntityFromList(ScriptParams[0], CLEANUP_OBJECT);
+		return 0;
+	}
+	case COMMAND_DONT_REMOVE_CHAR:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		CTheScripts::MissionCleanup.RemoveEntityFromList(ScriptParams[0], CLEANUP_CHAR);
+		return 0;
+	}
+	case COMMAND_DONT_REMOVE_CAR:
+	{
+		CollectParameters(&m_nIp, 1);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		CTheScripts::MissionCleanup.RemoveEntityFromList(ScriptParams[0], CLEANUP_CAR);
+		return 0;
+	}
+	case COMMAND_DONT_REMOVE_OBJECT:
+	{
+		CollectParameters(&m_nIp, 1);
+		CObject* pObject = CPools::GetObjectPool()->GetAt(ScriptParams[0]);
+		CTheScripts::MissionCleanup.RemoveEntityFromList(ScriptParams[0], CLEANUP_OBJECT);
+		return 0;
+	}
+	case COMMAND_CREATE_CHAR_AS_PASSENGER:
+	{
+		CollectParameters(&m_nIp, 4);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle);
+		switch (ScriptParams[2]) {
+		case MI_COP:
+			if (ScriptParams[1] == PEDTYPE_COP)
+				ScriptParams[2] = COP_STREET;
+			break;
+		case MI_SWAT:
+			if (ScriptParams[1] == PEDTYPE_COP)
+				ScriptParams[2] = COP_SWAT;
+			break;
+		case MI_FBI:
+			if (ScriptParams[1] == PEDTYPE_COP)
+				ScriptParams[2] = COP_FBI;
+			break;
+		case MI_ARMY:
+			if (ScriptParams[1] == PEDTYPE_COP)
+				ScriptParams[2] = COP_ARMY;
+			break;
+		case MI_MEDIC:
+			if (ScriptParams[1] == PEDTYPE_EMERGENCY)
+				ScriptParams[2] = PEDTYPE_EMERGENCY;
+			break;
+		case MI_FIREMAN:
+			if (ScriptParams[1] == PEDTYPE_FIREMAN)
+				ScriptParams[2] = PEDTYPE_FIREMAN;
+			break;
+		default:
+			break;
+		}
+		CPed* pPed;
+		if (ScriptParams[1] == PEDTYPE_COP)
+			pPed = new CCopPed((eCopType)ScriptParams[2]);
+		else if (ScriptParams[1] == PEDTYPE_EMERGENCY || ScriptParams[1] == PEDTYPE_FIREMAN)
+			pPed = new CEmergencyPed(ScriptParams[2]);
+		else
+			pPed = new CCivilianPed(ScriptParams[1], ScriptParams[2]);
+		pPed->CharCreatedBy = MISSION_CHAR;
+		pPed->bRespondsToThreats = false;
+		pPed->m_ped_flagG2 = false;
+		pPed->GetPosition() = pVehicle->GetPosition();
+		pPed->SetOrientation(0.0f, 0.0f, 0.0f);
+		pPed->SetPedState(PED_DRIVING);
+		CPopulation::ms_nTotalMissionPeds++;
+		if (ScriptParams[3] >= 0)
+			pVehicle->AddPassenger(pPed, ScriptParams[3]);
+		else
+			pVehicle->AddPassenger(pPed);
+		pPed->m_pMyVehicle = pVehicle;
+		pPed->m_pMyVehicle->RegisterReference((CEntity**)&pPed->m_pMyVehicle);
+		pPed->bInVehicle = true;
+		pPed->SetPedState(PED_DRIVING);
+		pVehicle->m_status = STATUS_PHYSICS;
+		pPed->bUsesCollision = false;
+		AnimationId anim = pVehicle->bLowVehicle ? ANIM_CAR_LSIT : ANIM_CAR_SIT;
+		pPed->m_pVehicleAnim = CAnimManager::BlendAnimation(pPed->GetClump(), ASSOCGRP_STD, anim, 100.0f);
+		pPed->StopNonPartialAnims();
+		pPed->m_nZoneLevel = CTheZones::GetLevelFromPosition(pPed->GetPosition());
+		CWorld::Add(pPed);
+		ScriptParams[0] = CPools::GetPedPool()->GetIndex(pPed);
+		StoreParameters(&m_nIp, 1);
+		if (m_bIsMissionScript)
+			CTheScripts::MissionCleanup.AddEntityToList(ScriptParams[0], CLEANUP_CHAR);
+		return 0;
+	}
+	case COMMAND_SET_CHAR_OBJ_KILL_CHAR_ON_FOOT:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		CPed* pTarget = CPools::GetPedPool()->GetAt(ScriptParams[1]);
+		pPed->bObjectiveCompleted = false;
+		pPed->SetObjective(OBJECTIVE_KILL_CHAR_ON_FOOT, pTarget);
+		return 0;
+	}
+	case COMMAND_SET_CHAR_OBJ_KILL_PLAYER_ON_FOOT:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		CPed* pTarget = CWorld::Players[ScriptParams[1]].m_pPed;
+		pPed->bObjectiveCompleted = false;
+		pPed->SetObjective(OBJECTIVE_KILL_CHAR_ON_FOOT, pTarget);
+		return 0;
+	}
+	case COMMAND_SET_CHAR_OBJ_KILL_CHAR_ANY_MEANS:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		CPed* pTarget = CPools::GetPedPool()->GetAt(ScriptParams[1]);
+		pPed->bObjectiveCompleted = false;
+		pPed->SetObjective(OBJECTIVE_KILL_CHAR_ANY_MEANS, pTarget);
+		return 0;
+	}
+	case COMMAND_SET_CHAR_OBJ_KILL_PLAYER_ANY_MEANS:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		CPed* pTarget = CWorld::Players[ScriptParams[1]].m_pPed;
+		pPed->bObjectiveCompleted = false;
+		pPed->SetObjective(OBJECTIVE_KILL_CHAR_ANY_MEANS, pTarget);
+		return 0;
+	}
+	case COMMAND_SET_CHAR_OBJ_FLEE_CHAR_ON_FOOT_TILL_SAFE:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		CPed* pTarget = CPools::GetPedPool()->GetAt(ScriptParams[1]);
+		pPed->bObjectiveCompleted = false;
+		pPed->SetObjective(OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE, pTarget);
+		return 0;
+	}
+	case COMMAND_SET_CHAR_OBJ_FLEE_PLAYER_ON_FOOT_TILL_SAFE:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		CPed* pTarget = CWorld::Players[ScriptParams[1]].m_pPed;
+		pPed->bObjectiveCompleted = false;
+		pPed->SetObjective(OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE, pTarget);
+		return 0;
+	}
+	case COMMAND_SET_CHAR_OBJ_FLEE_CHAR_ON_FOOT_ALWAYS:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		CPed* pTarget = CPools::GetPedPool()->GetAt(ScriptParams[1]);
+		pPed->bObjectiveCompleted = false;
+		pPed->SetObjective(OBJECTIVE_FLEE_CHAR_ON_FOOT_ALWAYS, pTarget);
+		return 0;
+	}
+	case COMMAND_SET_CHAR_OBJ_FLEE_PLAYER_ON_FOOT_ALWAYS:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		CPed* pTarget = CWorld::Players[ScriptParams[1]].m_pPed;
+		pPed->bObjectiveCompleted = false;
+		pPed->SetObjective(OBJECTIVE_FLEE_CHAR_ON_FOOT_ALWAYS, pTarget);
+		return 0;
+	}
+	case COMMAND_SET_CHAR_OBJ_GOTO_CHAR_ON_FOOT:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		CPed* pTarget = CPools::GetPedPool()->GetAt(ScriptParams[1]);
+		pPed->bObjectiveCompleted = false;
+		pPed->SetObjective(OBJECTIVE_GOTO_CHAR_ON_FOOT, pTarget);
+		return 0;
+	}
+	case COMMAND_SET_CHAR_OBJ_GOTO_PLAYER_ON_FOOT:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		CPed* pTarget = CWorld::Players[ScriptParams[1]].m_pPed;
+		pPed->bObjectiveCompleted = false;
+		pPed->SetObjective(OBJECTIVE_GOTO_CHAR_ON_FOOT, pTarget);
+		return 0;
+	}
+	case COMMAND_SET_CHAR_OBJ_LEAVE_CAR:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[1]);
+		pPed->bObjectiveCompleted = false;
+		pPed->SetObjective(OBJECTIVE_LEAVE_VEHICLE, pVehicle);
+		return 0;
+	}
+	case COMMAND_SET_CHAR_OBJ_ENTER_CAR_AS_PASSENGER:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[1]);
+		pPed->bObjectiveCompleted = false;
+		pPed->SetObjective(OBJECTIVE_ENTER_CAR_AS_PASSENGER, pVehicle);
+		return 0;
+	}
+	case COMMAND_SET_CHAR_OBJ_ENTER_CAR_AS_DRIVER:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[1]);
+		pPed->bObjectiveCompleted = false;
+		pPed->SetObjective(OBJECTIVE_ENTER_CAR_AS_DRIVER, pVehicle);
+		return 0;
+	}
+	/* Not implemented.
+	case COMMAND_SET_CHAR_OBJ_FOLLOW_CAR_IN_CAR:
+	case COMMAND_SET_CHAR_OBJ_FIRE_AT_OBJECT_FROM_VEHICLE:
+	case COMMAND_SET_CHAR_OBJ_DESTROY_OBJECT:
+	*/
+	case COMMAND_SET_CHAR_OBJ_DESTROY_CAR:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[1]);
+		pPed->bObjectiveCompleted = false;
+		pPed->SetObjective(OBJECTIVE_DESTROY_CAR, pVehicle);
+		return 0;
+	}
+	case COMMAND_SET_CHAR_OBJ_GOTO_AREA_ON_FOOT:
+	{
+		CollectParameters(&m_nIp, 5);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		float infX = *(float*)&ScriptParams[1];
+		float infY = *(float*)&ScriptParams[2];
+		float supX = *(float*)&ScriptParams[3];
+		float supY = *(float*)&ScriptParams[4];
+		if (infX > supX) {
+			infX = *(float*)&ScriptParams[3];
+			supX = *(float*)&ScriptParams[1];
+		}
+		if (infY > supY) {
+			infY = *(float*)&ScriptParams[4];
+			supY = *(float*)&ScriptParams[2];
+		}
+		CVector pos;
+		pos.x = (infX + supX) / 2;
+		pos.y = (infY + supY) / 2;
+		pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y);
+		float radius = max(pos.x - infX, pos.y - infY);
+		pPed->bObjectiveCompleted = false;
+		pPed->SetObjective(OBJECTIVE_GOTO_AREA_ON_FOOT, pos, radius);
+		return 0;
+	}
+	/* Not implemented.
+	case COMMAND_SET_CHAR_OBJ_GOTO_AREA_IN_CAR:
+	case COMMAND_SET_CHAR_OBJ_FOLLOW_CAR_ON_FOOT_WITH_OFFSET:
+	case COMMAND_SET_CHAR_OBJ_GUARD_ATTACK:
+	*/
+	case COMMAND_SET_CHAR_AS_LEADER:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		CPed* pTarget = CPools::GetPedPool()->GetAt(ScriptParams[1]);
+		pPed->SetObjective(OBJECTIVE_SET_LEADER, pTarget);
+		return 0;
+	}
+	case COMMAND_SET_PLAYER_AS_LEADER:
+	{
+		CollectParameters(&m_nIp, 2);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		CPed* pTarget = CWorld::Players[ScriptParams[1]].m_pPed;
+		pPed->SetObjective(OBJECTIVE_SET_LEADER, pTarget);
+		return 0;
+	}
+	case COMMAND_LEAVE_GROUP:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		pPed->ClearLeader();
+		return 0;
+	}
+	case COMMAND_SET_CHAR_OBJ_FOLLOW_ROUTE:
+	{
+		CollectParameters(&m_nIp, 3);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		pPed->bObjectiveCompleted = false;
+		pPed->SetObjective(OBJECTIVE_FOLLOW_ROUTE, ScriptParams[1], ScriptParams[2]);
+		return 0;
+	}
+	case COMMAND_ADD_ROUTE_POINT:
+	{
+		CollectParameters(&m_nIp, 4);
+		CRouteNode::AddRoutePoint(ScriptParams[0], *(CVector*)&ScriptParams[1]);
+		return 0;
+	}
+	case COMMAND_PRINT_WITH_NUMBER_BIG:
+	{
+		wchar* text = CTheScripts::GetTextByKeyFromScript(&m_nIp);
+		CollectParameters(&m_nIp, 3);
+		CMessages::AddBigMessageWithNumber(text, ScriptParams[1], ScriptParams[2] - 1, ScriptParams[0], -1, -1, -1, -1, -1);
+		return 0;
+	}
+	case COMMAND_PRINT_WITH_NUMBER:
+	{
+		wchar* text = CTheScripts::GetTextByKeyFromScript(&m_nIp);
+		CollectParameters(&m_nIp, 3);
+		CMessages::AddMessageWithNumber(text, ScriptParams[1], ScriptParams[2], ScriptParams[0], -1, -1, -1, -1, -1);
+		return 0;
+	}
+	case COMMAND_PRINT_WITH_NUMBER_NOW:
+	{
+		wchar* text = CTheScripts::GetTextByKeyFromScript(&m_nIp);
+		CollectParameters(&m_nIp, 3);
+		CMessages::AddMessageJumpQWithNumber(text, ScriptParams[1], ScriptParams[2], ScriptParams[0], -1, -1, -1, -1, -1);
+		return 0;
+	}
+	/* Not implemented.
+	case COMMAND_PRINT_WITH_NUMBER_SOON:
+	*/
+	case COMMAND_SWITCH_ROADS_ON:
+	{
+		CollectParameters(&m_nIp, 6);
+		float infX = *(float*)&ScriptParams[0];
+		float infY = *(float*)&ScriptParams[1];
+		float infZ = *(float*)&ScriptParams[2];
+		float supX = *(float*)&ScriptParams[3];
+		float supY = *(float*)&ScriptParams[4];
+		float supZ = *(float*)&ScriptParams[5];
+		if (infX > supX){
+			infX = *(float*)&ScriptParams[3];
+			supX = *(float*)&ScriptParams[0];
+		}
+		if (infY > supY){
+			infY = *(float*)&ScriptParams[4];
+			supY = *(float*)&ScriptParams[1];
+		}
+		if (infZ > supZ){
+			infZ = *(float*)&ScriptParams[5];
+			supZ = *(float*)&ScriptParams[2];
+		}
+		ThePaths.SwitchRoadsOffInArea(infX, supX, infY, supY, infZ, supZ, false);
+		return 0;
+	}
+	case COMMAND_SWITCH_ROADS_OFF:
+	{
+		CollectParameters(&m_nIp, 6);
+		float infX = *(float*)&ScriptParams[0];
+		float infY = *(float*)&ScriptParams[1];
+		float infZ = *(float*)&ScriptParams[2];
+		float supX = *(float*)&ScriptParams[3];
+		float supY = *(float*)&ScriptParams[4];
+		float supZ = *(float*)&ScriptParams[5];
+		if (infX > supX) {
+			infX = *(float*)&ScriptParams[3];
+			supX = *(float*)&ScriptParams[0];
+		}
+		if (infY > supY) {
+			infY = *(float*)&ScriptParams[4];
+			supY = *(float*)&ScriptParams[1];
+		}
+		if (infZ > supZ) {
+			infZ = *(float*)&ScriptParams[5];
+			supZ = *(float*)&ScriptParams[2];
+		}
+		ThePaths.SwitchRoadsOffInArea(infX, supX, infY, supY, infZ, supZ, true);
+		return 0;
+	}
+	case COMMAND_GET_NUMBER_OF_PASSENGERS:
+	{
+		CollectParameters(&m_nIp, 1);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle);
+		ScriptParams[0] = pVehicle->m_nNumPassengers;
+		StoreParameters(&m_nIp, 1);
+		return 0;
+	}
+	case COMMAND_GET_MAXIMUM_NUMBER_OF_PASSENGERS:
+	{
+		CollectParameters(&m_nIp, 1);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle);
+		ScriptParams[0] = pVehicle->m_nNumMaxPassengers;
+		StoreParameters(&m_nIp, 1);
+		return 0;
+	}
+	case COMMAND_SET_CAR_DENSITY_MULTIPLIER:
+	{
+		CollectParameters(&m_nIp, 1);
+		CCarCtrl::CarDensityMultiplier = *(float*)&ScriptParams[0];
+		return 0;
+	}
+	case COMMAND_SET_CAR_HEAVY:
+	{
+		CollectParameters(&m_nIp, 1);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle);
+		pVehicle->bIsHeavy = (ScriptParams[1] != 0);
+		return 0;
+	}
+	case COMMAND_CLEAR_CHAR_THREAT_SEARCH:
+	{
+		CollectParameters(&m_nIp, 1);
+		CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
+		assert(pPed);
+		pPed->m_fearFlags = 0;
+		return 0;
+	}
+	case COMMAND_ACTIVATE_CRANE:
+	{
+		CollectParameters(&m_nIp, 10);
+		float infX = *(float*)&ScriptParams[2];
+		float infY = *(float*)&ScriptParams[3];
+		float supX = *(float*)&ScriptParams[4];
+		float supY = *(float*)&ScriptParams[5];
+		if (infX > supX) {
+			infX = *(float*)&ScriptParams[4];
+			supX = *(float*)&ScriptParams[2];
+		}
+		if (infY > supY) {
+			infY = *(float*)&ScriptParams[5];
+			supY = *(float*)&ScriptParams[3];
+		}
+		CCranes::ActivateCrane(infX, supX, infY, supY,
+			*(float*)&ScriptParams[6], *(float*)&ScriptParams[7], *(float*)&ScriptParams[8],
+			DEGTORAD(*(float*)&ScriptParams[9]), false, false,
+			*(float*)&ScriptParams[0], *(float*)&ScriptParams[1]);
+		return 0;
+	}
+	case COMMAND_DEACTIVATE_CRANE:
+	{
+		CollectParameters(&m_nIp, 2);
+		CCranes::DeActivateCrane(*(float*)&ScriptParams[0], *(float*)&ScriptParams[1]);
+		return 0;
+	}
+	case COMMAND_SET_MAX_WANTED_LEVEL:
+	{
+		CollectParameters(&m_nIp, 1);
+		CWanted::SetMaximumWantedLevel(ScriptParams[0]);
+		return 0;
+	}
+	/* Debug commands? 
+	case COMMAND_SAVE_VAR_INT:
+	case COMMAND_SAVE_VAR_FLOAT:
+	*/
+	case COMMAND_IS_CAR_IN_AIR_PROPER:
+	{
+		CollectParameters(&m_nIp, 1);
+		CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
+		assert(pVehicle);
+		UpdateCompareFlag(pVehicle->m_nCollisionRecords == 0);
+		return 0;
+	}
+	default:
+		assert(0);
+	}
+	return -1;
+}
+#endif
+
 int16 CRunningScript::GetPadState(uint16 pad, uint16 button)
 {
 	CPad* pPad = CPad::GetPad(pad);
@@ -3572,7 +4360,11 @@ int16 CRunningScript::GetPadState(uint16 pad, uint16 button)
 	return 0;
 }
 
-WRAPPER int8 CRunningScript::ProcessCommandsFrom400To499(int32 command) { EAXJMP(0x440CB0); }
+bool CTheScripts::IsVehicleStopped(CVehicle* pVehicle)
+{
+	return 0.01f * CTimer::GetTimeStep() >= pVehicle->m_fDistanceTravelled;
+}
+
 WRAPPER int8 CRunningScript::ProcessCommandsFrom500To599(int32 command) { EAXJMP(0x4429C0); }
 WRAPPER int8 CRunningScript::ProcessCommandsFrom600To699(int32 command) { EAXJMP(0x444B20); }
 WRAPPER int8 CRunningScript::ProcessCommandsFrom700To799(int32 command) { EAXJMP(0x4458A0); }
@@ -3590,10 +4382,10 @@ WRAPPER void CRunningScript::LocateCharCarCommand(int32, uint32*) { EAXJMP(0x450
 WRAPPER void CRunningScript::LocateCharObjectCommand(int32, uint32*) { EAXJMP(0x451260); }
 WRAPPER void CRunningScript::LocateCarCommand(int32, uint32*) { EAXJMP(0x451590); }
 WRAPPER void CRunningScript::LocateSniperBulletCommand(int32, uint32*) { EAXJMP(0x4518A0); }
-WRAPPER void CRunningScript::LocatePlayerInAreaCheckCommand(int32, uint32*) { EAXJMP(0x451A60); }
-WRAPPER void CRunningScript::LocatePlayerInAngledAreaCheckCommand(int32, uint32*) { EAXJMP(0x451E50); }
-WRAPPER void CRunningScript::LocateCharInAreaCheckCommand(int32, uint32*) { EAXJMP(0x4523B0); }
-WRAPPER void CRunningScript::LocateCharInAngledAreaCheckCommand(int32, uint32*) { EAXJMP(0x452750); }
+WRAPPER void CRunningScript::PlayerInAreaCheckCommand(int32, uint32*) { EAXJMP(0x451A60); }
+WRAPPER void CRunningScript::PlayerInAngledAreaCheckCommand(int32, uint32*) { EAXJMP(0x451E50); }
+WRAPPER void CRunningScript::CharInAreaCheckCommand(int32, uint32*) { EAXJMP(0x4523B0); }
+WRAPPER void CRunningScript::CarInAreaCheckCommand(int32, uint32*) { EAXJMP(0x452750); }
 
 WRAPPER void CTheScripts::DrawScriptSpheres() { EAXJMP(0x44FAC0); }
 WRAPPER void CRunningScript::DoDeatharrestCheck() { EAXJMP(0x452A30); }
diff --git a/src/control/Script.h b/src/control/Script.h
index 47c70914..2c4ec2c0 100644
--- a/src/control/Script.h
+++ b/src/control/Script.h
@@ -124,10 +124,10 @@ public:
 	void LocateCharObjectCommand(int32, uint32*);
 	void LocateCarCommand(int32, uint32*);
 	void LocateSniperBulletCommand(int32, uint32*);
-	void LocatePlayerInAreaCheckCommand(int32, uint32*);
-	void LocatePlayerInAngledAreaCheckCommand(int32, uint32*);
-	void LocateCharInAreaCheckCommand(int32, uint32*);
-	void LocateCharInAngledAreaCheckCommand(int32, uint32*);
+	void PlayerInAreaCheckCommand(int32, uint32*);
+	void PlayerInAngledAreaCheckCommand(int32, uint32*);
+	void CharInAreaCheckCommand(int32, uint32*);
+	void CarInAreaCheckCommand(int32, uint32*);
 private:
 	enum {
 		ANDOR_NONE = 0,
@@ -348,6 +348,7 @@ public:
 	static void HighlightImportantArea(uint32, float, float, float, float, float);
 	static void DrawDebugSquare(float, float, float, float);
 	static void DrawDebugCube(float, float, float, float, float, float);
+	static bool IsVehicleStopped(CVehicle*);
 
 	static int32 Read4BytesFromScript(uint32* pIp){
 		int32 retval = 0;
diff --git a/src/core/Messages.cpp b/src/core/Messages.cpp
index 07784eda..9b5342ac 100644
--- a/src/core/Messages.cpp
+++ b/src/core/Messages.cpp
@@ -10,9 +10,14 @@ WRAPPER void CMessages::InsertNumberInString(wchar* src, int n1, int n2, int n3,
 WRAPPER void CMessages::InsertPlayerControlKeysInString(wchar* src) { EAXJMP(0x52A490); }
 WRAPPER int CMessages::GetWideStringLength(wchar* src) { EAXJMP(0x529490); }
 WRAPPER void CMessages::AddBigMessage(wchar* key, uint32 time, uint16 pos) { EAXJMP(0x529EB0);  }
+WRAPPER void CMessages::AddBigMessageWithNumber(wchar* key, uint32 time, uint16 pos, int n1, int n2, int n3, int n4, int n5, int n6) { EAXJMP(0x52AD10); }
+WRAPPER void CMessages::AddBigMessageWithNumberQ(wchar* key, uint32 time, uint16 pos, int n1, int n2, int n3, int n4, int n5, int n6) { EAXJMP(0x52AE00); }
 WRAPPER void CMessages::AddMessage(wchar* key, uint32 time, uint16 pos) { EAXJMP(0x529900); }
 WRAPPER void CMessages::AddMessageJumpQ(wchar* key, uint32 time, uint16 pos) { EAXJMP(0x529A10); }
 WRAPPER void CMessages::AddMessageSoon(wchar* key, uint32 time, uint16 pos) { EAXJMP(0x529AF0); }
+WRAPPER void CMessages::AddMessageWithNumber(wchar* key, uint32 time, uint16 pos, int n1, int n2, int n3, int n4, int n5, int n6) { EAXJMP(0x52A850); }
+WRAPPER void CMessages::AddMessageJumpQWithNumber(wchar* key, uint32 time, uint16 pos, int n1, int n2, int n3, int n4, int n5, int n6) { EAXJMP(0x52A9A0); }
+WRAPPER void CMessages::AddMessageSoonWithNumber(wchar* key, uint32 time, uint16 pos, int n1, int n2, int n3, int n4, int n5, int n6) { EAXJMP(0x52AAC0); }
 WRAPPER void CMessages::ClearMessages() { EAXJMP(0x529CE0); }
 WRAPPER void CMessages::Init() { EAXJMP(0x529310); }
 WRAPPER void CMessages::Process() { EAXJMP(0x529580); }
diff --git a/src/core/Messages.h b/src/core/Messages.h
index 3ee5d026..7caf5786 100644
--- a/src/core/Messages.h
+++ b/src/core/Messages.h
@@ -42,9 +42,14 @@ public:
 	static void InsertPlayerControlKeysInString(wchar* src);
 	static int GetWideStringLength(wchar *src);
 	static void AddBigMessage(wchar* key, uint32 time, uint16 pos);
+	static void AddBigMessageWithNumber(wchar* key, uint32 time, uint16 pos, int n1, int n2, int n3, int n4, int n5, int n6);
+	static void AddBigMessageWithNumberQ(wchar* key, uint32 time, uint16 pos, int n1, int n2, int n3, int n4, int n5, int n6);
 	static void AddMessage(wchar* key, uint32 time, uint16 pos);
 	static void AddMessageJumpQ(wchar* key, uint32 time, uint16 pos);
 	static void AddMessageSoon(wchar* key, uint32 time, uint16 pos);
+	static void AddMessageWithNumber(wchar* key, uint32 time, uint16 pos, int n1, int n2, int n3, int n4, int n5, int n6);
+	static void AddMessageJumpQWithNumber(wchar* key, uint32 time, uint16 pos, int n1, int n2, int n3, int n4, int n5, int n6);
+	static void AddMessageSoonWithNumber(wchar* key, uint32 time, uint16 pos, int n1, int n2, int n3, int n4, int n5, int n6);
 	static void ClearMessages();
 	static void Init();
 	static void Process();
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index 9eec49ab..b0dc96cf 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -62,6 +62,8 @@ WRAPPER void CPed::UpdateFromLeader(void) {	EAXJMP(0x4D8F30); }
 WRAPPER int CPed::ScanForThreats(void) { EAXJMP(0x4C5FE0); }
 WRAPPER void CPed::SetEnterCar_AllClear(CVehicle*, uint32, uint32) { EAXJMP(0x4E0A40); }
 WRAPPER bool CPed::WarpPedToNearEntityOffScreen(CEntity*) { EAXJMP(0x4E5570); }
+WRAPPER void CPed::SetObjective(eObjective, CVector) { EAXJMP(0x4D8A90); }
+WRAPPER void CPed::SetObjective(eObjective, CVector, float) { EAXJMP(0x4D8770); }
 
 #define FEET_OFFSET 1.04f
 
diff --git a/src/peds/Ped.h b/src/peds/Ped.h
index c1ac7cfd..7a0ade14 100644
--- a/src/peds/Ped.h
+++ b/src/peds/Ped.h
@@ -553,6 +553,8 @@ public:
 	void SetObjective(eObjective, void*);
 	void SetObjective(eObjective);
 	void SetObjective(eObjective, int16, int16);
+	void SetObjective(eObjective, CVector);
+	void SetObjective(eObjective, CVector, float);
 	void ClearChat(void);
 	void InformMyGangOfAttack(CEntity*);
 	void ReactToAttack(CEntity*);
diff --git a/src/peds/PedRoutes.cpp b/src/peds/PedRoutes.cpp
index a8e8d2ab..c2ec51e2 100644
--- a/src/peds/PedRoutes.cpp
+++ b/src/peds/PedRoutes.cpp
@@ -26,4 +26,20 @@ CVector
 CRouteNode::GetPointPosition(int16 point)
 {
 	return gaRoutes[point].m_pos;
-}
\ No newline at end of file
+}
+
+void
+CRouteNode::AddRoutePoint(int16 route, CVector pos)
+{
+	uint16 point;
+	for (point = 0; point < NUMPEDROUTES; point++) {
+		if (gaRoutes[point].m_route == -1)
+			break;
+	}
+#ifdef FIX_BUGS
+	if (point == NUMPEDROUTES)
+		return;
+#endif
+	gaRoutes[point].m_route = route;
+	gaRoutes[point].m_pos = pos;
+}
diff --git a/src/peds/PedRoutes.h b/src/peds/PedRoutes.h
index 9df9a29d..ff4e6c89 100644
--- a/src/peds/PedRoutes.h
+++ b/src/peds/PedRoutes.h
@@ -9,4 +9,5 @@ public:
 	static int16 GetRouteThisPointIsOn(int16);
 	static CVector GetPointPosition(int16);
 	static int16 GetRouteStart(int16);
+	static void AddRoutePoint(int16, CVector);
 };
\ No newline at end of file
diff --git a/src/render/Weather.cpp b/src/render/Weather.cpp
index 460deeac..452eca92 100644
--- a/src/render/Weather.cpp
+++ b/src/render/Weather.cpp
@@ -33,3 +33,15 @@ void CWeather::ReleaseWeather()
 {
 	ForcedWeatherType = -1;
 }
+
+void CWeather::ForceWeather(int16 weather)
+{
+	ForcedWeatherType = weather;
+}
+
+void CWeather::ForceWeatherNow(int16 weather)
+{
+	OldWeatherType = weather;
+	NewWeatherType = weather;
+	ForcedWeatherType = weather;
+}
diff --git a/src/render/Weather.h b/src/render/Weather.h
index a9c15fd9..bbf8498e 100644
--- a/src/render/Weather.h
+++ b/src/render/Weather.h
@@ -36,4 +36,6 @@ public:
 	static void RenderRainStreaks(void);
 	
 	static void ReleaseWeather();
+	static void ForceWeather(int16);
+	static void ForceWeatherNow(int16);
 };