# HG changeset patch # User frosch # Date 2011-07-02 19:31:01 # Node ID 2afeae3a66211f569f8e77dc226cdf8395d9787e # Parent 2216a89739e6574c2b3f2799f7868dd112464a6e (svn r22624) -Fix [FS#4654]: When closing an AI company the local player cheated to, we need to cheat him to another company. diff --git a/src/economy.cpp b/src/economy.cpp --- a/src/economy.cpp +++ b/src/economy.cpp @@ -296,6 +296,21 @@ void ChangeOwnershipOfCompanyItems(Owner /* In all cases, make spectators of clients connected to that company */ if (_networking) NetworkClientsToSpectators(old_owner); #endif /* ENABLE_NETWORK */ + if (old_owner == _local_company) { + /* Single player cheated to AI company. + * There are no specatators in single player, so we must pick some other company. */ + assert(!_networking); + Backup cur_company(_current_company, FILE_LINE); + Company *c; + FOR_ALL_COMPANIES(c) { + if (c->index != old_owner) { + SetLocalCompany(c->index); + break; + } + } + cur_company.Restore(); + assert(old_owner != _local_company); + } Town *t;