Set ambient light in inventory cube generation

[dragonfireclient.git] / src / main.h

diff --git a/src/main.h b/src/main.h
index 22b5157d70250c7c3d6ae324bed939819ada6393..b951ab5b04440c6453d9f8f82a66567778c5d9e8 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -20,18 +20,24 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef MAIN_HEADER
 #define MAIN_HEADER
 
-#include <string>
-extern std::string getTimestamp();
-#define DTIME (getTimestamp()+": ")
-
-#include <jmutex.h>
-
 // Settings
+#include "utility.h"
 extern Settings g_settings;
 
-#include <fstream>
+// A thread safe wrapper to irrlicht
+// On a server build, this is always NULL.
+// TODO: Remove this
+#include "irrlichtwrapper.h"
+extern IrrlichtWrapper *g_irrlicht;
+
+// This makes and maps textures
+#include "tile.h"
+extern ITextureSource *g_texturesource;
 
 // Debug streams
+
+#include <fstream>
+
 extern std::ostream *dout_con_ptr;
 extern std::ostream *derr_con_ptr;
 extern std::ostream *dout_client_ptr;
@@ -46,14 +52,5 @@ extern std::ostream *derr_server_ptr;
 #define dout_server (*dout_server_ptr)
 #define derr_server (*derr_server_ptr)
 
-/*#ifndef SERVER
-       #include "utility.h"
-       extern TextureCache g_texturecache;
-#endif*/
-
-#include "irrlichtwrapper.h"
-//extern IrrlichtDevice *g_device;
-extern IrrlichtWrapper *g_irrlicht;
-
 #endif