miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: NewGRF vehicles display loading sprites when not actually loading or unloading (#13554)

Browse Source
This commit is contained in:
enveeed
2025-03-15 21:58:47 +01:00
committed by GitHub
parent 2fed4b0059
commit b0cc56a8b5
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/order_cmd.cpp
View File

@@ -197,7 +197,7 @@ bool Order::Equals(const Order &other) const
uint16_t Order::MapOldOrder() const
{
uint16_t order = this->GetType();
switch (this->type) {
switch (this->GetType()) {
case OT_GOTO_STATION:
if (this->GetUnloadType() & OUFB_UNLOAD) SetBit(order, 5);
if (this->GetLoadType() & OLFB_FULL_LOAD) SetBit(order, 6);
@@ -211,6 +211,12 @@ uint16_t Order::MapOldOrder() const
break;
case OT_LOADING:
if (this->GetLoadType() & OLFB_FULL_LOAD) SetBit(order, 6);
/* If both "no load" and "no unload" are set, return nothing order instead */
if ((this->GetLoadType() & OLFB_NO_LOAD) && (this->GetUnloadType() & OUFB_NO_UNLOAD)) {
order = OT_NOTHING;
}
break;
default:
break;
}
return order;