diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -603,7 +603,7 @@ static int CDECL VehicleMaxSpeedSorter(c { int r = 0; if ((*a)->type == VEH_TRAIN && (*b)->type == VEH_TRAIN) { - r = ((const Train *)(*a))->tcache.cached_max_speed - ((const Train *)(*b))->tcache.cached_max_speed; + r = Train::From(*a)->tcache.cached_max_speed - Train::From(*b)->tcache.cached_max_speed; } else { r = (*a)->max_speed - (*b)->max_speed; } @@ -636,13 +636,13 @@ static int CDECL VehicleLengthSorter(con int r = 0; switch ((*a)->type) { case VEH_TRAIN: - r = ((const Train *)(*a))->tcache.cached_total_length - ((const Train *)(*b))->tcache.cached_total_length; + r = Train::From(*a)->tcache.cached_total_length - Train::From(*b)->tcache.cached_total_length; break; case VEH_ROAD: { const RoadVehicle *u; - for (u = (const RoadVehicle *)*a; u != NULL; u = u->Next()) r += u->rcache.cached_veh_length; - for (u = (const RoadVehicle *)*b; u != NULL; u = u->Next()) r -= u->rcache.cached_veh_length; + for (u = RoadVehicle::From(*a); u != NULL; u = u->Next()) r += u->rcache.cached_veh_length; + for (u = RoadVehicle::From(*b); u != NULL; u = u->Next()) r -= u->rcache.cached_veh_length; } break; default: NOT_REACHED(); @@ -1471,10 +1471,10 @@ struct VehicleDetailsWindow : Window { switch (v->type) { case VEH_TRAIN: SetDParam(2, v->GetDisplayMaxSpeed()); - SetDParam(1, ((const Train *)v)->tcache.cached_power); - SetDParam(0, ((const Train *)v)->tcache.cached_weight); - SetDParam(3, ((const Train *)v)->tcache.cached_max_te / 1000); - DrawString(2, this->width - 2, 25, (_settings_game.vehicle.train_acceleration_model != TAM_ORIGINAL && ((const Train *)v)->railtype != RAILTYPE_MAGLEV) ? + SetDParam(1, Train::From(v)->tcache.cached_power); + SetDParam(0, Train::From(v)->tcache.cached_weight); + SetDParam(3, Train::From(v)->tcache.cached_max_te / 1000); + DrawString(2, this->width - 2, 25, (_settings_game.vehicle.train_acceleration_model != TAM_ORIGINAL && Train::From(v)->railtype != RAILTYPE_MAGLEV) ? STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE : STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED); break; @@ -1943,7 +1943,7 @@ struct VehicleViewWindow : Window { } else if (v->vehstatus & VS_STOPPED) { if (v->type == VEH_TRAIN) { if (v->cur_speed == 0) { - if (((const Train *)v)->tcache.cached_power == 0) { + if (Train::From(v)->tcache.cached_power == 0) { str = STR_TRAIN_NO_POWER; } else { str = STR_VEHICLE_STATUS_STOPPED; @@ -1955,7 +1955,7 @@ struct VehicleViewWindow : Window { } else { // no train str = STR_VEHICLE_STATUS_STOPPED; } - } else if (v->type == VEH_TRAIN && HasBit(((const Train *)v)->flags, VRF_TRAIN_STUCK)) { + } else if (v->type == VEH_TRAIN && HasBit(Train::From(v)->flags, VRF_TRAIN_STUCK)) { str = STR_TRAIN_STUCK; } else { // vehicle is in a "normal" state, show current order switch (v->current_order.GetType()) {