Fix itemdef drop on NULL texture

[oweals/minetest.git] / src / subgame.cpp

diff --git a/src/subgame.cpp b/src/subgame.cpp
index 16e7cc8e0df4e0e451bcc3d5bf80e8103145b731..19ad4e636be379fdd38171d175f72f42b49b455e 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,24 @@ 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/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 "";
@@ -74,9 +84,9 @@ 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);
        if(user != share || user_game)
@@ -84,7 +94,7 @@ SubgameSpec findSubgame(const std::string &id)
        std::string game_name = getGameName(game_path);
        if(game_name == "")
                game_name = id;
-       return SubgameSpec(id, game_path, mods_paths, game_name);
+       return SubgameSpec(id, game_path, gamemod_path, mods_paths, game_name);
 }
 
 SubgameSpec findWorldSubgame(const std::string &world_path)
@@ -96,7 +106,7 @@ SubgameSpec findWorldSubgame(const std::string &world_path)
                SubgameSpec gamespec;
                gamespec.id = world_gameid;
                gamespec.path = world_gamepath;
-               gamespec.mods_paths.insert(world_gamepath + DIR_DELIM + "mods");
+               gamespec.gamemods_path= world_gamepath + DIR_DELIM + "mods";
                gamespec.name = getGameName(world_gamepath);
                if(gamespec.name == "")
                        gamespec.name = "unknown";
@@ -117,6 +127,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 != "")