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

Merge branch 'enhanced_viewport_overlay' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2018-03-11 22:21:39 +00:00
parent cb2077edd5 864d94d2c5
commit 385a2552e9
107 changed files with 395 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/economy.cpp
View File

@@ -685,12 +685,16 @@ static void CompanyCheckBankrupt(Company *c)
*/
static void CompaniesGenStatistics()
{
Station *st;
/* Check for bankruptcy each month */
Company *c;
FOR_ALL_COMPANIES(c) {
CompanyCheckBankrupt(c);
}
Backup<CompanyByte> cur_company(_current_company, FILE_LINE);
Company *c;
if (!_settings_game.economy.infrastructure_maintenance) {
Station *st;
FOR_ALL_STATIONS(st) {
cur_company.Change(st->owner);
CommandCost cost(EXPENSES_PROPERTY, _price[PR_STATION_VALUE] >> 1);
@@ -719,11 +723,6 @@ static void CompaniesGenStatistics()
}
cur_company.Restore();
/* Check for bankruptcy each month */
FOR_ALL_COMPANIES(c) {
CompanyCheckBankrupt(c);
}
/* Only run the economic statics and update company stats every 3rd month (1st of quarter). */
if (!HasBit(1 << 0 | 1 << 3 | 1 << 6 | 1 << 9, _cur_month)) return;