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

Fixed some E_META_*** Names

Browse Source
This commit is contained in:
narroo 2014-05-20 11:10:22 -04:00
parent f4fa3985b5
commit a1b3e51aba
1 changed files with 66 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
src/BlockID.h
View File

@ -490,38 +490,34 @@ enum
E_META_HOPPER_FACING_XP = 5,
// E_BLOCK_LEAVES metas:
E_META_LEAVES_APPLE = 0,
E_META_LEAVES_CONIFER = 1,
E_META_LEAVES_BIRCH = 2,
E_META_LEAVES_JUNGLE = 3,
E_META_LEAVES_APPLE_NO_DECAY = 4,
E_META_LEAVES_CONIFER_NO_DECAY = 5,
E_META_LEAVES_BIRCH_NO_DECAY = 6,
E_META_LEAVES_JUNGLE_NO_DECAY = 7,
E_META_LEAVES_APPLE_CHECK_DECAY = 8,
E_META_LEAVES_CONIFER_CHECK_DECAY = 9,
E_META_LEAVES_BIRCH_CHECK_DECAY = 10,
E_META_LEAVES_JUNGLE_CHECK_DECAY = 11,
E_META_LEAVES_APPLE_NO_DECAY_AND_CHECK_DECAY = 12,
E_META_LEAVES_CONIFER_NO_DECAY_AND_CHECK_DECAY = 13,
E_META_LEAVES_BIRCH_NO_DECAY_AND_CHECK_DECAY = 14,
E_META_LEAVES_JUNGLE_NO_DECAY_AND_CHECK_DECAY = 15,
E_META_NEWLEAVES_APPLE = 0,
E_META_NEWLEAVES_CONIFER = 1,
E_META_NEWLEAVES_BIRCH = 2,
E_META_NEWLEAVES_JUNGLE = 3,
E_META_NEWLEAVES_APPLE_NO_DECAY = 4,
E_META_NEWLEAVES_CONIFER_NO_DECAY = 5,
E_META_NEWLEAVES_BIRCH_NO_DECAY = 6,
E_META_NEWLEAVES_JUNGLE_NO_DECAY = 7,
E_META_NEWLEAVES_APPLE_CHECK_DECAY = 8,
E_META_NEWLEAVES_CONIFER_CHECK_DECAY = 9,
E_META_NEWLEAVES_BIRCH_CHECK_DECAY = 10,
E_META_NEWLEAVES_JUNGLE_CHECK_DECAY = 11,
// E_BLOCK_LEAVES meta cont. (Block ID 161):
E_META_LEAVES_ACACIA = 0,
E_META_LEAVES_DARK_OAK = 1,
E_META_LEAVES_ACACIA_NO_DECAY = 4,
E_META_LEAVES_DARK_OAK_NO_DECAY = 5,
E_META_LEAVES_ACACIA_CHECK_DECAY = 8,
E_META_LEAVES_DARK_OAK_CHECK_DECAY = 9,
E_META_LEAVES_ACACIA_NO_DECAY_CHECK_DECAY = 12,
E_META_LEAVES_DARK_OAK_NO_DECAY_CHECK_DECAY = 13,
E_META_NEWLEAVES_ACACIA = 0,
E_META_NEWLEAVES_DARK_OAK = 1,
E_META_NEWLEAVES_ACACIA_NO_DECAY = 4,
E_META_NEWLEAVES_DARK_OAK_NO_DECAY = 5,
E_META_NEWLEAVES_ACACIA_CHECK_DECAY = 8,
E_META_NEWLEAVES_DARK_OAK_CHECK_DECAY = 9,
E_META_NEWLEAVES_ACACIA_NO_DECAY_CHECK_DECAY = 12,
E_META_NEWLEAVES_DARK_OAK_NO_DECAY_CHECK_DECAY = 13,
// E_BLOCK_LOG metas:
E_META_LOG_APPLE = 0,
E_META_LOG_CONIFER = 1,
E_META_LOG_BIRCH = 2,
E_META_LOG_JUNGLE = 3,
E_META_NEWLOG_APPLE = 0,
E_META_NEWLOG_CONIFER = 1,
E_META_NEWLOG_BIRCH = 2,
E_META_NEWLOG_JUNGLE = 3,
// E_BLOCK_NEW_LEAVES metas
E_META_NEW_LEAVES_ACACIA_WOOD = 0,
@ -534,10 +530,10 @@ enum
// E_BLOCK_PISTON metas:
E_META_PISTON_DOWN = 0,
E_META_PISTON_UP = 1,
E_META_PISTON_NORTH = 2,
E_META_PISTON_SOUTH = 3,
E_META_PISTON_WEST = 4,
E_META_PISTON_EAST = 5,
E_META_PISTON_ZM = 2,
E_META_PISTON_ZP = 3,
E_META_PISTON_XM = 4,
E_META_PISTON_XP = 5,
E_META_PISTON_HEAD_STICKY = 8,
E_META_PISTON_EXTENDED = 8,
@ -657,10 +653,10 @@ enum
E_META_STAINED_GLASS_PANE_BLACK = 15,
// E_BLOCK_STAIRS metas:
E_BLOCK_STAIRS_EAST = 0,
E_BLOCK_STAIRS_WEST = 1,
E_BLOCK_STAIRS_SOUTH = 2,
E_BLOCK_STAIRS_NORTH = 3,
E_BLOCK_STAIRS_XP = 0,
E_BLOCK_STAIRS_XM = 1,
E_BLOCK_STAIRS_ZP = 2,
E_BLOCK_STAIRS_ZM = 3,
E_BLOCK_STAIRS_UPSIDE_DOWN = 4,
// E_BLOCK_STONE metas:
@ -705,41 +701,41 @@ enum
E_META_TORCH_ZM = 3, // Torch attached to the ZM side of its block
E_META_TORCH_ZP = 4, // Torch attached to the ZP side of its block
// E_BLOCK_WOOD metas:
E_BLOCK_WOOD_OAK_UP_DOWN = 0,
E_BLOCK_WOOD_SPRUCE_UP_DOWN = 1,
E_BLOCK_WOOD_BIRCH_UP_DOWN = 2,
E_BLOCK_WOOD_JUNGLE_UP_DOWN = 3,
E_BLOCK_WOOD_OAK_EAST_WEST = 4,
E_BLOCK_WOOD_SPRUCE_EAST_WEST = 5,
E_BLOCK_WOOD_BIRCH_EAST_WEST = 6,
E_BLOCK_WOOD_JUNGLE_EAST_WEST = 7,
E_BLOCK_WOOD_OAK_NORTH_SOUTH = 8,
E_BLOCK_WOOD_SPRUCE_NORTH_SOUTH = 9,
E_BLOCK_WOOD_BIRCH_NORTH_SOUTH = 10,
E_BLOCK_WOOD_JUNGLE_NORTH_SOUTH = 11,
E_BLOCK_WOOD_OAK_BARK_ONLY = 12,
E_BLOCK_WOOD_SPRUCE_BARK_ONLY = 13,
E_BLOCK_WOOD_BIRCH_BARK_ONLY = 14,
E_BLOCK_WOOD_JUNGLE_BARK_ONLY = 15,
// E_META_LOG metas:
E_META_NEWLOG_OAK_UP_DOWN = 0,
E_META_NEWLOG_SPRUCE_UP_DOWN = 1,
E_META_NEWLOG_BIRCH_UP_DOWN = 2,
E_META_NEWLOG_JUNGLE_UP_DOWN = 3,
E_META_NEWLOG_OAK_X = 4,
E_META_NEWLOG_SPRUCE_X = 5,
E_META_NEWLOG_BIRCH_X = 6,
E_META_NEWLOG_JUNGLE_X = 7,
E_META_NEWLOG_OAK_Z = 8,
E_META_NEWLOG_SPRUCE_Z = 9,
E_META_NEWLOG_BIRCH_Z = 10,
E_META_NEWLOG_JUNGLE_Z = 11,
E_META_NEWLOG_OAK_BARK_ONLY = 12,
E_META_NEWLOG_SPRUCE_BARK_ONLY = 13,
E_META_NEWLOG_BIRCH_BARK_ONLY = 14,
E_META_NEWLOG_JUNGLE_BARK_ONLY = 15,
// E_BLOCK_WOOD metas cont. (Block ID 162):
E_BLOCK_WOOD_ACACIA_UP_DOWN = 0,
E_BLOCK_WOOD_DARK_OAK_UP_DOWN = 1,
E_BLOCK_WOOD_ACACIA_UP_DOWN = 2,
E_BLOCK_WOOD_DARK_OAK_UP_DOWN = 3,
E_BLOCK_WOOD_ACACIA_EAST_WEST = 4,
E_BLOCK_WOOD_DARK_OAK_EAST_WEST = 5,
E_BLOCK_WOOD_ACACIA_EAST_WEST = 6,
E_BLOCK_WOOD_DARK_OAK_EAST_WEST = 7,
E_BLOCK_WOOD_ACACIA_NORTH_SOUTH = 8,
E_BLOCK_WOOD_DARK_OAK_NORTH_SOUTH = 9,
E_BLOCK_WOOD_ACACIA_NORTH_SOUTH = 10,
E_BLOCK_WOOD_DARK_OAK_NORTH_SOUTH = 11,
E_BLOCK_WOOD_ACACIA_BARK_ONLY = 12,
E_BLOCK_WOOD_DARK_OAK_BARK_ONLY = 13,
E_BLOCK_WOOD_ACACIA_BARK_ONLY = 14,
E_BLOCK_WOOD_DARK_OAK_BARK_ONLY = 15,
// E_META_NEWLOG metas cont. (Block ID 162):
E_META_NEWLOG_ACACIA_UP_DOWN = 0,
E_META_NEWLOG_DARK_OAK_UP_DOWN = 1,
E_META_NEWLOG_ACACIA_UP_DOWN = 2,
E_META_NEWLOG_DARK_OAK_UP_DOWN = 3,
E_META_NEWLOG_ACACIA_X = 4,
E_META_NEWLOG_DARK_OAK_X = 5,
E_META_NEWLOG_ACACIA_X = 6,
E_META_NEWLOG_DARK_OAK_X = 7,
E_META_NEWLOG_ACACIA_Z = 8,
E_META_NEWLOG_DARK_OAK_Z = 9,
E_META_NEWLOG_ACACIA_Z = 10,
E_META_NEWLOG_DARK_OAK_Z = 11,
E_META_NEWLOG_ACACIA_BARK_ONLY = 12,
E_META_NEWLOG_DARK_OAK_BARK_ONLY = 13,
E_META_NEWLOG_ACACIA_BARK_ONLY = 14,
E_META_NEWLOG_DARK_OAK_BARK_ONLY = 15,
// E_BLOCK_WOODEN_DOUBLE_SLAB metas:
E_META_WOODEN_DOUBLE_SLAB_APPLE = 0,