dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: don't compare next_station when trying to merge CargoPackets

Browse Source 
For vehicle packets they shouldn't be compared, and for station
packets they are already in a bucket per next_station.

(cherry picked from commit 1243c331b6)
This commit is contained in:
Patric Stout
2023-09-10 22:34:26 +02:00
committed by Jonathan G Rennison
parent 4ee51442d2
commit a38b072e4b
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cargopacket.h
View File

@@ -470,7 +470,6 @@ public:
{ {
return cp1->source_xy == cp2->source_xy && return cp1->source_xy == cp2->source_xy &&
cp1->periods_in_transit == cp2->periods_in_transit && cp1->periods_in_transit == cp2->periods_in_transit &&
cp1->next_station == cp2->next_station &&
cp1->source_type == cp2->source_type && cp1->source_type == cp2->source_type &&
cp1->source_id == cp2->source_id; cp1->source_id == cp2->source_id;
} }
@@ -605,7 +604,6 @@ public:
{ {
return cp1->source_xy == cp2->source_xy && return cp1->source_xy == cp2->source_xy &&
cp1->periods_in_transit == cp2->periods_in_transit && cp1->periods_in_transit == cp2->periods_in_transit &&
cp1->next_station == cp2->next_station &&
cp1->source_type == cp2->source_type && cp1->source_type == cp2->source_type &&
cp1->source_id == cp2->source_id; cp1->source_id == cp2->source_id;
} }