dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r15383) -Cleanup: Don't call MakeNewgameSettingsLive more often than necessary.

Browse Source
This commit is contained in:
Yexo
2009-02-06 23:58:16 +00:00
parent 0caa32816f
commit caf540d284
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/genworld_gui.cpp
View File

@@ -248,8 +248,8 @@ void StartGeneratingLandscape(glwp_modes mode)
{
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 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
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) ||