Inventory menu changes: Tooltips; dragging; drop from menu. Lag is a bit annoying...

[minetest.git] / src / guiInventoryMenu.h

diff --git a/src/guiInventoryMenu.h b/src/guiInventoryMenu.h
index 5336cae8206a1ae9ffea543b66403fa01e37df10..903a8b137cdfd31141fc2f114264d24be1d2f193 100644 (file)
--- a/src/guiInventoryMenu.h
+++ b/src/guiInventoryMenu.h
@@ -23,13 +23,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "common_irrlicht.h"
 #include "inventory.h"
+#include "inventorymanager.h"
 #include "utility.h"
 #include "modalMenu.h"
 
-void drawInventoryItem(video::IVideoDriver *driver,
+class IGameDef;
+class InventoryManager;
+
+void drawItemStack(video::IVideoDriver *driver,
                gui::IGUIFont *font,
-               InventoryItem *item, core::rect<s32> rect,
-               const core::rect<s32> *clip);
+               const ItemStack &item,
+               const core::rect<s32> &rect,
+               const core::rect<s32> *clip,
+               IGameDef *gamedef);
 
 class GUIInventoryMenu : public GUIModalMenu
 {
@@ -39,11 +45,11 @@ class GUIInventoryMenu : public GUIModalMenu
                {
                        i = -1;
                }
-               ItemSpec(const std::string &a_inventoryname,
+               ItemSpec(const InventoryLocation &a_inventoryloc,
                                const std::string &a_listname,
                                s32 a_i)
                {
-                       inventoryname = a_inventoryname;
+                       inventoryloc = a_inventoryloc;
                        listname = a_listname;
                        i = a_i;
                }
@@ -52,7 +58,7 @@ class GUIInventoryMenu : public GUIModalMenu
                        return i != -1;
                }
 
-               std::string inventoryname;
+               InventoryLocation inventoryloc;
                std::string listname;
                s32 i;
        };
@@ -62,17 +68,17 @@ class GUIInventoryMenu : public GUIModalMenu
                ListDrawSpec()
                {
                }
-               ListDrawSpec(const std::string &a_inventoryname,
+               ListDrawSpec(const InventoryLocation &a_inventoryloc,
                                const std::string &a_listname,
                                v2s32 a_pos, v2s32 a_geom)
                {
-                       inventoryname = a_inventoryname;
+                       inventoryloc = a_inventoryloc;
                        listname = a_listname;
                        pos = a_pos;
                        geom = a_geom;
                }
 
-               std::string inventoryname;
+               InventoryLocation inventoryloc;
                std::string listname;
                v2s32 pos;
                v2s32 geom;
@@ -84,7 +90,7 @@ class GUIInventoryMenu : public GUIModalMenu
                {
                }
                DrawSpec(const std::string &a_type,
-                               const std::string &a_name,
+                               const InventoryLocation &a_name,
                                const std::string &a_subname,
                                v2s32 a_pos,
                                v2s32 a_geom)
@@ -97,7 +103,7 @@ class GUIInventoryMenu : public GUIModalMenu
                }
 
                std::string type;
-               std::string name;
+               InventoryLocation name;
                std::string subname;
                v2s32 pos;
                v2s32 geom;
@@ -107,14 +113,14 @@ class GUIInventoryMenu : public GUIModalMenu
        static v2s16 makeDrawSpecArrayFromString(
                        core::array<GUIInventoryMenu::DrawSpec> &draw_spec,
                        const std::string &data,
-                       const std::string &current_name);
+                       const InventoryLocation &current_location);
 
        GUIInventoryMenu(gui::IGUIEnvironment* env,
                        gui::IGUIElement* parent, s32 id,
                        IMenuManager *menumgr,
                        v2s16 menu_size,
-                       InventoryContext *c,
-                       InventoryManager *invmgr
+                       InventoryManager *invmgr,
+                       IGameDef *gamedef
                        );
        ~GUIInventoryMenu();
 
@@ -130,7 +136,7 @@ class GUIInventoryMenu : public GUIModalMenu
        void regenerateGui(v2u32 screensize);
        
        ItemSpec getItemAtPos(v2s32 p) const;
-       void drawList(const ListDrawSpec &s);
+       void drawList(const ListDrawSpec &s, int phase);
        void drawMenu();
 
        bool OnEvent(const SEvent& event);
@@ -147,13 +153,15 @@ class GUIInventoryMenu : public GUIModalMenu
        v2s32 spacing;
        v2s32 imgsize;
        
-       InventoryContext *m_c;
        InventoryManager *m_invmgr;
+       IGameDef *m_gamedef;
 
        core::array<DrawSpec> m_init_draw_spec;
        core::array<ListDrawSpec> m_draw_spec;
 
        ItemSpec *m_selected_item;
+       v2s32 m_pointer;
+       gui::IGUIStaticText *m_tooltip_element;
 };
 
 #endif