From aff537e7141952f743d6536c8e66d54374d1c2ba Mon Sep 17 00:00:00 2001 From: Mattes D Date: Sun, 26 Oct 2014 10:13:43 +0100 Subject: Added type to block type enum. --- src/BlockID.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/BlockID.h b/src/BlockID.h index bb06722d2..b0cdc2a00 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 pocess 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 { -- cgit v1.2.3