revised attack animation codes

[l2e.git] / src / battle / AttackAnimation.h

diff --git a/src/battle/AttackAnimation.h b/src/battle/AttackAnimation.h
index a8ec014ecc43de3a3c003a75a10711b168d19d2d..7758bb89594989f5828cb10ccdc2d8541742cf3e 100644 (file)
--- a/src/battle/AttackAnimation.h
+++ b/src/battle/AttackAnimation.h
@@ -29,12 +29,13 @@ public:
        ~AttackAnimation();
 
 public:
-       void Wait(int ms);
-       void WaitForAnimation();
+       void StartTimer(int ms);
        void PlayAttackAnimation();
        void PlaySpellAnimation();
        void PlayTargetAnimation(graphics::Animation *);
        void PlayFullscreenAnimation(graphics::Animation *);
+       void WaitForTimer();
+       void WaitForAnimations();
 
 public:
        void Start(BattleState *, app::State *);
@@ -44,22 +45,24 @@ public:
 
 private:
        bool ExecuteCommand();
-
-       bool ExecuteWait();
-       bool ExecuteWaitAnimation();
+       bool ExecuteStartTimer();
        bool ExecuteAttackAnimation();
        bool ExecuteSpellAnimation();
        bool ExecuteTargetAnimation();
        bool ExecuteFullscreenAnimation();
+       bool ExecuteWaitTimer();
+       bool ExecuteWaitAnimations();
 
 private:
        enum Command {
-               WAIT,
-               WAIT_ANIMATION,
+               NOOP,
+               START_TIMER,
                ATTACK_ANIMATION,
                SPELL_ANIMATION,
                TARGET_ANIMATION,
                FULLSCREEN_ANIMATION,
+               WAIT_TIMER,
+               WAIT_ANIMATIONS,
        };
        union Code {
                Code(Command c) : command(c) { }