summaryrefslogtreecommitdiffstats
path: root/source/Blocks
diff options
context:
space:
mode:
Diffstat (limited to 'source/Blocks')
-rw-r--r--source/Blocks/BlockCloth.h2
-rw-r--r--source/Blocks/BlockDirt.h2
-rw-r--r--source/Blocks/BlockFlowerPot.h30
-rw-r--r--source/Blocks/BlockFurnace.h2
-rw-r--r--source/Blocks/BlockHandler.cpp2
-rw-r--r--source/Blocks/BlockLeaves.h2
-rw-r--r--source/Blocks/BlockLever.h2
-rw-r--r--source/Blocks/BlockRedstoneTorch.h2
-rw-r--r--source/Blocks/BlockSapling.h2
9 files changed, 23 insertions, 23 deletions
diff --git a/source/Blocks/BlockCloth.h b/source/Blocks/BlockCloth.h
index 82c0a0e29..a95f12500 100644
--- a/source/Blocks/BlockCloth.h
+++ b/source/Blocks/BlockCloth.h
@@ -19,7 +19,7 @@ public:
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{
- a_Pickups.push_back(cItem(E_ITEM_WOOL, 1, a_BlockMeta));
+ a_Pickups.push_back(cItem(E_BLOCK_WOOL, 1, a_BlockMeta));
}
diff --git a/source/Blocks/BlockDirt.h b/source/Blocks/BlockDirt.h
index 9617a47da..73bc28dc5 100644
--- a/source/Blocks/BlockDirt.h
+++ b/source/Blocks/BlockDirt.h
@@ -22,7 +22,7 @@ public:
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{
- a_Pickups.push_back(cItem(E_ITEM_DIRT, 1, 0));
+ a_Pickups.push_back(cItem(E_BLOCK_DIRT, 1, 0));
}
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:
{
diff --git a/source/Blocks/BlockFurnace.h b/source/Blocks/BlockFurnace.h
index e50641258..a163c9483 100644
--- a/source/Blocks/BlockFurnace.h
+++ b/source/Blocks/BlockFurnace.h
@@ -22,7 +22,7 @@ public:
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{
- a_Pickups.push_back(cItem(E_ITEM_FURNACE, 1, 0));
+ a_Pickups.push_back(cItem(E_BLOCK_FURNACE, 1, 0));
}
diff --git a/source/Blocks/BlockHandler.cpp b/source/Blocks/BlockHandler.cpp
index 5c535e052..cde85fce8 100644
--- a/source/Blocks/BlockHandler.cpp
+++ b/source/Blocks/BlockHandler.cpp
@@ -154,7 +154,7 @@ cBlockHandler * cBlockHandler::CreateBlockHandler(BLOCKTYPE a_BlockType)
case E_BLOCK_RED_MUSHROOM: return new cBlockMushroomHandler (a_BlockType);
case E_BLOCK_RED_ROSE: return new cBlockFlowerHandler (a_BlockType);
case E_BLOCK_SAND: return new cBlockSandHandler (a_BlockType);
- case E_ITEM_SANDSTONE_STAIRS: return new cBlockStairsHandler (a_BlockType);
+ case E_BLOCK_SANDSTONE_STAIRS: return new cBlockStairsHandler (a_BlockType);
case E_BLOCK_SAPLING: return new cBlockSaplingHandler (a_BlockType);
case E_BLOCK_SIGN_POST: return new cBlockSignHandler (a_BlockType);
case E_BLOCK_SNOW: return new cBlockSnowHandler (a_BlockType);
diff --git a/source/Blocks/BlockLeaves.h b/source/Blocks/BlockLeaves.h
index 101f7c087..3563babcf 100644
--- a/source/Blocks/BlockLeaves.h
+++ b/source/Blocks/BlockLeaves.h
@@ -41,7 +41,7 @@ public:
// Only the first 2 bits contain the display information, the others are for growing
if (rand.randInt(5) == 0)
{
- a_Pickups.push_back(cItem(E_ITEM_SAPLING, 1, a_BlockMeta & 3));
+ a_Pickups.push_back(cItem(E_BLOCK_SAPLING, 1, a_BlockMeta & 3));
}
if ((a_BlockMeta & 3) == E_META_SAPLING_APPLE)
{
diff --git a/source/Blocks/BlockLever.h b/source/Blocks/BlockLever.h
index d03443abd..42a16fd9b 100644
--- a/source/Blocks/BlockLever.h
+++ b/source/Blocks/BlockLever.h
@@ -21,7 +21,7 @@ public:
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{
// Reset meta to 0
- a_Pickups.push_back(cItem(E_ITEM_LEVER, 1, 0));
+ a_Pickups.push_back(cItem(E_BLOCK_LEVER, 1, 0));
}
diff --git a/source/Blocks/BlockRedstoneTorch.h b/source/Blocks/BlockRedstoneTorch.h
index ef4efaaab..0127dc082 100644
--- a/source/Blocks/BlockRedstoneTorch.h
+++ b/source/Blocks/BlockRedstoneTorch.h
@@ -22,7 +22,7 @@ public:
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{
// Always drop the ON torch, meta 0
- a_Pickups.push_back(cItem(E_ITEM_REDSTONE_TORCH_ON, 1, 0));
+ a_Pickups.push_back(cItem(E_BLOCK_REDSTONE_TORCH_ON, 1, 0));
}
diff --git a/source/Blocks/BlockSapling.h b/source/Blocks/BlockSapling.h
index 447774f85..18fdb9d05 100644
--- a/source/Blocks/BlockSapling.h
+++ b/source/Blocks/BlockSapling.h
@@ -21,7 +21,7 @@ public:
virtual void ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) override
{
// Only the first 2 bits contain the display information, the others are for growing
- a_Pickups.push_back(cItem(E_ITEM_SAPLING, 1, a_BlockMeta & 3));
+ a_Pickups.push_back(cItem(E_BLOCK_SAPLING, 1, a_BlockMeta & 3));
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 17:36:36 +0100