projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #503 from RealBadAngel/master
[oweals/minetest.git]
/
src
/
guiFormSpecMenu.h
diff --git
a/src/guiFormSpecMenu.h
b/src/guiFormSpecMenu.h
index e6a2efe42413d900e274052a58b0cd1d60d69e42..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;
send = false;
is_button = false;
is_exit = false;
+ tooltip="";
}
std::wstring fname;
std::wstring flabel;
}
std::wstring fname;
std::wstring flabel;
@@
-141,6
+142,8
@@
class GUIFormSpecMenu : public GUIModalMenu
bool send;
bool is_button;
bool is_exit;
bool send;
bool is_button;
bool is_exit;
+ core::rect<s32> rect;
+ std::string tooltip;
};
public:
};
public:
@@
-209,6
+212,7
@@
protected:
core::array<ListDrawSpec> m_inventorylists;
core::array<ImageDrawSpec> m_backgrounds;
core::array<ImageDrawSpec> m_images;
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;
core::array<FieldSpec> m_fields;
ItemSpec *m_selected_item;