#include "porting.h"
#include "filesys.h"
#include "settings.h"
-#include "main.h"
#include "log.h"
#include "strfnd.h"
#include "defaultsettings.h" // for override_default_settings
#include "mapgen.h" // for MapgenParams
-#include "main.h" // for g_settings
+#include "util/string.h"
+
#ifndef SERVER
-#include "client/tile.h" // getImagePath
+ #include "client/tile.h" // getImagePath
#endif
-#include "util/string.h"
bool getGameMinetestConfig(const std::string &game_path, Settings &conf)
{
}
for(std::set<std::string>::const_iterator i = gamespaths.begin();
- i != gamespaths.end(); i++){
+ i != gamespaths.end(); ++i){
std::vector<fs::DirListNode> dirlist = fs::GetDirListing(*i);
for(u32 j=0; j<dirlist.size(); j++){
if(!dirlist[j].dir)
std::vector<SubgameSpec> specs;
std::set<std::string> gameids = getAvailableGameIds();
for(std::set<std::string>::const_iterator i = gameids.begin();
- i != gameids.end(); i++)
+ i != gameids.end(); ++i)
specs.push_back(findSubgame(*i));
return specs;
}
worldspaths.insert(porting::path_user + DIR_DELIM + "worlds");
infostream<<"Searching worlds..."<<std::endl;
for(std::set<std::string>::const_iterator i = worldspaths.begin();
- i != worldspaths.end(); i++){
+ i != worldspaths.end(); ++i){
infostream<<" In "<<(*i)<<": "<<std::endl;
std::vector<fs::DirListNode> dirvector = fs::GetDirListing(*i);
for(u32 j=0; j<dirvector.size(); j++){
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;