2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 06:27:43 +00:00

Merge fixes

This commit is contained in:
Jack Andersen
2018-12-12 21:47:50 -10:00
parent 001d4ab7dc
commit ccf87925b9
3 changed files with 2 additions and 7 deletions

View File

@@ -321,7 +321,6 @@ public:
void TryMeleeAttack(CStateManager& mgr, int arg);
void TryGenerate(CStateManager& mgr, int arg);
void TryJump(CStateManager& mgr, int arg);
void TryMeleeAttack(CStateManager& mgr, int arg);
void TryTurn(CStateManager& mgr, int arg);
void TryGetUp(CStateManager& mgr, int arg);
void TryTaunt(CStateManager& mgr, int arg);