summaryrefslogtreecommitdiff
path: root/src/company_cmd.cpp
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2010-04-14 20:26:34 +0000
committerrubidium <rubidium@openttd.org>2010-04-14 20:26:34 +0000
commit1177092da650ff539c1d4933737e0bf42a417771 (patch)
treea7271c807daf90f86e340f2aa12cd3167f8789f2 /src/company_cmd.cpp
parentb858c22a7eda139d10410931f531cd7c0f44b438 (diff)
downloadopenttd-1177092da650ff539c1d4933737e0bf42a417771.tar.xz
(svn r19636) -Fix: desync when taking over companies
Diffstat (limited to 'src/company_cmd.cpp')
-rw-r--r--src/company_cmd.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp
index 673d1c1fa..f738f07e0 100644
--- a/src/company_cmd.cpp
+++ b/src/company_cmd.cpp
@@ -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);
}
}