cpp/openttd-patchpack/source Changeset - r26869:74bd8a3c8b66

Changeset - r26869:74bd8a3c8b66

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

SamuXarick - 22 months ago 2023-02-09 18:51:58
43006711+SamuXarick@users.noreply.github.com

Fix: [Script] Use Money instead of int32 for presenting the value of a company to AIs

2 files changed with 4 insertions and 4 deletions:

src/company_cmd.cpp

src/script/api/script_event_types.hpp

0 comments (0 inline, 0 general)

src/company_cmd.cpp

➞

Show inline comments

@@ @@ -703,7 +703,7 @@ static void HandleBankruptcyTakeover(Com @@
 	c->bankrupt_timeout = TAKE_OVER_TIMEOUT;
 	if (best->is_ai) {
-		AI::NewEvent(best->index, new ScriptEventCompanyAskMerger(c->index, ClampToI32(c->bankrupt_value)));
 		AI::NewEvent(best->index, new ScriptEventCompanyAskMerger(c->index, c->bankrupt_value));
 	} else if (IsInteractiveCompany(best->index)) {
 		ShowBuyCompanyDialog(c->index);
+	}

src/script/api/script_event_types.hpp

➞

Show inline comments

@@ @@ -381,7 +381,7 @@ public: @@
 	 * @param owner The company that can be bought.
 	 * @param value The value/costs of buying the company.
 	 */
-	ScriptEventCompanyAskMerger(Owner owner, int32 value) :
+	ScriptEventCompanyAskMerger(Owner owner, Money value) :
 		ScriptEvent(ET_COMPANY_ASK_MERGER),
 		owner((ScriptCompany::CompanyID)owner),
 		value(value)
@@ @@ -406,7 +406,7 @@ public: @@
 	 * Get the value of the new company.
 	 * @return The value of the new company.
 	 */
-	int32 GetValue() { return this->value; }
+	Money GetValue() { return this->value; }
 	/**
 	 * Take over the company for this merger.
@@ @@ -416,7 +416,7 @@ public: @@
 private:
 	ScriptCompany::CompanyID owner; ///< The company that is in trouble.
-	int32 value;                ///< The value of the company, i.e. the amount you would pay.
+	Money value;                ///< The value of the company, i.e. the amount you would pay.
 };
 /**

0 comments (0 inline, 0 general)