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

(svn r20797) -Fix: disable houses without a size that are available according to their building flags

release/1.1
yexo 2010-09-13 13:27:29 +00:00
parent e5a81fbbde
commit 2d4c5ea668
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/house.h
View File

@ -80,7 +80,8 @@ enum HouseZones { ///< Bit Value Meaning
HZ_TEMP = 0x1000, ///< 12 1000 can appear in temperate climate HZ_TEMP = 0x1000, ///< 12 1000 can appear in temperate climate
HZ_SUBARTC_BELOW = 0x2000, ///< 13 2000 can appear in sub-arctic climate below the snow line HZ_SUBARTC_BELOW = 0x2000, ///< 13 2000 can appear in sub-arctic climate below the snow line
HZ_SUBTROPIC = 0x4000, ///< 14 4000 can appear in subtropical climate HZ_SUBTROPIC = 0x4000, ///< 14 4000 can appear in subtropical climate
HZ_TOYLND = 0x8000 ///< 15 8000 can appear in toyland climate HZ_TOYLND = 0x8000, ///< 15 8000 can appear in toyland climate
HZ_CLIMALL = 0xF800, ///< Bitmask of all climate bits
}; };
DECLARE_ENUM_AS_BIT_SET(HouseZones) DECLARE_ENUM_AS_BIT_SET(HouseZones)

7
src/newgrf.cpp
View File

@ -7318,6 +7318,13 @@ static bool IsHouseSpecValid(HouseSpec *hs, const HouseSpec *next1, const HouseS
return false; return false;
} }
/* Make sure that additional parts of multitile houses are not available. */
if ((hs->building_flags & BUILDING_HAS_1_TILE) == 0 && (hs->building_availability & HZ_ZONALL) != 0 && (hs->building_availability & HZ_CLIMALL) != 0) {
hs->enabled = false;
if (filename != NULL) DEBUG(grf, 1, "FinaliseHouseArray: %s defines house %d without a size but marked it as available. Disabling house.", filename, hs->grf_prop.local_id);
return false;
}
return true; return true;
} }