diff options
| author | Weblate <42@minetest.ru> | 2013-03-31 12:27:05 +0200 |
|---|---|---|
| committer | Weblate <42@minetest.ru> | 2013-03-31 12:27:05 +0200 |
| commit | 319662c0ed047c6604d802336b54c325867fcab9 (patch) | |
| tree | 5e30a3f9568ddafc41420f8d5bedc1c5dacce6e2 /src/nodedef.h | |
| parent | 5b597a6bfacda92006d153159929c8d777b4df89 (diff) | |
| parent | a2e5706661b2aa4796c01a251bc05ae3eb93f9d6 (diff) | |
| download | minetest-319662c0ed047c6604d802336b54c325867fcab9.tar.gz minetest-319662c0ed047c6604d802336b54c325867fcab9.tar.bz2 minetest-319662c0ed047c6604d802336b54c325867fcab9.zip | |
Merge remote branch 'origin/master'
Diffstat (limited to 'src/nodedef.h')
| -rw-r--r-- | src/nodedef.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/nodedef.h b/src/nodedef.h index 4f07565d1..d846489ae 100644 --- a/src/nodedef.h +++ b/src/nodedef.h @@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <string> #include <iostream> #include <map> +#include <list> #include "mapnode.h" #ifndef SERVER #include "tile.h" @@ -36,6 +37,8 @@ class IItemDefManager; class ITextureSource; class IGameDef; +typedef std::list<std::pair<content_t, int> > GroupItems; + enum ContentParamType { CPT_NONE, |