X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=00cea78781cf14166dc779408c344475b0371cd2;hb=2ccc2369d32fb680a3047519d79c17de34c4e10a;hp=fbaa1d0169f79107b954ba3ece200ca18018454f;hpb=2a1d9169e1f6c2dfe0f93ed40d5fb68d3da342af;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index fbaa1d0..00cea78 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -18,7 +18,9 @@
 #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"
 #include "../graphics/Animation.h"
 #include "../graphics/fwd.h"
@@ -34,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)
@@ -46,19 +49,19 @@ 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 OnEnterState(app::Application &ctrl, SDL_Surface *screen);
+	virtual void OnExitState(app::Application &ctrl, SDL_Surface *screen);
+	virtual void OnResumeState(app::Application &ctrl, SDL_Surface *screen);
+	virtual void OnPauseState(app::Application &ctrl, SDL_Surface *screen);
 
-	virtual void Resize(int width, int height);
+	virtual void OnResize(int width, int height);
 
 	virtual void HandleEvents(const app::Input &);
 	virtual void UpdateWorld(float deltaT);
@@ -138,10 +141,11 @@ private:
 	void LoadInventory();
 
 	void DecideMonsterAttack(Monster &) const;
-	void CalculateDamage(const Stats &attackerStats, TargetSelection &targets) const;
-	Uint16 CalculateDamage(const Stats &attacker, const Stats &defender) const;
+	void CalculateDamage(const common::Stats &attackerStats, TargetSelection &targets) const;
+	Uint16 CalculateDamage(const common::Stats &attacker, const common::Stats &defender) const;
 
 private:
+	common::GameConfig *game;
 	SDL_Surface *background;
 	const PartyLayout *monstersLayout;
 	const PartyLayout *heroesLayout;