X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmenu%2FEquipMenu.h;h=cf7e75b384b6d15af50d91ef5ac0047a9ece6749;hb=4309d259becd96ead792678257e910c03a6b4a3d;hp=5c2cc9b583307a49bf4854093f8a05af542b92ea;hpb=cc3d698b8c1ad09d7a3f9e3f28bc84e0ac1735ea;p=l2e.git

diff --git a/src/menu/EquipMenu.h b/src/menu/EquipMenu.h
index 5c2cc9b..cf7e75b 100644
--- a/src/menu/EquipMenu.h
+++ b/src/menu/EquipMenu.h
@@ -1,10 +1,19 @@
 #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 {
@@ -17,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:
@@ -47,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;
@@ -72,4 +81,4 @@ private:
 
 }
 
-#endif /* MENU_EQUIPMENU_H_ */
+#endif