From 0932854f7cb8ead7579f2e3b94b4a807c67bcc42 Mon Sep 17 00:00:00 2001 From: wolfreak99 Date: Thu, 23 Feb 2017 08:59:18 -0500 Subject: [PATCH] Sync "Raise / lower initial cash" --- src/openrct2/editor.c | 5 ++++- .../windows/editor_scenario_options.c | 22 +++++++++++++++---- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/openrct2/editor.c b/src/openrct2/editor.c index af08bfc54e..121df94093 100644 --- a/src/openrct2/editor.c +++ b/src/openrct2/editor.c @@ -566,7 +566,10 @@ void game_command_edit_scenario_options(sint32* eax, sint32* ebx, sint32* ecx, s } break; case EDIT_SCENARIOOPTIONS_SETINITIALCASH: - + gInitialCash = max(MONEY(0,00), min(MONEY(1000000,00), *edx)); + gCashEncrypted = ENCRYPT_MONEY(gInitialCash); + window_invalidate_by_class(WC_FINANCES); + window_invalidate_by_class(WC_BOTTOM_TOOLBAR); break; case EDIT_SCENARIOOPTIONS_SETINITIALLOAN: diff --git a/src/openrct2/windows/editor_scenario_options.c b/src/openrct2/windows/editor_scenario_options.c index 4e4983f76b..6f6f8d7c43 100644 --- a/src/openrct2/windows/editor_scenario_options.c +++ b/src/openrct2/windows/editor_scenario_options.c @@ -536,8 +536,15 @@ static void window_editor_scenario_options_financial_mousedown(sint32 widgetInde switch (widgetIndex) { case WIDX_INITIAL_CASH_INCREASE: if (gInitialCash < MONEY(1000000,00)) { - gInitialCash += MONEY(500,00); - gCashEncrypted = ENCRYPT_MONEY(gInitialCash); + game_do_command( + 0, + GAME_COMMAND_FLAG_APPLY, + EDIT_SCENARIOOPTIONS_SETINITIALCASH, + gInitialCash + MONEY(500,00), + GAME_COMMAND_EDIT_SCENARIO_OPTIONS, + 0, + 0 + ); } else { window_error_open(STR_CANT_INCREASE_CASH, STR_NONE); } @@ -545,8 +552,15 @@ static void window_editor_scenario_options_financial_mousedown(sint32 widgetInde break; case WIDX_INITIAL_CASH_DECREASE: if (gInitialCash > MONEY(0,00)) { - gInitialCash -= MONEY(500,00); - gCashEncrypted = ENCRYPT_MONEY(gInitialCash); + game_do_command( + 0, + GAME_COMMAND_FLAG_APPLY, + EDIT_SCENARIOOPTIONS_SETINITIALCASH, + gInitialCash - MONEY(500,00), + GAME_COMMAND_EDIT_SCENARIO_OPTIONS, + 0, + 0 + ); } else { window_error_open(STR_CANT_REDUCE_CASH, STR_NONE); }