Set acceleration only once in falling node

[minetest.git] / src / subgame.h

diff --git a/src/subgame.h b/src/subgame.h
index 8561c1a52ce322effffba0130557baf266257169..f3633ce2f2695c7e36e6148bfb40b5f0e40aac52 100644 (file)
--- a/src/subgame.h
+++ b/src/subgame.h
@@ -24,6 +24,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <set>
 #include <vector>
 
+class Settings;
+
 #define WORLDNAME_BLACKLISTED_CHARS "/\\"
 
 struct SubgameSpec
@@ -33,17 +35,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;
+       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 &name_="",
+                       const std::string &menuicon_path_=""):
                id(id_),
                path(path_),
                gamemods_path(gamemods_path_),          
                addon_mods_paths(addon_mods_paths_),
-               name(name_)
+               name(name_),
+               menuicon_path(menuicon_path_)
        {}
 
        bool isValid() const
@@ -52,6 +57,11 @@ 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);
 
 SubgameSpec findSubgame(const std::string &id);
@@ -88,8 +98,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