summaryrefslogtreecommitdiffstats
path: root/src/Blocks
diff options
context:
space:
mode:
authorworktycho <work.tycho@gmail.com>2015-09-17 14:32:01 +0200
committerworktycho <work.tycho@gmail.com>2015-09-17 14:32:01 +0200
commit2598f3158f0f47c5e082851032bf4a1a3b8d88e5 (patch)
tree4b984cbc73628fac3a3e0ed3aff55a65dfaf82f7 /src/Blocks
parentMerge pull request #2457 from cuberite/log (diff)
parentAdded CircleCI for stylechecking. (diff)
downloadcuberite-2598f3158f0f47c5e082851032bf4a1a3b8d88e5.tar
cuberite-2598f3158f0f47c5e082851032bf4a1a3b8d88e5.tar.gz
cuberite-2598f3158f0f47c5e082851032bf4a1a3b8d88e5.tar.bz2
cuberite-2598f3158f0f47c5e082851032bf4a1a3b8d88e5.tar.lz
cuberite-2598f3158f0f47c5e082851032bf4a1a3b8d88e5.tar.xz
cuberite-2598f3158f0f47c5e082851032bf4a1a3b8d88e5.tar.zst
cuberite-2598f3158f0f47c5e082851032bf4a1a3b8d88e5.zip
Diffstat (limited to 'src/Blocks')
-rw-r--r--src/Blocks/BlockPlant.h5
-rw-r--r--src/Blocks/CMakeLists.txt13
2 files changed, 12 insertions, 6 deletions
diff --git a/src/Blocks/BlockPlant.h b/src/Blocks/BlockPlant.h
index 0e6aca7eb..0155dc466 100644
--- a/src/Blocks/BlockPlant.h
+++ b/src/Blocks/BlockPlant.h
@@ -49,13 +49,12 @@ protected:
Light = Blocklight;
}
- // Return true if there is enough light
- // Set m_ShouldDie if the base light amounts are not enough to sustain a plant
+ // Based on light levels, decide between growth, stay and death:
if (Light > 8)
{
return paGrowth;
}
- else if (Blocklight < 9 && SkyLight < 9)
+ else if ((Blocklight < 9) && (SkyLight < 9))
{
return paDeath;
}
diff --git a/src/Blocks/CMakeLists.txt b/src/Blocks/CMakeLists.txt
index ed3e321d4..1c12d9fbc 100644
--- a/src/Blocks/CMakeLists.txt
+++ b/src/Blocks/CMakeLists.txt
@@ -9,7 +9,8 @@ SET (SRCS
BlockDoor.cpp
BlockHandler.cpp
BlockPiston.cpp
- ChunkInterface.cpp)
+ ChunkInterface.cpp
+)
SET (HDRS
BlockAnvil.h
@@ -54,12 +55,15 @@ SET (HDRS
BlockLilypad.h
BlockMelon.h
BlockMobHead.h
+ BlockMobSpawner.h
BlockMushroom.h
BlockMycelium.h
+ BlockNetherrack.h
BlockNetherWart.h
BlockOre.h
BlockPiston.h
BlockPlanks.h
+ BlockPlant.h
BlockPluginInterface.h
BlockPortal.h
BlockPressurePlate.h
@@ -72,6 +76,7 @@ SET (HDRS
BlockRedstoneTorch.h
BlockSand.h
BlockSapling.h
+ BlockSeaLantern.h
BlockSideways.h
BlockSignPost.h
BlockSlab.h
@@ -80,8 +85,8 @@ SET (HDRS
BlockStems.h
BlockStone.h
BlockSugarcane.h
- BlockTNT.h
BlockTallGrass.h
+ BlockTNT.h
BlockTorch.h
BlockTrapdoor.h
BlockTripwire.h
@@ -92,8 +97,10 @@ SET (HDRS
BroadcastInterface.h
ChunkInterface.h
ClearMetaOnDrop.h
+ GetHandlerCompileTimeTemplate.h
MetaRotator.h
- WorldInterface.h)
+ WorldInterface.h
+)
if(NOT MSVC)
add_library(Blocks ${SRCS} ${HDRS})