From 49d5c02d69abaa5282906df9a8d53ea67fed69c3 Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Fri, 8 Jan 2021 23:43:52 +0100
Subject: anims done. ped fight hacked to compile

---
 src/peds/Ped.h | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

(limited to 'src/peds/Ped.h')

diff --git a/src/peds/Ped.h b/src/peds/Ped.h
index 6c0d9987..a126fed6 100644
--- a/src/peds/Ped.h
+++ b/src/peds/Ped.h
@@ -100,9 +100,31 @@ enum PedFightMoves
 {
 	FIGHTMOVE_NULL,
 	// Attacker
-	FIGHTMOVE_STDPUNCH,
+//	FIGHTMOVE_STDPUNCH,
 	FIGHTMOVE_IDLE,
 	FIGHTMOVE_SHUFFLE_F,
+	// Combos
+	FIGHTMOVE_COMBO_A1,
+	FIGHTMOVE_COMBO_A2,
+	FIGHTMOVE_COMBO_A3,
+	FIGHTMOVE_COMBO_B1,
+	FIGHTMOVE_COMBO_B2,
+	FIGHTMOVE_COMBO_B3,
+	// Melee
+	FIGHTMOVE_MELEE1,
+	FIGHTMOVE_MELEE2,
+	FIGHTMOVE_MELEE3,
+	// Special
+	FIGHTMOVE_GROUNDKICK,
+	// Opponent
+	FIGHTMOVE_HITFRONT,
+	FIGHTMOVE_HITBACK,
+	FIGHTMOVE_HITRIGHT,
+	FIGHTMOVE_HITLEFT,
+	FIGHTMOVE_HITONFLOOR,
+	FIGHTMOVE_HITBEHIND,
+	FIGHTMOVE_IDLE2NORM,
+/*
 	FIGHTMOVE_KNEE,
 	FIGHTMOVE_PUNCHHOOK,
 	FIGHTMOVE_PUNCHJAB,
@@ -134,7 +156,16 @@ enum PedFightMoves
 	FIGHTMOVE_MELEE2,
 	FIGHTMOVE_MELEE3,
 	FIGHTMOVE_IDLE2NORM,
-	NUM_FIGHTMOVES
+*/
+
+	NUM_FIGHTMOVES,
+
+	// LCS replacements for the old names:
+	// NB: this may be totally bogus, i just need it to compile
+	FIGHTMOVE_PUNCH = FIGHTMOVE_COMBO_A2,
+	FIGHTMOVE_FWDRIGHT = FIGHTMOVE_COMBO_B1,
+	FIGHTMOVE_LONGKICK = FIGHTMOVE_COMBO_B2,
+	FIGHTMOVE_ROUNDHOUSE = FIGHTMOVE_COMBO_B3,
 };
 
 enum ePedPieceTypes
-- 
cgit v1.2.3