9 files changed, 70 insertions, 39 deletions

diff --git a/src/Bindings/DeprecatedBindings.cpp b/src/Bindings/DeprecatedBindings.cpp
index 876ec7b20..25fba5d9d 100644
--- a/src/Bindings/DeprecatedBindings.cpp
+++ b/src/Bindings/DeprecatedBindings.cpp
@@ -19,7 +19,9 @@
 #ifndef TOLUA_DISABLE_tolua_get_AllToLua_g_BlockLightValue
 static int tolua_get_AllToLua_g_BlockLightValue(lua_State* tolua_S)
 {
-	BLOCKTYPE BlockType;
+	cLuaState LuaState(tolua_S);
+
+	int BlockType = 0;
 	#ifndef TOLUA_RELEASE
 	{
 		tolua_Error tolua_err;
@@ -29,12 +31,12 @@ static int tolua_get_AllToLua_g_BlockLightValue(lua_State* tolua_S)
 		}
 	}
 	#endif
-	BlockType = static_cast<BLOCKTYPE>(tolua_tonumber(tolua_S, 2, 0));
+	LuaState.GetStackValue(2, BlockType);
 	if ((BlockType < 0) || (BlockType > E_BLOCK_MAX_TYPE_ID))
 	{
 		tolua_error(tolua_S, "array indexing out of range.", nullptr);
 	}
-	tolua_pushnumber(tolua_S, static_cast<lua_Number>(cBlockInfo::GetLightValue(BlockType)));
+	LuaState.Push(cBlockInfo::GetLightValue(static_cast<BLOCKTYPE>(BlockType)));
 	return 1;
 }
 #endif  // #ifndef TOLUA_DISABLE
@@ -47,7 +49,9 @@ static int tolua_get_AllToLua_g_BlockLightValue(lua_State* tolua_S)
 #ifndef TOLUA_DISABLE_tolua_get_AllToLua_g_BlockSpreadLightFalloff
 static int tolua_get_AllToLua_g_BlockSpreadLightFalloff(lua_State* tolua_S)
 {
-	BLOCKTYPE BlockType;
+	cLuaState LuaState(tolua_S);
+
+	int BlockType = 0;
 	#ifndef TOLUA_RELEASE
 	{
 		tolua_Error tolua_err;
@@ -57,12 +61,12 @@ static int tolua_get_AllToLua_g_BlockSpreadLightFalloff(lua_State* tolua_S)
 		}
 	}
 	#endif
-	BlockType = static_cast<BLOCKTYPE>(tolua_tonumber(tolua_S, 2, 0));
+	LuaState.GetStackValue(2, BlockType);
 	if ((BlockType < 0) || (BlockType > E_BLOCK_MAX_TYPE_ID))
 	{
 		tolua_error(tolua_S, "array indexing out of range.", nullptr);
 	}
-	tolua_pushnumber(tolua_S, static_cast<lua_Number>(cBlockInfo::GetSpreadLightFalloff(BlockType)));
+	LuaState.Push(cBlockInfo::GetSpreadLightFalloff(static_cast<BLOCKTYPE>(BlockType)));
 	return 1;
 }
 #endif  // #ifndef TOLUA_DISABLE
@@ -75,7 +79,9 @@ static int tolua_get_AllToLua_g_BlockSpreadLightFalloff(lua_State* tolua_S)
 #ifndef TOLUA_DISABLE_tolua_get_AllToLua_g_BlockTransparent
 static int tolua_get_AllToLua_g_BlockTransparent(lua_State* tolua_S)
 {
-	BLOCKTYPE BlockType;
+	cLuaState LuaState(tolua_S);
+
+	int BlockType = 0;
 	#ifndef TOLUA_RELEASE
 	{
 		tolua_Error tolua_err;
@@ -85,12 +91,12 @@ static int tolua_get_AllToLua_g_BlockTransparent(lua_State* tolua_S)
 		}
 	}
 	#endif
-	BlockType = static_cast<BLOCKTYPE>(tolua_tonumber(tolua_S, 2, 0));
+	LuaState.GetStackValue(2, BlockType);
 	if ((BlockType < 0) || (BlockType > E_BLOCK_MAX_TYPE_ID))
 	{
 		tolua_error(tolua_S, "array indexing out of range.", nullptr);
 	}
-	tolua_pushboolean(tolua_S, cBlockInfo::IsTransparent(BlockType));
+	LuaState.Push(cBlockInfo::IsTransparent(static_cast<BLOCKTYPE>(BlockType)));
 	return 1;
 }
 #endif  // #ifndef TOLUA_DISABLE
@@ -103,7 +109,9 @@ static int tolua_get_AllToLua_g_BlockTransparent(lua_State* tolua_S)
 #ifndef TOLUA_DISABLE_tolua_get_AllToLua_g_BlockOneHitDig
 static int tolua_get_AllToLua_g_BlockOneHitDig(lua_State* tolua_S)
 {
-	BLOCKTYPE BlockType;
+	cLuaState LuaState(tolua_S);
+
+	int BlockType = 0;
 	#ifndef TOLUA_RELEASE
 	{
 		tolua_Error tolua_err;
@@ -113,12 +121,12 @@ static int tolua_get_AllToLua_g_BlockOneHitDig(lua_State* tolua_S)
 		}
 	}
 	#endif
-	BlockType = static_cast<BLOCKTYPE>(tolua_tonumber(tolua_S, 2, 0));
+	LuaState.GetStackValue(2, BlockType);
 	if ((BlockType < 0) || (BlockType > E_BLOCK_MAX_TYPE_ID))
 	{
 		tolua_error(tolua_S, "array indexing out of range.", nullptr);
 	}
-	tolua_pushboolean(tolua_S, cBlockInfo::IsOneHitDig(BlockType));
+	LuaState.Push(cBlockInfo::IsOneHitDig(static_cast<BLOCKTYPE>(BlockType)));
 	return 1;
 }
 #endif  // #ifndef TOLUA_DISABLE
@@ -131,7 +139,9 @@ static int tolua_get_AllToLua_g_BlockOneHitDig(lua_State* tolua_S)
 #ifndef TOLUA_DISABLE_tolua_get_AllToLua_g_BlockPistonBreakable
 static int tolua_get_AllToLua_g_BlockPistonBreakable(lua_State* tolua_S)
 {
-	BLOCKTYPE BlockType;
+	cLuaState LuaState(tolua_S);
+
+	int BlockType = 0;
 	#ifndef TOLUA_RELEASE
 	{
 		tolua_Error tolua_err;
@@ -141,12 +151,12 @@ static int tolua_get_AllToLua_g_BlockPistonBreakable(lua_State* tolua_S)
 		}
 	}
 	#endif
-	BlockType = static_cast<BLOCKTYPE>(tolua_tonumber(tolua_S, 2, 0));
+	LuaState.GetStackValue(2, BlockType);
 	if ((BlockType < 0) || (BlockType > E_BLOCK_MAX_TYPE_ID))
 	{
 		tolua_error(tolua_S, "array indexing out of range.", nullptr);
 	}
-	tolua_pushboolean(tolua_S, cBlockInfo::IsPistonBreakable(BlockType));
+	LuaState.Push(cBlockInfo::IsPistonBreakable(static_cast<BLOCKTYPE>(BlockType)));
 	return 1;
 }
 #endif  // #ifndef TOLUA_DISABLE
@@ -159,7 +169,9 @@ static int tolua_get_AllToLua_g_BlockPistonBreakable(lua_State* tolua_S)
 #ifndef TOLUA_DISABLE_tolua_get_AllToLua_g_BlockIsSnowable
 static int tolua_get_AllToLua_g_BlockIsSnowable(lua_State* tolua_S)
 {
-	BLOCKTYPE BlockType;
+	cLuaState LuaState(tolua_S);
+
+	int BlockType = 0;
 	#ifndef TOLUA_RELEASE
 	{
 		tolua_Error tolua_err;
@@ -169,12 +181,12 @@ static int tolua_get_AllToLua_g_BlockIsSnowable(lua_State* tolua_S)
 		}
 	}
 	#endif
-	BlockType = static_cast<BLOCKTYPE>(tolua_tonumber(tolua_S, 2, 0));
+	LuaState.GetStackValue(2, BlockType);
 	if ((BlockType < 0) || (BlockType > E_BLOCK_MAX_TYPE_ID))
 	{
 		tolua_error(tolua_S, "array indexing out of range.", nullptr);
 	}
-	tolua_pushboolean(tolua_S, cBlockInfo::IsSnowable(BlockType));
+	LuaState.Push(cBlockInfo::IsSnowable(static_cast<BLOCKTYPE>(BlockType)));
 	return 1;
 }
 #endif  // #ifndef TOLUA_DISABLE
@@ -187,7 +199,9 @@ static int tolua_get_AllToLua_g_BlockIsSnowable(lua_State* tolua_S)
 #ifndef TOLUA_DISABLE_tolua_get_AllToLua_g_BlockIsSolid
 static int tolua_get_AllToLua_g_BlockIsSolid(lua_State* tolua_S)
 {
-	BLOCKTYPE BlockType;
+	cLuaState LuaState(tolua_S);
+
+	int BlockType = 0;
 	#ifndef TOLUA_RELEASE
 	{
 		tolua_Error tolua_err;
@@ -197,12 +211,12 @@ static int tolua_get_AllToLua_g_BlockIsSolid(lua_State* tolua_S)
 		}
 	}
 	#endif
-	BlockType = static_cast<BLOCKTYPE>(tolua_tonumber(tolua_S, 2, 0));
+	LuaState.GetStackValue(2, BlockType);
 	if ((BlockType < 0) || (BlockType > E_BLOCK_MAX_TYPE_ID))
 	{
 		tolua_error(tolua_S, "array indexing out of range.", nullptr);
 	}
-	tolua_pushboolean(tolua_S, static_cast<bool>(cBlockInfo::IsSolid(BlockType)));
+	LuaState.Push(cBlockInfo::IsSolid(static_cast<BLOCKTYPE>(BlockType)));
 	return 1;
 }
 #endif  // #ifndef TOLUA_DISABLE
@@ -215,7 +229,9 @@ static int tolua_get_AllToLua_g_BlockIsSolid(lua_State* tolua_S)
 #ifndef TOLUA_DISABLE_tolua_get_AllToLua_g_BlockFullyOccupiesVoxel
 static int tolua_get_AllToLua_g_BlockFullyOccupiesVoxel(lua_State* tolua_S)
 {
-	BLOCKTYPE BlockType;
+	cLuaState LuaState(tolua_S);
+
+	int BlockType = 0;
 	#ifndef TOLUA_RELEASE
 	{
 		tolua_Error tolua_err;
@@ -225,12 +241,12 @@ static int tolua_get_AllToLua_g_BlockFullyOccupiesVoxel(lua_State* tolua_S)
 		}
 	}
 	#endif
-	BlockType = static_cast<BLOCKTYPE>(tolua_tonumber(tolua_S, 2, 0));
+	LuaState.GetStackValue(2, BlockType);
 	if ((BlockType < 0) || (BlockType > E_BLOCK_MAX_TYPE_ID))
 	{
 		tolua_error(tolua_S, "array indexing out of range.", nullptr);
 	}
-	tolua_pushboolean(tolua_S, static_cast<bool>(cBlockInfo::FullyOccupiesVoxel(BlockType)));
+	LuaState.Push(cBlockInfo::FullyOccupiesVoxel(static_cast<BLOCKTYPE>(BlockType)));
 	return 1;
 }
 #endif  // #ifndef TOLUA_DISABLE
diff --git a/src/Bindings/ManualBindings.cpp b/src/Bindings/ManualBindings.cpp
index b4d5449b5..876d4e280 100644
--- a/src/Bindings/ManualBindings.cpp
+++ b/src/Bindings/ManualBindings.cpp
@@ -159,7 +159,7 @@ static int tolua_UncompressStringZLIB(lua_State * tolua_S)
 
 	// Get the params:
 	AString ToUncompress;
-	size_t UncompressedSize;
+	size_t UncompressedSize = 0;
 	S.GetStackValues(1, ToUncompress, UncompressedSize);
 
 	// Compress the string:
diff --git a/src/Bindings/ManualBindings.h b/src/Bindings/ManualBindings.h
index f8c9b96de..38f7ac5f1 100644
--- a/src/Bindings/ManualBindings.h
+++ b/src/Bindings/ManualBindings.h
@@ -263,7 +263,9 @@ public:
 
 		// Get parameters:
 		Ty1 * Self = nullptr;
-		int BlockX, BlockY, BlockZ;
+		int BlockX = 0;
+		int BlockY = 0;
+		int BlockZ = 0;
 		cLuaState::cRef FnRef;
 		L.GetStackValues(1, Self, BlockX, BlockY, BlockZ, FnRef);
 		if (Self == nullptr)
@@ -327,7 +329,8 @@ public:
 
 		// Get parameters:
 		Ty1 * Self = nullptr;
-		int ChunkX, ChunkZ;
+		int ChunkX = 0;
+		int ChunkZ = 0;
 		cLuaState::cRef FnRef;
 		L.GetStackValues(1, Self, ChunkX, ChunkZ, FnRef);
 		if (Self == nullptr)
diff --git a/src/Bindings/ManualBindings_Network.cpp b/src/Bindings/ManualBindings_Network.cpp
index b5fb5b046..99f86b500 100644
--- a/src/Bindings/ManualBindings_Network.cpp
+++ b/src/Bindings/ManualBindings_Network.cpp
@@ -49,7 +49,7 @@ static int tolua_cNetwork_Connect(lua_State * L)
 
 	// Read the params:
 	AString Host;
-	int Port;
+	int Port = 0;
 	S.GetStackValues(2, Host, Port);
 
 	// Check validity:
@@ -888,7 +888,7 @@ static int tolua_cUDPEndpoint_Send(lua_State * L)
 
 	// Get the data to send:
 	AString Data, RemotePeer;
-	int RemotePort;
+	int RemotePort = 0;
 	S.GetStackValues(2, Data, RemotePeer, RemotePort);
 
 	// Check the port:
diff --git a/src/Bindings/ManualBindings_World.cpp b/src/Bindings/ManualBindings_World.cpp
index 59dde9a93..e2902b81a 100644
--- a/src/Bindings/ManualBindings_World.cpp
+++ b/src/Bindings/ManualBindings_World.cpp
@@ -129,7 +129,9 @@ static int tolua_cWorld_GetBlockInfo(lua_State * tolua_S)
 
 	// Get params:
 	cWorld * Self = nullptr;
-	int BlockX, BlockY, BlockZ;
+	int BlockX = 0;
+	int BlockY = 0;
+	int BlockZ = 0;
 	L.GetStackValues(1, Self, BlockX, BlockY, BlockZ);
 	if (Self == nullptr)
 	{
@@ -176,7 +178,9 @@ static int tolua_cWorld_GetBlockTypeMeta(lua_State * tolua_S)
 
 	// Get params:
 	cWorld * Self = nullptr;
-	int BlockX, BlockY, BlockZ;
+	int BlockX = 0;
+	int BlockY = 0;
+	int BlockZ = 0;
 	L.GetStackValues(1, Self, BlockX, BlockY, BlockZ);
 	if (Self == nullptr)
 	{
@@ -220,7 +224,9 @@ static int tolua_cWorld_GetSignLines(lua_State * tolua_S)
 
 	// Get params:
 	cWorld * Self = nullptr;
-	int BlockX, BlockY, BlockZ;
+	int BlockX = 0;
+	int BlockY = 0;
+	int BlockZ = 0;
 	L.GetStackValues(1, Self, BlockX, BlockY, BlockZ);
 	if (Self == nullptr)
 	{
@@ -267,7 +273,8 @@ static int tolua_cWorld_PrepareChunk(lua_State * tolua_S)
 	
 	// Read the params:
 	cWorld * world = nullptr;
-	int chunkX = 0, chunkZ = 0;
+	int chunkX = 0;
+	int chunkZ = 0;
 	L.GetStackValues(1, world, chunkX, chunkZ);
 	if (world == nullptr)
 	{
@@ -401,7 +408,9 @@ static int tolua_cWorld_SetSignLines(lua_State * tolua_S)
 
 	// Get params:
 	cWorld * Self = nullptr;
-	int BlockX, BlockY, BlockZ;
+	int BlockX = 0;
+	int BlockY = 0;
+	int BlockZ = 0;
 	AString Line1, Line2, Line3, Line4;
 	L.GetStackValues(1, Self, BlockX, BlockY, BlockZ, Line1, Line2, Line3, Line4);
 	if (Self == nullptr)
@@ -518,7 +527,8 @@ static int tolua_cWorld_TryGetHeight(lua_State * tolua_S)
 
 	// Get params:
 	cWorld * self = nullptr;
-	int BlockX, BlockZ;
+	int BlockX = 0;
+	int BlockZ = 0;
 	L.GetStackValues(1, self, BlockX, BlockZ);
 	if (self == nullptr)
 	{
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:
diff --git a/src/ChunkMap.cpp b/src/ChunkMap.cpp
index 19ffd9b98..aeae8f350 100644
--- a/src/ChunkMap.cpp
+++ b/src/ChunkMap.cpp
@@ -38,7 +38,7 @@ cChunkMap::cChunkMap(cWorld * a_World) :
 	m_World(a_World),
 	m_Pool(
 		new cListAllocationPool<cChunkData::sChunkSection, 1600>(
-			std::auto_ptr<cAllocationPool<cChunkData::sChunkSection>::cStarvationCallbacks>(
+			std::unique_ptr<cAllocationPool<cChunkData::sChunkSection>::cStarvationCallbacks>(
 				new cStarvationCallbacks()
 			)
 		)
diff --git a/src/ChunkMap.h b/src/ChunkMap.h
index 53ec06475..4974671da 100644
--- a/src/ChunkMap.h
+++ b/src/ChunkMap.h
@@ -508,7 +508,7 @@ private:
 	/** The cChunkStay descendants that are currently enabled in this chunkmap */
 	cChunkStays m_ChunkStays;
 
-	std::auto_ptr<cAllocationPool<cChunkData::sChunkSection> > m_Pool;
+	std::unique_ptr<cAllocationPool<cChunkData::sChunkSection> > m_Pool;
 
 	cChunkPtr GetChunk      (int a_ChunkX, int a_ChunkZ);  // Also queues the chunk for loading / generating if not valid
 	cChunkPtr GetChunkNoGen (int a_ChunkX, int a_ChunkZ);  // Also queues the chunk for loading if not valid; doesn't generate
diff --git a/src/OSSupport/ServerHandleImpl.cpp b/src/OSSupport/ServerHandleImpl.cpp
index 6f0a1ee16..d1443757a 100644
--- a/src/OSSupport/ServerHandleImpl.cpp
+++ b/src/OSSupport/ServerHandleImpl.cpp
@@ -123,7 +123,7 @@ bool cServerHandleImpl::Listen(UInt16 a_Port)
 	// Set up the main socket:
 	// It should listen on IPv6 with IPv4 fallback, when available; IPv4 when IPv6 is not available.
 	bool NeedsTwoSockets = false;
-	int err;
+	int err = 0;
 	evutil_socket_t MainSock = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP);
 
 	if (!IsValidSocket(MainSock))
@@ -271,6 +271,8 @@ bool cServerHandleImpl::Listen(UInt16 a_Port)
 		return true;  // Report as success, the primary socket is working
 	}
 
+	UNUSED(err);
+
 	m_SecondaryConnListener = evconnlistener_new(cNetworkSingleton::Get().GetEventBase(), Callback, this, LEV_OPT_CLOSE_ON_FREE | LEV_OPT_REUSEABLE, 0, SecondSock);
 	return true;
 }