From 4d74e519074bec9a07c2997715ab635ac0e8f084 Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Sat, 29 May 2021 11:21:30 +0200 Subject: Fix #9281: acquire a company uses special bookkeeping to make you rich (#9300) When you buy-out a company, you got your shares back. This is based on company-value, which includes values for the vehicles etc. In other words, you not only got the vehicles, but you also got paid to get them back. Additionally, you also got the loan of the company, but not the money for the loan (as that is subtracted from the company-value). Solve this by changing the rules of a buy-out: don't sell your shares, get the loan AND the balance and get the infrastructure. --- src/economy.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/economy.cpp') diff --git a/src/economy.cpp b/src/economy.cpp index 09adf81b9..cde08f76a 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -324,8 +324,11 @@ void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner) Backup cur_company2(_current_company, FILE_LINE); const Company *c = Company::Get(old_owner); for (i = 0; i < 4; i++) { - cur_company2.Change(c->share_owners[i]); - if (_current_company != INVALID_OWNER) { + if (c->bankrupt_value == 0 && c->share_owners[i] == new_owner) { + /* You are the one buying the company; so don't sell the shares back to you. */ + Company::Get(new_owner)->share_owners[i] = COMPANY_SPECTATOR; + } else if (c->share_owners[i] != INVALID_OWNER) { + cur_company2.Change(c->share_owners[i]); /* Sell the shares */ CommandCost res = DoCommand(0, old_owner, 0, DC_EXEC | DC_BANKRUPT, CMD_SELL_SHARE_IN_COMPANY); /* Because we are in a DoCommand, we can't just execute another one and @@ -1986,6 +1989,9 @@ static void DoAcquireCompany(Company *c) if (c->bankrupt_value == 0) { Company *owner = Company::Get(_current_company); + + /* Get both the balance and the loan of the company you just bought. */ + SubtractMoneyFromCompany(CommandCost(EXPENSES_OTHER, -c->money)); owner->current_loan += c->current_loan; } -- cgit v1.2.3-54-g00ecf