mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r9417) -Fix (r1): Waiting cargo icons in the station view window were incorrectly drawn if the cargo list was scrolled, resulting in overlapping images

This commit is contained in:
peter1138 2007-03-23 20:51:42 +00:00
parent 2e32df30dd
commit 8353032129
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/station_gui.cpp
View File

@ -667,6 +667,21 @@ static const Widget _station_view_widgets[] = {
{ WIDGETS_END},
};
static void DrawCargoIcons(CargoID i, uint waiting, int x, int y)
{
uint num = min((waiting + 5) / 10, 23);
if (num == 0) return;
const CargoSpec *cs = GetCargo(i);
SpriteID sprite = cs->sprite;
do {
DrawSprite(sprite, PAL_NONE, x, y);
x += 10;
} while (--num);
}
static void DrawStationViewWindow(Window *w)
{
StationID station_id = w->window_number;
@ -713,18 +728,9 @@ static void DrawStationViewWindow(Window *w)
uint waiting = GB(st->goods[i].waiting_acceptance, 0, 12);
if (waiting == 0) continue;
num = (waiting + 5) / 10;
if (num != 0) {
int cur_x = x;
num = min(num, 23);
do {
DrawSprite(GetCargo(i)->sprite, PAL_NONE, cur_x, y);
cur_x += 10;
} while (--num);
}
if (st->goods[i].enroute_from == station_id) {
if (--pos < 0) {
DrawCargoIcons(i, waiting, x, y);
SetDParam(1, waiting);
SetDParam(0, i);
DrawStringRightAligned(x + 234, y, STR_0009, 0);
@ -733,6 +739,7 @@ static void DrawStationViewWindow(Window *w)
} else {
/* enroute */
if (--pos < 0) {
DrawCargoIcons(i, waiting, x, y);
SetDParam(1, waiting);
SetDParam(0, i);
DrawStringRightAligned(x + 234, y, STR_000A_EN_ROUTE_FROM, 0);