X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fsubgame.cpp;h=1030d535a7b51613c3e1bd2350b4edb939153c92;hb=6929206bc29960b0fab8c0a0a65a48992cfff398;hp=a17b1623466c301d509a0aadb2be6f6268f7e940;hpb=084be3599a5ef0acba7c341bfd14a4e9801423a2;p=oweals%2Fminetest.git

diff --git a/src/subgame.cpp b/src/subgame.cpp
index a17b16234..1030d535a 100644
--- 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/background.png");
-	menuoverlay_path = getImagePath(game_path + DIR_DELIM + "menu/overlay.png");
-	menuicon_path = getImagePath(game_path + DIR_DELIM + "menu/icon.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,14 @@ 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<<
+#ifdef __ANDROID__
+				"\nbackend = leveldb\n";
+#else
+				"\nbackend = sqlite3\n";
+#endif
+		fs::safeWriteToFile(worldmt_path, ss.str());
 	}
 	return true;
 }