(svn r13617) -Codechange: calculate the diff in StationWaitingSorter directly
authorskidd13
Mon, 23 Jun 2008 22:51:21 +0000
changeset 11060 88faea407e28
parent 11055 4a2809a022b5
child 11061 f5806d84e7a9
(svn r13617) -Codechange: calculate the diff in StationWaitingSorter directly
src/station_gui.cpp
--- a/src/station_gui.cpp	Mon Jun 23 08:49:09 2008 +0000
+++ b/src/station_gui.cpp	Mon Jun 23 22:51:21 2008 +0000
@@ -168,16 +168,15 @@
 	/** Sort stations by their waiting cargo */
 	static int CDECL StationWaitingSorter(const Station* const *a, const Station* const *b)
 	{
-		Money sum1 = 0;
-		Money sum2 = 0;
+		Money diff = 0;
 
 		for (CargoID j = 0; j < NUM_CARGO; j++) {
 			if (!HasBit(cargo_filter, j)) continue;
-			if (!(*a)->goods[j].cargo.Empty()) sum1 += GetTransportedGoodsIncome((*a)->goods[j].cargo.Count(), 20, 50, j);
-			if (!(*b)->goods[j].cargo.Empty()) sum2 += GetTransportedGoodsIncome((*b)->goods[j].cargo.Count(), 20, 50, j);
+			if (!(*a)->goods[j].cargo.Empty()) diff += GetTransportedGoodsIncome((*a)->goods[j].cargo.Count(), 20, 50, j);
+			if (!(*b)->goods[j].cargo.Empty()) diff -= GetTransportedGoodsIncome((*b)->goods[j].cargo.Count(), 20, 50, j);
 		}
 
-		return ClampToI32(sum1 - sum2);
+		return ClampToI32(diff);
 	}
 
 	/** Sort stations by their rating */