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/Generating/CompoGen.cpp | 2 +- source/Generating/StructGen.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'source/Generating') diff --git a/source/Generating/CompoGen.cpp b/source/Generating/CompoGen.cpp index 9983a6d57..53d10c674 100644 --- a/source/Generating/CompoGen.cpp +++ b/source/Generating/CompoGen.cpp @@ -76,7 +76,7 @@ void cCompoGenDebugBiomes::ComposeTerrain( E_BLOCK_LOG, E_BLOCK_PLANKS, E_BLOCK_SANDSTONE, - E_BLOCK_WHITE_CLOTH, + E_BLOCK_WOOL, E_BLOCK_COAL_ORE, E_BLOCK_IRON_ORE, E_BLOCK_GOLD_ORE, diff --git a/source/Generating/StructGen.cpp b/source/Generating/StructGen.cpp index 30d7b48a7..b0828f15a 100644 --- a/source/Generating/StructGen.cpp +++ b/source/Generating/StructGen.cpp @@ -178,7 +178,7 @@ void cStructGenTrees::GenerateSingleTree( // Check the block underneath the tree: BLOCKTYPE TopBlock = cChunkDef::GetBlock(a_BlockTypes, x, Height, z); - if ((TopBlock != E_BLOCK_DIRT) && (TopBlock != E_BLOCK_GRASS) && (TopBlock != E_BLOCK_SOIL)) + if ((TopBlock != E_BLOCK_DIRT) && (TopBlock != E_BLOCK_GRASS) && (TopBlock != E_BLOCK_FARMLAND)) { return; } -- cgit v1.2.3