diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-01-29 20:28:19 +0100 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-01-29 20:28:19 +0100 |
| commit | 89afb970d88e3efa8ddb2f1eafff10cd6525f2b7 (patch) | |
| tree | 206b3ba15c0fc87b3bf9ad7371f73887280945c4 /source/cServer.cpp | |
| parent | VC2008 compilation with new lua webplugin (diff) | |
| download | cuberite-89afb970d88e3efa8ddb2f1eafff10cd6525f2b7.tar cuberite-89afb970d88e3efa8ddb2f1eafff10cd6525f2b7.tar.gz cuberite-89afb970d88e3efa8ddb2f1eafff10cd6525f2b7.tar.bz2 cuberite-89afb970d88e3efa8ddb2f1eafff10cd6525f2b7.tar.lz cuberite-89afb970d88e3efa8ddb2f1eafff10cd6525f2b7.tar.xz cuberite-89afb970d88e3efa8ddb2f1eafff10cd6525f2b7.tar.zst cuberite-89afb970d88e3efa8ddb2f1eafff10cd6525f2b7.zip | |
Diffstat (limited to 'source/cServer.cpp')
| -rw-r--r-- | source/cServer.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/source/cServer.cpp b/source/cServer.cpp index 326bbf9ce..f13fc50dd 100644 --- a/source/cServer.cpp +++ b/source/cServer.cpp @@ -1,10 +1,10 @@ +
// ReDucTor is an awesome guy who helped me a lot
+#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
+
#include "cServer.h"
#include "cClientHandle.h"
-#include "cMCLogger.h"
-#include "cThread.h"
-#include "cEvent.h"
#include "cSleep.h"
#include "cTimer.h"
#include "cMonster.h"
@@ -30,22 +30,18 @@ #include "packets/cPacket_Chat.h"
-#ifndef _WIN32
-#define sprintf_s(dst, size, format, ...) sprintf(dst, format, __VA_ARGS__ )
-#endif
-
-#include <string>
#include <fstream>
#include <sstream>
#include <iostream>
+
+
+
+
extern "C" {
#include "zlib.h"
}
-#ifdef SendMessage
-#undef SendMessage
-#endif
bool g_bWaterPhysics = false;
|