summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlexander Harkness <me@bearbin.net>2014-10-26 16:11:54 +0100
committerAlexander Harkness <me@bearbin.net>2014-10-26 16:11:54 +0100
commitcede90a2313bc372f9d281f9a582829fb6eb3fda (patch)
treeb47b9da4bcb23795bd5cfec3e74cab0e526235a4 /src
parentAPIDump: Added basic projectile documentation. (diff)
parentAdded type to block type enum. (diff)
downloadcuberite-cede90a2313bc372f9d281f9a582829fb6eb3fda.tar
cuberite-cede90a2313bc372f9d281f9a582829fb6eb3fda.tar.gz
cuberite-cede90a2313bc372f9d281f9a582829fb6eb3fda.tar.bz2
cuberite-cede90a2313bc372f9d281f9a582829fb6eb3fda.tar.lz
cuberite-cede90a2313bc372f9d281f9a582829fb6eb3fda.tar.xz
cuberite-cede90a2313bc372f9d281f9a582829fb6eb3fda.tar.zst
cuberite-cede90a2313bc372f9d281f9a582829fb6eb3fda.zip
Diffstat (limited to 'src')
-rw-r--r--src/BlockID.h12
1 files changed, 11 insertions, 1 deletions
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
{