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

Merge branch 'master' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-04-11 18:26:40 +01:00
parent 33a0253137 c0836bccef
commit c365c904a2
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/economy.cpp
View File

@@ -602,8 +602,10 @@ static void CompanyCheckBankrupt(Company *c)
{ {
/* If the company has money again, it does not go bankrupt */ /* If the company has money again, it does not go bankrupt */
if (c->money - c->current_loan >= -_economy.max_loan) { if (c->money - c->current_loan >= -_economy.max_loan) {
int previous_months_of_bankruptcy = CeilDiv(c->months_of_bankruptcy, 3);
c->months_of_bankruptcy = 0; c->months_of_bankruptcy = 0;
c->bankrupt_asked = 0; c->bankrupt_asked = 0;
if (previous_months_of_bankruptcy != 0) CompanyAdminUpdate(c);
return; return;
} }
@@ -672,10 +674,15 @@ static void CompanyCheckBankrupt(Company *c)
* that changing the current company is okay. In case of single * that changing the current company is okay. In case of single
* player we are sure (the above check) that we are not the local * player we are sure (the above check) that we are not the local
* company and thus we won't be moved. */ * company and thus we won't be moved. */
if (!_networking || _network_server) DoCommandP(0, CCA_DELETE | (c->index << 16) | (CRR_BANKRUPT << 24), 0, CMD_COMPANY_CTRL); if (!_networking || _network_server) {
DoCommandP(0, CCA_DELETE | (c->index << 16) | (CRR_BANKRUPT << 24), 0, CMD_COMPANY_CTRL);
return;
}
break; break;
} }
} }
if (CeilDiv(c->months_of_bankruptcy, 3) != CeilDiv(c->months_of_bankruptcy - 1, 3)) CompanyAdminUpdate(c);
} }
/** /**

1
src/subsidy.cpp
View File

@@ -333,6 +333,7 @@ bool FindSubsidyTownCargoRoute()
/* Select a random town. */ /* Select a random town. */
const Town *src_town = Town::GetRandom(); const Town *src_town = Town::GetRandom();
if (src_town->cache.population < SUBSIDY_CARGO_MIN_POPULATION) return false;
CargoTypes town_cargo_produced = src_town->cargo_produced; CargoTypes town_cargo_produced = src_town->cargo_produced;