1 files changed, 149 insertions, 103 deletions

diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index 70e6303e..744ba793 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -2821,14 +2821,13 @@ CPed::CanSeeEntity(CEntity *entity, float threshold = CAN_SEE_ENTITY_ANGLE_THRES
 	return neededTurn < threshold || TWOPI - threshold < neededTurn;
 }
 
+// --MIAMI: Done
 bool
 CPed::IsTemporaryObjective(eObjective objective)
 {
 	return objective == OBJECTIVE_LEAVE_VEHICLE || objective == OBJECTIVE_SET_LEADER ||
-#ifdef VC_PED_PORTS
-		objective == OBJECTIVE_LEAVE_CAR_AND_DIE ||
-#endif
-		objective == OBJECTIVE_ENTER_CAR_AS_DRIVER || objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER;
+		objective == OBJECTIVE_LEAVE_CAR_AND_DIE || objective == OBJECTIVE_ENTER_CAR_AS_DRIVER ||
+		objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER;
 }
 
 void
@@ -2837,6 +2836,7 @@ CPed::SetMoveState(eMoveState state)
 	m_nMoveState = state;
 }
 
+// --MIAMI: Done
 void
 CPed::SetObjectiveTimer(int time)
 {
@@ -2847,6 +2847,7 @@ CPed::SetObjectiveTimer(int time)
 	}
 }
 
+// --MIAMI: Done
 void
 CPed::ForceStoredObjective(eObjective objective)
 {
@@ -2855,49 +2856,65 @@ CPed::ForceStoredObjective(eObjective objective)
 		return;
 	}
 
-	switch (m_objective)
-	{
+	switch (m_objective) {
 		case OBJECTIVE_FLEE_TILL_SAFE:
 		case OBJECTIVE_KILL_CHAR_ON_FOOT:
 		case OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE:
 		case OBJECTIVE_FLEE_CHAR_ON_FOOT_ALWAYS:
 		case OBJECTIVE_GOTO_CHAR_ON_FOOT:
+		case OBJECTIVE_GOTO_CHAR_ON_FOOT_WALKING:
+		case OBJECTIVE_HASSLE_CHAR:
 		case OBJECTIVE_ENTER_CAR_AS_PASSENGER:
 		case OBJECTIVE_ENTER_CAR_AS_DRIVER:
 		case OBJECTIVE_GOTO_AREA_ON_FOOT:
 		case OBJECTIVE_RUN_TO_AREA:
+		case OBJECTIVE_USE_SEAT_ATTRACTOR:
+		case OBJECTIVE_USE_ATM_ATTRACTOR:
+		case OBJECTIVE_USE_STOP_ATTRACTOR:
+		case OBJECTIVE_USE_PIZZA_ATTRACTOR:
+		case OBJECTIVE_USE_SHELTER_ATTRACTOR:
+		case OBJECTIVE_SPRINT_TO_COORD:
+		case OBJECTIVE_USE_ICECREAM_ATTRACTOR:
 			return;
 		default:
 			m_prevObjective = m_objective;
 	}
 }
 
+// --MIAMI: Done
 void
 CPed::SetStoredObjective(void)
 {
 	if (m_objective == m_prevObjective)
 		return;
 
-	switch (m_objective)
-	{
+	switch (m_objective) {
 		case OBJECTIVE_FLEE_TILL_SAFE:
 		case OBJECTIVE_KILL_CHAR_ON_FOOT:
 		case OBJECTIVE_KILL_CHAR_ANY_MEANS:
 		case OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE:
 		case OBJECTIVE_FLEE_CHAR_ON_FOOT_ALWAYS:
 		case OBJECTIVE_GOTO_CHAR_ON_FOOT:
-		case OBJECTIVE_FOLLOW_PED_IN_FORMATION:
-		case OBJECTIVE_LEAVE_VEHICLE:
+		case OBJECTIVE_GOTO_CHAR_ON_FOOT_WALKING:
+		case OBJECTIVE_HASSLE_CHAR:
 		case OBJECTIVE_ENTER_CAR_AS_PASSENGER:
 		case OBJECTIVE_ENTER_CAR_AS_DRIVER:
 		case OBJECTIVE_GOTO_AREA_ON_FOOT:
 		case OBJECTIVE_RUN_TO_AREA:
+		case OBJECTIVE_USE_SEAT_ATTRACTOR:
+		case OBJECTIVE_USE_ATM_ATTRACTOR:
+		case OBJECTIVE_USE_STOP_ATTRACTOR:
+		case OBJECTIVE_USE_PIZZA_ATTRACTOR:
+		case OBJECTIVE_USE_SHELTER_ATTRACTOR:
+		case OBJECTIVE_SPRINT_TO_COORD:
+		case OBJECTIVE_USE_ICECREAM_ATTRACTOR:
 			return;
 		default:
 			m_prevObjective = m_objective;
 	}
 }
 
+// --MIAMI: Done
 void
 CPed::RestorePreviousObjective(void)
 {
@@ -2905,10 +2922,7 @@ CPed::RestorePreviousObjective(void)
 		return;
 
 	if (m_objective != OBJECTIVE_LEAVE_VEHICLE && m_objective != OBJECTIVE_ENTER_CAR_AS_PASSENGER && m_objective != OBJECTIVE_ENTER_CAR_AS_DRIVER
-#ifdef VC_PED_PORTS
-		&& m_nPedState != PED_CARJACK
-#endif
-		)
+		&& m_nPedState != PED_CARJACK)
 		m_pedInObjective = nil;
 
 	if (m_objective == OBJECTIVE_WAIT_IN_CAR_THEN_GETOUT) {
@@ -2932,6 +2946,7 @@ CPed::SetLeader(CEntity *leader)
 		m_leader->RegisterReference((CEntity **)&m_leader);
 }
 
+// TODO(Miami)
 void
 CPed::SetObjective(eObjective newObj, void *entity)
 {
@@ -2947,7 +2962,6 @@ CPed::SetObjective(eObjective newObj, void *entity)
 	if (entity == this)
 		return;
 
-	SetObjectiveTimer(0);
 	if (m_objective == newObj) {
 		switch (newObj) {
 			case OBJECTIVE_KILL_CHAR_ON_FOOT:
@@ -2958,7 +2972,6 @@ CPed::SetObjective(eObjective newObj, void *entity)
 			case OBJECTIVE_FIGHT_CHAR:
 				if (m_pedInObjective == entity)
 					return;
-
 				break;
 			case OBJECTIVE_LEAVE_VEHICLE:
 			case OBJECTIVE_FLEE_CAR:
@@ -2973,12 +2986,14 @@ CPed::SetObjective(eObjective newObj, void *entity)
 			case OBJECTIVE_BUY_ICE_CREAM:
 				if (m_carInObjective == entity)
 					return;
-
 				break;
 			case OBJECTIVE_SET_LEADER:
 				if (m_leader == entity)
 					return;
-
+				break;
+			case OBJECTIVE_AIM_GUN_AT_PED:
+				if (m_pedInObjective == entity)
+					return;
 				break;
 			default:
 				break;
@@ -2992,9 +3007,8 @@ CPed::SetObjective(eObjective newObj, void *entity)
 			return;
 	}
 
-#ifdef VC_PED_PORTS
 	ClearPointGunAt();
-#endif
+	m_objectiveTimer = 0;
 	bObjectiveCompleted = false;
 	if (!IsTemporaryObjective(m_objective) || IsTemporaryObjective(newObj)) {
 		if (m_objective != newObj) {
@@ -3028,6 +3042,8 @@ CPed::SetObjective(eObjective newObj, void *entity)
 		case OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE:
 		case OBJECTIVE_FLEE_CHAR_ON_FOOT_ALWAYS:
 		case OBJECTIVE_GOTO_CHAR_ON_FOOT:
+		case OBJECTIVE_GOTO_CHAR_ON_FOOT_WALKING:
+		case OBJECTIVE_HASSLE_CHAR:
 		case OBJECTIVE_FIGHT_CHAR:
 			m_vecSeekPos = CVector(0.0f, 0.0f, 0.0f);
 			m_pedInObjective = (CPed*)entity;
@@ -3087,6 +3103,10 @@ CPed::SetObjective(eObjective newObj, void *entity)
 			SetLeader((CEntity*)entity);
 			RestorePreviousObjective();
 			break;
+		case OBJECTIVE_AIM_GUN_AT_PED:
+			m_pedInObjective = (CPed*)entity;
+			m_pedInObjective->RegisterReference((CEntity**)&m_pedInObjective);
+			break;
 		default:
 			break;
 	}
@@ -3109,21 +3129,16 @@ CPed::SetIdle(void)
 	}
 }
 
+// --MIAMI: Done
 void
 CPed::SetObjective(eObjective newObj)
 {
-	if (DyingOrDead())
+	if (DyingOrDead() || m_attachedTo)
 		return;
 
 	if (newObj == OBJECTIVE_NONE) {
 		if ((m_objective == OBJECTIVE_LEAVE_VEHICLE || m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER || m_objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER
-#ifdef VC_PED_PORTS
-			|| m_objective == OBJECTIVE_LEAVE_CAR_AND_DIE)
-			&& !IsPlayer()
-#else
-			)
-#endif
-			&& !IsPedInControl()) {
+			|| m_objective == OBJECTIVE_LEAVE_CAR_AND_DIE) && !IsPlayer() && !IsPedInControl()) {
 
 			bStartWanderPathOnFoot = true;
 			return;
@@ -3200,6 +3215,7 @@ CPed::SetObjective(eObjective newObj, int16 routePoint, int16 routeType)
 	}
 }
 
+// --MIAMI: Done
 void
 CPed::ClearChat(void)
 {
@@ -3211,6 +3227,11 @@ CPed::ClearChat(void)
 	bIsTalking = false;
 	ClearLookFlag();
 	RestorePreviousState();
+	if (m_objective == OBJECTIVE_BUY_ICE_CREAM) {
+		bBoughtIceCream = true;
+		SetObjective(OBJECTIVE_NONE);
+		SetWanderPath(CGeneral::GetRandomNumberInRange(0, 8));
+	}
 }
 
 bool
@@ -3749,7 +3770,8 @@ CPed::ClearAll(void)
 	bIsPointingGunAt = false;
 	bRenderPedInCar = true;
 	bKnockedUpIntoAir = false;
-	b158_4 = false;
+	bCrouchWhenScared = false;
+	bKnockedOffBike = false;
 	m_pCollidingEntity = nil;
 }
 
@@ -4561,28 +4583,23 @@ CPed::ClearLook(void)
 	ClearLookFlag();
 }
 
+// --MIAMI: Done
 void
 CPed::ClearObjective(void)
 {
 	if (IsPedInControl() || m_nPedState == PED_DRIVING) {
 		m_objective = OBJECTIVE_NONE;
-#ifdef VC_PED_PORTS
 		m_pedInObjective = nil;
 		m_carInObjective = nil;
-#endif
 		if (m_nPedState == PED_DRIVING && m_pMyVehicle) {
 
 			if (m_pMyVehicle->pDriver != this) {
-#ifdef VC_PED_PORTS
 				if(!IsPlayer())
-#endif
 					bWanderPathAfterExitingCar = true;
 
 				SetObjective(OBJECTIVE_LEAVE_VEHICLE, m_pMyVehicle);
 			}
-#ifdef VC_PED_PORTS
 			m_nLastPedState = PED_NONE;
-#endif
 		} else {
 			SetIdle();
 			SetMoveState(PEDMOVE_STILL);
@@ -7038,7 +7055,7 @@ CPed::Fall(void)
 	CAnimBlendAssociation *firstPartialAssoc;
 	CAnimBlendAssociation *fallAssoc;
 
-	if (IsPlayer() && (bKnockedUpIntoAir || b158_4) && !bIsStanding) {
+	if (IsPlayer() && (bKnockedUpIntoAir || bKnockedOffBike) && !bIsStanding) {
 		firstPartialAssoc = RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_PARTIAL);
 
 		// What???
@@ -7066,7 +7083,7 @@ CPed::Fall(void)
 		} else {
 			CAnimManager::BlendAnimation(GetClump(), ASSOCGRP_STD, ANIM_FALL_BACK, 8.0f);
 		}
-	} else if ((bKnockedUpIntoAir || b158_4) && bIsStanding && !bWasStanding) {
+	} else if ((bKnockedUpIntoAir || bKnockedOffBike) && bIsStanding && !bWasStanding) {
 		fallAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_FALL_BACK);
 
 		if (!fallAssoc)
@@ -7074,7 +7091,7 @@ CPed::Fall(void)
 
 		if (fallAssoc) {
 			bKnockedUpIntoAir = false;
-			b158_4 = false;
+			bKnockedOffBike = false;
 			fallAssoc->speed = 3.0f;
 			if (IsPlayer())
 				Say(SOUND_PED_LAND);
@@ -7083,7 +7100,7 @@ CPed::Fall(void)
 			firstPartialAssoc = RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_PARTIAL);
 			if (firstPartialAssoc && !firstPartialAssoc->IsRunning()) {
 				bKnockedUpIntoAir = false;
-				b158_4 = false;
+				bKnockedOffBike = false;
 			}
 		}
 	}
@@ -8092,7 +8109,9 @@ CPed::Seek(void)
 
 	} else if (m_objective != OBJECTIVE_FOLLOW_PED_IN_FORMATION) {
 
-		if (m_objective == OBJECTIVE_KILL_CHAR_ON_FOOT || m_objective == OBJECTIVE_KILL_CHAR_ANY_MEANS || m_objective == OBJECTIVE_RUN_TO_AREA || bIsRunning)
+		if (m_objective == OBJECTIVE_SPRINT_TO_COORD)
+			nextMove = PEDMOVE_SPRINT;
+		else if (m_objective == OBJECTIVE_KILL_CHAR_ON_FOOT || m_objective == OBJECTIVE_KILL_CHAR_ANY_MEANS || m_objective == OBJECTIVE_RUN_TO_AREA || bIsRunning)
 			nextMove = PEDMOVE_RUN;
 		else
 			nextMove = PEDMOVE_WALK;
@@ -8114,7 +8133,7 @@ CPed::Seek(void)
 	}
 
 	if (seekPosDist >= distanceToCountItDone) {
-		if (bIsRunning)
+		if (bIsRunning && nextMove != PEDMOVE_SPRINT)
 			nextMove = PEDMOVE_RUN;
 
 		if (CTimer::GetTimeInMilliseconds() <= m_nPedStateTimer) {
@@ -8186,7 +8205,9 @@ CPed::Seek(void)
 		m_actionY = 0;
 	}
 
-	if (m_objective == OBJECTIVE_GOTO_AREA_ON_FOOT || m_objective == OBJECTIVE_RUN_TO_AREA || m_objective == OBJECTIVE_GOTO_AREA_ANY_MEANS) {
+	if (m_objective == OBJECTIVE_GOTO_AREA_ON_FOOT || m_objective == OBJECTIVE_RUN_TO_AREA || m_objective == OBJECTIVE_SPRINT_TO_COORD ||
+		m_objective == OBJECTIVE_GOTO_AREA_ANY_MEANS) {
+
 		if (m_pNextPathNode)
 			m_pNextPathNode = nil;
 		else
@@ -10332,6 +10353,7 @@ CPed::ProcessControl(void)
 							&& (!IsPlayer()
 								|| m_objective == OBJECTIVE_GOTO_AREA_ON_FOOT
 								|| m_objective == OBJECTIVE_RUN_TO_AREA
+								|| m_objective == OBJECTIVE_SPRINT_TO_COORD
 								|| m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER)) {
 
 							if (collidingVeh != m_pCurrentPhysSurface || IsPlayer()) {
@@ -11172,7 +11194,7 @@ CPed::ProcessControl(void)
 					if (!IsPlayer() && m_pMyVehicle->IsBoat()
 						&& FindPlayerPed()->m_pCurrentPhysSurface == m_pMyVehicle
 						&& CharCreatedBy != MISSION_CHAR || !bIsPlayerFriend) {
-						SetObjective(OBJ_50, FindPlayerPed());
+						SetObjective(OBJECTIVE_KILL_CHAR_ON_BOAT, FindPlayerPed());
 						Say(SOUND_PED_CAR_JACKED);
 					}
 
@@ -12296,10 +12318,11 @@ CPed::PedSetInCarCB(CAnimBlendAssociation *animAssoc, void *arg)
 			veh->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_AVOID_CARS;
 			veh->AutoPilot.m_nCruiseSpeed = 25;
 		}
-		ped->m_nPedState = PED_DRIVING;
+		ped->SetPedState(PED_DRIVING);
 		if (ped->m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER) {
 
-			if (ped->m_prevObjective == OBJECTIVE_RUN_TO_AREA || ped->m_prevObjective == OBJECTIVE_GOTO_CHAR_ON_FOOT || ped->m_prevObjective == OBJECTIVE_KILL_CHAR_ON_FOOT)
+			if (ped->m_prevObjective == OBJECTIVE_RUN_TO_AREA || ped->m_prevObjective == OBJECTIVE_GOTO_CHAR_ON_FOOT
+				|| ped->m_prevObjective == OBJECTIVE_SPRINT_TO_COORD || ped->m_prevObjective == OBJECTIVE_KILL_CHAR_ON_FOOT)
 				ped->m_prevObjective = OBJECTIVE_NONE;
 
 			ped->RestorePreviousObjective();
@@ -12325,7 +12348,8 @@ CPed::PedSetInCarCB(CAnimBlendAssociation *animAssoc, void *arg)
 			}
 		}
 		ped->m_nPedState = PED_DRIVING;
-		if (ped->m_prevObjective == OBJECTIVE_RUN_TO_AREA || ped->m_prevObjective == OBJECTIVE_GOTO_CHAR_ON_FOOT || ped->m_prevObjective == OBJECTIVE_KILL_CHAR_ON_FOOT)
+		if (ped->m_prevObjective == OBJECTIVE_RUN_TO_AREA || ped->m_prevObjective == OBJECTIVE_GOTO_CHAR_ON_FOOT
+			|| ped->m_prevObjective == OBJECTIVE_SPRINT_TO_COORD || ped->m_prevObjective == OBJECTIVE_KILL_CHAR_ON_FOOT)
 			ped->m_prevObjective = OBJECTIVE_NONE;
 
 		ped->RestorePreviousObjective();
@@ -12348,6 +12372,13 @@ CPed::PedSetInCarCB(CAnimBlendAssociation *animAssoc, void *arg)
 		case OBJECTIVE_GOTO_AREA_ANY_MEANS:
 		case OBJECTIVE_GOTO_AREA_ON_FOOT:
 		case OBJECTIVE_RUN_TO_AREA:
+		case OBJECTIVE_USE_SEAT_ATTRACTOR:
+		case OBJECTIVE_USE_ATM_ATTRACTOR:
+		case OBJECTIVE_USE_STOP_ATTRACTOR:
+		case OBJECTIVE_USE_PIZZA_ATTRACTOR:
+		case OBJECTIVE_USE_SHELTER_ATTRACTOR:
+		case OBJECTIVE_SPRINT_TO_COORD:
+		case OBJECTIVE_USE_ICECREAM_ATTRACTOR:
 			break;
 		default:
 			ped->SetObjective(OBJECTIVE_NONE);
@@ -13211,8 +13242,8 @@ CPed::ProcessObjective(void)
 			case OBJECTIVE_FOLLOW_CAR_IN_CAR:
 			case OBJECTIVE_FIRE_AT_OBJ_FROM_VEHICLE:
 			case OBJECTIVE_DESTROY_OBJ:
-			case OBJECTIVE_26:
-			case OBJECTIVE_27:
+			case OBJECTIVE_GOTO_AREA_IN_CAR:
+			case OBJECTIVE_FOLLOW_CAR_ON_FOOT_WITH_OFFSET:
 			case OBJECTIVE_SET_LEADER:
 				break;
 			case OBJECTIVE_IDLE:
@@ -13758,6 +13789,8 @@ CPed::ProcessObjective(void)
 				break;
 			}
 			case OBJECTIVE_GOTO_CHAR_ON_FOOT:
+			case OBJECTIVE_GOTO_CHAR_ON_FOOT_WALKING:
+			case OBJECTIVE_HASSLE_CHAR:
 			{
 				if (m_pedInObjective) {
 					float safeDistance = 2.0f;
@@ -13803,6 +13836,8 @@ CPed::ProcessObjective(void)
 								}
 							}
 						}
+						if (m_objective == OBJECTIVE_GOTO_CHAR_ON_FOOT_WALKING && m_nMoveState > PEDMOVE_STILL)
+							SetMoveState(PEDMOVE_WALK);
 					}
 				} else {
 					SetObjective(OBJECTIVE_NONE);
@@ -14095,8 +14130,9 @@ CPed::ProcessObjective(void)
 			}
 			case OBJECTIVE_GOTO_AREA_ON_FOOT:
 			case OBJECTIVE_RUN_TO_AREA:
+			case OBJECTIVE_SPRINT_TO_COORD:
 			{
-				if ((m_objective == OBJECTIVE_GOTO_AREA_ON_FOOT || m_objective == OBJECTIVE_RUN_TO_AREA)
+				if ((m_objective == OBJECTIVE_GOTO_AREA_ON_FOOT || m_objective == OBJECTIVE_RUN_TO_AREA || m_objective == OBJECTIVE_SPRINT_TO_COORD)
 					&& InVehicle()) {
 					SetObjective(OBJECTIVE_LEAVE_VEHICLE, m_pMyVehicle);
 				} else {
@@ -14111,11 +14147,22 @@ CPed::ProcessObjective(void)
 							CVector bestCoords(0.0f, 0.0f, 0.0f);
 							m_vecSeekPos = m_nextRoutePointPos;
 
-							if (!m_pNextPathNode)
-								FindBestCoordsFromNodes(m_vecSeekPos, &bestCoords);
+							if (!m_pNextPathNode) {
+								bool found = FindBestCoordsFromNodes(m_vecSeekPos, &bestCoords);
+								if (m_pNextPathNode) {
 
+									// Because it already does that if it finds better coords.
+									if (!found) {
+										bestCoords = CPathFind::TakeWidthIntoAccountForWandering(m_pNextPathNode, m_randomSeed);
+									}
+									if ((bestCoords - GetPosition()).Magnitude2D() < m_distanceToCountSeekDone) {
+										m_pNextPathNode = nil;
+										bUsePedNodeSeek = false;
+									}
+								}
+							}
 							if (m_pNextPathNode)
-								m_vecSeekPos = m_pNextPathNode->GetPosition();
+								m_vecSeekPos = CPathFind::TakeWidthIntoAccountForWandering(m_pNextPathNode, m_randomSeed);
 						}
 						SetSeek(m_vecSeekPos, m_distanceToCountSeekDone);
 					}
@@ -14342,13 +14389,18 @@ CPed::ProcessObjective(void)
 						SetWanderPath(CGeneral::GetRandomNumber() & 7);
 					}
 				} else {
-#ifdef VC_PED_PORTS
 					m_objective = OBJECTIVE_NONE;
-#endif
 					ClearObjective();
 				}
-				break;
 			}
+			// fall through
+			case OBJECTIVE_WANDER:
+				if (CTimer::GetTimeInMilliseconds() > m_leaveCarTimer && !bInVehicle) {
+					m_leaveCarTimer = 0;
+					m_objective = OBJECTIVE_NONE;
+					CPed::SetWanderPath(m_nPathDir);
+				}
+				break;
 			case OBJECTIVE_FLEE_CAR:
 				if (!bInVehicle && m_nPedState != PED_FLEE_ENTITY && m_pMyVehicle) {
 					RestorePreviousObjective();
@@ -14382,6 +14434,19 @@ CPed::ProcessObjective(void)
 					}
 				}
 				break;
+			case OBJECTIVE_AIM_GUN_AT_PED:
+				if (m_pedInObjective) {
+					if (!bObstacleShowedUpDuringKillObjective)
+						SetPointGunAt(m_pedInObjective);
+
+					if (m_nMoveState == PEDMOVE_STILL && IsPedInControl()) {
+						SetLookFlag(m_pedInObjective, false); // TODO(Miami): new parameter: false
+						TurnBody();
+					}
+				} else {
+					ClearObjective();
+				}
+				break;
 #ifdef VC_PED_PORTS
 			case OBJECTIVE_LEAVE_CAR_AND_DIE:
 			{
@@ -17623,6 +17688,7 @@ CPed::WarpPedIntoCar(CVehicle *car)
 	bChangedSeat = true;
 }
 
+// --MIAMI: Done
 void
 CPed::SetObjective(eObjective newObj, float heading, const CVector& pos)
 {
@@ -17639,6 +17705,7 @@ CPed::SetObjective(eObjective newObj, float heading, const CVector& pos)
 	}
 }
 
+// --MIAMI: Done
 void
 CPed::SetObjective(eObjective newObj, CVector dest)
 {
@@ -17648,9 +17715,8 @@ CPed::SetObjective(eObjective newObj, CVector dest)
 	if (m_prevObjective != OBJECTIVE_NONE && m_prevObjective == newObj)
 		return;
 
-	SetObjectiveTimer(0);
 	if (m_objective == newObj) {
-		if (newObj == OBJECTIVE_GOTO_AREA_ANY_MEANS || newObj == OBJECTIVE_GOTO_AREA_ON_FOOT || newObj == OBJECTIVE_RUN_TO_AREA) {
+		if (newObj == OBJECTIVE_GOTO_AREA_ANY_MEANS || newObj == OBJECTIVE_GOTO_AREA_ON_FOOT || newObj == OBJECTIVE_RUN_TO_AREA || newObj == OBJECTIVE_SPRINT_TO_COORD) {
 			if (m_nextRoutePointPos == dest)
 				return;
 		} else if (newObj == OBJECTIVE_GUARD_SPOT) {
@@ -17659,9 +17725,8 @@ CPed::SetObjective(eObjective newObj, CVector dest)
 		}
 	}
 
-#ifdef VC_PED_PORTS
 	ClearPointGunAt();
-#endif
+	m_objectiveTimer = 0;
 	bObjectiveCompleted = false;
 	switch (newObj) {
 		case OBJECTIVE_GUARD_SPOT:
@@ -17677,6 +17742,8 @@ CPed::SetObjective(eObjective newObj, CVector dest)
 		case OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE:
 		case OBJECTIVE_FLEE_CHAR_ON_FOOT_ALWAYS:
 		case OBJECTIVE_GOTO_CHAR_ON_FOOT:
+		case OBJECTIVE_GOTO_CHAR_ON_FOOT_WALKING:
+		case OBJECTIVE_HASSLE_CHAR:
 		case OBJECTIVE_FOLLOW_PED_IN_FORMATION:
 		case OBJECTIVE_LEAVE_VEHICLE:
 		case OBJECTIVE_ENTER_CAR_AS_PASSENGER:
@@ -17685,6 +17752,27 @@ CPed::SetObjective(eObjective newObj, CVector dest)
 		case OBJECTIVE_FIRE_AT_OBJ_FROM_VEHICLE:
 		case OBJECTIVE_DESTROY_OBJ:
 		case OBJECTIVE_DESTROY_CAR:
+		case OBJECTIVE_GOTO_AREA_IN_CAR:
+		case OBJECTIVE_FOLLOW_CAR_ON_FOOT_WITH_OFFSET:
+		case OBJECTIVE_FIGHT_CHAR:
+		case OBJECTIVE_SET_LEADER:
+		case OBJECTIVE_FOLLOW_ROUTE:
+		case OBJECTIVE_SOLICIT:
+		case OBJECTIVE_HAIL_TAXI:
+		case OBJECTIVE_CATCH_TRAIN:
+		case OBJECTIVE_BUY_ICE_CREAM:
+		case OBJECTIVE_STEAL_ANY_CAR:
+		case OBJECTIVE_STEAL_ANY_MISSION_CAR:
+		case OBJECTIVE_MUG_CHAR:
+		case OBJECTIVE_LEAVE_CAR_AND_DIE:
+		case OBJECTIVE_FLEE_CAR:
+		case OBJECTIVE_SUN_BATHE:
+		case OBJECTIVE_AIM_GUN_AT_PED:
+		case OBJECTIVE_WANDER:
+		case OBJECTIVE_WAIT_FOR_RAIN_TO_END:
+		case OBJECTIVE_KILL_CHAR_ON_BOAT:
+		case OBJECTIVE_SOLICIT_FOOT:
+		case OBJECTIVE_WAIT_FOR_BUS:
 			break;
 		case OBJECTIVE_GOTO_AREA_ANY_MEANS:
 		case OBJECTIVE_GOTO_AREA_ON_FOOT:
@@ -17734,6 +17822,7 @@ CPed::SetObjective(eObjective newObj, CVector dest)
 			}
 			break;
 		case OBJECTIVE_RUN_TO_AREA:
+		case OBJECTIVE_SPRINT_TO_COORD:
 			bIsRunning = true;
 			m_pNextPathNode = nil;
 			m_nextRoutePointPos = dest;
@@ -18148,50 +18237,6 @@ CPed::SetCarJack_AllClear(CVehicle *car, uint32 doorNode, uint32 doorFlag)
 }
 
 void
-CPed::SetObjective(eObjective newObj, CVector dest, float safeDist)
-{
-	if (DyingOrDead())
-		return;
-
-	if (m_prevObjective != OBJECTIVE_NONE && m_prevObjective == newObj)
-		return;
-
-	SetObjectiveTimer(0);
-	if (m_objective == newObj) {
-		if (newObj == OBJECTIVE_GOTO_AREA_ANY_MEANS || newObj == OBJECTIVE_GOTO_AREA_ON_FOOT || newObj == OBJECTIVE_RUN_TO_AREA) {
-			if (m_nextRoutePointPos == dest && m_distanceToCountSeekDone == safeDist)
-				return;
-		} else if (newObj == OBJECTIVE_GUARD_SPOT) {
-			if (m_vecSeekPosEx == dest && m_distanceToCountSeekDoneEx == safeDist)
-				return;
-		}
-	}
-
-#ifdef VC_PED_PORTS
-	ClearPointGunAt();
-#endif
-	bObjectiveCompleted = false;
-	if (IsTemporaryObjective(m_objective)) {
-		m_prevObjective = newObj;
-	} else {
-		if (m_objective != newObj)
-			SetStoredObjective();
-
-		m_objective = newObj;
-	}
-	
-	if (newObj == OBJECTIVE_GUARD_SPOT) {
-		m_vecSeekPosEx = dest;
-		m_distanceToCountSeekDoneEx = safeDist;
-	} else if (newObj == OBJECTIVE_GOTO_AREA_ANY_MEANS || newObj == OBJECTIVE_GOTO_AREA_ON_FOOT || newObj == OBJECTIVE_RUN_TO_AREA) {
-		m_pNextPathNode = nil;
-		m_nextRoutePointPos = dest;
-		m_vecSeekPos = m_nextRoutePointPos;
-		bUsePedNodeSeek = true;
-	}
-}
-
-void
 CPed::SetCarJack(CVehicle* car)
 {
 	uint8 doorFlag;
@@ -18344,6 +18389,7 @@ CPed::SetExitBoat(CVehicle *boat)
 	m_vecMoveSpeed = boat->m_vecMoveSpeed;
 }
 
+// --MIAMI: Done
 void
 CPed::SetNewAttraction(CPedAttractor* pAttractor, const CVector& pos, float heading, float time, int32 qid)
 {