(svn r16527) -Codechange: use static member functions instead of simple casts when converting Vehicle to specialised vehicle types. Includes safety check
This commit is contained in:
@@ -80,7 +80,7 @@ void DrawTrainImage(const Vehicle *v, int x, int y, VehicleID selection, int cou
|
||||
_cur_dpi = &tmp_dpi;
|
||||
|
||||
do {
|
||||
int width = ((const Train *)v)->tcache.cached_veh_length;
|
||||
int width = Train::From(v)->tcache.cached_veh_length;
|
||||
|
||||
if (dx + width > 0) {
|
||||
if (dx <= count) {
|
||||
@@ -236,7 +236,7 @@ void DrawTrainDetails(const Vehicle *v, int left, int right, int y, int vscroll_
|
||||
do {
|
||||
SpriteID pal = (v->vehstatus & VS_CRASHED) ? PALETTE_CRASH : GetVehiclePalette(v);
|
||||
DrawSprite(u->GetImage(DIR_W), pal, x + WagonLengthToPixels(4 + dx), y + 6 + (is_custom_sprite(RailVehInfo(u->engine_type)->image_index) ? _traininfo_vehicle_pitch : 0));
|
||||
dx += ((const Train *)u)->tcache.cached_veh_length;
|
||||
dx += Train::From(u)->tcache.cached_veh_length;
|
||||
u = u->Next();
|
||||
} while (u != NULL && IsArticulatedPart(u) && u->cargo_cap == 0);
|
||||
|
||||
|
Reference in New Issue
Block a user