# HG changeset patch
# User bjarni <bjarni@openttd.org>
# Date 2007-02-15 17:51:39
# Node ID c78cfe30dfd3167145102659483310a95d8286f3
# Parent  0dc54a2fcc2d317aca07d557e485ee872d8656fc

(svn r8746) -Regression r8331: build train window could sort incorrectly by EngineID with certain newGRF sets

diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp
--- a/src/build_vehicle_gui.cpp
+++ b/src/build_vehicle_gui.cpp
@@ -224,6 +224,15 @@ static int CDECL TrainEnginePowerVsRunni
 	return _internal_sort_order ? -r : r;
 }
 
+static int CDECL TrainEngineNumberSorter(const void *a, const void *b)
+{
+	const EngineID va = *(const EngineID*)a;
+	const EngineID vb = *(const EngineID*)b;
+	int r = ListPositionOfEngine(va) - ListPositionOfEngine(vb);
+
+	return _internal_sort_order ? -r : r;
+}
+
 static int CDECL TrainEnginesThenWagonsSorter(const void *a, const void *b)
 {
 	EngineID va = *(const EngineID*)a;
@@ -290,7 +299,7 @@ static int CDECL AircraftEngineCargoSort
 
 static EngList_SortTypeFunction * const _sorter[][9] = {{
 	/* Trains */
-	&EngineNumberSorter,
+	&TrainEngineNumberSorter,
 	&TrainEngineCostSorter,
 	&TrainEngineSpeedSorter,
 	&TrainEnginePowerSorter,