cpp/openttd-patchpack/source Changeset - r15011:acd1a8b391ed

Changeset - r15011:acd1a8b391ed

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 15 years ago 2010-04-14 20:26:34
rubidium@openttd.org

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

1 file changed with 2 insertions and 5 deletions:

src/company_cmd.cpp

0 comments (0 inline, 0 general)

src/company_cmd.cpp

➞

Show inline comments

@@ @@ -592,20 +592,17 @@ static void HandleBankruptcyTakeover(Com @@
 		c->bankrupt_asked = MAX_UVALUE(CompanyMask);
 		return;
+	}
 	SetBit(c->bankrupt_asked, best->index);
 	if (IsInteractiveCompany(best->index)) {
 		c->bankrupt_timeout = TAKE_OVER_TIMEOUT;
 		ShowBuyCompanyDialog(c->index);
 		return;
+	}
 	if (best->is_ai) {
 		AI::NewEvent(best->index, new AIEventCompanyAskMerger(c->index, ClampToI32(c->bankrupt_value)));
 	} else if (IsInteractiveCompany(best->index)) {
 		ShowBuyCompanyDialog(c->index);
+	}
+}
 void OnTick_Companies()
+{
 	if (_game_mode == GM_EDITOR) return;

0 comments (0 inline, 0 general)