1
0
Fork 0

Codechange: Factor out OnStartScenario function

pull/9915/head
Niels Martin Hansen 2022-06-09 21:32:31 +02:00
parent 0d3756818f
commit 2cdb0cb084
1 changed files with 10 additions and 2 deletions

View File

@ -837,6 +837,15 @@ void HandleExitGameRequest()
} }
} }
/**
* Triggers everything required to set up a saved scenario for a new game.
*/
static void OnStartScenario()
{
/* Reset engine pool to simplify changing engine NewGRFs in scenario editor. */
EngineOverrideManager::ResetToCurrentNewGRFConfig();
}
/** /**
* Triggers everything that should be triggered when starting a game. * Triggers everything that should be triggered when starting a game.
* @param dedicated_server Whether this is a dedicated server or not. * @param dedicated_server Whether this is a dedicated server or not.
@ -1049,8 +1058,7 @@ void SwitchToMode(SwitchMode new_mode)
ShowErrorMessage(STR_JUST_RAW_STRING, INVALID_STRING_ID, WL_ERROR); ShowErrorMessage(STR_JUST_RAW_STRING, INVALID_STRING_ID, WL_ERROR);
} else { } else {
if (_file_to_saveload.abstract_ftype == FT_SCENARIO) { if (_file_to_saveload.abstract_ftype == FT_SCENARIO) {
/* Reset engine pool to simplify changing engine NewGRFs in scenario editor. */ OnStartScenario();
EngineOverrideManager::ResetToCurrentNewGRFConfig();
} }
OnStartGame(_network_dedicated); OnStartGame(_network_dedicated);
/* Decrease pause counter (was increased from opening load dialog) */ /* Decrease pause counter (was increased from opening load dialog) */