(svn r14096) -Codechange: merge the shared order's vehicle list management to a single location.

2008-08-17 19:56:17 +00:00
parent ca3f1f6406
commit abd9f74871
9 changed files with 118 additions and 113 deletions
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -2272,7 +2272,7 @@ bool AfterLoadGame()
 			if (v->orders != NULL && !v->orders->IsValid()) v->orders = NULL;

 			v->current_order.ConvertFromOldSavegame();
-			if (v->type == VEH_ROAD && v->IsPrimaryVehicle() && v->prev_shared == NULL) {
+			if (v->type == VEH_ROAD && v->IsPrimaryVehicle() && v->FirstShared() == v) {
 				FOR_VEHICLE_ORDERS(v, order) order->SetNonStopType(ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS);
 			}
 		}