Mercurial > hg > openttd
changeset 11043:8ce8bcce0288 draft
(svn r15383) -Cleanup: Don't call MakeNewgameSettingsLive more often than necessary.
| author | Yexo <Yexo@openttd.org> |
|---|---|
| date | Fri, 06 Feb 2009 23:58:16 +0000 |
| parents | 3f6dbfd6e903 |
| children | 245be18513f4 |
| files | src/genworld_gui.cpp src/openttd.cpp |
| diffstat | 2 files changed, 4 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/genworld_gui.cpp +++ b/src/genworld_gui.cpp @@ -248,8 +248,8 @@ { DeleteAllNonVitalWindows(); - /* Copy all XXX_newgame to XXX when coming from outside the editor */ - MakeNewgameSettingsLive(); + /* Copy the settings needed for creating a new map. */ + _settings_game.game_creation = _settings_newgame.game_creation; ResetGRFConfig(true); SndPlayFx(SND_15_BEEP); @@ -441,8 +441,6 @@ break; case GLAND_GENERATE_BUTTON: // Generate - MakeNewgameSettingsLive(); - if (mode == GLWP_HEIGHTMAP && (this->x * 2 < (1U << _settings_newgame.game_creation.map_x) || this->x / 2 > (1U << _settings_newgame.game_creation.map_x) ||
--- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -661,8 +661,8 @@ /* XXX - ugly hack, if diff_level is 9, it means we got no setting from the config file */ if (_settings_newgame.difficulty.diff_level == 9) SetDifficultyLevel(0, &_settings_newgame.difficulty); - /* Make sure _settings is filled with _settings_newgame if we switch to a game directly */ - if (_switch_mode != SM_NONE) MakeNewgameSettingsLive(); + /* Copy the settings needed for creating a new map. */ + _settings_game.game_creation = _settings_newgame.game_creation; /* initialize the ingame console */ IConsoleInit();