diff options
| author | aap <aap@papnet.eu> | 2021-01-08 23:43:52 +0100 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2021-01-08 23:43:52 +0100 |
| commit | 49d5c02d69abaa5282906df9a8d53ea67fed69c3 (patch) | |
| tree | c0b673ff28f9cd61d6460475465883a2c8035bf4 /src/peds/Ped.h | |
| parent | Merge branch 'miami' into lcs (diff) | |
| download | re3-49d5c02d69abaa5282906df9a8d53ea67fed69c3.tar re3-49d5c02d69abaa5282906df9a8d53ea67fed69c3.tar.gz re3-49d5c02d69abaa5282906df9a8d53ea67fed69c3.tar.bz2 re3-49d5c02d69abaa5282906df9a8d53ea67fed69c3.tar.lz re3-49d5c02d69abaa5282906df9a8d53ea67fed69c3.tar.xz re3-49d5c02d69abaa5282906df9a8d53ea67fed69c3.tar.zst re3-49d5c02d69abaa5282906df9a8d53ea67fed69c3.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/peds/Ped.h | 35 |
1 files changed, 33 insertions, 2 deletions
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 |