Merge pull request #503 from RealBadAngel/master

[oweals/minetest.git] / src / guiFormSpecMenu.h

diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h
index 5c01bdcd222ec606703e933da7abc5e5024a9347..86235900d7fc37a5297a9bb7115c7ec5e96f5d6e 100644 (file)
--- a/src/guiFormSpecMenu.h
+++ b/src/guiFormSpecMenu.h
@@ -133,6 +133,7 @@ class GUIFormSpecMenu : public GUIModalMenu
                        send = false;
                        is_button = false;
                        is_exit = false;
+                       tooltip="";
                }
                std::wstring fname;
                std::wstring flabel;
@@ -141,10 +142,12 @@ class GUIFormSpecMenu : public GUIModalMenu
                bool send;
                bool is_button;
                bool is_exit;
+               core::rect<s32> rect;
+               std::string tooltip;
        };
 
 public:
-       GUIFormSpecMenu(gui::IGUIEnvironment* env,
+       GUIFormSpecMenu(irr::IrrlichtDevice* dev,
                        gui::IGUIElement* parent, s32 id,
                        IMenuManager *menumgr,
                        InventoryManager *invmgr,
@@ -197,6 +200,7 @@ protected:
        v2s32 spacing;
        v2s32 imgsize;
        
+       irr::IrrlichtDevice* m_device;
        InventoryManager *m_invmgr;
        IGameDef *m_gamedef;
 
@@ -206,7 +210,9 @@ protected:
        TextDest *m_text_dst;
 
        core::array<ListDrawSpec> m_inventorylists;
+       core::array<ImageDrawSpec> m_backgrounds;       
        core::array<ImageDrawSpec> m_images;
+       core::array<ImageDrawSpec> m_itemimages;
        core::array<FieldSpec> m_fields;
 
        ItemSpec *m_selected_item;