From b1873526635efa1b6fb2e2ba636f0d3368a9389e Mon Sep 17 00:00:00 2001 From: rubidium Date: Fri, 11 Feb 2011 13:38:34 +0000 Subject: (svn r22058) -Fix (r22050): removing broken orders happened before the "front engine" conversion was done for road vehicles, so road vehicles didn't have orders anymore --- src/saveload/vehicle_sl.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'src/saveload/vehicle_sl.cpp') diff --git a/src/saveload/vehicle_sl.cpp b/src/saveload/vehicle_sl.cpp index 6b677fcf0..4529dc50a 100644 --- a/src/saveload/vehicle_sl.cpp +++ b/src/saveload/vehicle_sl.cpp @@ -289,12 +289,6 @@ void AfterLoadVehicles(bool part_of_load) } } } - - /* In some old savegames there might be some "crap" stored. */ - if (IsSavegameVersionBefore(160) && !v->IsPrimaryVehicle()) { - v->current_order.Free(); - v->unitnumber = 0; - } } } @@ -336,6 +330,16 @@ void AfterLoadVehicles(bool part_of_load) } } } + + if (IsSavegameVersionBefore(160)) { + /* In some old savegames there might be some "crap" stored. */ + FOR_ALL_VEHICLES(v) { + if (!v->IsPrimaryVehicle()) { + v->current_order.Free(); + v->unitnumber = 0; + } + } + } } CheckValidVehicles(); -- cgit v1.2.3-54-g00ecf