From 2cdb0cb084a1c85cedc8ae3d26df83e8328cd2b7 Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@indvikleren.dk>
Date: Thu, 9 Jun 2022 21:32:31 +0200
Subject: [PATCH] Codechange: Factor out OnStartScenario function

---
 src/openttd.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/openttd.cpp b/src/openttd.cpp
index e2cedd5775..7a1cd0bc4f 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -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.
  * @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);
 			} else {
 				if (_file_to_saveload.abstract_ftype == FT_SCENARIO) {
-					/* Reset engine pool to simplify changing engine NewGRFs in scenario editor. */
-					EngineOverrideManager::ResetToCurrentNewGRFConfig();
+					OnStartScenario();
 				}
 				OnStartGame(_network_dedicated);
 				/* Decrease pause counter (was increased from opening load dialog) */