X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fsubgame.h;h=8c21973eab3cdec319e28b6b236c9907c4a2f4e3;hb=b5f7249a7edc25077d84b27b38552228b92ff763;hp=dd725caf7b385211aef2ca4df546d1d6cd40cc78;hpb=6af8a34d91582ce15a0341e75d3e55d847a5a47a;p=oweals%2Fminetest.git

diff --git a/src/subgame.h b/src/subgame.h
index dd725caf7..8c21973ea 100644
--- a/src/subgame.h
+++ b/src/subgame.h
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -17,14 +17,13 @@ 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>
 #include <vector>
 
-#define WORLDNAME_BLACKLISTED_CHARS "/\\"
+class Settings;
 
 struct SubgameSpec
 {
@@ -33,17 +32,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
@@ -52,6 +54,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 +95,6 @@ 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);
-
-#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);