gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-13 02:52:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r21564) -Fix: Avoid drawing road vehicles outside of their given space.

Browse Source
This commit is contained in:
terkhen 2010-12-21 13:56:07 +00:00
parent 759a596e0b
commit 5a124feb6d
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/roadveh_gui.cpp
View File

@ -135,22 +135,30 @@ void DrawRoadVehImage(const Vehicle *v, int left, int right, int y, VehicleID se
Direction dir = rtl ? DIR_E : DIR_W; Direction dir = rtl ? DIR_E : DIR_W;
const RoadVehicle *u = RoadVehicle::From(v); const RoadVehicle *u = RoadVehicle::From(v);
DrawPixelInfo tmp_dpi, *old_dpi;
int max_width = right - left + 1; int max_width = right - left + 1;
int spent_width = 0;
int pos = rtl ? right : left;
for (; u != NULL && spent_width < max_width; u = u->Next()) { if (!FillDrawPixelInfo(&tmp_dpi, left, y, max_width, 14)) return;
old_dpi = _cur_dpi;
_cur_dpi = &tmp_dpi;
int px = rtl ? max_width : 0;
for (; u != NULL && (rtl ? px > 0 : px < max_width); u = u->Next()) {
Point offset; Point offset;
int width = u->GetDisplayImageWidth(&offset); int width = u->GetDisplayImageWidth(&offset);
PaletteID pal = (u->vehstatus & VS_CRASHED) ? PALETTE_CRASH : GetVehiclePalette(u); if (rtl ? px + width > 0 : px - width < max_width) {
DrawSprite(u->GetImage(dir), pal, pos + (rtl ? -offset.x : offset.x), y + 6 + offset.y); PaletteID pal = (u->vehstatus & VS_CRASHED) ? PALETTE_CRASH : GetVehiclePalette(u);
DrawSprite(u->GetImage(dir), pal, px + (rtl ? -offset.x : offset.x), 6 + offset.y);
}
pos += rtl ? -width : width; px += rtl ? -width : width;
spent_width += width;
} }
if (v->index == selection) { if (v->index == selection) {
DrawFrameRect((rtl ? pos : left) - 1, y - 1, (rtl ? pos : right) - 1, y + 12, COLOUR_WHITE, FR_BORDERONLY); DrawFrameRect((rtl ? px : left) - 1, y - 1, (rtl ? px : right) - 1, y + 12, COLOUR_WHITE, FR_BORDERONLY);
} }
_cur_dpi = old_dpi;
} }