summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2013-08-11 16:21:31 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2013-08-11 16:21:31 +0200
commit93f5a4388c62bfe6e470a30e6598495f130db871 (patch)
tree8448e41bcd7a0dc42384949163df2963b8617341
parentTried adding bracket (diff)
downloadcuberite-93f5a4388c62bfe6e470a30e6598495f130db871.tar
cuberite-93f5a4388c62bfe6e470a30e6598495f130db871.tar.gz
cuberite-93f5a4388c62bfe6e470a30e6598495f130db871.tar.bz2
cuberite-93f5a4388c62bfe6e470a30e6598495f130db871.tar.lz
cuberite-93f5a4388c62bfe6e470a30e6598495f130db871.tar.xz
cuberite-93f5a4388c62bfe6e470a30e6598495f130db871.tar.zst
cuberite-93f5a4388c62bfe6e470a30e6598495f130db871.zip
-rw-r--r--source/Blocks/BlockTorch.h27
-rw-r--r--source/Generating/ComposableGenerator.cpp2
2 files changed, 13 insertions, 16 deletions
diff --git a/source/Blocks/BlockTorch.h b/source/Blocks/BlockTorch.h
index ebff7b641..f774e15a0 100644
--- a/source/Blocks/BlockTorch.h
+++ b/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_IRON_BARS
- if ( g_BlockIsSolid[a_BlockType] ) {
- return (a_Direction == 0x1); // allow only direction "standing on floor"
- }
- else {
- //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];
}
}
diff --git a/source/Generating/ComposableGenerator.cpp b/source/Generating/ComposableGenerator.cpp
index fb31ec7b2..8763e2809 100644
--- a/source/Generating/ComposableGenerator.cpp
+++ b/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);
}