From ba0a5814c2f36f6dca68d094882e5240b7635b74 Mon Sep 17 00:00:00 2001 From: rubidium Date: Thu, 10 Apr 2008 17:23:51 +0000 Subject: (svn r12652) -Codechange: rework the order GUI a little more to make it a little more clear that 'transfer' is just an unload type. --- src/openttd.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'src/openttd.cpp') diff --git a/src/openttd.cpp b/src/openttd.cpp index 52fed7da1..25798c486 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -2452,6 +2452,23 @@ bool AfterLoadGame() Vehicle *v; FOR_ALL_VEHICLES(v) v->current_order.ConvertFromOldSavegame(); + } else if (CheckSavegameVersion(94)) { + /* Unload and transfer are now mutual exclusive. */ + Order *order; + FOR_ALL_ORDERS(order) { + if ((order->GetUnloadType() & (OUFB_UNLOAD | OUFB_TRANSFER)) == (OUFB_UNLOAD | OUFB_TRANSFER)) { + order->SetUnloadType(OUFB_TRANSFER); + order->SetLoadType(OLFB_NO_LOAD); + } + } + + Vehicle *v; + FOR_ALL_VEHICLES(v) { + if ((v->current_order.GetUnloadType() & (OUFB_UNLOAD | OUFB_TRANSFER)) == (OUFB_UNLOAD | OUFB_TRANSFER)) { + v->current_order.SetUnloadType(OUFB_TRANSFER); + v->current_order.SetLoadType(OLFB_NO_LOAD); + } + } } return InitializeWindowsAndCaches(); -- cgit v1.2.3-70-g09d2