Biome API: Make fallback biome stone and water, disable filler

[minetest.git] / src / subgame.cpp

diff --git a/src/subgame.cpp b/src/subgame.cpp
index a3edcda2eb294a08cc9c396891f6d5fd078663eb..f736a78c63058bbd59659206d2d67da70bd7a698 100644 (file)
--- 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)
 {
@@ -267,25 +266,31 @@ std::vector<WorldSpec> getAvailableWorlds()
        return worlds;
 }
 
-bool initializeWorld(const std::string &path, const std::string &gameid)
+bool loadGameConfAndInitWorld(const std::string &path, const SubgameSpec &gamespec)
 {
+       // Override defaults with those provided by the game.
+       // We clear and reload the defaults because the defaults
+       // might have been overridden by other subgame config
+       // files that were loaded before.
+       g_settings->clearDefaults();
+       set_default_settings(g_settings);
+       Settings game_defaults;
+       getGameMinetestConfig(gamespec.path, game_defaults);
+       override_default_settings(g_settings, &game_defaults);
+
        infostream << "Initializing world at " << path << std::endl;
 
        fs::CreateAllDirs(path);
 
-       // Initialize default settings and override defaults with those
-       // provided by the game
-       Settings game_defaults;
-       getGameMinetestConfig(path, game_defaults);
-       override_default_settings(g_settings, &game_defaults);
-
        // Create world.mt if does not already exist
        std::string worldmt_path = path + DIR_DELIM "world.mt";
        if (!fs::PathExists(worldmt_path)) {
                std::ostringstream ss(std::ios_base::binary);
-               ss << "gameid = " << gameid << "\nbackend = sqlite3\n"
-                               << "creative_mode = " << g_settings->get("creative_mode")
-                               << "\nenable_damage = " << g_settings->get("enable_damage") << "\n";
+               ss << "gameid = " << gamespec.id
+                       << "\nbackend = sqlite3"
+                       << "\ncreative_mode = " << g_settings->get("creative_mode")
+                       << "\nenable_damage = " << g_settings->get("enable_damage")
+                       << "\n";
                if (!fs::safeWriteToFile(worldmt_path, ss.str()))
                        return false;