aboutsummaryrefslogtreecommitdiff
path: root/src/subgame.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/subgame.cpp')
-rw-r--r--src/subgame.cpp7
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)
{