Don't leak textures all over the place

[dragonfireclient.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 928b878444205b74e9cfe7f7a72cba75ee16721d..6075e9d100752f1cebbc3a1d98cab8c9aa788f2a 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -47,7 +47,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <iostream>
 #include <fstream>
 #include <locale.h>
-#include "common_irrlicht.h"
+#include "irrlichttypes_extrabloated.h"
 #include "debug.h"
 #include "test.h"
 #include "server.h"
@@ -68,7 +68,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "profiler.h"
 #include "log.h"
 #include "mods.h"
-#include "utility_string.h"
+#include "util/string.h"
 #include "subgame.h"
 #include "quicktune.h"
 
@@ -877,8 +877,9 @@ int main(int argc, char *argv[])
        init_gettext((porting::path_share+DIR_DELIM+".."+DIR_DELIM+"locale").c_str());
        
        // Initialize debug streams
-#ifdef RUN_IN_PLACE
-       std::string logfile = "debug.txt";
+#define DEBUGFILE "debug.txt"
+#if RUN_IN_PLACE
+       std::string logfile = DEBUGFILE;
 #else
        std::string logfile = porting::path_user+DIR_DELIM+DEBUGFILE;
 #endif
@@ -961,7 +962,7 @@ int main(int argc, char *argv[])
                // Legacy configuration file location
                filenames.push_back(porting::path_user +
                                DIR_DELIM + ".." + DIR_DELIM + "minetest.conf");
-#ifdef RUN_IN_PLACE
+#if RUN_IN_PLACE
                // Try also from a lower level (to aid having the same configuration
                // for many RUN_IN_PLACE installs)
                filenames.push_back(porting::path_user +