From 5990a92bcaf34eff860099b8ba53585dc4071e8c Mon Sep 17 00:00:00 2001 From: rubidium Date: Thu, 5 Jun 2008 11:34:26 +0000 Subject: (svn r13387) -Fix: industry directory sorting not working correctly (= != ==) --- src/industry_gui.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp index 1ad50439e..d1e16ada7 100644 --- a/src/industry_gui.cpp +++ b/src/industry_gui.cpp @@ -806,13 +806,13 @@ protected: static int CDECL IndustryTypeSorter(const Industry* const *a, const Industry* const *b) { 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 */ 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 ((*b)->produced_cargo[0] != CT_INVALID) return -1; @@ -823,14 +823,14 @@ protected: ((*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 */ static int CDECL IndustryTransportedCargoSorter(const Industry* const *a, const Industry* const *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 */ -- cgit v1.2.3-54-g00ecf