Cpp11 initializers: last src root changeset (#6022)

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

diff --git a/src/subgame.h b/src/subgame.h
index 996714be04accb6bb3c9ce285ec9990a7e8947a4..dda249a9862a31a282c27776667b33dd64db21ee 100644 (file)
--- a/src/subgame.h
+++ b/src/subgame.h
@@ -26,8 +26,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,17 +33,20 @@ 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
@@ -54,6 +55,9 @@ struct SubgameSpec
        }
 };
 
+// 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);
@@ -92,8 +96,9 @@ struct WorldSpec
 
 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);
+// 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);
 
 #endif