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

(svn r15831) -Fix: make sure house class/ID counters don't overflow

release/1.0
smatz 2009-03-23 14:09:05 +00:00
parent c299bac5be
commit abff5eacbc
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/town_cmd.cpp
View File

@ -1948,14 +1948,24 @@ static bool BuildTownHouse(Town *t, TileIndex tile)
/* Generate a list of all possible houses that can be built. */ /* Generate a list of all possible houses that can be built. */
for (uint i = 0; i < HOUSE_MAX; i++) { for (uint i = 0; i < HOUSE_MAX; i++) {
const HouseSpec *hs = GetHouseSpecs(i); const HouseSpec *hs = GetHouseSpecs(i);
/* Verify that the candidate house spec matches the current tile status */ /* Verify that the candidate house spec matches the current tile status */
if ((~hs->building_availability & bitmask) == 0 && hs->enabled) { if ((~hs->building_availability & bitmask) != 0 || !hs->enabled) continue;
/* Without NewHouses, all houses have probability '1' */
uint cur_prob = (_loaded_newgrf_features.has_newhouses ? hs->probability : 1); /* Don't let these counters overflow. Global counters are 32bit, there will never be that many houses. */
probability_max += cur_prob; if (hs->class_id != HOUSE_NO_CLASS) {
probs[num] = cur_prob; /* id_count is always <= class_count, so it doesn't need to be checked */
houses[num++] = (HouseID)i; if (t->building_counts.class_count[hs->class_id] == UINT16_MAX) continue;
} else {
/* If the house has no class, check id_count instead */
if (t->building_counts.id_count[i] == UINT16_MAX) continue;
} }
/* Without NewHouses, all houses have probability '1' */
uint cur_prob = (_loaded_newgrf_features.has_newhouses ? hs->probability : 1);
probability_max += cur_prob;
probs[num] = cur_prob;
houses[num++] = (HouseID)i;
} }
uint maxz = GetTileMaxZ(tile); uint maxz = GetTileMaxZ(tile);