diff options
| author | Peter Nelson <peter1138@openttd.org> | 2019-02-01 22:46:12 +0000 |
|---|---|---|
| committer | PeterN <peter@fuzzle.org> | 2019-02-02 21:39:06 +0000 |
| commit | e21ade375ee008fa32db8e154f14fb18b37e8dc7 (patch) | |
| tree | 839d5687fd190157355f414b30b060f7d50af2a4 /src/saveload/company_sl.cpp | |
| parent | 0f37a683a2360c7cb3d56fc828b96d7ee7e997f0 (diff) | |
| download | openttd-e21ade375ee008fa32db8e154f14fb18b37e8dc7.tar.xz | |
Codechange: Change from numeric to descriptive SLV enum labels for last entries.
Diffstat (limited to 'src/saveload/company_sl.cpp')
| -rw-r--r-- | src/saveload/company_sl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/saveload/company_sl.cpp b/src/saveload/company_sl.cpp index 882a0265b..a51f8081b 100644 --- a/src/saveload/company_sl.cpp +++ b/src/saveload/company_sl.cpp @@ -350,8 +350,8 @@ static const SaveLoad _company_economy_desc[] = { SLE_CONDVAR(CompanyEconomyEntry, company_value, SLE_INT64, SLV_2, SL_MAX_VERSION), SLE_CONDVAR(CompanyEconomyEntry, delivered_cargo[NUM_CARGO - 1], SLE_INT32, SL_MIN_VERSION, SLV_170), - SLE_CONDARR(CompanyEconomyEntry, delivered_cargo, SLE_UINT32, 32, SLV_170, SLV_199), - SLE_CONDARR(CompanyEconomyEntry, delivered_cargo, SLE_UINT32, NUM_CARGO, SLV_199, SL_MAX_VERSION), + SLE_CONDARR(CompanyEconomyEntry, delivered_cargo, SLE_UINT32, 32, SLV_170, SLV_EXTEND_CARGOTYPES), + SLE_CONDARR(CompanyEconomyEntry, delivered_cargo, SLE_UINT32, NUM_CARGO, SLV_EXTEND_CARGOTYPES, SL_MAX_VERSION), SLE_VAR(CompanyEconomyEntry, performance_history, SLE_INT32), SLE_END() @@ -443,7 +443,7 @@ static void SaveLoad_PLYR_common(Company *c, CompanyProperties *cprops) /* Write each livery entry. */ int num_liveries = IsSavegameVersionBefore(SLV_63) ? LS_END - 4 : (IsSavegameVersionBefore(SLV_85) ? LS_END - 2: LS_END); - bool update_in_use = IsSavegameVersionBefore(SLV_205); + bool update_in_use = IsSavegameVersionBefore(SLV_GROUP_LIVERIES); if (c != NULL) { for (i = 0; i < num_liveries; i++) { SlObject(&c->livery[i], _company_livery_desc); |