From 9527984dbcfc0a6cc7aa0470430cb6c3aa4103ba Mon Sep 17 00:00:00 2001 From: Craig Robbins Date: Wed, 1 Apr 2015 23:01:28 +1000 Subject: 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 --- src/script/common/c_internal.cpp | 1 - src/script/lua_api/l_internal.h | 1 - src/script/lua_api/l_mainmenu.cpp | 1 - src/script/lua_api/l_mapgen.cpp | 1 - src/script/lua_api/l_util.cpp | 1 - 5 files changed, 5 deletions(-) (limited to 'src/script') diff --git a/src/script/common/c_internal.cpp b/src/script/common/c_internal.cpp index 61248534c..fcab98dc6 100644 --- a/src/script/common/c_internal.cpp +++ b/src/script/common/c_internal.cpp @@ -20,7 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "common/c_internal.h" #include "debug.h" #include "log.h" -#include "main.h" #include "settings.h" std::string script_get_backtrace(lua_State *L) diff --git a/src/script/lua_api/l_internal.h b/src/script/lua_api/l_internal.h index 5936ac046..e8a029b86 100644 --- a/src/script/lua_api/l_internal.h +++ b/src/script/lua_api/l_internal.h @@ -36,7 +36,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #if (defined(WIN32) || defined(_WIN32_WCE)) #define NO_MAP_LOCK_REQUIRED #else -#include "main.h" #include "profiler.h" #define NO_MAP_LOCK_REQUIRED \ ScopeProfiler nolocktime(g_profiler,"Scriptapi: unlockable time",SPT_ADD) diff --git a/src/script/lua_api/l_mainmenu.cpp b/src/script/lua_api/l_mainmenu.cpp index 2ad6ba360..b068040db 100644 --- a/src/script/lua_api/l_mainmenu.cpp +++ b/src/script/lua_api/l_mainmenu.cpp @@ -34,7 +34,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "emerge.h" #include "sound.h" #include "settings.h" -#include "main.h" // for g_settings #include "log.h" #include "EDriverTypes.h" diff --git a/src/script/lua_api/l_mapgen.cpp b/src/script/lua_api/l_mapgen.cpp index ed0eaaaac..cbe3610c8 100644 --- a/src/script/lua_api/l_mapgen.cpp +++ b/src/script/lua_api/l_mapgen.cpp @@ -33,7 +33,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "mapgen_v5.h" #include "mapgen_v7.h" #include "settings.h" -#include "main.h" #include "log.h" diff --git a/src/script/lua_api/l_util.cpp b/src/script/lua_api/l_util.cpp index eb6c1835d..79a5b252a 100644 --- a/src/script/lua_api/l_util.cpp +++ b/src/script/lua_api/l_util.cpp @@ -30,7 +30,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "tool.h" #include "filesys.h" #include "settings.h" -#include "main.h" //required for g_settings, g_settings_path // debug(...) // Writes a line to dstream -- cgit v1.2.3