diff options
author | Mattes D <github@xoft.cz> | 2014-11-04 15:45:08 +0100 |
---|---|---|
committer | Mattes D <github@xoft.cz> | 2014-11-04 15:45:08 +0100 |
commit | 6201b3602c2f82fd9de68404a9e742c9cf3c6554 (patch) | |
tree | e086038a40a07eba6be7a10a18f9cc95527fc729 /src/BlockID.h | |
parent | Moved the chrono include into Globals. (diff) | |
parent | WebAdmin: Fixed login template destination address. (diff) | |
download | cuberite-6201b3602c2f82fd9de68404a9e742c9cf3c6554.tar cuberite-6201b3602c2f82fd9de68404a9e742c9cf3c6554.tar.gz cuberite-6201b3602c2f82fd9de68404a9e742c9cf3c6554.tar.bz2 cuberite-6201b3602c2f82fd9de68404a9e742c9cf3c6554.tar.lz cuberite-6201b3602c2f82fd9de68404a9e742c9cf3c6554.tar.xz cuberite-6201b3602c2f82fd9de68404a9e742c9cf3c6554.tar.zst cuberite-6201b3602c2f82fd9de68404a9e742c9cf3c6554.zip |
Diffstat (limited to 'src/BlockID.h')
-rw-r--r-- | src/BlockID.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/BlockID.h b/src/BlockID.h index bb06722d2..24de2dc8a 100644 --- a/src/BlockID.h +++ b/src/BlockID.h @@ -1,7 +1,13 @@ #pragma once +// The following hackery is to allow typed C++ enum for C++ code, yet have ToLua process the values. +// ToLua doesn't understand typed enums, so we use preprocessor to hide it from ToLua. + +enum ENUM_BLOCK_ID : BLOCKTYPE +#if 0 +enum ENUM_BLOCK_ID // tolua_export +#endif // tolua_begin -enum ENUM_BLOCK_ID { E_BLOCK_AIR = 0, E_BLOCK_STONE = 1, @@ -221,6 +227,10 @@ enum ENUM_BLOCK_ID }; // tolua_end + + + + // tolua_begin enum ENUM_ITEM_ID { |