diff options
author | terkhen <terkhen@openttd.org> | 2011-01-29 17:30:25 +0000 |
---|---|---|
committer | terkhen <terkhen@openttd.org> | 2011-01-29 17:30:25 +0000 |
commit | 734994c9ba642f5c75b709d4b44e0c4b993a949a (patch) | |
tree | f7f6264f438d4707aaa7e4bfe4c2a223a0c4abba /src/vehicle_gui.cpp | |
parent | 50b0e1002621720c6b2cd4b8e20856b86da0b61d (diff) | |
download | openttd-734994c9ba642f5c75b709d4b44e0c4b993a949a.tar.xz |
(svn r21924) -Codechange: Unify some parts of the articulated vehicle code.
-Cleanup: Avoid conversions to Train and RoadVehicle that are no longer required.
Diffstat (limited to 'src/vehicle_gui.cpp')
-rw-r--r-- | src/vehicle_gui.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index 9c94fea4b..e16b8deee 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -1785,7 +1785,7 @@ struct VehicleDetailsWindow : Window { uint GetRoadVehDetailsHeight(const Vehicle *v) { uint desired_height; - if (RoadVehicle::From(v)->HasArticulatedPart()) { + if (v->HasArticulatedPart()) { /* An articulated RV has its text drawn under the sprite instead of after it, hence 15 pixels extra. */ desired_height = WD_FRAMERECT_TOP + 15 + 3 * FONT_HEIGHT_NORMAL + 2 + WD_FRAMERECT_BOTTOM; /* Add space for the cargo amount for each part. */ @@ -1962,7 +1962,7 @@ struct VehicleDetailsWindow : Window { uint text_right = r.right - (rtl ? sprite_width : 0); /* Articulated road vehicles use a complete line. */ - if (v->type == VEH_ROAD && RoadVehicle::From(v)->HasArticulatedPart()) { + if (v->type == VEH_ROAD && v->HasArticulatedPart()) { DrawVehicleImage(v, r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, r.top + WD_FRAMERECT_TOP, INVALID_VEHICLE, 0); } else { uint sprite_left = rtl ? text_right : r.left; |