mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix: Player-placed house protection for houses should override the callback

pull/14408/head
Tyler Trahan 2025-07-01 13:57:16 -04:00
parent b84b641ed9
commit c229823550
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/newgrf_house.cpp
View File

@ -595,12 +595,16 @@ bool CanDeleteHouse(TileIndex tile)
return true; return true;
} }
/* The house might be placed by a player or protected by the GRF house flag. */
if (IsHouseProtected(tile)) return false;
/* Check the callback result, if the house uses it. */
if (hs->callback_mask.Test(HouseCallbackMask::DenyDestruction)) { if (hs->callback_mask.Test(HouseCallbackMask::DenyDestruction)) {
uint16_t callback_res = GetHouseCallback(CBID_HOUSE_DENY_DESTRUCTION, 0, 0, GetHouseType(tile), Town::GetByTile(tile), tile); uint16_t callback_res = GetHouseCallback(CBID_HOUSE_DENY_DESTRUCTION, 0, 0, GetHouseType(tile), Town::GetByTile(tile), tile);
return (callback_res == CALLBACK_FAILED || !ConvertBooleanCallback(hs->grf_prop.grffile, CBID_HOUSE_DENY_DESTRUCTION, callback_res)); return (callback_res == CALLBACK_FAILED || !ConvertBooleanCallback(hs->grf_prop.grffile, CBID_HOUSE_DENY_DESTRUCTION, callback_res));
} else {
return !IsHouseProtected(tile);
} }
return true;
} }
/** /**