From 50996e799bc0a2abaca04eb5e4d81dc2fef4a2a7 Mon Sep 17 00:00:00 2001 From: rubidium Date: Thu, 10 Feb 2011 18:28:25 +0000 Subject: (svn r22050) -Fix-ish [FS#4496]: in ancient savegames, e.g. TTO savegames, non primary vehicles (wagons and such) could have unitnumbers or even orders. However, these orders would not be updated when a station is removed. As such some savegames have wagons with current orders to invalid stations which triggers trouble in the load conversion. So, trash any orders/unitnumbers a non-primary vehicle has. --- src/saveload/vehicle_sl.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/saveload/vehicle_sl.cpp b/src/saveload/vehicle_sl.cpp index f264c3d10..6b677fcf0 100644 --- a/src/saveload/vehicle_sl.cpp +++ b/src/saveload/vehicle_sl.cpp @@ -289,6 +289,12 @@ 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; + } } } -- cgit v1.2.3-54-g00ecf