Respect game mapgen flags and save world noise params

[dragonfireclient.git] / src / subgame.cpp

diff --git a/src/subgame.cpp b/src/subgame.cpp
index f2602856f99603fc8bd58acdf94f21a151752d48..4e8777d13a7ef30691fad1e6efa7e59c9469ee07 100644 (file)
--- a/src/subgame.cpp
+++ b/src/subgame.cpp
@@ -21,9 +21,14 @@ 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
 #ifndef SERVER
-#include "tile.h" // getImagePath
+#include "client/tile.h" // getImagePath
 #endif
 #include "util/string.h"
 
@@ -59,6 +64,17 @@ struct GameFindPath
        {}
 };
 
+Strfnd getSubgamePathEnv() {
+       std::string sp;
+       char *subgame_path = getenv("MINETEST_SUBGAME_PATH");
+
+       if(subgame_path) {
+               sp = std::string(subgame_path);
+       }
+
+       return Strfnd(sp);
+}
+
 SubgameSpec findSubgame(const std::string &id)
 {
        if(id == "")
@@ -66,6 +82,17 @@ SubgameSpec findSubgame(const std::string &id)
        std::string share = porting::path_share;
        std::string user = porting::path_user;
        std::vector<GameFindPath> find_paths;
+
+       Strfnd search_paths = getSubgamePathEnv();
+
+       while(!search_paths.atend()) {
+               std::string path = search_paths.next(":");
+               find_paths.push_back(GameFindPath(
+                               path + DIR_DELIM + id, false));
+               find_paths.push_back(GameFindPath(
+                               path + DIR_DELIM + id + "_game", false));
+       }
+
        find_paths.push_back(GameFindPath(
                        user + DIR_DELIM + "games" + DIR_DELIM + id + "_game", true));
        find_paths.push_back(GameFindPath(
@@ -129,6 +156,13 @@ std::set<std::string> getAvailableGameIds()
        std::set<std::string> gamespaths;
        gamespaths.insert(porting::path_share + DIR_DELIM + "games");
        gamespaths.insert(porting::path_user + DIR_DELIM + "games");
+
+       Strfnd search_paths = getSubgamePathEnv();
+
+       while(!search_paths.atend()) {
+               gamespaths.insert(search_paths.next(":"));
+       }
+
        for(std::set<std::string>::const_iterator i = gamespaths.begin();
                        i != gamespaths.end(); i++){
                std::vector<fs::DirListNode> dirlist = fs::GetDirListing(*i);
@@ -235,17 +269,44 @@ std::vector<WorldSpec> getAvailableWorlds()
 
 bool initializeWorld(const std::string &path, const std::string &gameid)
 {
-       infostream<<"Initializing world at "<<path<<std::endl;
+       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)){
-               infostream<<"Creating world.mt ("<<worldmt_path<<")"<<std::endl;
-               fs::CreateAllDirs(path);
+       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";
-               fs::safeWriteToFile(worldmt_path, ss.str());
+               ss << "gameid = " << gameid << "\nbackend = sqlite3\n";
+               if (!fs::safeWriteToFile(worldmt_path, ss.str()))
+                       return false;
+
+               infostream << "Wrote world.mt (" << worldmt_path << ")" << std::endl;
+       }
+
+       // Create map_meta.txt if does not already exist
+       std::string map_meta_path = path + DIR_DELIM + "map_meta.txt";
+       if (!fs::PathExists(map_meta_path)){
+               verbosestream << "Creating map_meta.txt (" << map_meta_path << ")" << std::endl;
+               fs::CreateAllDirs(path);
+               std::ostringstream oss(std::ios_base::binary);
+
+               Settings conf;
+               MapgenParams params;
+
+               params.load(*g_settings);
+               params.save(conf);
+               conf.writeLines(oss);
+               oss << "[end_of_params]\n";
+
+               fs::safeWriteToFile(map_meta_path, oss.str());
        }
        return true;
 }
 
-