]> git.lizzy.rs Git - minetest.git/blobdiff - src/subgame.cpp
Fix red background missing in deathscreen
[minetest.git] / src / subgame.cpp
index 00b63bdcfc62b62b9c92f5432a2df5e52cbbb6ac..95ae9ef9856ea9bc651c6a7842dac012dcb9df33 100644 (file)
@@ -1,18 +1,18 @@
 /*
-Minetest-c55
-Copyright (C) 2012 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,14 +22,27 @@ 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"
+#ifndef SERVER
+#include "tile.h" // getImagePath
+#endif
+#include "util/string.h"
 
-std::string getGameName(const std::string &game_path)
+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 "";
@@ -53,14 +66,14 @@ SubgameSpec findSubgame(const std::string &id)
        std::string share = porting::path_share;
        std::string user = porting::path_user;
        std::vector<GameFindPath> find_paths;
-       find_paths.push_back(GameFindPath(
-                       user + DIR_DELIM + "games" + DIR_DELIM + id, true));
        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 +87,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<std::string> 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<std::string> getAvailableGameIds()
@@ -99,6 +135,11 @@ std::set<std::string> getAvailableGameIds()
                for(u32 j=0; j<dirlist.size(); j++){
                        if(!dirlist[j].dir)
                                continue;
+                       // If configuration file is not found or broken, ignore game
+                       Settings conf;
+                       if(!getGameConfig(*i + DIR_DELIM + dirlist[j].name, conf))
+                               continue;
+                       // Add it to result
                        const char *ends[] = {"_game", NULL};
                        std::string shorter = removeStringEnd(dirlist[j].name, ends);
                        if(shorter != "")
@@ -200,8 +241,9 @@ bool initializeWorld(const std::string &path, const std::string &gameid)
        if(!fs::PathExists(worldmt_path)){
                infostream<<"Creating world.mt ("<<worldmt_path<<")"<<std::endl;
                fs::CreateAllDirs(path);
-               std::ofstream of(worldmt_path.c_str(), std::ios::binary);
-               of<<"gameid = "<<gameid<<"\n";
+               std::ostringstream ss(std::ios_base::binary);
+               ss<<"gameid = "<<gameid<<"\nbackend = sqlite3\n";
+               fs::safeWriteToFile(worldmt_path, ss.str());
        }
        return true;
 }