diff options
author | belugas <belugas@openttd.org> | 2007-06-15 23:55:52 +0000 |
---|---|---|
committer | belugas <belugas@openttd.org> | 2007-06-15 23:55:52 +0000 |
commit | 108ee9bc3e7645cad0e4977519ee56cef685fb7e (patch) | |
tree | ef79fa77b3b91584c234b33bb2995df7ed57ad55 /src/town_cmd.cpp | |
parent | ef099dbc27fe513d8a915c23186179cde3f338c3 (diff) | |
download | openttd-108ee9bc3e7645cad0e4977519ee56cef685fb7e.tar.xz |
(svn r10167) -Codechange: Change the flagging system of grf loaded feature from a bitset to a bool evaluation.
Like easier to read and faster to evaluate :)
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 cc790a3d0..800de934b 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 (HASBIT(_loaded_newgrf_features, GRFLOADED_NEWHOUSES)) { + if (_loaded_newgrf_features.has_newhouses) { probability_max += hs->probability; cumulative_probs[num] = probability_max; } @@ -1677,7 +1677,7 @@ static void DoBuildTownHouse(Town *t, TileIndex tile) } for (;;) { - if (HASBIT(_loaded_newgrf_features, GRFLOADED_NEWHOUSES)) { + if (_loaded_newgrf_features.has_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 (HASBIT(_loaded_newgrf_features, GRFLOADED_NEWHOUSES)) { + if (_loaded_newgrf_features.has_newhouses) { if (hs->override != 0) hs = GetHouseSpecs(hs->override); if ((hs->extra_flags & BUILDING_IS_HISTORICAL) && !_generating_world) continue; |