added Input class for handling user input

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

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 06b8fbd8291fbf3cd41136013d901da28028b3aa..397e5e3b02a59314bd97dc7518c2746d25ab54b7 100644 (file)
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -8,13 +8,17 @@
 #ifndef BATTLE_BATTLESTATE_H_
 #define BATTLE_BATTLESTATE_H_
 
+#include "Hero.h"
 #include "Monster.h"
 #include "../app/State.h"
 #include "../geometry/Point.h"
+#include "../geometry/Vector.h"
 
 #include <vector>
 #include <SDL.h>
 
+namespace app { class Input; }
+
 namespace battle {
 
 class PartyLayout;
@@ -30,6 +34,7 @@ public:
 
 public:
        void AddMonster(const Monster &);
+       void AddHero(const Hero &);
 
 public:
        virtual void EnterState(app::Application &ctrl, SDL_Surface *screen);
@@ -37,10 +42,15 @@ public:
 
        virtual void Resize(int width, int height);
 
-       virtual void HandleEvent(const SDL_Event &);
+       virtual void HandleInput(const app::Input &);
        virtual void UpdateWorld(float deltaT);
        virtual void Render(SDL_Surface *);
 
+private:
+       void RenderBackground(SDL_Surface *screen, const geometry::Vector<int> &offset);
+       void RenderMonsters(SDL_Surface *screen, const geometry::Vector<int> &offset);
+       void RenderHeroes(SDL_Surface *screen, const geometry::Vector<int> &offset);
+
 private:
        SDL_Surface *background;
        const PartyLayout *monstersLayout;
@@ -48,6 +58,7 @@ private:
        std::vector<geometry::Point<int> > monsterPositions;
        std::vector<geometry::Point<int> > heroesPositions;
        std::vector<Monster> monsters;
+       std::vector<Hero> heroes;
 
 };