diff options
author | rubidium <rubidium@openttd.org> | 2009-05-22 22:55:41 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2009-05-22 22:55:41 +0000 |
commit | da5661a0c8870c532c393ec3d330c3fbb44eb8ac (patch) | |
tree | 93b9332d7e83e012a46777e2baf91bf323ea9fe9 /src/vehicle_gui.cpp | |
parent | c4b627af422075ce4a0e1026c52f871dd3f146c0 (diff) | |
download | openttd-da5661a0c8870c532c393ec3d330c3fbb44eb8ac.tar.xz |
(svn r16393) -Codechange: move VehicleRail to Train.
Diffstat (limited to 'src/vehicle_gui.cpp')
-rw-r--r-- | src/vehicle_gui.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index 9bee78ce0..2cd83a57d 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -603,7 +603,7 @@ static int CDECL VehicleMaxSpeedSorter(const Vehicle * const *a, const Vehicle * { int r = 0; if ((*a)->type == VEH_TRAIN && (*b)->type == VEH_TRAIN) { - r = (*a)->u.rail.cached_max_speed - (*b)->u.rail.cached_max_speed; + r = ((const Train *)(*a))->tcache.cached_max_speed - ((const Train *)(*b))->tcache.cached_max_speed; } else { r = (*a)->max_speed - (*b)->max_speed; } @@ -636,7 +636,7 @@ static int CDECL VehicleLengthSorter(const Vehicle * const *a, const Vehicle * c int r = 0; switch ((*a)->type) { case VEH_TRAIN: - r = (*a)->u.rail.cached_total_length - (*b)->u.rail.cached_total_length; + r = ((const Train *)(*a))->tcache.cached_total_length - ((const Train *)(*b))->tcache.cached_total_length; break; case VEH_ROAD: { @@ -1466,9 +1466,9 @@ struct VehicleDetailsWindow : Window { switch (v->type) { case VEH_TRAIN: SetDParam(2, v->GetDisplayMaxSpeed()); - SetDParam(1, v->u.rail.cached_power); - SetDParam(0, v->u.rail.cached_weight); - SetDParam(3, v->u.rail.cached_max_te / 1000); + 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) ? STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE : STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED); @@ -1937,7 +1937,7 @@ struct VehicleViewWindow : Window { } else if (v->vehstatus & VS_STOPPED) { if (v->type == VEH_TRAIN) { if (v->cur_speed == 0) { - if (v->u.rail.cached_power == 0) { + if (((Train *)v)->tcache.cached_power == 0) { str = STR_TRAIN_NO_POWER; } else { str = STR_VEHICLE_STATUS_STOPPED; |