diff options
Diffstat (limited to 'ship_gui.c')
| -rw-r--r-- | ship_gui.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ship_gui.c b/ship_gui.c index 9c953e9f1..0e786aa93 100644 --- a/ship_gui.c +++ b/ship_gui.c @@ -12,6 +12,7 @@ #include "command.h" #include "player.h" #include "engine.h" +#include "depot.h" void Set_DPARAM_Ship_Build_Window(uint16 engine_number) { @@ -518,8 +519,8 @@ static void ShipViewWndProc(Window *w, WindowEvent *e) { } break; case OT_GOTO_DEPOT: { - Depot *dep = &_depots[v->current_order.station]; - SetDParam(0, dep->town_index); + Depot *depot = GetDepot(v->current_order.station); + SetDParam(0, depot->town_index); SetDParam(1, v->cur_speed * 10 >> 5); str = STR_HEADING_FOR_SHIP_DEPOT + _patches.vehicle_speed; } break; @@ -627,7 +628,7 @@ static void DrawShipDepotWindow(Window *w) uint tile; Vehicle *v; int num,x,y; - Depot *d; + Depot *depot; tile = w->window_number; @@ -644,11 +645,10 @@ static void DrawShipDepotWindow(Window *w) SetVScrollCount(w, (num + w->hscroll.cap - 1) / w->hscroll.cap); /* locate the depot struct */ - for (d = _depots; d->xy != (TileIndex)tile; d++) { - assert(d < endof(_depots)); - } + depot = GetDepotByTile(tile); + assert(depot != NULL); - SetDParam(0, d->town_index); + SetDParam(0, depot->town_index); DrawWindowWidgets(w); x = 2; |