cpp/openttd-patchpack/source Changeset - r22433:3130481e7a32

Changeset - r22433:3130481e7a32

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

alberth - 8 years ago 2016-09-04 12:48:28
alberth@openttd.org

(svn r27640) -Codechange: Remove another use of _saveload_mode in the loading code.

1 file changed with 1 insertions and 1 deletions:

src/openttd.cpp

0 comments (0 inline, 0 general)

src/openttd.cpp

➞

Show inline comments

@@ @@ -1094,13 +1094,13 @@ void SwitchToMode(SwitchMode new_mode) @@
 			ResetWindowSystem();
 			if (!SafeLoad(_file_to_saveload.name, _file_to_saveload.mode, GM_NORMAL, NO_DIRECTORY)) {
 				SetDParamStr(0, GetSaveLoadErrorString());
 				ShowErrorMessage(STR_JUST_RAW_STRING, INVALID_STRING_ID, WL_ERROR);
 			} else {
-				if (_saveload_mode == SLD_LOAD_SCENARIO) {
+				if (_file_to_saveload.filetype == FT_SCENARIO) {
 					/* Reset engine pool to simplify changing engine NewGRFs in scenario editor. */
 					EngineOverrideManager::ResetToCurrentNewGRFConfig();
+				}
 				/* Update the local company for a loaded game. It is either always
 				 * company #1 (eg 0) or in the case of a dedicated server a spectator */
 				SetLocalCompany(_network_dedicated ? COMPANY_SPECTATOR : COMPANY_FIRST);

0 comments (0 inline, 0 general)