cpp/openttd-patchpack/source Changeset - r25757:4e1bad193015

Changeset - r25757:4e1bad193015

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

Patric Stout - 3 years ago 2021-06-19 09:18:30
truebrain@openttd.org

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.

1 file changed with 2 insertions and 2 deletions:

src/saveload/company_sl.cpp

0 comments (0 inline, 0 general)

src/saveload/company_sl.cpp

➞

Show inline comments

@@ @@ -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];

0 comments (0 inline, 0 general)