Merge pull request #74 from tigerw/master

Further attempt at fixing torch placements

source/Blocks/BlockFlower.h

@@ -32,7 +32,7 @@ public:
 
 	virtual bool DoesAllowBlockOnTop(void) override
 	{
-		return false;
+		return true;
 	}
 	
 	

source/Blocks/BlockTorch.h

@@ -109,21 +109,18 @@ public:
 
 	static bool CanBePlacedOn(BLOCKTYPE a_BlockType, char a_Direction)
 	{
-		switch (a_BlockType)
-		{
-			case E_BLOCK_GLASS:
-			case E_BLOCK_FENCE:
-			case E_BLOCK_NETHER_BRICK_FENCE:
-			case E_BLOCK_PISTON:
-			case E_BLOCK_WORKBENCH:
-			{
-				return (a_Direction == 0x1);  // allow only direction "standing on floor"
-			}
-			
-			default:
-			{
-				return g_BlockIsSolid[a_BlockType];
-			}
+		//case E_BLOCK_GLASS:
+		//case E_BLOCK_FENCE:
+		//case E_BLOCK_NETHER_BRICK_FENCE:
+		//case E_BLOCK_PISTON:
+		//case E_BLOCK_IRON_BARS
+		if ( g_BlockIsSolid[a_BlockType] ) {
+			return (a_Direction == 0x1);  // allow only direction "standing on floor"
+		}
+		else {
+		//default:
+		//{
+			return g_BlockIsSolid[a_BlockType];
 		}
 	}
 	

source/Generating/ComposableGenerator.cpp

@@ -207,7 +207,7 @@ void cComposableGenerator::InitBiomeGen(cIniFile & a_IniFile)
 			);
 			CacheSize = 4;
 		}
-		LOGINFO("Using a cache for biomegen of size %d.", CacheSize);
+		LOGD("Using a cache for biomegen of size %d.", CacheSize);
 		m_UnderlyingBiomeGen = m_BiomeGen;
 		m_BiomeGen = new cBioGenCache(m_UnderlyingBiomeGen, CacheSize);
 	}