X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fsubgame.cpp;h=55bbd395447f198290d2db001d177cf16a148ec1;hb=d1df09841d0eac7a88f638676b80ec848522cca5;hp=00b63bdcfc62b62b9c92f5432a2df5e52cbbb6ac;hpb=814ada538a9e2380827b0e3600fa8caef9533265;p=dragonfireclient.git diff --git a/src/subgame.cpp b/src/subgame.cpp index 00b63bdcf..55bbd3954 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,14 +22,31 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "filesys.h" #include "settings.h" #include "log.h" -#include "utility_string.h" +#include "util/strfnd.h" +#include "defaultsettings.h" // for override_default_settings +#include "mapgen.h" // for MapgenParams +#include "util/string.h" -std::string getGameName(const std::string &game_path) +#ifndef SERVER + #include "client/tile.h" // getImagePath +#endif + +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; - bool succeeded = conf.readConfigFile(conf_path.c_str()); - if(!succeeded) + if(!getGameConfig(game_path, conf)) return ""; if(!conf.exists("name")) return ""; @@ -46,6 +63,12 @@ struct GameFindPath {} }; +std::string getSubgamePathEnv() +{ + char *subgame_path = getenv("MINETEST_SUBGAME_PATH"); + return subgame_path ? std::string(subgame_path) : ""; +} + SubgameSpec findSubgame(const std::string &id) { if(id == "") @@ -53,14 +76,25 @@ SubgameSpec findSubgame(const std::string &id) 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, true)); + + Strfnd search_paths(getSubgamePathEnv()); + + while (!search_paths.at_end()) { + std::string path = search_paths.next(PATH_DELIM); + find_paths.push_back(GameFindPath( + path + DIR_DELIM + id, false)); + find_paths.push_back(GameFindPath( + path + DIR_DELIM + id + "_game", false)); + } + find_paths.push_back(GameFindPath( user + DIR_DELIM + "games" + DIR_DELIM + id + "_game", true)); find_paths.push_back(GameFindPath( - share + DIR_DELIM + "games" + DIR_DELIM + id, false)); + 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; bool user_game = true; // Game is in user's directory @@ -74,17 +108,40 @@ SubgameSpec findSubgame(const std::string &id) } if(game_path == "") return SubgameSpec(); + std::string gamemod_path = game_path + DIR_DELIM + "mods"; // Find mod directories std::set mods_paths; - mods_paths.insert(game_path + DIR_DELIM + "mods"); if(!user_game) - mods_paths.insert(share + DIR_DELIM + "mods" + DIR_DELIM + id); + mods_paths.insert(share + DIR_DELIM + "mods"); if(user != share || user_game) - mods_paths.insert(user + DIR_DELIM + "mods" + DIR_DELIM + id); + mods_paths.insert(user + DIR_DELIM + "mods"); std::string game_name = getGameName(game_path); if(game_name == "") game_name = id; - return SubgameSpec(id, game_path, mods_paths, game_name); + 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() @@ -93,12 +150,23 @@ std::set getAvailableGameIds() std::set gamespaths; gamespaths.insert(porting::path_share + DIR_DELIM + "games"); gamespaths.insert(porting::path_user + DIR_DELIM + "games"); - for(std::set::const_iterator i = gamespaths.begin(); - i != gamespaths.end(); i++){ + + Strfnd search_paths(getSubgamePathEnv()); + + while (!search_paths.at_end()) + gamespaths.insert(search_paths.next(PATH_DELIM)); + + for (std::set::const_iterator i = gamespaths.begin(); + i != gamespaths.end(); ++i){ std::vector dirlist = fs::GetDirListing(*i); for(u32 j=0; j getAvailableGames() std::vector specs; std::set gameids = getAvailableGameIds(); for(std::set::const_iterator i = gameids.begin(); - i != gameids.end(); i++) + i != gameids.end(); ++i) specs.push_back(findSubgame(*i)); return specs; } @@ -149,15 +217,27 @@ std::string getWorldGameId(const std::string &world_path, bool can_be_legacy) return conf.get("gameid"); } +std::string getWorldPathEnv() +{ + char *world_path = getenv("MINETEST_WORLD_PATH"); + return world_path ? std::string(world_path) : ""; +} + std::vector getAvailableWorlds() { std::vector worlds; std::set worldspaths; + + Strfnd search_paths(getWorldPathEnv()); + + while (!search_paths.at_end()) + worldspaths.insert(search_paths.next(PATH_DELIM)); + worldspaths.insert(porting::path_user + DIR_DELIM + "worlds"); - infostream<<"Searching worlds..."<::const_iterator i = worldspaths.begin(); - i != worldspaths.end(); i++){ - infostream<<" In "<<(*i)<<": "<::const_iterator i = worldspaths.begin(); + i != worldspaths.end(); ++i) { + infostream << " In " << (*i) << ": " < dirvector = fs::GetDirListing(*i); for(u32 j=0; j getAvailableWorlds() return worlds; } -bool initializeWorld(const std::string &path, const std::string &gameid) +bool loadGameConfAndInitWorld(const std::string &path, const SubgameSpec &gamespec) { - infostream<<"Initializing world at "<clearDefaults(); + set_default_settings(g_settings); + Settings game_defaults; + getGameMinetestConfig(gamespec.path, game_defaults); + override_default_settings(g_settings, &game_defaults); + + infostream << "Initializing world at " << path << std::endl; + + fs::CreateAllDirs(path); + // Create world.mt if does not already exist - std::string worldmt_path = path + DIR_DELIM + "world.mt"; - if(!fs::PathExists(worldmt_path)){ - infostream<<"Creating world.mt ("<