(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.

This commit is contained in:
rubidium
2008-05-29 15:13:28 +00:00
parent 48e20d8012
commit e7a501100a
95 changed files with 915 additions and 880 deletions

View File

@@ -926,8 +926,8 @@ DEF_CONSOLE_CMD(ConRestart)
}
/* Don't copy the _newgame pointers to the real pointers, so call SwitchMode directly */
_settings.game_creation.map_x = MapLogX();
_settings.game_creation.map_y = FindFirstBit(MapSizeY());
_settings_game.game_creation.map_x = MapLogX();
_settings_game.game_creation.map_y = FindFirstBit(MapSizeY());
SwitchMode(SM_NEWGAME);
return true;
}
@@ -940,7 +940,7 @@ DEF_CONSOLE_CMD(ConGetSeed)
return true;
}
IConsolePrintF(CC_DEFAULT, "Generation Seed: %u", _settings.game_creation.generation_seed);
IConsolePrintF(CC_DEFAULT, "Generation Seed: %u", _settings_game.game_creation.generation_seed);
return true;
}
@@ -1083,7 +1083,7 @@ DEF_CONSOLE_CMD(ConExit)
return true;
}
if (_game_mode == GM_NORMAL && _settings.gui.autosave_on_exit) DoExitSave();
if (_game_mode == GM_NORMAL && _settings_client.gui.autosave_on_exit) DoExitSave();
_exit_game = true;
return true;