diff options
| author | Craig Robbins <kde.psych@gmail.com> | 2015-04-01 23:01:28 +1000 |
|---|---|---|
| committer | Craig Robbins <kde.psych@gmail.com> | 2015-04-01 23:04:25 +1000 |
| commit | 9527984dbcfc0a6cc7aa0470430cb6c3aa4103ba (patch) | |
| tree | a06f321422fb501ea6c28571a9ac31bf7d09c43a /src/subgame.cpp | |
| parent | 113bdd3ec0608655d1ab36886b4708bb8ccb7870 (diff) | |
| download | minetest-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/subgame.cpp')
| -rw-r--r-- | src/subgame.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/subgame.cpp b/src/subgame.cpp index 864732876..f736a78c6 100644 --- a/src/subgame.cpp +++ b/src/subgame.cpp @@ -21,16 +21,15 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "porting.h" #include "filesys.h" #include "settings.h" -#include "main.h" #include "log.h" #include "strfnd.h" #include "defaultsettings.h" // for override_default_settings #include "mapgen.h" // for MapgenParams -#include "main.h" // for g_settings +#include "util/string.h" + #ifndef SERVER -#include "client/tile.h" // getImagePath + #include "client/tile.h" // getImagePath #endif -#include "util/string.h" bool getGameMinetestConfig(const std::string &game_path, Settings &conf) { |