dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow using the money cheat with values greater than 32 bits

Browse Source 
See: #536
This commit is contained in:
Jonathan G Rennison
2023-06-06 21:49:30 +01:00
parent d03465db59
commit 3151751eda
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cheat_gui.cpp
View File

@@ -58,7 +58,7 @@ static int32 _money_cheat_amount = 10000000;
*/ */
static int32 ClickMoneyCheat(int32 p1, int32 p2) static int32 ClickMoneyCheat(int32 p1, int32 p2)
{ {
DoCommandP(0, (uint32)(p2 * _money_cheat_amount), 0, _network_server || _network_settings_access ? CMD_MONEY_CHEAT_ADMIN : CMD_MONEY_CHEAT); DoCommandPEx(0, 0, 0, (uint64)(p2 * _money_cheat_amount), _network_server || _network_settings_access ? CMD_MONEY_CHEAT_ADMIN : CMD_MONEY_CHEAT);
return _money_cheat_amount; return _money_cheat_amount;
} }
@@ -504,7 +504,7 @@ struct CheatWindow : Window {
} }
if (ce->mode == CNM_MONEY) { if (ce->mode == CNM_MONEY) {
if (!_networking) *ce->been_used = true; if (!_networking) *ce->been_used = true;
DoCommandP(0, (strtoll(str, nullptr, 10) / _currency->rate), 0, _network_server || _network_settings_access ? CMD_MONEY_CHEAT_ADMIN : CMD_MONEY_CHEAT); DoCommandPEx(0, 0, 0, (std::strtoll(str, nullptr, 10) / _currency->rate), _network_server || _network_settings_access ? CMD_MONEY_CHEAT_ADMIN : CMD_MONEY_CHEAT);
return; return;
} }

4
src/command.cpp
View File

@@ -178,8 +178,8 @@ CommandProc CmdCloneOrder;
CommandProc CmdClearArea; CommandProc CmdClearArea;
CommandProc CmdGiveMoney; CommandProc CmdGiveMoney;
CommandProc CmdMoneyCheat; CommandProcEx CmdMoneyCheat;
CommandProc CmdMoneyCheatAdmin; CommandProcEx CmdMoneyCheatAdmin;
CommandProc CmdChangeBankBalance; CommandProc CmdChangeBankBalance;
CommandProc CmdCheatSetting; CommandProc CmdCheatSetting;
CommandProc CmdBuildCanal; CommandProc CmdBuildCanal;

14
src/misc_cmd.cpp
View File

@@ -201,37 +201,39 @@ CommandCost CmdPause(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2,
* Change the financial flow of your company. * Change the financial flow of your company.
* @param tile unused * @param tile unused
* @param flags operation to perform * @param flags operation to perform
* @param p1 the amount of money to receive (if positive), or spend (if negative) * @param p1 unused
* @param p2 unused * @param p2 unused
* @param p3 the amount of money to receive (if positive), or spend (if negative)
* @param text unused * @param text unused
* @return the cost of this operation or an error * @return the cost of this operation or an error
*/ */
CommandCost CmdMoneyCheat(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text) CommandCost CmdMoneyCheat(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, uint64 p3, const char *text, const CommandAuxiliaryBase *aux_data)
{ {
if (_networking && !_settings_game.difficulty.money_cheat_in_multiplayer) return CMD_ERROR; if (_networking && !_settings_game.difficulty.money_cheat_in_multiplayer) return CMD_ERROR;
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
_cheats.money.been_used = true; _cheats.money.been_used = true;
SetWindowDirty(WC_CHEATS, 0); SetWindowDirty(WC_CHEATS, 0);
} }
return CommandCost(EXPENSES_OTHER, -(int32)p1); return CommandCost(EXPENSES_OTHER, -(int64)p3);
} }
/** /**
* Change the financial flow of your company (admin). * Change the financial flow of your company (admin).
* @param tile unused * @param tile unused
* @param flags operation to perform * @param flags operation to perform
* @param p1 the amount of money to receive (if positive), or spend (if negative) * @param p1 unused
* @param p2 unused * @param p2 unused
* @param p3 the amount of money to receive (if positive), or spend (if negative)
* @param text unused * @param text unused
* @return the cost of this operation or an error * @return the cost of this operation or an error
*/ */
CommandCost CmdMoneyCheatAdmin(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text) CommandCost CmdMoneyCheatAdmin(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, uint64 p3, const char *text, const CommandAuxiliaryBase *aux_data)
{ {
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
_cheats.money.been_used = true; _cheats.money.been_used = true;
SetWindowDirty(WC_CHEATS, 0); SetWindowDirty(WC_CHEATS, 0);
} }
return CommandCost(EXPENSES_OTHER, -(int32)p1); return CommandCost(EXPENSES_OTHER, -(int64)p3);
} }
/** /**