mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r13387) -Fix: industry directory sorting not working correctly (= != ==)

release/0.7
rubidium 2008-06-05 11:34:26 +00:00
parent 9e811a2f8b
commit 94718ae0de
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/industry_gui.cpp
View File

@ -806,13 +806,13 @@ protected:
static int CDECL IndustryTypeSorter(const Industry* const *a, const Industry* const *b) static int CDECL IndustryTypeSorter(const Industry* const *a, const Industry* const *b)
{ {
int r = (*a)->type - (*b)->type; int r = (*a)->type - (*b)->type;
return (r = 0) ? IndustryNameSorter(a, b) : r; return (r == 0) ? IndustryNameSorter(a, b) : r;
} }
/** Sort industries by production and name */ /** Sort industries by production and name */
static int CDECL IndustryProductionSorter(const Industry* const *a, const Industry* const *b) static int CDECL IndustryProductionSorter(const Industry* const *a, const Industry* const *b)
{ {
int r; int r = 0;
if ((*a)->produced_cargo[0] == CT_INVALID) { if ((*a)->produced_cargo[0] == CT_INVALID) {
if ((*b)->produced_cargo[0] != CT_INVALID) return -1; if ((*b)->produced_cargo[0] != CT_INVALID) return -1;
@ -823,14 +823,14 @@ protected:
((*b)->last_month_production[0] + (*b)->last_month_production[1]); ((*b)->last_month_production[0] + (*b)->last_month_production[1]);
} }
return (r = 0) ? IndustryNameSorter(a, b) : r; return (r == 0) ? IndustryNameSorter(a, b) : r;
} }
/** Sort industries by transported cargo and name */ /** Sort industries by transported cargo and name */
static int CDECL IndustryTransportedCargoSorter(const Industry* const *a, const Industry* const *b) static int CDECL IndustryTransportedCargoSorter(const Industry* const *a, const Industry* const *b)
{ {
int r = GetCargoTransportedSortValue(*a) - GetCargoTransportedSortValue(*b); int r = GetCargoTransportedSortValue(*a) - GetCargoTransportedSortValue(*b);
return (r = 0) ? IndustryNameSorter(a, b) : r; return (r == 0) ? IndustryNameSorter(a, b) : r;
} }
/** Sort the industries list */ /** Sort the industries list */