(svn r1798) GetFoo(i)->index is per definition i, so replace the former with the latter

This commit is contained in:
tron 2005-02-04 20:40:04 +00:00
parent 981b6c1ecd
commit 6379304126
5 changed files with 5 additions and 5 deletions

View File

@ -1012,7 +1012,7 @@ static void PlayerAircraftWndProc(Window *w, WindowEvent *e)
w->widget[1].unkA = STR_A009_AIRCRAFT; w->widget[1].unkA = STR_A009_AIRCRAFT;
} else { } else {
/* Station Name -- (###) Aircraft */ /* Station Name -- (###) Aircraft */
SetDParam(0, GetStation(station)->index); SetDParam(0, station);
SetDParam(1, w->vscroll.count); SetDParam(1, w->vscroll.count);
w->widget[1].unkA = STR_SCHEDULED_AIRCRAFT; w->widget[1].unkA = STR_SCHEDULED_AIRCRAFT;
} }

View File

@ -799,7 +799,7 @@ static void PlayerRoadVehWndProc(Window *w, WindowEvent *e)
w->widget[1].unkA = STR_9001_ROAD_VEHICLES; w->widget[1].unkA = STR_9001_ROAD_VEHICLES;
} else { } else {
/* Station Name -- (###) Road vehicles */ /* Station Name -- (###) Road vehicles */
SetDParam(0, GetStation(station)->index); SetDParam(0, station);
SetDParam(1, w->vscroll.count); SetDParam(1, w->vscroll.count);
w->widget[1].unkA = STR_SCHEDULED_ROAD_VEHICLES; w->widget[1].unkA = STR_SCHEDULED_ROAD_VEHICLES;
} }

View File

@ -956,7 +956,7 @@ static void PlayerShipsWndProc(Window *w, WindowEvent *e)
w->widget[1].unkA = STR_9805_SHIPS; w->widget[1].unkA = STR_9805_SHIPS;
} else { } else {
/* Station Name -- (###) Trains */ /* Station Name -- (###) Trains */
SetDParam(0, GetStation(station)->index); SetDParam(0, station);
SetDParam(1, w->vscroll.count); SetDParam(1, w->vscroll.count);
w->widget[1].unkA = STR_SCHEDULED_SHIPS; w->widget[1].unkA = STR_SCHEDULED_SHIPS;
} }

View File

@ -1298,7 +1298,7 @@ static void PlayerTrainsWndProc(Window *w, WindowEvent *e)
w->widget[1].unkA = STR_881B_TRAINS; w->widget[1].unkA = STR_881B_TRAINS;
} else { } else {
/* Station Name -- (###) Trains */ /* Station Name -- (###) Trains */
SetDParam(0, GetStation(station)->index); SetDParam(0, station);
SetDParam(1, w->vscroll.count); SetDParam(1, w->vscroll.count);
w->widget[1].unkA = STR_SCHEDULED_TRAINS; w->widget[1].unkA = STR_SCHEDULED_TRAINS;
} }

View File

@ -176,7 +176,7 @@ int CDECL GeneralOwnerSorter(const void *a, const void *b)
*/ */
int CDECL VehicleUnsortedSorter(const void *a, const void *b) int CDECL VehicleUnsortedSorter(const void *a, const void *b)
{ {
return GetVehicle((*(const SortStruct*)a).index)->index - GetVehicle((*(const SortStruct*)b).index)->index; return ((const SortStruct*)a)->index - ((const SortStruct*)b)->index;
} }
// if the sorting criteria had the same value, sort vehicle by unitnumber // if the sorting criteria had the same value, sort vehicle by unitnumber