added basic defeat state

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

diff --git a/src/battle/states/SelectIkari.h b/src/battle/states/SelectIkari.h
index 43fa0cf1b4de65901e9505410082bccb6541294e..9b46deb5e88a8305783cabff32eb67bd6b6dbd50 100644 (file)
--- a/src/battle/states/SelectIkari.h
+++ b/src/battle/states/SelectIkari.h
@@ -2,15 +2,12 @@
 #define BATTLE_SELECTIKARI_H_
 
 namespace battle {
-       class BattleState;
+       class Battle;
        class SelectAttackType;
 }
-namespace math {
-       template<class>
-       class Vector;
-}
 
 #include "../../app/State.h"
+#include "../../math/Vector.h"
 
 namespace battle {
 
@@ -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,13 +32,17 @@ 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;
 
 };