dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix type mismatch in _sl_version extern declaration

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-02-05 18:03:28 +00:00
parent f5728b8c48
commit b11f1a233f
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/saveload/extended_ver_sl.cpp
View File

@@ -194,23 +194,23 @@ void SlXvSetCurrentState()
void SlXvCheckSpecialSavegameVersions() void SlXvCheckSpecialSavegameVersions()
{ {
// Checks for special savegame versions go here // Checks for special savegame versions go here
extern uint16 _sl_version; extern SaveLoadVersion _sl_version;
if (_sl_version == 2000) { if (_sl_version == 2000) {
DEBUG(sl, 1, "Loading a trace restrict patch savegame version %d as version 194", _sl_version); DEBUG(sl, 1, "Loading a trace restrict patch savegame version %d as version 194", _sl_version);
_sl_version = 194; _sl_version = (SaveLoadVersion) 194;
_sl_is_faked_ext = true; _sl_is_faked_ext = true;
_sl_xv_feature_versions[XSLFI_TRACE_RESTRICT] = 1; _sl_xv_feature_versions[XSLFI_TRACE_RESTRICT] = 1;
} }
if (_sl_version == 2001) { if (_sl_version == 2001) {
DEBUG(sl, 1, "Loading a trace restrict patch savegame version %d as version 195", _sl_version); DEBUG(sl, 1, "Loading a trace restrict patch savegame version %d as version 195", _sl_version);
_sl_version = 195; _sl_version = (SaveLoadVersion) 195;
_sl_is_faked_ext = true; _sl_is_faked_ext = true;
_sl_xv_feature_versions[XSLFI_TRACE_RESTRICT] = 6; _sl_xv_feature_versions[XSLFI_TRACE_RESTRICT] = 6;
} }
if (_sl_version == 2002) { if (_sl_version == 2002) {
DEBUG(sl, 1, "Loading a trace restrict patch savegame version %d as version 196", _sl_version); DEBUG(sl, 1, "Loading a trace restrict patch savegame version %d as version 196", _sl_version);
_sl_version = 196; _sl_version = (SaveLoadVersion) 196;
_sl_is_faked_ext = true; _sl_is_faked_ext = true;
_sl_xv_feature_versions[XSLFI_TRACE_RESTRICT] = 6; _sl_xv_feature_versions[XSLFI_TRACE_RESTRICT] = 6;
} }
@@ -218,49 +218,49 @@ void SlXvCheckSpecialSavegameVersions()
if (_sl_version == 220) { /* SL_SPRING_2013_v2_0_102 */ if (_sl_version == 220) { /* SL_SPRING_2013_v2_0_102 */
DEBUG(sl, 1, "Loading a SpringPP 2013 v2.0.102 savegame version %d as version 187", _sl_version); DEBUG(sl, 1, "Loading a SpringPP 2013 v2.0.102 savegame version %d as version 187", _sl_version);
_sl_version = 187; _sl_version = (SaveLoadVersion) 187;
_sl_is_faked_ext = true; _sl_is_faked_ext = true;
_sl_xv_feature_versions[XSLFI_SPRINGPP] = 1; _sl_xv_feature_versions[XSLFI_SPRINGPP] = 1;
} else if (_sl_version == 221) { /* SL_SPRING_2013_v2_1_108 */ } else if (_sl_version == 221) { /* SL_SPRING_2013_v2_1_108 */
DEBUG(sl, 1, "Loading a SpringPP 2013 v2.1.108 savegame version %d as version 188", _sl_version); DEBUG(sl, 1, "Loading a SpringPP 2013 v2.1.108 savegame version %d as version 188", _sl_version);
_sl_version = 188; _sl_version = (SaveLoadVersion) 188;
_sl_is_faked_ext = true; _sl_is_faked_ext = true;
_sl_xv_feature_versions[XSLFI_SPRINGPP] = 2; _sl_xv_feature_versions[XSLFI_SPRINGPP] = 2;
} else if (_sl_version == 222) { /* SL_SPRING_2013_v2_1_147 */ } else if (_sl_version == 222) { /* SL_SPRING_2013_v2_1_147 */
DEBUG(sl, 1, "Loading a SpringPP 2013 v2.1.147 savegame version %d as version 194", _sl_version); DEBUG(sl, 1, "Loading a SpringPP 2013 v2.1.147 savegame version %d as version 194", _sl_version);
_sl_version = 194; _sl_version = (SaveLoadVersion) 194;
_sl_is_faked_ext = true; _sl_is_faked_ext = true;
_sl_xv_feature_versions[XSLFI_SPRINGPP] = 4; // Note that this break in numbering is deliberate _sl_xv_feature_versions[XSLFI_SPRINGPP] = 4; // Note that this break in numbering is deliberate
} else if (_sl_version == 223) { /* SL_SPRING_2013_v2_3_XXX */ } else if (_sl_version == 223) { /* SL_SPRING_2013_v2_3_XXX */
DEBUG(sl, 1, "Loading a SpringPP 2013 v2.3.xxx savegame version %d as version 194", _sl_version); DEBUG(sl, 1, "Loading a SpringPP 2013 v2.3.xxx savegame version %d as version 194", _sl_version);
_sl_version = 194; _sl_version = (SaveLoadVersion) 194;
_sl_is_faked_ext = true; _sl_is_faked_ext = true;
_sl_xv_feature_versions[XSLFI_SPRINGPP] = 3; // Note that this break in numbering is deliberate _sl_xv_feature_versions[XSLFI_SPRINGPP] = 3; // Note that this break in numbering is deliberate
} else if (_sl_version == 224) { /* SL_SPRING_2013_v2_3_b3 */ } else if (_sl_version == 224) { /* SL_SPRING_2013_v2_3_b3 */
DEBUG(sl, 1, "Loading a SpringPP 2013 v2.3.b3 savegame version %d as version 194", _sl_version); DEBUG(sl, 1, "Loading a SpringPP 2013 v2.3.b3 savegame version %d as version 194", _sl_version);
_sl_version = 194; _sl_version = (SaveLoadVersion) 194;
_sl_is_faked_ext = true; _sl_is_faked_ext = true;
_sl_xv_feature_versions[XSLFI_SPRINGPP] = 5; _sl_xv_feature_versions[XSLFI_SPRINGPP] = 5;
} else if (_sl_version == 225) { /* SL_SPRING_2013_v2_3_b4 */ } else if (_sl_version == 225) { /* SL_SPRING_2013_v2_3_b4 */
DEBUG(sl, 1, "Loading a SpringPP 2013 v2.3.b4 savegame version %d as version 194", _sl_version); DEBUG(sl, 1, "Loading a SpringPP 2013 v2.3.b4 savegame version %d as version 194", _sl_version);
_sl_version = 194; _sl_version = (SaveLoadVersion) 194;
_sl_is_faked_ext = true; _sl_is_faked_ext = true;
_sl_xv_feature_versions[XSLFI_SPRINGPP] = 6; _sl_xv_feature_versions[XSLFI_SPRINGPP] = 6;
} else if (_sl_version == 226) { /* SL_SPRING_2013_v2_3_b5 */ } else if (_sl_version == 226) { /* SL_SPRING_2013_v2_3_b5 */
DEBUG(sl, 1, "Loading a SpringPP 2013 v2.3.b5 savegame version %d as version 195", _sl_version); DEBUG(sl, 1, "Loading a SpringPP 2013 v2.3.b5 savegame version %d as version 195", _sl_version);
_sl_version = 195; _sl_version = (SaveLoadVersion) 195;
_sl_is_faked_ext = true; _sl_is_faked_ext = true;
_sl_xv_feature_versions[XSLFI_SPRINGPP] = 7; _sl_xv_feature_versions[XSLFI_SPRINGPP] = 7;
} else if (_sl_version == 227) { /* SL_SPRING_2013_v2_4 */ } else if (_sl_version == 227) { /* SL_SPRING_2013_v2_4 */
DEBUG(sl, 1, "Loading a SpringPP 2013 v2.4 savegame version %d as version 195", _sl_version); DEBUG(sl, 1, "Loading a SpringPP 2013 v2.4 savegame version %d as version 195", _sl_version);
_sl_version = 195; _sl_version = (SaveLoadVersion) 195;
_sl_is_faked_ext = true; _sl_is_faked_ext = true;
_sl_xv_feature_versions[XSLFI_SPRINGPP] = 8; _sl_xv_feature_versions[XSLFI_SPRINGPP] = 8;
} }