Fix a crash or random memory leak when reseting saved environment variable in test_se...

[oweals/minetest.git] / src / subgame.h

diff --git a/src/subgame.h b/src/subgame.h
index 996714be04accb6bb3c9ce285ec9990a7e8947a4..6e78639625e9c2508a1d4be91fadb07fbeb0dd6f 100644 (file)
--- a/src/subgame.h
+++ b/src/subgame.h
@@ -17,8 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef SUBGAME_HEADER
-#define SUBGAME_HEADER
+#pragma once
 
 #include <string>
 #include <set>
@@ -26,8 +25,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 class Settings;
 
-#define WORLDNAME_BLACKLISTED_CHARS "/\\"
-
 struct SubgameSpec
 {
        std::string id; // "" = game does not exist
@@ -35,25 +32,31 @@ struct SubgameSpec
        std::string gamemods_path; //path to mods of the game
        std::set<std::string> addon_mods_paths; //paths to addon mods for this game
        std::string name;
-
-       SubgameSpec(const std::string &id_="",
-                       const std::string &path_="",    
-                       const std::string &gamemods_path_="",
-                       const std::set<std::string> &addon_mods_paths_=std::set<std::string>(),
-                       const std::string &name_=""):
+       std::string menuicon_path;
+
+       SubgameSpec(const std::string &id_ = "",
+                       const std::string &path_ = "",
+                       const std::string &gamemods_path_ = "",
+                       const std::set<std::string> &addon_mods_paths_ = std::set<std::string>(),
+                       const std::string &name_ = "",
+                       const std::string &menuicon_path_ = ""):
                id(id_),
                path(path_),
-               gamemods_path(gamemods_path_),          
+               gamemods_path(gamemods_path_),
                addon_mods_paths(addon_mods_paths_),
-               name(name_)
+               name(name_),
+               menuicon_path(menuicon_path_)
        {}
 
        bool isValid() const
        {
-               return (id != "" && path != "");
+               return (!id.empty() && !path.empty());
        }
 };
 
+// minetest.conf
+bool getGameMinetestConfig(const std::string &game_path, Settings &conf);
+// game.conf
 bool getGameConfig(const std::string &game_path, Settings &conf);
 
 std::string getGameName(const std::string &game_path);
@@ -86,14 +89,12 @@ struct WorldSpec
 
        bool isValid() const
        {
-               return (name != "" && path != "" && gameid != "");
+               return (!name.empty() && !path.empty() && !gameid.empty());
        }
 };
 
 std::vector<WorldSpec> getAvailableWorlds();
 
-// Create world directory and world.mt if they don't exist
-bool initializeWorld(const std::string &path, const std::string &gameid);
-
-#endif
-
+// loads the subgame's config and creates world directory
+// and world.mt if they don't exist
+bool loadGameConfAndInitWorld(const std::string &path, const SubgameSpec &gamespec);