From b9eaef9fe1517c246974b7b6b3dffc7ed1c99158 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Tue, 25 Feb 2020 21:31:10 +0000 Subject: [PATCH] Fix 81a67b5b: Fix fake house case not being handled in GetHouseCallback --- src/newgrf_house.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/newgrf_house.cpp b/src/newgrf_house.cpp index 40b156c952..077584a0be 100644 --- a/src/newgrf_house.cpp +++ b/src/newgrf_house.cpp @@ -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(); + } } /**