From 8c07613eed66f8f741f0a34d9589c694718dcbfc Mon Sep 17 00:00:00 2001 From: wolfreak99 Date: Thu, 23 Feb 2017 09:05:06 -0500 Subject: [PATCH] Sync "Raise / lower maximum loan size" --- src/openrct2/editor.c | 4 +++- .../windows/editor_scenario_options.c | 22 +++++++++++++++---- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/openrct2/editor.c b/src/openrct2/editor.c index dcc491576e..485bb25c3d 100644 --- a/src/openrct2/editor.c +++ b/src/openrct2/editor.c @@ -577,7 +577,9 @@ void game_command_edit_scenario_options(sint32* eax, sint32* ebx, sint32* ecx, s window_invalidate_by_class(WC_FINANCES); break; case EDIT_SCENARIOOPTIONS_SETMAXIMUMLOANSIZE: - + gMaxBankLoan = max(MONEY(0,00), min(MONEY(5000000,00), *edx)); + gBankLoan = min(gBankLoan, gMaxBankLoan); + window_invalidate_by_class(WC_FINANCES); break; case EDIT_SCENARIOOPTIONS_SETANNUALINTERESTRATE: diff --git a/src/openrct2/windows/editor_scenario_options.c b/src/openrct2/windows/editor_scenario_options.c index 6f32eae5cf..f1f146f15b 100644 --- a/src/openrct2/windows/editor_scenario_options.c +++ b/src/openrct2/windows/editor_scenario_options.c @@ -600,8 +600,15 @@ static void window_editor_scenario_options_financial_mousedown(sint32 widgetInde break; case WIDX_MAXIMUM_LOAN_INCREASE: if (gMaxBankLoan < MONEY(5000000,00)) { - gMaxBankLoan += MONEY(1000,00); - gBankLoan = min(gBankLoan, gMaxBankLoan); + game_do_command( + 0, + GAME_COMMAND_FLAG_APPLY, + EDIT_SCENARIOOPTIONS_SETMAXIMUMLOANSIZE, + gMaxBankLoan + MONEY(1000,00), + GAME_COMMAND_EDIT_SCENARIO_OPTIONS, + 0, + 0 + ); } else { window_error_open(STR_CANT_INCREASE_MAX_LOAN, STR_NONE); } @@ -609,8 +616,15 @@ static void window_editor_scenario_options_financial_mousedown(sint32 widgetInde break; case WIDX_MAXIMUM_LOAN_DECREASE: if (gMaxBankLoan > MONEY(0,00)) { - gMaxBankLoan -= MONEY(1000,00); - gBankLoan = min(gBankLoan, gMaxBankLoan); + game_do_command( + 0, + GAME_COMMAND_FLAG_APPLY, + EDIT_SCENARIOOPTIONS_SETMAXIMUMLOANSIZE, + gMaxBankLoan - MONEY(1000,00), + GAME_COMMAND_EDIT_SCENARIO_OPTIONS, + 0, + 0 + ); } else { window_error_open(STR_CANT_REDUCE_MAX_LOAN, STR_NONE); }