From 0130f3be459fd906c6f75f08230293184aff73db Mon Sep 17 00:00:00 2001 From: peter1138 Date: Tue, 9 Apr 2019 10:04:43 +0100 Subject: [PATCH] Fix #7491: Send company update admin message when bankruptcy counter changes. --- src/economy.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/economy.cpp b/src/economy.cpp index 8fc7179565..b4b2988366 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -570,8 +570,10 @@ static void CompanyCheckBankrupt(Company *c) { /* If the company has money again, it does not go bankrupt */ 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->bankrupt_asked = 0; + if (previous_months_of_bankruptcy != 0) CompanyAdminUpdate(c); return; } @@ -640,10 +642,15 @@ static void CompanyCheckBankrupt(Company *c) * that changing the current company is okay. In case of single * player we are sure (the above check) that we are not the local * 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; } } + + if (CeilDiv(c->months_of_bankruptcy, 3) != CeilDiv(c->months_of_bankruptcy - 1, 3)) CompanyAdminUpdate(c); } /**