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 e665c696c22cb1240630e9b644be0b3c2cf0ce31..9b46deb5e88a8305783cabff32eb67bd6b6dbd50 100644 (file)
--- a/src/battle/states/SelectIkari.h
+++ b/src/battle/states/SelectIkari.h
@@ -1,14 +1,11 @@
-/*
- * 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 "../../math/Vector.h"
 
@@ -19,8 +16,7 @@ class SelectIkari
 : public app::State {
 
 public:
-       SelectIkari(BattleState *battle, SelectAttackType *parent)
-       : battle(battle), parent(parent) { }
+       SelectIkari(Battle *battle, SelectAttackType *parent);
 
 public:
        virtual void HandleEvents(const app::Input &);
@@ -36,16 +32,20 @@ private:
        virtual void OnResize(int width, int height);
 
 private:
-       void RenderFrame(SDL_Surface *, const math::Vector<int> &offset);
-       void RenderHeadline(SDL_Surface *, const math::Vector<int> &offset);
-       void RenderMenu(SDL_Surface *, const math::Vector<int> &offset);
+       void RenderFrame(SDL_Surface *);
+       void RenderHeadline(SDL_Surface *);
+       void RenderMenu(SDL_Surface *);
 
 private:
-       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