mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-16 11:09:11 +00:00
Code Issues Activity

Fix 952d111: Houses and industry tiles could accept incorrect cargo. (#12547)

Browse Source 
Default cargo label was not cleared (set to CT_INVALID) when using older 3-slot acceptance properties for house and industry tiles.

Missed in #12053 and #12062.
This commit is contained in:
Peter Nelson
2024-04-21 19:46:05 +01:00
committed by Peter Nelson
parent aece877960
commit 17ae92c50d
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/newgrf.cpp
View File

@@ -2563,6 +2563,7 @@ static ChangeInfoResult TownHouseChangeInfo(uint hid, int numinfo, int prop, Byt
} else { } else {
housespec->accepts_cargo[j] = cargo; housespec->accepts_cargo[j] = cargo;
} }
housespec->accepts_cargo_label[j] = CT_INVALID;
} }
break; break;
} }
@@ -3299,6 +3300,7 @@ static ChangeInfoResult IndustrytilesChangeInfo(uint indtid, int numinfo, int pr
uint16_t acctp = buf->ReadWord(); uint16_t acctp = buf->ReadWord();
tsp->accepts_cargo[prop - 0x0A] = GetCargoTranslation(GB(acctp, 0, 8), _cur.grffile); tsp->accepts_cargo[prop - 0x0A] = GetCargoTranslation(GB(acctp, 0, 8), _cur.grffile);
tsp->acceptance[prop - 0x0A] = Clamp(GB(acctp, 8, 8), 0, 16); tsp->acceptance[prop - 0x0A] = Clamp(GB(acctp, 8, 8), 0, 16);
tsp->accepts_cargo_label[prop - 0x0A] = CT_INVALID;
break; break;
} }