Archives
/
OpenTTD-patches
mirror of https://github.com/JGRennison/OpenTTD-patches
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(svn r12063) -Cleanup: use C++ indenting and variable scope/declaration in BuildTownHouse()

Browse Source
replace/41b28d7194a279bdc17475d4fbe2ea6ec885a466
smatz 17 years ago
parent 146779b158
commit c261218cf5
1 changed files with 100 additions and 110 deletions
Show Stats Download Patch File Download Diff File

210
src/town_cmd.cpp
Unescape Escape View File

@ -1717,152 +1717,142 @@ static bool CheckFree2x2Area(TileIndex tile, uint z, bool noslope)
*/ */
static bool BuildTownHouse(Town *t, TileIndex tile) static bool BuildTownHouse(Town *t, TileIndex tile)
{ {
int i;
uint bitmask;
HouseID house;
Slope slope;
uint z;
uint oneof = 0;
HouseSpec *hs;
/* no house allowed at all, bail out */ /* no house allowed at all, bail out */
if (!CanBuildHouseHere(tile, false)) return false; if (!CanBuildHouseHere(tile, false)) return false;
/* Above snow? */ uint z;
slope = GetTileSlope(tile, &z); Slope slope = GetTileSlope(tile, &z);
/* Get the town zone type of the current tile, as well as the climate. /* Get the town zone type of the current tile, as well as the climate.
* This will allow to easily compare with the specs of the new house to build */ * This will allow to easily compare with the specs of the new house to build */
{ HouseZonesBits rad = GetTownRadiusGroup(t, tile);
HouseZonesBits rad = GetTownRadiusGroup(t, tile);
int land = _opt.landscape; /* Above snow? */
if (land == LT_ARCTIC && z >= _opt.snow_line) land = -1; int land = _opt.landscape;
if (land == LT_ARCTIC && z >= _opt.snow_line) land = -1;
bitmask = (1 << rad) + (1 << (land + 12)); uint bitmask = (1 << rad) + (1 << (land + 12));
}
/* bits 0-4 are used /* bits 0-4 are used
* bits 11-15 are used * bits 11-15 are used
* bits 5-10 are not used. */ * bits 5-10 are not used. */
{ HouseID houses[HOUSE_MAX];
HouseID houses[HOUSE_MAX]; uint num = 0;
int num = 0; uint probs[HOUSE_MAX];
uint probs[HOUSE_MAX]; uint probability_max = 0;
uint probability_max = 0;
/* 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 (i = 0; i < HOUSE_MAX; i++) { HouseSpec *hs = GetHouseSpecs(i);
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) { /* Without NewHouses, all houses have probability '1' */
/* Without NewHouses, all houses have probability '1' */ uint cur_prob = (_loaded_newgrf_features.has_newhouses ? hs->probability : 1);
uint cur_prob = (_loaded_newgrf_features.has_newhouses ? hs->probability : 1); probability_max += cur_prob;
probability_max += cur_prob; probs[num] = cur_prob;
probs[num] = cur_prob; houses[num++] = (HouseID)i;
houses[num++] = (HouseID)i;
}
} }
}
uint maxz = GetTileMaxZ(tile); uint maxz = GetTileMaxZ(tile);
while (probability_max > 0) { while (probability_max > 0) {
uint r = RandomRange(probability_max); uint r = RandomRange(probability_max);
for (i = 0; i < num; i++) { uint i;
if (probs[i] > r) break; for (i = 0; i < num; i++) {
r -= probs[i]; if (probs[i] > r) break;
} r -= probs[i];
}
house = houses[i]; HouseID house = houses[i];
probability_max -= probs[i]; probability_max -= probs[i];
/* remove tested house from the set */ /* remove tested house from the set */
num--; num--;
houses[i] = houses[num]; houses[i] = houses[num];
probs[i] = probs[num]; probs[i] = probs[num];
hs = GetHouseSpecs(house); HouseSpec *hs = GetHouseSpecs(house);
if (_loaded_newgrf_features.has_newhouses) { if (_loaded_newgrf_features.has_newhouses) {
if (hs->override != 0) { if (hs->override != 0) {
house = hs->override; house = hs->override;
hs = GetHouseSpecs(house); hs = GetHouseSpecs(house);
} }
if ((hs->extra_flags & BUILDING_IS_HISTORICAL) && !_generating_world) continue; if ((hs->extra_flags & BUILDING_IS_HISTORICAL) && !_generating_world) continue;
if (HasBit(hs->callback_mask, CBM_HOUSE_ALLOW_CONSTRUCTION)) { if (HasBit(hs->callback_mask, CBM_HOUSE_ALLOW_CONSTRUCTION)) {
uint16 callback_res = GetHouseCallback(CBID_HOUSE_ALLOW_CONSTRUCTION, 0, 0, house, t, tile); uint16 callback_res = GetHouseCallback(CBID_HOUSE_ALLOW_CONSTRUCTION, 0, 0, house, t, tile);
if (callback_res != CALLBACK_FAILED && callback_res == 0) continue; if (callback_res != CALLBACK_FAILED && callback_res == 0) continue;
}
} }
}
if (_cur_year < hs->min_date || _cur_year > hs->max_date) continue; if (_cur_year < hs->min_date || _cur_year > hs->max_date) continue;
/* Special houses that there can be only one of. */ /* Special houses that there can be only one of. */
if (hs->building_flags & BUILDING_IS_CHURCH) { uint oneof = 0;
SetBit(oneof, TOWN_HAS_CHURCH);
} else if (hs->building_flags & BUILDING_IS_STADIUM) {
SetBit(oneof, TOWN_HAS_STADIUM);
} else {
oneof = 0;
}
if (HASBITS(t->flags12 , oneof)) continue; if (hs->building_flags & BUILDING_IS_CHURCH) {
SetBit(oneof, TOWN_HAS_CHURCH);
} else if (hs->building_flags & BUILDING_IS_STADIUM) {
SetBit(oneof, TOWN_HAS_STADIUM);
}
/* Make sure there is no slope? */ if (HASBITS(t->flags12 , oneof)) continue;
bool noslope = (hs->building_flags & TILE_NOT_SLOPED) != 0;
if (noslope && slope != SLOPE_FLAT) continue;
if (hs->building_flags & TILE_SIZE_2x2) { /* Make sure there is no slope? */
if (!CheckFree2x2Area(tile, maxz, noslope) && bool noslope = (hs->building_flags & TILE_NOT_SLOPED) != 0;
!CheckFree2x2Area(tile += TileDiffXY(-1, 0), maxz, noslope) && if (noslope && slope != SLOPE_FLAT) continue;
!CheckFree2x2Area(tile += TileDiffXY( 0, -1), maxz, noslope) &&
!CheckFree2x2Area(tile += TileDiffXY( 1, 0), maxz, noslope)) { if (hs->building_flags & TILE_SIZE_2x2) {
/* return to the original tile */ if (!CheckFree2x2Area(tile, maxz, noslope) &&
tile += TileDiffXY(0, 1); !CheckFree2x2Area(tile += TileDiffXY(-1, 0), maxz, noslope) &&
continue; /* continue the while() loop */ !CheckFree2x2Area(tile += TileDiffXY( 0, -1), maxz, noslope) &&
} !CheckFree2x2Area(tile += TileDiffXY( 1, 0), maxz, noslope)) {
} else if (hs->building_flags & TILE_SIZE_2x1) { /* return to the original tile */
/* 'tile' is already checked above - CanBuildHouseHere() and slope test */ tile += TileDiffXY(0, 1);
if (!CheckBuildHouseSameZ(tile + TileDiffXY(1, 0), maxz, noslope)) { continue; /* continue the while() loop */
if (!CheckBuildHouseSameZ(tile + TileDiffXY(-1, 0), maxz, noslope)) continue; }
tile += TileDiffXY(-1, 0); } else if (hs->building_flags & TILE_SIZE_2x1) {
} /* 'tile' is already checked above - CanBuildHouseHere() and slope test */
} else if (hs->building_flags & TILE_SIZE_1x2) { if (!CheckBuildHouseSameZ(tile + TileDiffXY(1, 0), maxz, noslope)) {
if (!CheckBuildHouseSameZ(tile + TileDiffXY(0, 1), maxz, noslope)) { if (!CheckBuildHouseSameZ(tile + TileDiffXY(-1, 0), maxz, noslope)) continue;
if (!CheckBuildHouseSameZ(tile + TileDiffXY(0, -1), maxz, noslope)) continue; tile += TileDiffXY(-1, 0);
tile += TileDiffXY(0, -1); }
} } else if (hs->building_flags & TILE_SIZE_1x2) {
if (!CheckBuildHouseSameZ(tile + TileDiffXY(0, 1), maxz, noslope)) {
if (!CheckBuildHouseSameZ(tile + TileDiffXY(0, -1), maxz, noslope)) continue;
tile += TileDiffXY(0, -1);
} }
}
/* build the house */ /* build the house */
t->num_houses++; t->num_houses++;
IncreaseBuildingCount(t, house); IncreaseBuildingCount(t, house);
/* Special houses that there can be only one of. */ /* Special houses that there can be only one of. */
t->flags12 |= oneof; t->flags12 |= oneof;
{ byte construction_counter = 0;
byte construction_counter = 0, construction_stage = 0; byte construction_stage = 0;
if (_generating_world) { if (_generating_world) {
uint32 r = Random(); uint32 r = Random();
construction_stage = TOWN_HOUSE_COMPLETED; construction_stage = TOWN_HOUSE_COMPLETED;
if (Chance16(1, 7)) construction_stage = GB(r, 0, 2); if (Chance16(1, 7)) construction_stage = GB(r, 0, 2);
if (construction_stage == TOWN_HOUSE_COMPLETED) { if (construction_stage == TOWN_HOUSE_COMPLETED) {
ChangePopulation(t, hs->population); ChangePopulation(t, hs->population);
} else { } else {
construction_counter = GB(r, 2, 2); construction_counter = GB(r, 2, 2);
}
}
MakeTownHouse(tile, t->index, construction_counter, construction_stage, house, Random());
} }
return true;
} }
MakeTownHouse(tile, t->index, construction_counter, construction_stage, house, Random());
return true;
} }
return false; return false;

Write Preview
Loading…
Cancel
Save