(svn r19636) -Fix: desync when taking over companies

This commit is contained in:
rubidium
2010-04-14 20:26:34 +00:00
parent b858c22a7e
commit 1177092da6

View File

@@ -595,14 +595,11 @@ static void HandleBankruptcyTakeover(Company *c)
SetBit(c->bankrupt_asked, best->index);
if (IsInteractiveCompany(best->index)) {
c->bankrupt_timeout = TAKE_OVER_TIMEOUT;
ShowBuyCompanyDialog(c->index);
return;
}
c->bankrupt_timeout = TAKE_OVER_TIMEOUT;
if (best->is_ai) {
AI::NewEvent(best->index, new AIEventCompanyAskMerger(c->index, ClampToI32(c->bankrupt_value)));
} else if (IsInteractiveCompany(best->index)) {
ShowBuyCompanyDialog(c->index);
}
}