(svn r19642) -Add: Sort cargos alphabetically at the "Reffitable to" label in the

build vehicle window.

1 files changed, 4 insertions, 3 deletions

diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index 067c5a688..ebb0ff47d 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -572,15 +572,16 @@ uint ShowRefitOptionsList(int left, int right, int y, EngineID engine)
 		bool first = true;
 
 		/* Add each cargo type to the list */
-		for (CargoID cid = 0; cid < NUM_CARGO; cid++) {
-			if (!HasBit(cmask, cid)) continue;
+		const CargoSpec *cs;
+		FOR_ALL_SORTED_CARGOSPECS(cs) {
+			if (!HasBit(cmask, cs->Index())) continue;
 
 			if (b >= lastof(string) - (2 + 2 * 4)) break; // ", " and two calls to Utf8Encode()
 
 			if (!first) b = strecpy(b, ", ", lastof(string));
 			first = false;
 
-			b = InlineString(b, CargoSpec::Get(cid)->name);
+			b = InlineString(b, cs->name);
 		}
 	}