X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmenu%2FEquipMenu.h;h=cf7e75b384b6d15af50d91ef5ac0047a9ece6749;hb=ec824200aec12d6870b70304bcd2e2aeadba767b;hp=f8e9e78361a0f7e54914273aa5d41bd43b0cb057;hpb=ec18252fd6199492c40b98abab289c375a5a41b7;p=l2e.git

diff --git a/src/menu/EquipMenu.h b/src/menu/EquipMenu.h
index f8e9e78..cf7e75b 100644
--- a/src/menu/EquipMenu.h
+++ b/src/menu/EquipMenu.h
@@ -1,17 +1,19 @@
-/*
- * EquipMenu.h
- *
- *  Created on: Nov 18, 2012
- *      Author: holy
- */
-
 #ifndef MENU_EQUIPMENU_H_
 #define MENU_EQUIPMENU_H_
 
-#include "fwd.h"
+namespace common {
+	class Hero;
+	class Item;
+}
+namespace math {
+	template<class>
+	class Vector;
+}
+namespace menu {
+	class PartyMenu;
+}
+
 #include "../app/State.h"
-#include "../common/fwd.h"
-#include "../geometry/Vector.h"
 #include "../graphics/Menu.h"
 
 namespace menu {
@@ -24,7 +26,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:
@@ -54,12 +56,12 @@ private:
 	void LoadInventory();
 	void EquipSelected();
 
-	void RenderStatus(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
-	void RenderStats(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
-	void RenderStatsLine(const char *label, int number, SDL_Surface *screen, const geometry::Vector<int> &position) const;
-	void RenderEquipmentMenu(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
-	void RenderActionMenu(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
-	void RenderInventoryMenu(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
+	void RenderStatus(SDL_Surface *screen, const math::Vector<int> &offset) const;
+	void RenderStats(SDL_Surface *screen, const math::Vector<int> &offset) const;
+	void RenderStatsLine(const char *label, int number, SDL_Surface *screen, const math::Vector<int> &position) const;
+	void RenderEquipmentMenu(SDL_Surface *screen, const math::Vector<int> &offset) const;
+	void RenderActionMenu(SDL_Surface *screen, const math::Vector<int> &offset) const;
+	void RenderInventoryMenu(SDL_Surface *screen, const math::Vector<int> &offset) const;
 
 private:
 	PartyMenu *parent;
@@ -79,4 +81,4 @@ private:
 
 }
 
-#endif /* MENU_EQUIPMENU_H_ */
+#endif