From bf3d57e0e5713abf3e81dbd2e0376d94bc97502e Mon Sep 17 00:00:00 2001 From: bjarni Date: Fri, 6 Oct 2006 22:08:37 +0000 Subject: [PATCH] (svn r6673) -Codechange: [depot window] replaced a piece of code to calculate max number of vehicles in a row with a simple read of the matrix grid --- depot_gui.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/depot_gui.c b/depot_gui.c index 3acdd28862..0fc2c09204 100644 --- a/depot_gui.c +++ b/depot_gui.c @@ -393,6 +393,7 @@ static int GetVehicleFromDepotWndPt(const Window *w, int x, int y, Vehicle **veh Vehicle **vl = WP(w, depot_d).vehicle_list; uint xt, row, xm = 0, ym = 0; int pos, skip = 0; + uint16 boxes_in_each_row = w->widget[DEPOT_WIDGET_MATRIX].data & 0xFF; if (WP(w, depot_d).type == VEH_Train) { xt = 0; @@ -408,7 +409,7 @@ static int GetVehicleFromDepotWndPt(const Window *w, int x, int y, Vehicle **veh row = (y - 14) / w->resize.step_height; if (row >= w->vscroll.cap) return MODE_ERROR; - pos = (row + w->vscroll.pos) * (WP(w, depot_d).type == VEH_Train ? 1 : w->hscroll.cap) + xt; + pos = ((row + w->vscroll.pos) * boxes_in_each_row) + xt; if (WP(w, depot_d).engine_count + WP(w, depot_d).wagon_count <= pos) { if (WP(w, depot_d).type == VEH_Train) {