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

Fix: [NewGRF] For animation-triggers which do not supply a cargo-type in var18, the var18 bits should remain empty. (#14091)

Browse Source
This commit is contained in:
frosch
2025-04-26 14:44:07 +02:00
committed by GitHub
parent 0d9074769d
commit d3ae6bc9a8
4 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/newgrf_station.cpp
View File

@@ -923,13 +923,11 @@ void TriggerStationAnimation(BaseStation *st, TileIndex trigger_tile, StationAni
if (st->TileBelongsToRailStation(tile)) {
const StationSpec *ss = GetStationSpec(tile);
if (ss != nullptr && ss->animation.triggers.Test(trigger)) {
uint8_t local_cargo;
if (!IsValidCargoType(cargo_type)) {
local_cargo = UINT8_MAX;
} else {
local_cargo = ss->grf_prop.grffile->cargo_map[cargo_type];
uint8_t var18_extra = 0;
if (IsValidCargoType(cargo_type)) {
var18_extra |= ss->grf_prop.grffile->cargo_map[cargo_type] << 8;
}
StationAnimationBase::ChangeAnimationFrame(CBID_STATION_ANIMATION_TRIGGER, ss, st, tile, (random_bits << 16) | GB(Random(), 0, 16), to_underlying(trigger) | (local_cargo << 8));
StationAnimationBase::ChangeAnimationFrame(CBID_STATION_ANIMATION_TRIGGER, ss, st, tile, (random_bits << 16) | GB(Random(), 0, 16), to_underlying(trigger) | var18_extra);
}
}
}