cpp/openttd-patchpack/source Changeset - r11043:a402a079c6d6

Changeset - r11043:a402a079c6d6

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

Yexo - 15 years ago 2009-02-06 23:58:16
yexo@openttd.org

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

2 files changed with 4 insertions and 6 deletions:

src/genworld_gui.cpp

src/openttd.cpp

0 comments (0 inline, 0 general)

src/genworld_gui.cpp

➞

Show inline comments

@@ @@ -248,8 +248,8 @@ void StartGeneratingLandscape(glwp_modes @@
+{
 	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 @@
 				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) ||

src/openttd.cpp

➞

Show inline comments

@@ @@ -661,8 +661,8 @@ int ttd_main(int argc, char *argv[]) @@
 	/* 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();

0 comments (0 inline, 0 general)