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

Fix 81a67b5b: Fix fake house case not being handled in GetHouseCallback

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-02-25 21:31:10 +00:00
parent f2bc12bb21
commit b9eaef9fe1
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/newgrf_house.cpp
View File

@@ -511,9 +511,14 @@ static uint32 GetDistanceFromNearbyHouse(uint8 parameter, TileIndex tile, HouseI
uint16 GetHouseCallback(CallbackID callback, uint32 param1, uint32 param2, HouseID house_id, Town *town, TileIndex tile,
bool not_yet_constructed, uint8 initial_random_bits, CargoTypes watched_cargo_triggers)
{
HouseResolverObject object(house_id, tile, town, callback, param1, param2,
not_yet_constructed, initial_random_bits, watched_cargo_triggers);
return object.ResolveCallback();
if (tile != INVALID_TILE) {
HouseResolverObject object(house_id, tile, town, callback, param1, param2,
not_yet_constructed, initial_random_bits, watched_cargo_triggers);
return object.ResolveCallback();
} else {
FakeHouseResolverObject object(house_id, callback, param1, param2);
return object.ResolveCallback();
}
}
/**