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

(svn r22075) -Fix [FS#4501]: newgrfs with invalid multi-tile houses could cause a valid 1x1 house following it to be seen as multi-tile, causing crashes

release/1.1
yexo 2011-02-13 21:44:00 +00:00
parent b51c62f5af
commit 66543bde1d
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/newgrf.cpp
View File

@ -7628,7 +7628,16 @@ static void FinaliseHouseArray()
/* We need to check all houses again to we are sure that multitile houses /* We need to check all houses again to we are sure that multitile houses
* did get consecutive IDs and none of the parts are missing. */ * did get consecutive IDs and none of the parts are missing. */
IsHouseSpecValid(hs, next1, next2, next3, NULL); if (!IsHouseSpecValid(hs, next1, next2, next3, NULL)) {
/* GetHouseNorthPart checks 3 houses that are directly before
* it in the house pool. If any of those houses have multi-tile
* flags set it assumes it's part of a multitile house. Since
* we can have invalid houses in the pool marked as disabled, we
* don't want to have them influencing valid tiles. As such set
* building_flags to zero here to make sure any house following
* this one in the pool is properly handled as 1x1 house. */
hs->building_flags = 0;
}
} }
if (min_year != 0) { if (min_year != 0) {