extracted battle logic into a class

[l2e.git] / src / battle / states / SelectIkari.h

diff --git a/src/battle/states/SelectIkari.h b/src/battle/states/SelectIkari.h
index 8e565c4e0abbc3d39317a4e4a2df4f0926ed7d81..9b46deb5e88a8305783cabff32eb67bd6b6dbd50 100644 (file)
--- a/src/battle/states/SelectIkari.h
+++ b/src/battle/states/SelectIkari.h
@@ -1,16 +1,13 @@
-/*
- * SelectIkari.h
- *
- *  Created on: Aug 9, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_SELECTIKARI_H_
 #define BATTLE_SELECTIKARI_H_
 
-#include "../fwd.h"
+namespace battle {
+       class Battle;
+       class SelectAttackType;
+}
+
 #include "../../app/State.h"
-#include "../../geometry/Vector.h"
+#include "../../math/Vector.h"
 
 namespace battle {
 
@@ -19,33 +16,36 @@ class SelectIkari
 : public app::State {
 
 public:
-       SelectIkari(BattleState *battle, SelectAttackType *parent)
-       : ctrl(0), battle(battle), parent(parent) { }
+       SelectIkari(Battle *battle, SelectAttackType *parent);
 
 public:
-       virtual void EnterState(app::Application &ctrl, SDL_Surface *screen);
-       virtual void ExitState(app::Application &ctrl, SDL_Surface *screen);
-       virtual void ResumeState(app::Application &ctrl, SDL_Surface *screen);
-       virtual void PauseState(app::Application &ctrl, SDL_Surface *screen);
-
-       virtual void Resize(int width, int height);
-
        virtual void HandleEvents(const app::Input &);
-       virtual void UpdateWorld(float deltaT);
+       virtual void UpdateWorld(Uint32 deltaT);
        virtual void Render(SDL_Surface *);
 
 private:
-       void RenderFrame(SDL_Surface *, const geometry::Vector<int> &offset);
-       void RenderHeadline(SDL_Surface *, const geometry::Vector<int> &offset);
-       void RenderMenu(SDL_Surface *, const geometry::Vector<int> &offset);
+       virtual void OnEnterState(SDL_Surface *screen);
+       virtual void OnExitState(SDL_Surface *screen);
+       virtual void OnResumeState(SDL_Surface *screen);
+       virtual void OnPauseState(SDL_Surface *screen);
+
+       virtual void OnResize(int width, int height);
+
+private:
+       void RenderFrame(SDL_Surface *);
+       void RenderHeadline(SDL_Surface *);
+       void RenderMenu(SDL_Surface *);
 
 private:
-       app::Application *ctrl;
-       BattleState *battle;
+       Battle *battle;
        SelectAttackType *parent;
+       math::Vector<int> framePosition;
+       math::Vector<int> frameSize;
+       math::Vector<int> headlinePosition;
+       math::Vector<int> menuPosition;
 
 };
 
 }
 
-#endif /* BATTLE_SELECTIKARI_H_ */
+#endif