X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fsubgame.cpp;h=7fee3899d4ace353f7555735034f25390475c215;hb=c8bd2ae11cb0972eda86577ab15c2c69ecae33d0;hp=b4ae3185e84a7f310c1044c0d38357e38bcde762;hpb=1f56d71f190c67325bdc413dfbc6c8e4b8284d98;p=dragonfireclient.git diff --git a/src/subgame.cpp b/src/subgame.cpp index b4ae3185e..7fee3899d 100644 --- a/src/subgame.cpp +++ b/src/subgame.cpp @@ -1,18 +1,18 @@ /* -Minetest-c55 -Copyright (C) 2012 celeron55, Perttu Ahola +Minetest +Copyright (C) 2013 celeron55, Perttu Ahola 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,6 +22,42 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "filesys.h" #include "settings.h" #include "log.h" +#ifndef SERVER +#include "tile.h" // getImagePath +#endif +#include "util/string.h" + +bool getGameMinetestConfig(const std::string &game_path, Settings &conf) +{ + std::string conf_path = game_path + DIR_DELIM + "minetest.conf"; + return conf.readConfigFile(conf_path.c_str()); +} + +bool getGameConfig(const std::string &game_path, Settings &conf) +{ + std::string conf_path = game_path + DIR_DELIM + "game.conf"; + return conf.readConfigFile(conf_path.c_str()); +} + +std::string getGameName(const std::string &game_path) +{ + Settings conf; + if(!getGameConfig(game_path, conf)) + return ""; + if(!conf.exists("name")) + return ""; + return conf.get("name"); +} + +struct GameFindPath +{ + std::string path; + bool user_specific; + GameFindPath(const std::string &path, bool user_specific): + path(path), + user_specific(user_specific) + {} +}; SubgameSpec findSubgame(const std::string &id) { @@ -29,23 +65,62 @@ SubgameSpec findSubgame(const std::string &id) return SubgameSpec(); std::string share = porting::path_share; std::string user = porting::path_user; + std::vector find_paths; + find_paths.push_back(GameFindPath( + user + DIR_DELIM + "games" + DIR_DELIM + id + "_game", true)); + find_paths.push_back(GameFindPath( + user + DIR_DELIM + "games" + DIR_DELIM + id, true)); + find_paths.push_back(GameFindPath( + share + DIR_DELIM + "games" + DIR_DELIM + id + "_game", false)); + find_paths.push_back(GameFindPath( + share + DIR_DELIM + "games" + DIR_DELIM + id, false)); // Find game directory - std::string game_path = user + DIR_DELIM + "games" + DIR_DELIM + id; + std::string game_path; bool user_game = true; // Game is in user's directory - if(!fs::PathExists(game_path)){ - game_path = share + DIR_DELIM + "games" + DIR_DELIM + id; - user_game = false; + for(u32 i=0; i addon_paths; + std::string gamemod_path = game_path + DIR_DELIM + "mods"; + // Find mod directories + std::set mods_paths; if(!user_game) - addon_paths.insert(share + DIR_DELIM + "addons" + DIR_DELIM + id); - addon_paths.insert(user + DIR_DELIM + "addons" + DIR_DELIM + id); - // TODO: Read proper name from game_path/game.conf - std::string game_name = id; - return SubgameSpec(id, game_path, addon_paths, game_name); + mods_paths.insert(share + DIR_DELIM + "mods"); + if(user != share || user_game) + mods_paths.insert(user + DIR_DELIM + "mods"); + std::string game_name = getGameName(game_path); + if(game_name == "") + game_name = id; + std::string menuicon_path; +#ifndef SERVER + menuicon_path = getImagePath(game_path + DIR_DELIM + "menu" + DIR_DELIM + "icon.png"); +#endif + return SubgameSpec(id, game_path, gamemod_path, mods_paths, game_name, + menuicon_path); +} + +SubgameSpec findWorldSubgame(const std::string &world_path) +{ + std::string world_gameid = getWorldGameId(world_path, true); + // See if world contains an embedded game; if so, use it. + std::string world_gamepath = world_path + DIR_DELIM + "game"; + if(fs::PathExists(world_gamepath)){ + SubgameSpec gamespec; + gamespec.id = world_gameid; + gamespec.path = world_gamepath; + gamespec.gamemods_path= world_gamepath + DIR_DELIM + "mods"; + gamespec.name = getGameName(world_gamepath); + if(gamespec.name == "") + gamespec.name = "unknown"; + return gamespec; + } + return findSubgame(world_gameid); } std::set getAvailableGameIds() @@ -60,7 +135,17 @@ std::set getAvailableGameIds() for(u32 j=0; j getAvailableGames() return specs; } -#define LEGACY_GAMEID "mesetint" +#define LEGACY_GAMEID "minetest" + +bool getWorldExists(const std::string &world_path) +{ + return (fs::PathExists(world_path + DIR_DELIM + "map_meta.txt") || + fs::PathExists(world_path + DIR_DELIM + "world.mt")); +} std::string getWorldGameId(const std::string &world_path, bool can_be_legacy) { @@ -93,6 +184,9 @@ std::string getWorldGameId(const std::string &world_path, bool can_be_legacy) } if(!conf.exists("gameid")) return ""; + // The "mesetint" gameid has been discarded + if(conf.get("gameid") == "mesetint") + return "minetest"; return conf.get("gameid"); } @@ -111,7 +205,9 @@ std::vector getAvailableWorlds() continue; std::string fullpath = *i + DIR_DELIM + dirvector[j].name; std::string name = dirvector[j].name; - std::string gameid = getWorldGameId(fullpath); + // Just allow filling in the gameid always for now + bool can_be_legacy = true; + std::string gameid = getWorldGameId(fullpath, can_be_legacy); WorldSpec spec(fullpath, name, gameid); if(!spec.isValid()){ infostream<<"(invalid: "< getAvailableWorlds() } // Check old world location do{ -#ifdef RUN_IN_PLACE - std::string fullpath = porting::path_user + DIR_DELIM + ".." - + DIR_DELIM + "world"; -#else std::string fullpath = porting::path_user + DIR_DELIM + "world"; -#endif if(!fs::PathExists(fullpath)) break; std::string name = "Old World";