summaryrefslogtreecommitdiff
path: root/src/mapgen.cpp
diff options
context:
space:
mode:
authorCraig Robbins <kde.psych@gmail.com>2015-04-01 23:01:28 +1000
committerCraig Robbins <kde.psych@gmail.com>2015-04-01 23:04:25 +1000
commit9527984dbcfc0a6cc7aa0470430cb6c3aa4103ba (patch)
treea06f321422fb501ea6c28571a9ac31bf7d09c43a /src/mapgen.cpp
parent113bdd3ec0608655d1ab36886b4708bb8ccb7870 (diff)
downloadminetest-9527984dbcfc0a6cc7aa0470430cb6c3aa4103ba.tar.gz
minetest-9527984dbcfc0a6cc7aa0470430cb6c3aa4103ba.tar.bz2
minetest-9527984dbcfc0a6cc7aa0470430cb6c3aa4103ba.zip
Move globals from main.cpp to more sane locations
Move debug streams to log.cpp|h Move GUI-related globals to clientlauncher Move g_settings and g_settings_path to settings.cpp|h Move g_menuclouds to clouds.cpp|h Move g_profiler to profiler.cpp|h
Diffstat (limited to 'src/mapgen.cpp')
-rw-r--r--src/mapgen.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index fcde5bdb8..66937fb53 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -31,8 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "content_mapnode.h" // For content_mapnode_get_new_name
#include "voxelalgorithms.h"
#include "profiler.h"
-#include "settings.h" // For g_settings
-#include "main.h" // For g_profiler
+#include "settings.h"
#include "treegen.h"
#include "serialization.h"
#include "util/serialize.h"