diff options
| author | belugas <belugas@openttd.org> | 2007-05-31 19:13:41 +0000 |
|---|---|---|
| committer | belugas <belugas@openttd.org> | 2007-05-31 19:13:41 +0000 |
| commit | 4af692558a4e78e5b5b074f68adf3c60ff89d055 (patch) | |
| tree | 539e6a1d877b0459ab303b47d86cf1ac9c8c1e2f /src/town_cmd.cpp | |
| parent | 01f80cf343918df3e9865cb272264ee3519154fa (diff) | |
| download | openttd-4af692558a4e78e5b5b074f68adf3c60ff89d055.tar.xz | |
(svn r10005) -Codechange: Merge two flags (2cc and newhouses) indicating some newgrf features have been loaded, and introduce the newindustry one.
Diffstat (limited to 'src/town_cmd.cpp')
| -rw-r--r-- | src/town_cmd.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp index ce8e5dfe5..2f7b0158c 100644 --- a/src/town_cmd.cpp +++ b/src/town_cmd.cpp @@ -1668,7 +1668,7 @@ static void DoBuildTownHouse(Town *t, TileIndex tile) for (i = 0; i < HOUSE_MAX; i++) { hs = GetHouseSpecs(i); if ((~hs->building_availability & bitmask) == 0 && hs->enabled) { - if (_have_newhouses) { + if (HASBIT(_loaded_newgrf_features, GRFLOADED_NEWHOUSES)) { probability_max += hs->probability; cumulative_probs[num] = probability_max; } @@ -1677,7 +1677,7 @@ static void DoBuildTownHouse(Town *t, TileIndex tile) } for (;;) { - if (_have_newhouses) { + if (HASBIT(_loaded_newgrf_features, GRFLOADED_NEWHOUSES)) { uint r = RandomRange(probability_max); for (i = 0; i < num; i++) if (cumulative_probs[i] >= r) break; @@ -1688,7 +1688,7 @@ static void DoBuildTownHouse(Town *t, TileIndex tile) hs = GetHouseSpecs(house); - if (_have_newhouses) { + if (HASBIT(_loaded_newgrf_features, GRFLOADED_NEWHOUSES)) { if (hs->override != 0) hs = GetHouseSpecs(hs->override); if ((hs->extra_flags & BUILDING_IS_HISTORICAL) && !_generating_world) continue; |