removed now superfluous Application parameter to State callbacks

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

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index e002b7c026d8c33816d5bfadf5f213b9606fadf3..e76440ed2908b44d17343174bc12a48d6bf7f69a 100644 (file)
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -18,6 +18,7 @@
 #include "SmallHeroTag.h"
 #include "../app/fwd.h"
 #include "../app/State.h"
+#include "../common/GameConfig.h"
 #include "../common/fwd.h"
 #include "../common/Stats.h"
 #include "../geometry/Vector.h"
@@ -35,11 +36,12 @@ class BattleState
 : public app::State {
 
 public:
-       BattleState(SDL_Surface *background, const PartyLayout &monstersLayout, const PartyLayout &heroesLayout, const Resources *res)
-       : background(background)
-       , monstersLayout(&monstersLayout)
-       , heroesLayout(&heroesLayout)
-       , res(res)
+       BattleState(common::GameConfig *game, SDL_Surface *background, const PartyLayout *monstersLayout)
+       : game(game)
+       , background(background)
+       , monstersLayout(monstersLayout)
+       , heroesLayout(game->heroesLayout)
+       , res(game->battleResources)
        , attackTypeMenu(res->attackIcons)
        , moveMenu(res->moveIcons)
        , numHeroes(0)
@@ -47,20 +49,13 @@ public:
        , attackCursor(-1)
        , expReward(0)
        , goldReward(0)
-       , ranAway(false) { assert(background && res); }
+       , ranAway(false) { assert(background && monstersLayout && game); }
 
 public:
        void AddMonster(const Monster &);
        void AddHero(const Hero &);
 
 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 Render(SDL_Surface *);
@@ -135,6 +130,14 @@ public:
        void RenderHeroTags(SDL_Surface *screen, const geometry::Vector<int> &offset);
        void RenderSmallHeroTags(SDL_Surface *screen, const geometry::Vector<int> &offset);
 
+private:
+       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 LoadInventory();
 
@@ -143,6 +146,7 @@ private:
        Uint16 CalculateDamage(const common::Stats &attacker, const common::Stats &defender) const;
 
 private:
+       common::GameConfig *game;
        SDL_Surface *background;
        const PartyLayout *monstersLayout;
        const PartyLayout *heroesLayout;