switched geometric scalars from floating to fixed

[l2e.git] / src / menu / InventoryMenu.h

diff --git a/src/menu/InventoryMenu.h b/src/menu/InventoryMenu.h
index 20cbe17f54ef388786488f9d98941f9b46e3c01c..780bacb7725294dc278ae7ab1316bd0dbfdf75bd 100644 (file)
--- a/src/menu/InventoryMenu.h
+++ b/src/menu/InventoryMenu.h
@@ -1,17 +1,10 @@
-/*
- * InventoryMenu.h
- *
- *  Created on: Nov 4, 2012
- *      Author: holy
- */
-
 #ifndef MENU_INVENTORYMENU_H_
 #define MENU_INVENTORYMENU_H_
 
 #include "fwd.h"
 #include "../app/State.h"
 #include "../common/fwd.h"
-#include "../geometry/Vector.h"
+#include "../math/Vector.h"
 #include "../graphics/Menu.h"
 
 namespace menu {
@@ -24,7 +17,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,12 +31,19 @@ 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;
 
 };