Mercurial > hg > openttd

changeset 9467:8d16f4152b1b draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r13387) -Fix: industry directory sorting not working correctly (= != ==)
author rubidium <rubidium@openttd.org>
date Thu, 05 Jun 2008 11:34:26 +0000
parents f81fe8c0065a
children 07d40eb8252e
files src/industry_gui.cpp
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/industry_gui.cpp
+++ b/src/industry_gui.cpp
@@ -806,13 +806,13 @@
 	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 @@
 			    ((*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 */