From e33b2afd87379beb69cc7d488d52038e8f0921de Mon Sep 17 00:00:00 2001 From: Rubidium Date: Fri, 5 May 2023 11:37:17 +0200 Subject: [PATCH] Codechange: pass (uint) money as Money for CmdGiveMoney --- src/company_cmd.cpp | 2 +- src/company_cmd.h | 2 +- src/company_gui.cpp | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp index d72b4aae18..b1bf880859 100644 --- a/src/company_cmd.cpp +++ b/src/company_cmd.cpp @@ -1187,7 +1187,7 @@ uint32 CompanyInfrastructure::GetTramTotal() const * @param dest_company the company to transfer the money to * @return the cost of this operation or an error */ -CommandCost CmdGiveMoney(DoCommandFlag flags, uint32 money, CompanyID dest_company) +CommandCost CmdGiveMoney(DoCommandFlag flags, Money money, CompanyID dest_company) { if (!_settings_game.economy.give_money) return CMD_ERROR; diff --git a/src/company_cmd.h b/src/company_cmd.h index 5ffac5cbde..4a44fa7077 100644 --- a/src/company_cmd.h +++ b/src/company_cmd.h @@ -18,7 +18,7 @@ enum ClientID : uint32; enum Colours : byte; CommandCost CmdCompanyCtrl(DoCommandFlag flags, CompanyCtrlAction cca, CompanyID company_id, CompanyRemoveReason reason, ClientID client_id); -CommandCost CmdGiveMoney(DoCommandFlag flags, uint32 money, CompanyID dest_company); +CommandCost CmdGiveMoney(DoCommandFlag flags, Money money, CompanyID dest_company); CommandCost CmdRenameCompany(DoCommandFlag flags, const std::string &text); CommandCost CmdRenamePresident(DoCommandFlag flags, const std::string &text); CommandCost CmdSetCompanyManagerFace(DoCommandFlag flags, CompanyManagerFace cmf); diff --git a/src/company_gui.cpp b/src/company_gui.cpp index 59603e105f..cbeca84679 100644 --- a/src/company_gui.cpp +++ b/src/company_gui.cpp @@ -2646,10 +2646,8 @@ struct CompanyWindow : Window default: NOT_REACHED(); case WID_C_GIVE_MONEY: { - Money money = (Money)(std::strtoull(str, nullptr, 10) / _currency->rate); - uint32 money_c = Clamp(ClampToI32(money), 0, 20000000); // Clamp between 20 million and 0 - - Command::Post(STR_ERROR_CAN_T_GIVE_MONEY, money_c, (CompanyID)this->window_number); + Money money = std::strtoull(str, nullptr, 10) / _currency->rate; + Command::Post(STR_ERROR_CAN_T_GIVE_MONEY, money, (CompanyID)this->window_number); break; }