flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #1568 from mc-server/TypedBlocktypes

Browse Source 
Added type to block type enum.
This commit is contained in:
Alexander Harkness 2014-10-26 15:11:54 +00:00
commit cede90a231
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/BlockID.h
View File

@ -1,7 +1,13 @@
#pragma once #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 // tolua_begin
enum ENUM_BLOCK_ID
{ {
E_BLOCK_AIR = 0, E_BLOCK_AIR = 0,
E_BLOCK_STONE = 1, E_BLOCK_STONE = 1,
@ -221,6 +227,10 @@ enum ENUM_BLOCK_ID
}; };
// tolua_end // tolua_end
// tolua_begin // tolua_begin
enum ENUM_ITEM_ID enum ENUM_ITEM_ID
{ {