X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fsubgame.h;h=4b15faa8d570546fe1c30ee0696b39271bf22fd3;hb=b97c9c65777b0389f4cc9a6e3257506f29761e03;hp=ba2f235ed607cdd671d8e26680bc42461bb8b498;hpb=7f7fb9750df3aceec48f65cee657e15364e0a911;p=oweals%2Fminetest.git

diff --git a/src/subgame.h b/src/subgame.h
index ba2f235ed..4b15faa8d 100644
--- a/src/subgame.h
+++ b/src/subgame.h
@@ -1,18 +1,18 @@
 /*
-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 General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -22,19 +22,33 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <string>
 #include <set>
+#include <vector>
+
+class Settings;
+
+#define WORLDNAME_BLACKLISTED_CHARS "/\\"
 
 struct SubgameSpec
 {
 	std::string id; // "" = game does not exist
-	std::string path;
-	std::set<std::string> addon_paths;
+	std::string path; // path to game
+	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::set<std::string> &addon_paths_=std::set<std::string>()):
+			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_),
-		addon_paths(addon_paths_)
+		gamemods_path(gamemods_path_),		
+		addon_mods_paths(addon_mods_paths_),
+		name(name_),
+		menuicon_path(menuicon_path_)
 	{}
 
 	bool isValid() const
@@ -43,11 +57,49 @@ 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);
+SubgameSpec findWorldSubgame(const std::string &world_path);
 
 std::set<std::string> getAvailableGameIds();
+std::vector<SubgameSpec> getAvailableGames();
+
+bool getWorldExists(const std::string &world_path);
+std::string getWorldGameId(const std::string &world_path,
+		bool can_be_legacy=false);
+
+struct WorldSpec
+{
+	std::string path;
+	std::string name;
+	std::string gameid;
+
+	WorldSpec(
+		const std::string &path_="",
+		const std::string &name_="",
+		const std::string &gameid_=""
+	):
+		path(path_),
+		name(name_),
+		gameid(gameid_)
+	{}
+
+	bool isValid() const
+	{
+		return (name != "" && path != "" && gameid != "");
+	}
+};
+
+std::vector<WorldSpec> getAvailableWorlds();
 
-std::string getWorldGameId(const std::string &world_path);
+// Create world directory and world.mt if they don't exist
+bool initializeWorld(const std::string &path, const std::string &gameid);
 
 #endif