@@ -982,13 +982,13 @@ bool AfterLoadGame()
default:
break;
}
FOR_ALL_TRAINS(v) {
if (IsFrontEngine(v) || IsFreeWagon(v)) TrainConsistChanged(v, true);
if (v->IsFrontEngine() || IsFreeWagon(v)) TrainConsistChanged(v, true);
/* In version 16.1 of the savegame a company can decide if trains, which get
* replaced, shall keep their old length. In all prior versions, just default
@@ -1341,13 +1341,13 @@ bool AfterLoadGame()
if (CheckSavegameVersion(57)) {
Vehicle *v;
/* Added a FIFO queue of vehicles loading at stations */
FOR_ALL_VEHICLES(v) {
if ((v->type != VEH_TRAIN || IsFrontEngine(v)) && // for all locs
if ((v->type != VEH_TRAIN || Train::From(v)->IsFrontEngine()) && // for all locs
!(v->vehstatus & (VS_STOPPED | VS_CRASHED)) && // not stopped or crashed
v->current_order.IsType(OT_LOADING)) { // loading
Station::Get(v->last_station_visited)->loading_vehicles.push_back(v);
/* The loading finished flag is *only* set when actually completely
* finished. Because the vehicle is loading, it is not finished. */