diff options
| author | rubenwardy <rubenwardy@gmail.com> | 2016-07-07 21:10:15 +0100 |
|---|---|---|
| committer | paramat <mat.gregory@virginmedia.com> | 2016-10-03 01:53:13 +0100 |
| commit | 077b6cfa21fe323434e704bb7a81870ff689c433 (patch) | |
| tree | cd00e663e21ada4e4264a305c76cca5c7a5b625a /src/guiFormSpecMenu.h | |
| parent | eb0e9d5661e28cdd4f59b96f7ab269fbf67bdc34 (diff) | |
| download | minetest-077b6cfa21fe323434e704bb7a81870ff689c433.tar.gz minetest-077b6cfa21fe323434e704bb7a81870ff689c433.tar.bz2 minetest-077b6cfa21fe323434e704bb7a81870ff689c433.zip | |
Formspec: Add container[] and container_end[] elements
Diffstat (limited to 'src/guiFormSpecMenu.h')
| -rw-r--r-- | src/guiFormSpecMenu.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/guiFormSpecMenu.h b/src/guiFormSpecMenu.h index dbcbf126a..21054b725 100644 --- a/src/guiFormSpecMenu.h +++ b/src/guiFormSpecMenu.h @@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #define GUIINVENTORYMENU_HEADER #include <utility> +#include <stack> #include "irrlichttypes_extrabloated.h" #include "inventory.h" @@ -380,6 +381,8 @@ protected: v2s32 spacing; v2s32 imgsize; v2s32 offset; + v2s32 pos_offset; + std::stack<v2s32> container_stack; irr::IrrlichtDevice* m_device; InventoryManager *m_invmgr; @@ -472,13 +475,15 @@ private: fs_key_pendig current_keys_pending; std::string current_field_enter_pending; - void parseElement(parserData* data,std::string element); + void parseElement(parserData* data, std::string element); - void parseSize(parserData* data,std::string element); - void parseList(parserData* data,std::string element); - void parseListRing(parserData* data,std::string element); - void parseCheckbox(parserData* data,std::string element); - void parseImage(parserData* data,std::string element); + void parseSize(parserData* data, std::string element); + void parseContainer(parserData* data, std::string element); + void parseContainerEnd(parserData* data); + void parseList(parserData* data, std::string element); + void parseListRing(parserData* data, std::string element); + void parseCheckbox(parserData* data, std::string element); + void parseImage(parserData* data, std::string element); void parseItemImage(parserData* data,std::string element); void parseButton(parserData* data,std::string element,std::string typ); void parseBackground(parserData* data,std::string element); |