summaryrefslogtreecommitdiffstats
path: root/src/Protocol/Protocol14x.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-01-06 18:15:41 +0100
committerMattes D <github@xoft.cz>2014-01-06 18:15:41 +0100
commit6dd44e623070425b8e242858a89b99a57c98b9d7 (patch)
tree34ffc9a7ed7e803270e86467429a1b99b5cb9eb9 /src/Protocol/Protocol14x.cpp
parentExported cWorld::BroadcastBlockAction(). (diff)
parentUndid the changes to cryptlib.cpp. (diff)
downloadcuberite-6dd44e623070425b8e242858a89b99a57c98b9d7.tar
cuberite-6dd44e623070425b8e242858a89b99a57c98b9d7.tar.gz
cuberite-6dd44e623070425b8e242858a89b99a57c98b9d7.tar.bz2
cuberite-6dd44e623070425b8e242858a89b99a57c98b9d7.tar.lz
cuberite-6dd44e623070425b8e242858a89b99a57c98b9d7.tar.xz
cuberite-6dd44e623070425b8e242858a89b99a57c98b9d7.tar.zst
cuberite-6dd44e623070425b8e242858a89b99a57c98b9d7.zip
Diffstat (limited to 'src/Protocol/Protocol14x.cpp')
-rw-r--r--src/Protocol/Protocol14x.cpp13
1 files changed, 12 insertions, 1 deletions
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) \