From dd5201c29e4a9a889a70c81fa7a82bf0c8615d65 Mon Sep 17 00:00:00 2001 From: Julian Laubstein Date: Fri, 14 Aug 2015 22:19:15 +0200 Subject: Some warning fixes --- src/Blocks/BlockFarmland.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Blocks') 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(E_BLOCK_AIR) : a_Chunk.GetBlock(a_RelX, a_RelY + 1, a_RelZ); switch (UpperBlock) { case E_BLOCK_CROPS: -- cgit v1.2.3