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

(svn r20611) -Fix: disable newgrf houses that have a different size then their substitute type

release/1.1
yexo 2010-08-24 16:30:31 +00:00
parent 9390bddbbd
commit 0a644af019
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/newgrf.cpp
View File

@ -7093,6 +7093,13 @@ static void FinaliseHouseArray()
continue; continue;
} }
/* Substitute type is also used for override, and having an override with a different size causes crashes. */
if ((hs->building_flags & BUILDING_HAS_1_TILE) != (HouseSpec::Get(hs->grf_prop.subst_id)->building_flags & BUILDING_HAS_1_TILE)) {
hs->enabled = false;
DEBUG(grf, 1, "FinaliseHouseArray: %s defines house %d with different house size then it's substitute type. Disabling house.", (*file)->filename, hs->grf_prop.local_id);
continue;
}
_house_mngr.SetEntitySpec(hs); _house_mngr.SetEntitySpec(hs);
if (hs->min_year < min_year) min_year = hs->min_year; if (hs->min_year < min_year) min_year = hs->min_year;
} }