X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.h;h=8eb8f8d239ae3b5ac541aebbf862c13c13ec1c2c;hb=4309d259becd96ead792678257e910c03a6b4a3d;hp=1c994e4f88a664c2d572173fd79c156d1daf0687;hpb=2255d436a0c2acc10b015827366a72b2ece86094;p=l2e.git

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 1c994e4..8eb8f8d 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -1,7 +1,18 @@
 #ifndef BATTLE_BATTLESTATE_H_
 #define BATTLE_BATTLESTATE_H_
 
-#include "fwd.h"
+namespace battle {
+	class PartyLayout;
+}
+namespace common {
+	class Item;
+	struct GameConfig;
+}
+namespace math {
+	template<class>
+	class Vector;
+}
+
 #include "AttackTypeMenu.h"
 #include "Capsule.h"
 #include "Hero.h"
@@ -10,14 +21,10 @@
 #include "MoveMenu.h"
 #include "Resources.h"
 #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"
 #include "../graphics/Menu.h"
 
 #include <cassert>
@@ -52,7 +59,7 @@ public:
 
 public:
 	virtual void HandleEvents(const app::Input &);
-	virtual void UpdateWorld(float deltaT);
+	virtual void UpdateWorld(Uint32 deltaT);
 	virtual void Render(SDL_Surface *);
 
 public:
@@ -76,7 +83,7 @@ public:
 	const Monster &MonsterAt(int index) const { assert(index >= 0 && index < NumHeroes()); return monsters[index]; }
 
 	const HeroTag &HeroTagAt(int index) const { assert(index >= 0 && index < NumHeroes()); return heroTags[index]; }
-	const geometry::Vector<int> &HeroTagPositionAt(int index) const { assert(index >= 0 && index < NumHeroes()); return heroTagPositions[index]; }
+	const math::Vector<int> &HeroTagPositionAt(int index) const { assert(index >= 0 && index < NumHeroes()); return heroTagPositions[index]; }
 
 	Capsule &GetCapsule() { return capsule; }
 
@@ -122,21 +129,21 @@ public:
 	bool Defeat() const;
 
 public:
-	geometry::Vector<int> CalculateScreenOffset(SDL_Surface *screen) const {
-		return geometry::Vector<int>(
+	math::Vector<int> CalculateScreenOffset(SDL_Surface *screen) const {
+		return math::Vector<int>(
 				(screen->w - background->w) / 2,
 				(screen->h - background->h) / 2);
 	}
 	int Width() const { return background->w; }
 	int Height() const { return background->h; }
-	geometry::Vector<int> Size() const { return geometry::Vector<int>(Width(), Height()); }
+	math::Vector<int> Size() const { return math::Vector<int>(Width(), Height()); }
 
-	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);
-	void RenderCapsule(SDL_Surface *screen, const geometry::Vector<int> &offset);
-	void RenderHeroTags(SDL_Surface *screen, const geometry::Vector<int> &offset);
-	void RenderSmallHeroTags(SDL_Surface *screen, const geometry::Vector<int> &offset);
+	void RenderBackground(SDL_Surface *screen, const math::Vector<int> &offset);
+	void RenderMonsters(SDL_Surface *screen, const math::Vector<int> &offset);
+	void RenderHeroes(SDL_Surface *screen, const math::Vector<int> &offset);
+	void RenderCapsule(SDL_Surface *screen, const math::Vector<int> &offset);
+	void RenderHeroTags(SDL_Surface *screen, const math::Vector<int> &offset);
+	void RenderSmallHeroTags(SDL_Surface *screen, const math::Vector<int> &offset);
 
 private:
 	virtual void OnEnterState(SDL_Surface *screen);
@@ -168,8 +175,8 @@ private:
 	graphics::Menu<const common::Item *> itemMenu;
 	HeroTag heroTags[4];
 	SmallHeroTag smallHeroTags[4];
-	geometry::Vector<int> heroTagPositions[4];
-	geometry::Vector<int> smallHeroTagPositions[4];
+	math::Vector<int> heroTagPositions[4];
+	math::Vector<int> smallHeroTagPositions[4];
 	Capsule capsule;
 	int numHeroes;
 	int activeHero;
@@ -182,4 +189,4 @@ private:
 
 }
 
-#endif /* BATTLE_BATTLESTATE_H_ */
+#endif