Merge pull request #1825 from Zeno-/control_key_cache

[dragonfireclient.git] / src / subgame.cpp

diff --git a/src/subgame.cpp b/src/subgame.cpp
index 2f534037312480a0d87db1284b23cfe6aeed195b..94d9be181a669792ad6728968f5c997bf826e3f3 100644 (file)
--- a/src/subgame.cpp
+++ b/src/subgame.cpp
@@ -1,6 +1,6 @@
 /*
-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 Lesser General Public License as published by
@@ -22,14 +22,28 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "filesys.h"
 #include "settings.h"
 #include "log.h"
+#include "strfnd.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 "";
@@ -46,6 +60,17 @@ struct GameFindPath
        {}
 };
 
+Strfnd getSubgamePathEnv() {
+       std::string sp;
+       char *subgame_path = getenv("MINETEST_SUBGAME_PATH");
+
+       if(subgame_path) {
+               sp = std::string(subgame_path);
+       }
+
+       return Strfnd(sp);
+}
+
 SubgameSpec findSubgame(const std::string &id)
 {
        if(id == "")
@@ -53,6 +78,17 @@ SubgameSpec findSubgame(const std::string &id)
        std::string share = porting::path_share;
        std::string user = porting::path_user;
        std::vector<GameFindPath> find_paths;
+
+       Strfnd search_paths = getSubgamePathEnv();
+
+       while(!search_paths.atend()) {
+               std::string path = search_paths.next(":");
+               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(
@@ -78,13 +114,18 @@ SubgameSpec findSubgame(const std::string &id)
        // Find mod directories
        std::set<std::string> mods_paths;
        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, gamemod_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)
@@ -111,12 +152,24 @@ std::set<std::string> getAvailableGameIds()
        std::set<std::string> gamespaths;
        gamespaths.insert(porting::path_share + DIR_DELIM + "games");
        gamespaths.insert(porting::path_user + DIR_DELIM + "games");
+
+       Strfnd search_paths = getSubgamePathEnv();
+
+       while(!search_paths.atend()) {
+               gamespaths.insert(search_paths.next(":"));
+       }
+
        for(std::set<std::string>::const_iterator i = gamespaths.begin();
                        i != gamespaths.end(); i++){
                std::vector<fs::DirListNode> dirlist = fs::GetDirListing(*i);
                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 != "")
@@ -218,10 +271,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;
 }
-
-