cpp/openttd-patchpack/source Changeset - r1501:fe489bff5442

Changeset - r1501:fe489bff5442

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

Darkvater - 19 years ago 2005-03-13 11:47:04
darkvater@openttd.org

(svn r2005) - Fix: fix previous commit. Using 'New Game (scenario)' will use YOUR difficulty settings but ingame options (eg townnames, currency). Also settings are correctly saved when closing the difficulty window now.

2 files changed with 5 insertions and 9 deletions:

settings_gui.c

ttd.c

0 comments (0 inline, 0 general)

settings_gui.c

➞

Show inline comments

@@ @@ -483,7 +483,7 @@ static void GameDifficultyWndProc(Window @@
 			for (btn = 0; btn != GAME_DIFFICULTY_NUM; btn++) {
 				val = ((int*)&_opt_mod_temp.diff)[btn];
 				// if setting has changed, change it
-				if (val != ((int*)&_opt_mod_temp.diff)[btn])
+				if (val != ((int*)&_opt_ptr->diff)[btn])
 					DoCommandP(0, btn, val, NULL, CMD_CHANGE_DIFFICULTY_LEVEL);
+			}
 			DoCommandP(0, -1, _opt_mod_temp.diff_level, NULL, CMD_CHANGE_DIFFICULTY_LEVEL);

ttd.c

➞

Show inline comments

@@ @@ -789,8 +789,7 @@ void StartupDisasters(void); @@
 /**
  * Start Scenario starts a new game based on a scenario.
  * Eg 'New Game' --> select a preset scenario
  * This starts a scenario based on your current difficulty settings just
  * fix the landscape as that can be different from what is selected in the intro
  * This starts a scenario based on your current difficulty settings
  */
 static void StartScenario(void)
+{
@@ @@ -818,12 +817,9 @@ static void StartScenario(void) @@
 		ShowErrorMessage(_error_message, STR_4009_GAME_LOAD_FAILED, 0, 0);
+	}
+	{
 		byte landscape = _opt.landscape; // backup loaded landscape;
 		_opt_ptr = &_opt;
 		memcpy(_opt_ptr, &_opt_newgame, sizeof(GameOptions));
 		_opt_ptr->landscape = landscape;
+	}
 	_opt_ptr = &_opt;
 	memcpy(&_opt_ptr->diff, &_opt_newgame.diff, sizeof(GameDifficulty));
 	_opt.diff_level = _opt_newgame.diff_level;
 	// Inititalize data
 	StartupPlayers();

0 comments (0 inline, 0 general)