Increase default font_size

[minetest.git] / src / subgame.cpp

diff --git a/src/subgame.cpp b/src/subgame.cpp
index 1030d535a7b51613c3e1bd2350b4edb939153c92..fd2679eaea1e0be4c361d78de6f43ece33dcb7af 100644 (file)
--- a/src/subgame.cpp
+++ b/src/subgame.cpp
@@ -21,7 +21,9 @@ 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"
 #ifndef SERVER
 #include "tile.h" // getImagePath
 #endif
@@ -59,6 +61,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 +79,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 +153,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,22 +266,37 @@ 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);
+
        // 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<<
-#ifdef __ANDROID__
-                               "\nbackend = leveldb\n";
-#else
-                               "\nbackend = sqlite3\n";
-#endif
-               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;
        }
-       return true;
-}
 
+       // Create map_meta.txt if does not already exist
+       std::string mapmeta_path = path + DIR_DELIM "map_meta.txt";
+       if (!fs::PathExists(mapmeta_path)) {
+               std::ostringstream ss(std::ios_base::binary);
+               ss
+                       << "mg_name = "       << g_settings->get("mg_name")
+                       << "\nseed = "        << g_settings->get("fixed_map_seed")
+                       << "\nchunksize = "   << g_settings->get("chunksize")
+                       << "\nwater_level = " << g_settings->get("water_level")
+                       << "\nmg_flags = "    << g_settings->get("mg_flags")
+                       << "\n[end_of_params]\n";
+               if (!fs::safeWriteToFile(mapmeta_path, ss.str()))
+                       return false;
+
+               infostream << "Wrote map_meta.txt (" << mapmeta_path << ")" << std::endl;
+       }
 
+       return true;
+}