summaryrefslogtreecommitdiffstats
path: root/source/cWorld.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'source/cWorld.cpp')
-rw-r--r--source/cWorld.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/source/cWorld.cpp b/source/cWorld.cpp
index fc7447c1d..9891946be 100644
--- a/source/cWorld.cpp
+++ b/source/cWorld.cpp
@@ -1,3 +1,6 @@
+
+#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
+
#include "BlockID.h"
#include "cWorld.h"
#include "cRedstone.h"
@@ -5,10 +8,8 @@
#include "cClientHandle.h"
#include "cPickup.h"
#include "cBlockToPickup.h"
-#include "cMCLogger.h"
#include "cPlayer.h"
#include "cServer.h"
-#include "cCriticalSection.h"
#include "cItem.h"
#include "cRoot.h"
#include "../iniFile/iniFile.h"
@@ -54,13 +55,13 @@
#include "tolua++.h"
#ifndef _WIN32
-#include <stdlib.h>
-//#include <sys/stat.h> // for mkdir
-#include <sys/types.h>
+ #include <stdlib.h>
#endif
+
+
float cWorld::m_Time = 0.f;
char g_BlockLightValue[128];