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

Fix cargo mask truncation in CargoMaskValueFilter and LinkRefresher::RefreshLinks

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-11-01 22:10:03 +00:00
parent f54d69a60a
commit e1e7b67270
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/linkgraph/refresh.cpp
View File

@@ -345,7 +345,7 @@ void LinkRefresher::RefreshLinks(const Order *cur, const Order *next, uint8 flag
} }
if (cur->IsType(OT_GOTO_STATION) || cur->IsType(OT_IMPLICIT)) { if (cur->IsType(OT_GOTO_STATION) || cur->IsType(OT_IMPLICIT)) {
if (cur->CanLeaveWithCargo(HasBit(flags, HAS_CARGO), FindFirstBit(this->cargo_mask))) { if (cur->CanLeaveWithCargo(HasBit(flags, HAS_CARGO), FindFirstBit64(this->cargo_mask))) {
SetBit(flags, HAS_CARGO); SetBit(flags, HAS_CARGO);
this->RefreshStats(cur, next); this->RefreshStats(cur, next);
} else { } else {

2
src/order_base.h
View File

@@ -577,7 +577,7 @@ template <typename F> CargoTypes FilterCargoMask(F filter_func, CargoTypes cargo
template <typename T, typename F> T CargoMaskValueFilter(CargoTypes &cargo_mask, F filter_func) template <typename T, typename F> T CargoMaskValueFilter(CargoTypes &cargo_mask, F filter_func)
{ {
CargoID first_cargo_id = FindFirstBit(cargo_mask); CargoID first_cargo_id = FindFirstBit64(cargo_mask);
T value = filter_func(first_cargo_id); T value = filter_func(first_cargo_id);
CargoTypes other_cargo_mask = cargo_mask; CargoTypes other_cargo_mask = cargo_mask;
ClrBit(other_cargo_mask, first_cargo_id); ClrBit(other_cargo_mask, first_cargo_id);