1 files changed, 15 insertions, 15 deletions

diff --git a/src/peds/Ped.h b/src/peds/Ped.h
index 8b091d15..ac776469 100644
--- a/src/peds/Ped.h
+++ b/src/peds/Ped.h
@@ -679,7 +679,7 @@ public:
 	void SetLookFlag(CEntity* target, bool keepTryingToLook, bool cancelPrevious = false);
 	void SetLookFlag(float direction, bool keepTryingToLook, bool cancelPrevious = false);
 	void SetLookTimer(int time);
-	void SetDie(AnimationId anim = ANIM_KO_SHOT_FRONT1, float arg1 = 4.0f, float arg2 = 0.0f);
+	void SetDie(AnimationId anim = ANIM_STD_KO_FRONT, float arg1 = 4.0f, float arg2 = 0.0f);
 	void SetDead(void);
 	void ApplyHeadShot(eWeaponType weaponType, CVector pos, bool evenOnPlayer);
 	void RemoveBodyPart(PedNode nodeId, int8 direction);
@@ -1015,74 +1015,74 @@ public:
 
 	static AnimationId Get3rdFireAnim(CWeaponInfo* weapon) {
 		if (weapon->IsFlagSet(WEAPONFLAG_COP3_RD))
-			return ANIM_WEAPON_FIRE_3RD;
+			return ANIM_ATTACK_3;
 		else
 			return (AnimationId)0;
 	}
 
 	static AnimationId GetFireAnimGround(CWeaponInfo* weapon, bool kickFloorIfNone = true) {
 		if (weapon->IsFlagSet(WEAPONFLAG_GROUND_2ND))
-			return ANIM_WEAPON_CROUCHFIRE;
+			return ANIM_ATTACK_2;
 		else if (weapon->IsFlagSet(WEAPONFLAG_GROUND_3RD))
-			return ANIM_WEAPON_FIRE_3RD;
+			return ANIM_ATTACK_3;
 		else if (kickFloorIfNone)
-			return ANIM_KICK_FLOOR;
+			return ANIM_STD_KICKGROUND;
 		else
 			return (AnimationId)0;
 	}
 
 	static AnimationId GetPrimaryFireAnim(CWeaponInfo* weapon) {
 		if (weapon->IsFlagSet(WEAPONFLAG_ANIMDETONATE))
-			return ANIM_BOMBER;
+			return ANIM_STD_DETONATE;
 		else
-			return ANIM_WEAPON_FIRE;
+			return ANIM_ATTACK_1;
 	}
 
 	static AnimationId GetCrouchReloadAnim(CWeaponInfo* weapon) {
 		if (weapon->IsFlagSet(WEAPONFLAG_RELOAD))
-			return ANIM_WEAPON_CROUCHRELOAD;
+			return ANIM_ATTACK_EXTRA2;
 		else
 			return (AnimationId)0;
 	}
 
 	static AnimationId GetCrouchFireAnim(CWeaponInfo* weapon) {
 		if (weapon->IsFlagSet(WEAPONFLAG_CROUCHFIRE))
-			return ANIM_WEAPON_CROUCHFIRE;
+			return ANIM_ATTACK_2;
 		else
 			return (AnimationId)0;
 	}
 
 	static AnimationId GetReloadAnim(CWeaponInfo* weapon) {
 		if (weapon->IsFlagSet(WEAPONFLAG_RELOAD))
-			return ANIM_WEAPON_RELOAD;
+			return ANIM_ATTACK_EXTRA1;
 		else
 			return (AnimationId)0;
 	}
 
 	static AnimationId GetFightIdleWithMeleeAnim(CWeaponInfo* weapon) {
 		if (weapon->IsFlagSet(WEAPONFLAG_FIGHTMODE))
-			return ANIM_MELEE_IDLE_FIGHTMODE;
+			return ANIM_ATTACK_EXTRA2;
 		else
 			return (AnimationId)0;
 	}
 
 	static AnimationId GetFinishingAttackAnim(CWeaponInfo* weapon) {
 		if (weapon->IsFlagSet(WEAPONFLAG_FINISH_3RD))
-			return ANIM_MELEE_ATTACK_FINISH;
+			return ANIM_ATTACK_3;
 		else
 			return (AnimationId)0;
 	}
 
 	static AnimationId GetSecondFireAnim(CWeaponInfo* weapon) {
 		if (weapon->IsFlagSet(WEAPONFLAG_USE_2ND))
-			return ANIM_WEAPON_FIRE_2ND; // or ANIM_MELEE_ATTACK_2ND
+			return ANIM_ATTACK_2; // or ANIM_MELEE_ATTACK_2ND
 		else
 			return (AnimationId)0;
 	}
 	
 	static AnimationId GetMeleeStartAnim(CWeaponInfo* weapon) {
 		if (weapon->IsFlagSet(WEAPONFLAG_PARTIALATTACK))
-			return ANIM_MELEE_ATTACK_START;
+			return ANIM_ATTACK_EXTRA1;
 		else
 			return (AnimationId)0;
 	}
@@ -1090,7 +1090,7 @@ public:
 	static AnimationId GetThrowAnim(CWeaponInfo *weapon)
 	{
 		if (weapon->IsFlagSet(WEAPONFLAG_THROW))
-			return ANIM_THROWABLE_START_THROW;
+			return ANIM_ATTACK_EXTRA1;
 		else
 			return (AnimationId)0;
 	}