Fix red background missing in deathscreen

[minetest.git] / src / subgame.cpp

diff --git a/src/subgame.cpp b/src/subgame.cpp
index 1bee630b257de20b80904d93eef5019d4dad7723..95ae9ef9856ea9bc651c6a7842dac012dcb9df33 100644 (file)
--- a/src/subgame.cpp
+++ b/src/subgame.cpp
@@ -91,22 +91,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;
-       std::string menubackground_path;
-       std::string menuoverlay_path;
        std::string menuicon_path;
 #ifndef SERVER
-       menubackground_path = getImagePath(game_path + DIR_DELIM + "menu" + DIR_DELIM + "background.png");
-       menuoverlay_path = getImagePath(game_path + DIR_DELIM + "menu" + DIR_DELIM + "overlay.png");
        menuicon_path = getImagePath(game_path + DIR_DELIM + "menu" + DIR_DELIM + "icon.png");
 #endif
        return SubgameSpec(id, game_path, gamemod_path, mods_paths, game_name,
-                       menubackground_path, menuoverlay_path, menuicon_path);
+                       menuicon_path);
 }
 
 SubgameSpec findWorldSubgame(const std::string &world_path)
@@ -245,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;
 }