Fix arm inertia limit case

[minetest.git] / src / subgame.cpp

diff --git a/src/subgame.cpp b/src/subgame.cpp
index 864732876049c9206ebb4de7229e57cd8a075a1d..cd2aa752b56c96ee5049eb1d557d2070569fc615 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 "util/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)
 {
@@ -64,15 +63,10 @@ struct GameFindPath
        {}
 };
 
-Strfnd getSubgamePathEnv() {
-       std::string sp;
+std::string getSubgamePathEnv()
+{
        char *subgame_path = getenv("MINETEST_SUBGAME_PATH");
-
-       if(subgame_path) {
-               sp = std::string(subgame_path);
-       }
-
-       return Strfnd(sp);
+       return subgame_path ? std::string(subgame_path) : "";
 }
 
 SubgameSpec findSubgame(const std::string &id)
@@ -83,10 +77,10 @@ SubgameSpec findSubgame(const std::string &id)
        std::string user = porting::path_user;
        std::vector<GameFindPath> find_paths;
 
-       Strfnd search_paths = getSubgamePathEnv();
+       Strfnd search_paths(getSubgamePathEnv());
 
-       while(!search_paths.atend()) {
-               std::string path = search_paths.next(":");
+       while (!search_paths.at_end()) {
+               std::string path = search_paths.next(PATH_DELIM);
                find_paths.push_back(GameFindPath(
                                path + DIR_DELIM + id, false));
                find_paths.push_back(GameFindPath(
@@ -157,14 +151,13 @@ std::set<std::string> getAvailableGameIds()
        gamespaths.insert(porting::path_share + DIR_DELIM + "games");
        gamespaths.insert(porting::path_user + DIR_DELIM + "games");
 
-       Strfnd search_paths = getSubgamePathEnv();
+       Strfnd search_paths(getSubgamePathEnv());
 
-       while(!search_paths.atend()) {
-               gamespaths.insert(search_paths.next(":"));
-       }
+       while (!search_paths.at_end())
+               gamespaths.insert(search_paths.next(PATH_DELIM));
 
-       for(std::set<std::string>::const_iterator i = gamespaths.begin();
-                       i != gamespaths.end(); i++){
+       for (std::set<std::string>::const_iterator i = gamespaths.begin();
+                       i != gamespaths.end(); ++i){
                std::vector<fs::DirListNode> dirlist = fs::GetDirListing(*i);
                for(u32 j=0; j<dirlist.size(); j++){
                        if(!dirlist[j].dir)
@@ -190,7 +183,7 @@ std::vector<SubgameSpec> getAvailableGames()
        std::vector<SubgameSpec> specs;
        std::set<std::string> gameids = getAvailableGameIds();
        for(std::set<std::string>::const_iterator i = gameids.begin();
-                       i != gameids.end(); i++)
+                       i != gameids.end(); ++i)
                specs.push_back(findSubgame(*i));
        return specs;
 }
@@ -224,15 +217,27 @@ std::string getWorldGameId(const std::string &world_path, bool can_be_legacy)
        return conf.get("gameid");
 }
 
+std::string getWorldPathEnv()
+{
+       char *world_path = getenv("MINETEST_WORLD_PATH");
+       return world_path ? std::string(world_path) : "";
+}
+
 std::vector<WorldSpec> getAvailableWorlds()
 {
        std::vector<WorldSpec> worlds;
        std::set<std::string> worldspaths;
+
+       Strfnd search_paths(getWorldPathEnv());
+
+       while (!search_paths.at_end())
+               worldspaths.insert(search_paths.next(PATH_DELIM));
+
        worldspaths.insert(porting::path_user + DIR_DELIM + "worlds");
-       infostream<<"Searching worlds..."<<std::endl;
-       for(std::set<std::string>::const_iterator i = worldspaths.begin();
-                       i != worldspaths.end(); i++){
-               infostream<<"  In "<<(*i)<<": "<<std::endl;
+       infostream << "Searching worlds..." << std::endl;
+       for (std::set<std::string>::const_iterator i = worldspaths.begin();
+                       i != worldspaths.end(); ++i) {
+               infostream << "  In " << (*i) << ": " <<std::endl;
                std::vector<fs::DirListNode> dirvector = fs::GetDirListing(*i);
                for(u32 j=0; j<dirvector.size(); j++){
                        if(!dirvector[j].dir)
@@ -286,16 +291,16 @@ bool loadGameConfAndInitWorld(const std::string &path, const SubgameSpec &gamesp
        // 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 = " << 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;
+               Settings conf;
 
-               infostream << "Wrote world.mt (" << worldmt_path << ")" << std::endl;
+               conf.set("gameid", gamespec.id);
+               conf.set("backend", "sqlite3");
+               conf.set("player_backend", "sqlite3");
+               conf.setBool("creative_mode", g_settings->getBool("creative_mode"));
+               conf.setBool("enable_damage", g_settings->getBool("enable_damage"));
+
+               if (!conf.updateConfigFile(worldmt_path.c_str()))
+                       return false;
        }
 
        // Create map_meta.txt if does not already exist
@@ -308,8 +313,8 @@ bool loadGameConfAndInitWorld(const std::string &path, const SubgameSpec &gamesp
                Settings conf;
                MapgenParams params;
 
-               params.load(*g_settings);
-               params.save(conf);
+               params.readParams(g_settings);
+               params.writeParams(&conf);
                conf.writeLines(oss);
                oss << "[end_of_params]\n";