miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
dP
2020-08-09 22:02:18 +03:00
parent 44a331c926 9deb84f881
commit 4c16fd967e
80 changed files with 791 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/town_cmd.cpp
View File

@@ -66,7 +66,6 @@ uint days_in_month[] = {31, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};//CB
void CB_UpdateTownStorage(Town *t); //CB
TownID _new_town_id;
CargoTypes _town_cargoes_accepted; ///< Bitmap of all cargoes accepted by houses.
/* Initialize the town-pool */
TownPool _town_pool("Town");
@@ -829,85 +828,6 @@ static void ChangeTileOwner_Town(TileIndex tile, Owner old_owner, Owner new_owne
/* not used */
}
/** Update the total cargo acceptance of the whole town.
* @param t The town to update.
*/
void UpdateTownCargoTotal(Town *t)
{
t->cargo_accepted_total = 0;
const TileArea &area = t->cargo_accepted.GetArea();
TILE_AREA_LOOP(tile, area) {
if (TileX(tile) % AcceptanceMatrix::GRID == 0 && TileY(tile) % AcceptanceMatrix::GRID == 0) {
t->cargo_accepted_total |= t->cargo_accepted[tile];
}
}
}
/**
* Update accepted town cargoes around a specific tile.
* @param t The town to update.
* @param start Update the values around this tile.
* @param update_total Set to true if the total cargo acceptance should be updated.
*/
static void UpdateTownCargoes(Town *t, TileIndex start, bool update_total = true)
{
CargoArray accepted, produced;
CargoTypes dummy = 0;
/* Gather acceptance for all houses in an area around the start tile.
* The area is composed of the square the tile is in, extended one square in all
* directions as the coverage area of a single station is bigger than just one square. */
TileArea area = AcceptanceMatrix::GetAreaForTile(start, 1);
TILE_AREA_LOOP(tile, area) {
if (!IsTileType(tile, MP_HOUSE) || GetTownIndex(tile) != t->index) continue;
AddAcceptedCargo_Town(tile, accepted, &dummy);
AddProducedCargo_Town(tile, produced);
}
/* Create bitmap of produced and accepted cargoes. */
CargoTypes acc = 0;
for (uint cid = 0; cid < NUM_CARGO; cid++) {
if (accepted[cid] >= 8) SetBit(acc, cid);
if (produced[cid] > 0) SetBit(t->cargo_produced, cid);
}
t->cargo_accepted[start] = acc;
if (update_total) UpdateTownCargoTotal(t);
}
/** Update cargo acceptance for the complete town.
* @param t The town to update.
*/
void UpdateTownCargoes(Town *t)
{
t->cargo_produced = 0;
const TileArea &area = t->cargo_accepted.GetArea();
if (area.tile == INVALID_TILE) return;
/* Update acceptance for each grid square. */
TILE_AREA_LOOP(tile, area) {
if (TileX(tile) % AcceptanceMatrix::GRID == 0 && TileY(tile) % AcceptanceMatrix::GRID == 0) {
UpdateTownCargoes(t, tile, false);
}
}
/* Update the total acceptance. */
UpdateTownCargoTotal(t);
}
/** Updates the bitmap of all cargoes accepted by houses. */
void UpdateTownCargoBitmap()
{
_town_cargoes_accepted = 0;
for (const Town *town : Town::Iterate()) {
_town_cargoes_accepted |= town->cargo_accepted_total;
}
}
static bool GrowTown(Town *t);
bool TownNeedsFunding(Town *t) {
@@ -2886,7 +2806,6 @@ static bool BuildTownHouse(Town *t, TileIndex tile, bool is_rebuilding)
MakeTownHouse(tile, t, construction_counter, construction_stage, house, random_bits);
UpdateTownRadius(t);
UpdateTownGrowthRate(t);
UpdateTownCargoes(t, tile);
if (!_generating_world) {
citymania::Emit(citymania::event::HouseBuilt{t, tile, house, hs, is_rebuilding});
@@ -2979,9 +2898,6 @@ void ClearTownHouse(Town *t, TileIndex tile)
UpdateTownRadius(t);
citymania::UpdateZoningTownHouses(t, t->cache.num_houses + 1);
/* Update cargo acceptance. */
UpdateTownCargoes(t, tile);
citymania::Emit(citymania::event::HouseCleared{t, tile, house, hs, is_completed});
}
@@ -4017,12 +3933,10 @@ void TownsMonthlyLoop()
UpdateTownGrowth(t);
UpdateTownRating(t);
UpdateTownUnwanted(t);
UpdateTownCargoes(t);
DoRegularFunding(t);
}
UpdateTownCargoBitmap();
}
void TownsYearlyLoop()