X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmenu%2FPartyMenu.h;h=f104898c31ca66d6b001cf0ab1aa9353f8f67a58;hb=ec824200aec12d6870b70304bcd2e2aeadba767b;hp=08ffa3823b46c1a8a6b07db38f6982fd75fdb398;hpb=cc3d698b8c1ad09d7a3f9e3f28bc84e0ac1735ea;p=l2e.git

diff --git a/src/menu/PartyMenu.h b/src/menu/PartyMenu.h
index 08ffa38..f104898 100644
--- a/src/menu/PartyMenu.h
+++ b/src/menu/PartyMenu.h
@@ -1,11 +1,16 @@
 #ifndef MENU_PARTYMENU_H_
 #define MENU_PARTYMENU_H_
 
-#include "fwd.h"
+namespace common {
+	struct GameConfig;
+}
+namespace menu {
+	struct Resources;
+}
+
 #include "HeroStatus.h"
 #include "../app/State.h"
-#include "../common/fwd.h"
-#include "../geometry/Vector.h"
+#include "../math/Vector.h"
 #include "../graphics/Menu.h"
 
 namespace menu {
@@ -19,7 +24,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:
@@ -33,11 +38,11 @@ public:
 
 public:
 	void RenderBackground(SDL_Surface *screen) const;
-	void RenderHeros(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
-	void RenderMenu(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
-	void RenderInfo(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
+	void RenderHeros(SDL_Surface *screen, const math::Vector<int> &offset) const;
+	void RenderMenu(SDL_Surface *screen, const math::Vector<int> &offset) const;
+	void RenderInfo(SDL_Surface *screen, const math::Vector<int> &offset) const;
 
-	geometry::Vector<int> StatusOffset(int index) const;
+	math::Vector<int> StatusOffset(int index) const;
 	const HeroStatus &GetHeroStatus(int index) const { return status[index]; }
 
 	static void OnEquipSelect(void *, int);
@@ -66,7 +71,7 @@ private:
 
 private:
 	HeroStatus status[4];
-	geometry::Vector<int> statusPositions[4];
+	math::Vector<int> statusPositions[4];
 	common::GameConfig *game;
 	graphics::Menu<int> mainMenu;
 
@@ -74,4 +79,4 @@ private:
 
 }
 
-#endif /* MENU_PARTYMENU_H_ */
+#endif