equal
deleted
inserted
replaced
2270 Vehicle *v; |
2270 Vehicle *v; |
2271 FOR_ALL_VEHICLES(v) { |
2271 FOR_ALL_VEHICLES(v) { |
2272 if (v->orders != NULL && !v->orders->IsValid()) v->orders = NULL; |
2272 if (v->orders != NULL && !v->orders->IsValid()) v->orders = NULL; |
2273 |
2273 |
2274 v->current_order.ConvertFromOldSavegame(); |
2274 v->current_order.ConvertFromOldSavegame(); |
2275 if (v->type == VEH_ROAD && v->IsPrimaryVehicle() && v->prev_shared == NULL) { |
2275 if (v->type == VEH_ROAD && v->IsPrimaryVehicle() && v->FirstShared() == v) { |
2276 FOR_VEHICLE_ORDERS(v, order) order->SetNonStopType(ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS); |
2276 FOR_VEHICLE_ORDERS(v, order) order->SetNonStopType(ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS); |
2277 } |
2277 } |
2278 } |
2278 } |
2279 } else if (CheckSavegameVersion(94)) { |
2279 } else if (CheckSavegameVersion(94)) { |
2280 /* Unload and transfer are now mutual exclusive. */ |
2280 /* Unload and transfer are now mutual exclusive. */ |