From 32ee4aaf1e26a8fef31c1a8cc653694eb9187ae6 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Sat, 16 Feb 2013 11:12:56 +0000 Subject: Removed all E_ITEM_ symbols equivalent to E_BLOCK_, and all obsolete item and block symbols. git-svn-id: http://mc-server.googlecode.com/svn/trunk@1218 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Blocks/BlockFlowerPot.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'source/Blocks/BlockFlowerPot.h') diff --git a/source/Blocks/BlockFlowerPot.h b/source/Blocks/BlockFlowerPot.h index ba93430f8..1c02126df 100644 --- a/source/Blocks/BlockFlowerPot.h +++ b/source/Blocks/BlockFlowerPot.h @@ -27,15 +27,15 @@ public: cItem Plant; switch (a_BlockMeta) { - case 1: Plant = cItem(E_ITEM_RED_ROSE, 1, 0); break; - case 2: Plant = cItem(E_ITEM_YELLOW_FLOWER, 1, 0); break; - case 3: Plant = cItem(E_ITEM_SAPLING, 1, E_META_SAPLING_APPLE); break; - case 4: Plant = cItem(E_ITEM_SAPLING, 1, E_META_SAPLING_CONIFER); break; - case 5: Plant = cItem(E_ITEM_SAPLING, 1, E_META_SAPLING_BIRCH); break; - case 6: Plant = cItem(E_ITEM_SAPLING, 1, E_META_SAPLING_JUNGLE); break; - case 7: Plant = cItem(E_ITEM_RED_MUSHROOM, 1, 0); break; - case 8: Plant = cItem(E_ITEM_BROWN_MUSHROOM, 1, 0); break; - case 9: Plant = cItem(E_ITEM_CACTUS, 1, 0); break; + case 1: Plant = cItem(E_BLOCK_RED_ROSE, 1, 0); break; + case 2: Plant = cItem(E_BLOCK_YELLOW_FLOWER, 1, 0); break; + case 3: Plant = cItem(E_BLOCK_SAPLING, 1, E_META_SAPLING_APPLE); break; + case 4: Plant = cItem(E_BLOCK_SAPLING, 1, E_META_SAPLING_CONIFER); break; + case 5: Plant = cItem(E_BLOCK_SAPLING, 1, E_META_SAPLING_BIRCH); break; + case 6: Plant = cItem(E_BLOCK_SAPLING, 1, E_META_SAPLING_JUNGLE); break; + case 7: Plant = cItem(E_BLOCK_RED_MUSHROOM, 1, 0); break; + case 8: Plant = cItem(E_BLOCK_BROWN_MUSHROOM, 1, 0); break; + case 9: Plant = cItem(E_BLOCK_CACTUS, 1, 0); break; case 10: Plant = cItem(E_BLOCK_DEAD_BUSH, 1, 0); break; case 11: Plant = cItem(E_BLOCK_TALL_GRASS, 1, E_META_TALL_GRASS_FERN); break; default: return; @@ -55,9 +55,9 @@ public: switch (a_Player->GetEquippedItem().m_ItemType) { - case E_ITEM_RED_ROSE: Meta = 1; break; - case E_ITEM_YELLOW_FLOWER: Meta = 2; break; - case E_ITEM_SAPLING: + case E_BLOCK_RED_ROSE: Meta = 1; break; + case E_BLOCK_YELLOW_FLOWER: Meta = 2; break; + case E_BLOCK_SAPLING: { switch (a_Player->GetEquippedItem().m_ItemDamage) { @@ -68,9 +68,9 @@ public: } break; } - case E_ITEM_RED_MUSHROOM: Meta = 7; break; - case E_ITEM_BROWN_MUSHROOM: Meta = 8; break; - case E_ITEM_CACTUS: Meta = 9; break; + case E_BLOCK_RED_MUSHROOM: Meta = 7; break; + case E_BLOCK_BROWN_MUSHROOM: Meta = 8; break; + case E_BLOCK_CACTUS: Meta = 9; break; case E_BLOCK_DEAD_BUSH: Meta = 10; break; case E_BLOCK_TALL_GRASS: { -- cgit v1.2.3