From 43ce73db86fb5995f1c5dca51b94a744f5a6af08 Mon Sep 17 00:00:00 2001 From: SamuXarick <43006711+SamuXarick@users.noreply.github.com> Date: Thu, 9 Feb 2023 18:51:58 +0000 Subject: [PATCH] Fix: [Script] Use Money instead of int32 for presenting the value of a company to AIs --- src/company_cmd.cpp | 2 +- src/script/api/script_event_types.hpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp index 7432bde65b..8e07dd7162 100644 --- a/src/company_cmd.cpp +++ b/src/company_cmd.cpp @@ -703,7 +703,7 @@ static void HandleBankruptcyTakeover(Company *c) 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); } diff --git a/src/script/api/script_event_types.hpp b/src/script/api/script_event_types.hpp index 5431fcf1ee..161ad4d8ae 100644 --- a/src/script/api/script_event_types.hpp +++ b/src/script/api/script_event_types.hpp @@ -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. }; /**