1 files changed, 29 insertions, 33 deletions

diff --git a/src/peds/Ped.h b/src/peds/Ped.h
index e1795f55..457036d3 100644
--- a/src/peds/Ped.h
+++ b/src/peds/Ped.h
@@ -181,13 +181,13 @@ enum eWaitState {
 
 enum eObjective : uint32 {
 	OBJECTIVE_NONE,
-	OBJECTIVE_IDLE,
-	OBJECTIVE_IDLE_COP,
-	OBJECTIVE_FLEE_TILL_SAFE,
+	OBJECTIVE_WAIT_ON_FOOT,
+	OBJECTIVE_WAIT_ON_FOOT_FOR_COP,
+	OBJECTIVE_FLEE_ON_FOOT_TILL_SAFE,
 	OBJECTIVE_GUARD_SPOT,
-	OBJECTIVE_GUARD_AREA,	// not implemented
+	OBJECTIVE_GUARD_AREA,
 	OBJECTIVE_WAIT_IN_CAR,
-	OBJECTIVE_WAIT_IN_CAR_THEN_GETOUT,
+	OBJECTIVE_WAIT_IN_CAR_THEN_GET_OUT,
 	OBJECTIVE_KILL_CHAR_ON_FOOT,
 	OBJECTIVE_KILL_CHAR_ANY_MEANS,
 	OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE,
@@ -195,23 +195,23 @@ enum eObjective : uint32 {
 	OBJECTIVE_GOTO_CHAR_ON_FOOT,
 	OBJECTIVE_GOTO_CHAR_ON_FOOT_WALKING,
 	OBJECTIVE_HASSLE_CHAR,
-	OBJECTIVE_FOLLOW_PED_IN_FORMATION,
-	OBJECTIVE_LEAVE_VEHICLE,
+	OBJECTIVE_FOLLOW_CHAR_IN_FORMATION,
+	OBJECTIVE_LEAVE_CAR,
 	OBJECTIVE_ENTER_CAR_AS_PASSENGER,
 	OBJECTIVE_ENTER_CAR_AS_DRIVER,
-	OBJECTIVE_FOLLOW_CAR_IN_CAR, // seems not implemented so far
-	OBJECTIVE_FIRE_AT_OBJ_FROM_VEHICLE,	// not implemented
-	OBJECTIVE_DESTROY_OBJ,	// not implemented
+	OBJECTIVE_FOLLOW_CAR_IN_CAR,
+	OBJECTIVE_FIRE_AT_OBJECT_FROM_VEHICLE,
+	OBJECTIVE_DESTROY_OBJECT,
 	OBJECTIVE_DESTROY_CAR,
 	OBJECTIVE_GOTO_AREA_ANY_MEANS,
 	OBJECTIVE_GOTO_AREA_ON_FOOT,
 	OBJECTIVE_RUN_TO_AREA,
-	OBJECTIVE_GOTO_AREA_IN_CAR,	// not implemented
-	OBJECTIVE_FOLLOW_CAR_ON_FOOT_WITH_OFFSET,	// not implemented
-	OBJECTIVE_FIGHT_CHAR,
+	OBJECTIVE_GOTO_AREA_IN_CAR,
+	OBJECTIVE_FOLLOW_CAR_ON_FOOT_WITH_OFFSET,
+	OBJECTIVE_GUARD_ATTACK,
 	OBJECTIVE_SET_LEADER,
 	OBJECTIVE_FOLLOW_ROUTE,
-	OBJECTIVE_SOLICIT,
+	OBJECTIVE_SOLICIT_VEHICLE,
 	OBJECTIVE_HAIL_TAXI,
 	OBJECTIVE_CATCH_TRAIN,
 	OBJECTIVE_BUY_ICE_CREAM,
@@ -219,22 +219,22 @@ enum eObjective : uint32 {
 	OBJECTIVE_STEAL_ANY_MISSION_CAR,
 	OBJECTIVE_MUG_CHAR,
 	OBJECTIVE_LEAVE_CAR_AND_DIE,
-	OBJECTIVE_USE_SEAT_ATTRACTOR,
-	OBJECTIVE_USE_ATM_ATTRACTOR,
+	OBJECTIVE_GOTO_SEAT_ON_FOOT,
+	OBJECTIVE_GOTO_ATM_ON_FOOT,
 	OBJECTIVE_FLEE_CAR,
 	OBJECTIVE_SUN_BATHE,
-	OBJECTIVE_USE_STOP_ATTRACTOR,
-	OBJECTIVE_USE_PIZZA_ATTRACTOR,
-	OBJECTIVE_USE_SHELTER_ATTRACTOR,
-	OBJECTIVE_AIM_GUN_AT_PED,
+	OBJECTIVE_GOTO_BUS_STOP_ON_FOOT,
+	OBJECTIVE_GOTO_PIZZA_ON_FOOT,
+	OBJECTIVE_GOTO_SHELTER_ON_FOOT,
+	OBJECTIVE_AIM_GUN_AT,
 	OBJECTIVE_WANDER,
-	OBJECTIVE_WAIT_FOR_RAIN_TO_END,
-	OBJECTIVE_SPRINT_TO_COORD,
+	OBJECTIVE_WAIT_ON_FOOT_AT_SHELTER,
+	OBJECTIVE_SPRINT_TO_AREA,
 	OBJECTIVE_KILL_CHAR_ON_BOAT,
 	OBJECTIVE_SOLICIT_FOOT,
-	OBJECTIVE_WAIT_FOR_BUS,
-	OBJECTIVE_USE_ICECREAM_ATTRACTOR,
-	OBJECTIVE_PURCHASE_ICECREAM,
+	OBJECTIVE_WAIT_ON_FOOT_AT_BUS_STOP,
+	OBJECTIVE_GOTO_ICE_CREAM_VAN_ON_FOOT,
+	OBJECTIVE_WAIT_ON_FOOT_AT_ICE_CREAM_VAN,
 	OBJ_55,
 	OBJ_56,
 	OBJ_57,
@@ -349,6 +349,7 @@ enum eMoveState {
 	PEDMOVE_JOG,
 	PEDMOVE_RUN,
 	PEDMOVE_SPRINT,
+	PEDMOVE_THROWN
 };
 
 class CVehicle;
@@ -966,9 +967,9 @@ public:
 	bool EnteringCar(void) { return m_nPedState == PED_ENTER_CAR || m_nPedState == PED_CARJACK; }
 	bool HasAttractor(void) { return m_attractor != nil; }
 	bool IsUseAttractorObjective(eObjective obj) {
-		return obj == OBJECTIVE_USE_ATM_ATTRACTOR || obj == OBJECTIVE_USE_ICECREAM_ATTRACTOR ||
-			obj == OBJECTIVE_USE_PIZZA_ATTRACTOR || obj == OBJECTIVE_USE_SEAT_ATTRACTOR ||
-			obj == OBJECTIVE_USE_SHELTER_ATTRACTOR || obj == OBJECTIVE_USE_STOP_ATTRACTOR;
+		return obj == OBJECTIVE_GOTO_ATM_ON_FOOT || obj == OBJECTIVE_GOTO_ICE_CREAM_VAN_ON_FOOT ||
+			obj == OBJECTIVE_GOTO_PIZZA_ON_FOOT || obj == OBJECTIVE_GOTO_SEAT_ON_FOOT ||
+			obj == OBJECTIVE_GOTO_SHELTER_ON_FOOT || obj == OBJECTIVE_GOTO_BUS_STOP_ON_FOOT;
 	}
 
 	void ReplaceWeaponWhenExitingVehicle(void);
@@ -1080,11 +1081,6 @@ public:
 	static bool bPedCheat3;
 	static CVector2D ms_vec2DFleePosition;
 
-#ifdef TOGGLEABLE_BETA_FEATURES
-	static bool bPopHeadsOnHeadshot;
-	static bool bMakePedsRunToPhonesToReportCrimes;
-#endif
-
 #ifndef MASTER
 	// Mobile things
 	void DebugDrawPedDestination(CPed *, int, int);