From 9532c873c12b6d8f3c2715707d76b764251af2df Mon Sep 17 00:00:00 2001 From: bjarni Date: Mon, 11 Sep 2006 20:38:35 +0000 Subject: [PATCH] (svn r6442) -Fix: ship depots windows now only draws the ships inside the depot instead of all ships in the depot tile This bug was visible when a ship left. The window redraw was called, but it still saw the ship since it didn't leave the tile yet and it left a ghost in the depot window --- ship_gui.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ship_gui.c b/ship_gui.c index 0a0914e81e..75374c3c7d 100644 --- a/ship_gui.c +++ b/ship_gui.c @@ -620,7 +620,7 @@ static void DrawShipDepotWindow(Window *w) /* determine amount of items for scroller */ num = 0; FOR_ALL_VEHICLES(v) { - if (v->type == VEH_Ship && (v) && v->tile == tile) num++; + if (v->type == VEH_Ship && IsShipInDepot(v) && v->tile == tile) num++; } SetVScrollCount(w, (num + w->hscroll.cap - 1) / w->hscroll.cap); @@ -636,7 +636,7 @@ static void DrawShipDepotWindow(Window *w) num = w->vscroll.pos * w->hscroll.cap; FOR_ALL_VEHICLES(v) { - if (v->type == VEH_Ship && (v) && v->tile == tile && + if (v->type == VEH_Ship && IsShipInDepot(v) && v->tile == tile && --num < 0 && num >= -w->vscroll.cap * w->hscroll.cap) { DrawShipImage(v, x+19, y, WP(w,traindepot_d).sel);