7 files changed, 56 insertions, 7 deletions

diff --git a/src/Protocol/Protocol132.cpp b/src/Protocol/Protocol132.cpp
index 46ac4ef89..302d1298c 100644
--- a/src/Protocol/Protocol132.cpp
+++ b/src/Protocol/Protocol132.cpp
@@ -5,7 +5,6 @@
 
 #include "Globals.h"
 #include "ChunkDataSerializer.h"
-#include "cryptopp/randpool.h"
 #include "Protocol132.h"
 #include "../Root.h"
 #include "../Server.h"
@@ -19,8 +18,20 @@
 #include "../WorldStorage/FastNBT.h"
 #include "../StringCompression.h"
 
+#ifdef _MSC_VER
+	#pragma warning(push)
+	#pragma warning(disable:4127)
+	#pragma warning(disable:4244)
+	#pragma warning(disable:4231)
+	#pragma warning(disable:4189)
+	#pragma warning(disable:4702)
+#endif
 
+#include "cryptopp/randpool.h"
 
+#ifdef _MSC_VER
+	#pragma warning(pop)
+#endif
 
 
 #define HANDLE_PACKET_READ(Proc, Type, Var) \
@@ -866,7 +877,7 @@ void cProtocol132::SendCompass(const cWorld & a_World)
 void cProtocol132::SendEncryptionKeyRequest(void)
 {
 	cCSLock Lock(m_CSPacket);
-	WriteByte((char)0xfd);
+	WriteByte(0xfd);
 	WriteString(cRoot::Get()->GetServer()->GetServerID());
 	WriteShort((short)m_ServerPublicKey.size());
 	SendData(m_ServerPublicKey.data(), m_ServerPublicKey.size());
@@ -914,7 +925,7 @@ void cProtocol132::HandleEncryptionKeyResponse(const AString & a_EncKey, const A
 	{
 		// Send encryption key response:
 		cCSLock Lock(m_CSPacket);
-		WriteByte((char)0xfc);
+		WriteByte(0xfc);
 		WriteShort(0);
 		WriteShort(0);
 		Flush();
diff --git a/src/Protocol/Protocol132.h b/src/Protocol/Protocol132.h
index f76272b8d..d36384a88 100644
--- a/src/Protocol/Protocol132.h
+++ b/src/Protocol/Protocol132.h
@@ -10,9 +10,23 @@
 #pragma once
 
 #include "Protocol125.h"
+
+#ifdef _MSC_VER
+	#pragma warning(push)
+	#pragma warning(disable:4127)
+	#pragma warning(disable:4244)
+	#pragma warning(disable:4231)
+	#pragma warning(disable:4189)
+	#pragma warning(disable:4702)
+#endif
+
 #include "cryptopp/modes.h"
 #include "cryptopp/aes.h"
 
+#ifdef _MSC_VER
+	#pragma warning(pop)
+#endif
+
 
 
 
diff --git a/src/Protocol/Protocol14x.cpp b/src/Protocol/Protocol14x.cpp
index 28122034c..926fe6ee8 100644
--- a/src/Protocol/Protocol14x.cpp
+++ b/src/Protocol/Protocol14x.cpp
@@ -16,7 +16,6 @@ Implements the 1.4.x protocol classes representing these protocols:
 #include "../Root.h"
 #include "../Server.h"
 #include "../ClientHandle.h"
-#include "cryptopp/randpool.h"
 #include "../Item.h"
 #include "ChunkDataSerializer.h"
 #include "../Entities/Player.h"
@@ -25,8 +24,20 @@ Implements the 1.4.x protocol classes representing these protocols:
 #include "../Entities/Pickup.h"
 #include "../Entities/FallingBlock.h"
 
+#ifdef _MSC_VER
+	#pragma warning(push)
+	#pragma warning(disable:4127)
+	#pragma warning(disable:4244)
+	#pragma warning(disable:4231)
+	#pragma warning(disable:4189)
+	#pragma warning(disable:4702)
+#endif
 
+#include "cryptopp/randpool.h"
 
+#ifdef _MSC_VER
+	#pragma warning(pop)
+#endif
 
 
 #define HANDLE_PACKET_READ(Proc, Type, Var) \
diff --git a/src/Protocol/Protocol15x.cpp b/src/Protocol/Protocol15x.cpp
index 7e2aa9490..0f1e59f10 100644
--- a/src/Protocol/Protocol15x.cpp
+++ b/src/Protocol/Protocol15x.cpp
@@ -112,7 +112,7 @@ int cProtocol150::ParseWindowClick(void)
 	}
 	
 	// Convert Button, Mode, SlotNum and HeldItem into eClickAction:
-	eClickAction Action;
+	eClickAction Action = caUnknown;
 	switch ((Mode << 8) | Button)
 	{
 		case 0x0000: Action = (SlotNum != -999) ? caLeftClick  : caLeftClickOutside;  break;
diff --git a/src/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp
index bbbd5e973..8536689c3 100644
--- a/src/Protocol/Protocol17x.cpp
+++ b/src/Protocol/Protocol17x.cpp
@@ -986,7 +986,6 @@ void cProtocol172::AddReceivedData(const char * a_Data, int a_Size)
 	while (true)
 	{
 		UInt32 PacketLen;
-		int PacketStart = m_ReceivedData.GetDataStart();
 		if (!m_ReceivedData.ReadVarInt(PacketLen))
 		{
 			// Not enough data
diff --git a/src/Protocol/Protocol17x.h b/src/Protocol/Protocol17x.h
index cc0eda1e7..23ff2365d 100644
--- a/src/Protocol/Protocol17x.h
+++ b/src/Protocol/Protocol17x.h
@@ -16,9 +16,23 @@ Declares the 1.7.x protocol classes:
 
 #include "Protocol.h"
 #include "../ByteBuffer.h"
+
+#ifdef _MSC_VER
+	#pragma warning(push)
+	#pragma warning(disable:4127)
+	#pragma warning(disable:4244)
+	#pragma warning(disable:4231)
+	#pragma warning(disable:4189)
+	#pragma warning(disable:4702)
+#endif
+
 #include "cryptopp/modes.h"
 #include "cryptopp/aes.h"
 
+#ifdef _MSC_VER
+	#pragma warning(pop)
+#endif
+
 
 
 
diff --git a/src/Protocol/ProtocolRecognizer.cpp b/src/Protocol/ProtocolRecognizer.cpp
index 1cae4a750..e2ea0e6e5 100644
--- a/src/Protocol/ProtocolRecognizer.cpp
+++ b/src/Protocol/ProtocolRecognizer.cpp
@@ -198,7 +198,7 @@ void cProtocolRecognizer::SendDisconnect(const AString & a_Reason)
 	else
 	{
 		// This is used when the client sends a server-ping, respond with the default packet:
-		WriteByte  ((char)0xff);  // PACKET_DISCONNECT
+		WriteByte  (0xff);  // PACKET_DISCONNECT
 		WriteString(a_Reason);
 	}
 }