cpp/openttd-patchpack/source Changeset - r6023:c78cfe30dfd3

Changeset - r6023:c78cfe30dfd3

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

bjarni - 17 years ago 2007-02-15 17:51:39
bjarni@openttd.org

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

1 file changed with 10 insertions and 1 deletions:

src/build_vehicle_gui.cpp

0 comments (0 inline, 0 general)

src/build_vehicle_gui.cpp

➞

Show inline comments

@@ @@ -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,

0 comments (0 inline, 0 general)