mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r21156) -Codechange: Introduce EconomyIsInRecession().

This commit is contained in:
alberth 2010-11-13 09:45:20 +00:00
parent aea8274dba
commit 43f807a918
5 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/economy.cpp
View File

@ -710,7 +710,7 @@ static void HandleEconomyFluctuations()
if (_settings_game.difficulty.economy != 0) {
/* When economy is Fluctuating, decrease counter */
_economy.fluct--;
} else if (_economy.fluct <= 0) {
} else if (EconomyIsInRecession()) {
/* When it's Steady and we are in recession, end it now */
_economy.fluct = -12;
} else {

9
src/economy_func.h
View File

@ -42,4 +42,13 @@ void InitializeEconomy();
void RecomputePrices();
void AddInflation(bool check_year = true);
/**
* Is the economy in recession?
* @return \c True if economy is in recession, \c false otherwise.
*/
static inline bool EconomyIsInRecession()
{
return _economy.fluct <= 0;
}
#endif /* ECONOMY_FUNC_H */

2
src/industry_cmd.cpp
View File

@ -497,7 +497,7 @@ static void TransportIndustryGoods(TileIndex tile)
i->produced_cargo_waiting[j] -= cw;
/* fluctuating economy? */
if (_economy.fluct <= 0) cw = (cw + 1) / 2;
if (EconomyIsInRecession()) cw = (cw + 1) / 2;
i->this_month_production[j] += cw;

4
src/object_cmd.cpp
View File

@ -508,7 +508,7 @@ static void TileLoop_Object(TileIndex tile)
/* Top town buildings generate 250, so the top HQ type makes 256. */
if (GB(r, 0, 8) < (256 / 4 / (6 - level))) {
uint amt = GB(r, 0, 8) / 8 / 4 + 1;
if (_economy.fluct <= 0) amt = (amt + 1) >> 1;
if (EconomyIsInRecession()) amt = (amt + 1) >> 1;
MoveGoodsToStation(CT_PASSENGERS, amt, ST_HEADQUARTERS, GetTileOwner(tile), stations.GetStations());
}
@ -517,7 +517,7 @@ static void TileLoop_Object(TileIndex tile)
* equations. */
if (GB(r, 8, 8) < (196 / 4 / (6 - level))) {
uint amt = GB(r, 8, 8) / 8 / 4 + 1;
if (_economy.fluct <= 0) amt = (amt + 1) >> 1;
if (EconomyIsInRecession()) amt = (amt + 1) >> 1;
MoveGoodsToStation(CT_MAIL, amt, ST_HEADQUARTERS, GetTileOwner(tile), stations.GetStations());
}
}

4
src/town_cmd.cpp
View File

@ -497,7 +497,7 @@ static void TileLoop_Town(TileIndex tile)
if (GB(r, 0, 8) < hs->population) {
uint amt = GB(r, 0, 8) / 8 + 1;
if (_economy.fluct <= 0) amt = (amt + 1) >> 1;
if (EconomyIsInRecession()) amt = (amt + 1) >> 1;
t->new_max_pass += amt;
t->new_act_pass += MoveGoodsToStation(CT_PASSENGERS, amt, ST_TOWN, t->index, stations.GetStations());
}
@ -505,7 +505,7 @@ static void TileLoop_Town(TileIndex tile)
if (GB(r, 8, 8) < hs->mail_generation) {
uint amt = GB(r, 8, 8) / 8 + 1;
if (_economy.fluct <= 0) amt = (amt + 1) >> 1;
if (EconomyIsInRecession()) amt = (amt + 1) >> 1;
t->new_max_mail += amt;
t->new_act_mail += MoveGoodsToStation(CT_MAIL, amt, ST_TOWN, t->index, stations.GetStations());
}