diff options
| author | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-06-27 06:56:26 -0700 |
|---|---|---|
| committer | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-06-27 06:56:26 -0700 |
| commit | 1c90f9fc2eba43be71f9d49dad75c5d0514d4e50 (patch) | |
| tree | 63c1116ff43936475874b54d171c7e08556d54ee /src/guiInventoryMenu.h | |
| parent | 158b054e72582005d895f1ed0e1cb0c9b22a8e57 (diff) | |
| parent | 7efe89ff584b2c0338dcede4c1e08504d0158780 (diff) | |
| download | minetest-1c90f9fc2eba43be71f9d49dad75c5d0514d4e50.tar.gz minetest-1c90f9fc2eba43be71f9d49dad75c5d0514d4e50.tar.bz2 minetest-1c90f9fc2eba43be71f9d49dad75c5d0514d4e50.zip | |
Merge pull request #13 from Bahamada/upstream_merge
Upstream merge
Diffstat (limited to 'src/guiInventoryMenu.h')
| -rw-r--r-- | src/guiInventoryMenu.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/guiInventoryMenu.h b/src/guiInventoryMenu.h index 10fb7a425..5336cae82 100644 --- a/src/guiInventoryMenu.h +++ b/src/guiInventoryMenu.h @@ -102,6 +102,12 @@ public: v2s32 pos; v2s32 geom; }; + + // See .cpp for format + static v2s16 makeDrawSpecArrayFromString( + core::array<GUIInventoryMenu::DrawSpec> &draw_spec, + const std::string &data, + const std::string ¤t_name); GUIInventoryMenu(gui::IGUIEnvironment* env, gui::IGUIElement* parent, s32 id, |