# HG changeset patch # User Patric Stout # Date 2021-06-19 09:18:30 # Node ID 4e1bad193015bd50c6a704bd37c386befb7db1b5 # Parent de2f5a4c7565814d7a752ff932b5d79db2a306e0 Codechange: make savegame-version checks more obvious in SlCompanyLiveries::Load num_liveries indirectly contained the same information, but this makes reading these things pretty difficult. So use IsSavegameVersionBefore() like everywhere else instead. diff --git a/src/saveload/company_sl.cpp b/src/saveload/company_sl.cpp --- a/src/saveload/company_sl.cpp +++ b/src/saveload/company_sl.cpp @@ -423,14 +423,14 @@ public: } } - if (num_liveries < LS_END) { + if (IsSavegameVersionBefore(SLV_85)) { /* We want to insert some liveries somewhere in between. This means some have to be moved. */ memmove(&c->livery[LS_FREIGHT_WAGON], &c->livery[LS_PASSENGER_WAGON_MONORAIL], (LS_END - LS_FREIGHT_WAGON) * sizeof(c->livery[0])); c->livery[LS_PASSENGER_WAGON_MONORAIL] = c->livery[LS_MONORAIL]; c->livery[LS_PASSENGER_WAGON_MAGLEV] = c->livery[LS_MAGLEV]; } - if (num_liveries == LS_END - 4) { + if (IsSavegameVersionBefore(SLV_63)) { /* Copy bus/truck liveries over to trams */ c->livery[LS_PASSENGER_TRAM] = c->livery[LS_BUS]; c->livery[LS_FREIGHT_TRAM] = c->livery[LS_TRUCK];