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

@@ @@ -221,12 +221,21 @@ static int CDECL TrainEnginePowerVsRunni @@
 	int vb = (rvi_b->running_cost_base * _price.running_rail[rvi_b->running_cost_class]) / max((uint16)1, rvi_b->power);
 	int r = vb - va;
 	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;
 	EngineID vb = *(const EngineID*)b;
 	int val_a = (RailVehInfo(va)->railveh_type == RAILVEH_WAGON ? 1 : 0);
 	int val_b = (RailVehInfo(vb)->railveh_type == RAILVEH_WAGON ? 1 : 0);
@@ @@ -287,13 +296,13 @@ static int CDECL AircraftEngineCargoSort @@
+	}
 	return _internal_sort_order ? -r : r;
+}
 static EngList_SortTypeFunction * const _sorter[][9] = {{
 	/* Trains */
-	&EngineNumberSorter,
+	&TrainEngineNumberSorter,
 	&TrainEngineCostSorter,
 	&TrainEngineSpeedSorter,
 	&TrainEnginePowerSorter,
 	&EngineIntroDateSorter,
 	&EngineNameSorter,
 	&TrainEngineRunningCostSorter,

0 comments (0 inline, 0 general)