diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-01-12 05:46:01 +0100 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-01-12 05:46:01 +0100 |
| commit | 43e684071933adef93040e8d4b830d5c6b71cf9a (patch) | |
| tree | 014e5300feb1cdbbb8f24e4e42594eeb841f0be2 /source/BlockID.h | |
| parent | Fixed rclk in doublechests (diff) | |
| download | cuberite-43e684071933adef93040e8d4b830d5c6b71cf9a.tar cuberite-43e684071933adef93040e8d4b830d5c6b71cf9a.tar.gz cuberite-43e684071933adef93040e8d4b830d5c6b71cf9a.tar.bz2 cuberite-43e684071933adef93040e8d4b830d5c6b71cf9a.tar.lz cuberite-43e684071933adef93040e8d4b830d5c6b71cf9a.tar.xz cuberite-43e684071933adef93040e8d4b830d5c6b71cf9a.tar.zst cuberite-43e684071933adef93040e8d4b830d5c6b71cf9a.zip | |
Diffstat (limited to '')
| -rw-r--r-- | source/BlockID.h | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/source/BlockID.h b/source/BlockID.h index ae030e119..6ed0138a1 100644 --- a/source/BlockID.h +++ b/source/BlockID.h @@ -1,6 +1,6 @@ #pragma once -//tolua_begin +// tolua_begin enum ENUM_BLOCK_ID { E_BLOCK_AIR = 0, @@ -161,10 +161,15 @@ enum ENUM_BLOCK_ID E_BLOCK_POTATOES = 142, E_BLOCK_WOODEN_BUTTON = 143, E_BLOCK_HEAD = 144, + + // Keep these two as the last values, without a number - they will get their correct number assigned automagically by C++ + // IsValidBlock() depends on this + E_BLOCK_NUMBER_OF_TYPES, ///< Number of individual (different) blocktypes + E_BLOCK_MAX_TYPE_ID = E_BLOCK_NUMBER_OF_TYPES - 1 ///< Maximum BlockType number used }; -//tolua_end +// tolua_end -//tolua_begin +// tolua_begin enum ENUM_ITEM_ID { E_ITEM_EMPTY = -1, @@ -303,6 +308,8 @@ enum ENUM_ITEM_ID E_ITEM_TRIPWIRE = 132, E_ITEM_EMERALD_BLOCK = 133, + E_ITEM_FIRST = 256, // First true item type + E_ITEM_IRON_SHOVEL = 256, E_ITEM_IRON_PICKAXE = 257, E_ITEM_IRON_AXE = 258, @@ -445,7 +452,13 @@ enum ENUM_ITEM_ID E_ITEM_FIREWORK_ROCKET = 401, E_ITEM_FIREWORK_STAR = 402, E_ITEM_ENCHANTED_BOOK = 403, + + // Keep these two as the last values of the consecutive list, without a number - they will get their correct number assigned automagically by C++ + // IsValidItem() depends on this! + E_ITEM_NUMBER_OF_CONSECUTIVE_TYPES, ///< Number of individual (different) consecutive itemtypes + E_ITEM_MAX_CONSECUTIVE_TYPE_ID = E_ITEM_NUMBER_OF_CONSECUTIVE_TYPES - 1, ///< Maximum consecutive ItemType number used + E_ITEM_FIRST_DISC = 2256, E_ITEM_13_DISC = 2256, E_ITEM_CAT_DISC = 2257, E_ITEM_BLOCKS_DISC = 2258, @@ -457,7 +470,12 @@ enum ENUM_ITEM_ID E_ITEM_STRAD_DISC = 2264, E_ITEM_WARD_DISC = 2265, E_ITEM_11_DISC = 2266, - E_ITEM_WAIT_DISC = 2267 + E_ITEM_WAIT_DISC = 2267, + + // Keep these two as the last values of the disc list, without a number - they will get their correct number assigned automagically by C++ + // IsValidItem() depends on this! + E_ITEM_LAST_DISC_PLUS_ONE, ///< Useless, really, but needs to be present for the following value + E_ITEM_LAST_DISC = E_ITEM_LAST_DISC_PLUS_ONE - 1 ///< Maximum disc itemtype number used }; @@ -667,7 +685,7 @@ enum E_ENTITY_TYPE_IRON_GOLEM = 99, E_ENTITY_TYPE_VILLAGER = 120, } ; -//tolua_end +// tolua_end |