Noise: Prevent unittest crash caused by division by zero

[minetest.git] / src / subgame.h

diff --git a/src/subgame.h b/src/subgame.h
index 4b15faa8d570546fe1c30ee0696b39271bf22fd3..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
@@ -37,15 +35,15 @@ struct SubgameSpec
        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_=""):
+       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_),
                menuicon_path(menuicon_path_)
@@ -98,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