diff options
| author | rubidium <rubidium@openttd.org> | 2009-05-24 20:29:04 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-05-24 20:29:04 +0000 |
| commit | 0d99b6c71cd096599b4805d230483f3e4e958af1 (patch) | |
| tree | 463b69c3b2ea6f697506be055622229767dfebc4 /src/vehicle_gui.cpp | |
| parent | 36e71c8df6fe1f4c303d98b609bb9cdd0c4b7e75 (diff) | |
| download | openttd-0d99b6c71cd096599b4805d230483f3e4e958af1.tar.xz | |
(svn r16421) -Codechange: do not unnecessarily remove constness or unnecessarily add it.
Diffstat (limited to 'src/vehicle_gui.cpp')
| -rw-r--r-- | src/vehicle_gui.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index e2030df89..e1cc4aef0 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -641,8 +641,8 @@ static int CDECL VehicleLengthSorter(const Vehicle * const *a, const Vehicle * c case VEH_ROAD: { const RoadVehicle *u; - for (u = (RoadVehicle *)*a; u != NULL; u = u->Next()) r += u->rcache.cached_veh_length; - for (u = (RoadVehicle *)*b; u != NULL; u = u->Next()) r -= u->rcache.cached_veh_length; + 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; } break; default: NOT_REACHED(); @@ -1466,10 +1466,10 @@ struct VehicleDetailsWindow : Window { switch (v->type) { case VEH_TRAIN: SetDParam(2, v->GetDisplayMaxSpeed()); - SetDParam(1, ((Train *)v)->tcache.cached_power); - SetDParam(0, ((Train *)v)->tcache.cached_weight); - SetDParam(3, ((Train *)v)->tcache.cached_max_te / 1000); - DrawString(2, this->width - 2, 25, (_settings_game.vehicle.train_acceleration_model != TAM_ORIGINAL && ((Train *)v)->railtype != RAILTYPE_MAGLEV) ? + 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) ? STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE : STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED); break; @@ -1937,7 +1937,7 @@ struct VehicleViewWindow : Window { } else if (v->vehstatus & VS_STOPPED) { if (v->type == VEH_TRAIN) { if (v->cur_speed == 0) { - if (((Train *)v)->tcache.cached_power == 0) { + if (((const Train *)v)->tcache.cached_power == 0) { str = STR_TRAIN_NO_POWER; } else { str = STR_VEHICLE_STATUS_STOPPED; @@ -1949,7 +1949,7 @@ struct VehicleViewWindow : Window { } else { // no train str = STR_VEHICLE_STATUS_STOPPED; } - } else if (v->type == VEH_TRAIN && HasBit(((Train *)v)->flags, VRF_TRAIN_STUCK)) { + } else if (v->type == VEH_TRAIN && HasBit(((const Train *)v)->flags, VRF_TRAIN_STUCK)) { str = STR_TRAIN_STUCK; } else { // vehicle is in a "normal" state, show current order switch (v->current_order.GetType()) { |