X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmenu%2FInventoryMenu.h;h=10b9730fbbda7304e337c9dfbf0425d29132a65d;hb=4309d259becd96ead792678257e910c03a6b4a3d;hp=20cbe17f54ef388786488f9d98941f9b46e3c01c;hpb=c1de2db3755c2cffd790c58bbd92e7fc993afcb5;p=l2e.git

diff --git a/src/menu/InventoryMenu.h b/src/menu/InventoryMenu.h
index 20cbe17..10b9730 100644
--- a/src/menu/InventoryMenu.h
+++ b/src/menu/InventoryMenu.h
@@ -1,17 +1,18 @@
-/*
- * InventoryMenu.h
- *
- *  Created on: Nov 4, 2012
- *      Author: holy
- */
-
 #ifndef MENU_INVENTORYMENU_H_
 #define MENU_INVENTORYMENU_H_
 
-#include "fwd.h"
+namespace common {
+	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 +25,7 @@ public:
 
 public:
 	virtual void HandleEvents(const app::Input &);
-	virtual void UpdateWorld(float deltaT);
+	virtual void UpdateWorld(Uint32 deltaT);
 	virtual void Render(SDL_Surface *);
 
 	int Width() const;
@@ -38,16 +39,23 @@ private:
 
 	virtual void OnResize(int width, int height);
 
-	void RenderMenu(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
-	void RenderInventory(SDL_Surface *screen, const geometry::Vector<int> &offset) const;
+	void LoadInventory();
+
+	void RenderMenu(SDL_Surface *screen, const math::Vector<int> &offset) const;
+	void RenderInventory(SDL_Surface *screen, const math::Vector<int> &offset) const;
 
 private:
 	PartyMenu *parent;
-	graphics::Menu<int> menu;
+	enum Choice {
+		CHOICE_USE,
+		CHOICE_SORT,
+		CHOICE_DROP,
+	};
+	graphics::Menu<Choice> menu;
 	graphics::Menu<const common::Item *> itemMenu;
 
 };
 
 }
 
-#endif /* MENU_INVENTORYMENU_H_ */
+#endif