mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

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

release/1.1
rubidium 2010-04-14 20:26:34 +00:00
parent b858c22a7e
commit 1177092da6
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/company_cmd.cpp
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);
}
}