dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify implementation of TownGenerateCargo

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-04-15 00:11:52 +01:00
parent 3b72241280
commit f803ec9162
1 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/town_cmd.cpp
View File

@@ -642,9 +642,9 @@ static void MakeTownHouseBigger(TileIndex tile)
* @param stations available stations for this house * @param stations available stations for this house
* @param economy_adjust true if amount should be reduced during recession * @param economy_adjust true if amount should be reduced during recession
*/ */
static void TownGenerateCargo (Town *t, CargoID ct, uint amount, StationFinder &stations, bool economy_adjust) static void TownGenerateCargo(Town *t, CargoID ct, uint amount, StationFinder &stations, bool economy_adjust)
{ {
// when the economy flunctuates, everyone wants to stay at home /* When the economy flunctuates, everyone wants to stay at home */
if (economy_adjust && EconomyIsInRecession()) { if (economy_adjust && EconomyIsInRecession()) {
amount = (amount + 1) >> 1; amount = (amount + 1) >> 1;
} }
@@ -653,22 +653,8 @@ static void TownGenerateCargo (Town *t, CargoID ct, uint amount, StationFinder &
if (amount == 0) return; if (amount == 0) return;
// calculate for town stats t->supplied[ct].new_max += amount;
t->supplied[ct].new_act += MoveGoodsToStation(ct, amount, ST_TOWN, t->index, stations.GetStations());
switch (ct) {
case CT_PASSENGERS:
case CT_MAIL:
t->supplied[ct].new_max += amount;
t->supplied[ct].new_act += MoveGoodsToStation(ct, amount, ST_TOWN, t->index, stations.GetStations());
break;
default: {
const CargoSpec *cs = CargoSpec::Get(ct);
t->supplied[cs->Index()].new_max += amount;
t->supplied[cs->Index()].new_act += MoveGoodsToStation(ct, amount, ST_TOWN, t->index, stations.GetStations());
break;
}
}
} }
/** /**