# HG changeset patch # User bjarni # Date 1156962902 0 # Node ID 3dcd95a378c02545eba93bc81a34f1ec10ae967b # Parent 8a18dfe6a9f320aa0c77b973410d5ef806981370 (svn r6240) -Code cleanup: in PlayerVehWndProc: replaced size_of_row with w->resize.step_height it was only used twice, so there was no reason to calculate it for each event diff -r 8a18dfe6a9f3 -r 3dcd95a378c0 vehicle_gui.c --- a/vehicle_gui.c Wed Aug 30 16:32:00 2006 +0000 +++ b/vehicle_gui.c Wed Aug 30 18:35:02 2006 +0000 @@ -1214,7 +1214,6 @@ { vehiclelist_d *vl = &WP(w, vehiclelist_d); const byte vehicle_type = GB(w->window_number, 11, 5); - const byte size_of_row = (vehicle_type == VEH_Aircraft || vehicle_type == VEH_Ship) ? PLY_WND_PRC__SIZE_OF_ROW_BIG : PLY_WND_PRC__SIZE_OF_ROW_SMALL; switch (e->event) { case WE_PAINT: { @@ -1372,7 +1371,7 @@ ShowDropDownMenu(w, _vehicle_sort_listing, vl->sort_type, 5, 0, 0); return; case 7: { /* Matrix to show vehicles */ - uint32 id_v = (e->click.pt.y - PLY_WND_PRC__OFFSET_TOP_WIDGET) / size_of_row; + uint32 id_v = (e->click.pt.y - PLY_WND_PRC__OFFSET_TOP_WIDGET) / w->resize.step_height; const Vehicle *v; if (id_v >= w->vscroll.cap) return; // click out of bounds @@ -1468,7 +1467,7 @@ case WE_RESIZE: /* Update the scroll + matrix */ if (vehicle_type == VEH_Train) w->hscroll.cap += e->sizing.diff.x; - w->vscroll.cap += e->sizing.diff.y / size_of_row; + w->vscroll.cap += e->sizing.diff.y / w->resize.step_height; w->widget[7].unkA = (w->vscroll.cap << 8) + 1; break; }