summaryrefslogtreecommitdiffstats
path: root/src/Blocks
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2015-08-18 08:49:39 +0200
committerMattes D <github@xoft.cz>2015-08-18 08:49:39 +0200
commit5ea1b9cee17d7fb43a2e118b880cbf74cd9772d7 (patch)
treeb14ae581e0680c303466781cc356c2399a6c7990 /src/Blocks
parentMerge pull request #2436 from cuberite/UpdateCompileScript (diff)
parentSome warning fixes (diff)
downloadcuberite-5ea1b9cee17d7fb43a2e118b880cbf74cd9772d7.tar
cuberite-5ea1b9cee17d7fb43a2e118b880cbf74cd9772d7.tar.gz
cuberite-5ea1b9cee17d7fb43a2e118b880cbf74cd9772d7.tar.bz2
cuberite-5ea1b9cee17d7fb43a2e118b880cbf74cd9772d7.tar.lz
cuberite-5ea1b9cee17d7fb43a2e118b880cbf74cd9772d7.tar.xz
cuberite-5ea1b9cee17d7fb43a2e118b880cbf74cd9772d7.tar.zst
cuberite-5ea1b9cee17d7fb43a2e118b880cbf74cd9772d7.zip
Diffstat (limited to '')
-rw-r--r--src/Blocks/BlockFarmland.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Blocks/BlockFarmland.h b/src/Blocks/BlockFarmland.h
index 8d43632ff..886823ed6 100644
--- a/src/Blocks/BlockFarmland.h
+++ b/src/Blocks/BlockFarmland.h
@@ -45,7 +45,7 @@ public:
}
// Farmland too dry. If nothing is growing on top, turn back to dirt:
- BLOCKTYPE UpperBlock = (a_RelY >= cChunkDef::Height - 1) ? E_BLOCK_AIR : a_Chunk.GetBlock(a_RelX, a_RelY + 1, a_RelZ);
+ BLOCKTYPE UpperBlock = (a_RelY >= cChunkDef::Height - 1) ? static_cast<BLOCKTYPE>(E_BLOCK_AIR) : a_Chunk.GetBlock(a_RelX, a_RelY + 1, a_RelZ);
switch (UpperBlock)
{
case E_BLOCK_CROPS: