oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Fix game minetest.conf default settings

Browse source 
This was a regression introduced by f6e4c5d9cf .
This commit is contained in:
est31 2015-03-13 04:35:34 +01:00 • committed by ShadowNinja
parent 467fc0ddc9
commit 538036d004
6 changed files with 38 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/subgame.cpp
View file

@ -267,25 +267,31 @@ std::vector<WorldSpec> getAvailableWorlds()
return worlds;
}
bool initializeWorld(const std::string &path, const std::string &gameid)
bool loadGameConfAndInitWorld(const std::string &path, const SubgameSpec &gamespec)
{
// Override defaults with those provided by the game.
// We clear and reload the defaults because the defaults
// might have been overridden by other subgame config
// files that were loaded before.
g_settings->clearDefaults();
set_default_settings(g_settings);
Settings game_defaults;
getGameMinetestConfig(gamespec.path, game_defaults);
override_default_settings(g_settings, &game_defaults);
infostream << "Initializing world at " << path << std::endl;
fs::CreateAllDirs(path);
// Initialize default settings and override defaults with those
// provided by the game
Settings game_defaults;
getGameMinetestConfig(path, game_defaults);
override_default_settings(g_settings, &game_defaults);
// Create world.mt if does not already exist
std::string worldmt_path = path + DIR_DELIM "world.mt";
if (!fs::PathExists(worldmt_path)) {
std::ostringstream ss(std::ios_base::binary);
ss << "gameid = " << gameid << "\nbackend = sqlite3\n"
<< "creative_mode = " << g_settings->get("creative_mode")
<< "\nenable_damage = " << g_settings->get("enable_damage") << "\n";
ss << "gameid = " << gamespec.id
<< "\nbackend = sqlite3"
<< "\ncreative_mode = " << g_settings->get("creative_mode")
<< "\nenable_damage = " << g_settings->get("enable_damage")
<< "\n";
if (!fs::safeWriteToFile(worldmt_path, ss.str()))
return false;