From 86bcbafc019c0902d276d0efdb46a842a418c6a5 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Thu, 13 Aug 2015 09:00:49 +0200 Subject: [PATCH] Rename finance_mark_loan_settings_as_legitimate() to finance_update_loan_hash() --- src/editor.c | 2 +- src/game.c | 2 +- src/management/finance.c | 6 +++--- src/management/finance.h | 2 +- src/rct1.c | 2 +- src/scenario.c | 4 ++-- src/windows/editor_scenario_options.c | 12 ++++++------ 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/editor.c b/src/editor.c index 921b30afb0..193f393900 100644 --- a/src/editor.c +++ b/src/editor.c @@ -462,7 +462,7 @@ static int editor_read_s6(const char *path) RCT2_GLOBAL(0x013573DC, uint32) = min(RCT2_GLOBAL(0x013573DC, uint32), 100000); finance_reset_cash_to_initial(); - finance_mark_loan_settings_as_legitimate(); + finance_update_loan_hash(); RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_LOAN, money32) = clamp( MONEY(0,00), diff --git a/src/game.c b/src/game.c index e6cb1f9c78..a5eab478be 100644 --- a/src/game.c +++ b/src/game.c @@ -776,7 +776,7 @@ int game_load_save(const char *path) window_new_ride_init_vars(); RCT2_GLOBAL(0x009DEB7C, uint16) = 0; if (RCT2_GLOBAL(0x0013587C4, uint32) == 0) // this check is not in scenario play - finance_mark_loan_settings_as_legitimate(); + finance_update_loan_hash(); load_palette(); gfx_invalidate_screen(); diff --git a/src/management/finance.c b/src/management/finance.c index 49f3db2970..d17415ced0 100644 --- a/src/management/finance.c +++ b/src/management/finance.c @@ -188,7 +188,7 @@ void finance_init() { RCT2_GLOBAL(0x013587D8, uint16) = 0x3F; - finance_mark_loan_settings_as_legitimate(); + finance_update_loan_hash(); } /** @@ -244,7 +244,7 @@ void finance_update_daily_profit() } // This subroutine is used to mark loan changes as 'legitimate', to prevent cheat detection from incorrectly interfering -void finance_mark_loan_settings_as_legitimate() +void finance_update_loan_hash() { sint32 value = 0x70093A; value -= RCT2_GLOBAL(RCT2_ADDRESS_INITIAL_CASH, money32); @@ -314,7 +314,7 @@ void game_command_set_current_loan(int* eax, int* ebx, int* ecx, int* edx, int* RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_LOAN, money32) = newLoan; RCT2_GLOBAL(RCT2_ADDRESS_INITIAL_CASH, money32) = money; RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_MONEY_ENCRYPTED, money32) = ENCRYPT_MONEY(money); - finance_mark_loan_settings_as_legitimate(); + finance_update_loan_hash(); window_invalidate_by_class(WC_FINANCES); RCT2_GLOBAL(0x009A9804, uint16) |= 1; diff --git a/src/management/finance.h b/src/management/finance.h index 0650d31e6d..f0bb67fe90 100644 --- a/src/management/finance.h +++ b/src/management/finance.h @@ -61,7 +61,7 @@ void finance_reset_history(); void finance_init(); void finance_update_daily_profit(); void finance_shift_expenditure_table(); -void finance_mark_loan_settings_as_legitimate(); +void finance_update_loan_hash(); void finance_reset_cash_to_initial(); void finance_set_loan(money32 loan); diff --git a/src/rct1.c b/src/rct1.c index 50e3287eff..5e9c698ef3 100644 --- a/src/rct1.c +++ b/src/rct1.c @@ -259,7 +259,7 @@ void rct1_fix_landscape() RCT2_GLOBAL(RCT2_ADDRESS_INITIAL_CASH, money32) ); finance_reset_cash_to_initial(); - finance_mark_loan_settings_as_legitimate(); + finance_update_loan_hash(); RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_LOAN, money32) = clamp( MONEY(0,00), diff --git a/src/scenario.c b/src/scenario.c index 270d877eef..9ecb98e4a3 100644 --- a/src/scenario.c +++ b/src/scenario.c @@ -276,7 +276,7 @@ void scenario_begin() RCT2_GLOBAL(0x013587D0, money32) = RCT2_GLOBAL(0x013573DC, money32) - RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_LOAN, money32); RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_MONEY_ENCRYPTED, sint32) = ENCRYPT_MONEY(RCT2_GLOBAL(0x013573DC, sint32)); - finance_mark_loan_settings_as_legitimate(); // (loan related) + finance_update_loan_hash(); strcpy((char*)RCT2_ADDRESS_SCENARIO_DETAILS, s6Info->details); strcpy((char*)RCT2_ADDRESS_SCENARIO_NAME, s6Info->name); @@ -315,7 +315,7 @@ void scenario_begin() RCT2_GLOBAL(RCT2_ADDRESS_TOTAL_ADMISSIONS, uint32) = 0; RCT2_GLOBAL(RCT2_ADDRESS_INCOME_FROM_ADMISSIONS, uint32) = 0; RCT2_GLOBAL(0x013587D8, uint16) = 63; - finance_mark_loan_settings_as_legitimate(); // (loan related, called above already) + finance_update_loan_hash(); park_reset_history(); finance_reset_history(); award_reset(); diff --git a/src/windows/editor_scenario_options.c b/src/windows/editor_scenario_options.c index bae5cb49be..fc81d86aae 100644 --- a/src/windows/editor_scenario_options.c +++ b/src/windows/editor_scenario_options.c @@ -485,7 +485,7 @@ static void window_editor_scenario_options_financial_mousedown(int widgetIndex, if (RCT2_GLOBAL(RCT2_ADDRESS_INITIAL_CASH, money32) < MONEY(1000000,00)) { RCT2_GLOBAL(RCT2_ADDRESS_INITIAL_CASH, money32) += MONEY(500,00); RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_MONEY_ENCRYPTED, money32) = ENCRYPT_MONEY(RCT2_GLOBAL(RCT2_ADDRESS_INITIAL_CASH, money32)); - finance_mark_loan_settings_as_legitimate(); + finance_update_loan_hash(); } else { window_error_open(3248, STR_NONE); } @@ -495,7 +495,7 @@ static void window_editor_scenario_options_financial_mousedown(int widgetIndex, if (RCT2_GLOBAL(RCT2_ADDRESS_INITIAL_CASH, money32) > MONEY(0,00)) { RCT2_GLOBAL(RCT2_ADDRESS_INITIAL_CASH, money32) -= MONEY(500,00); RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_MONEY_ENCRYPTED, money32) = ENCRYPT_MONEY(RCT2_GLOBAL(RCT2_ADDRESS_INITIAL_CASH, money32)); - finance_mark_loan_settings_as_legitimate(); + finance_update_loan_hash(); } else { window_error_open(3249, STR_NONE); } @@ -505,7 +505,7 @@ static void window_editor_scenario_options_financial_mousedown(int widgetIndex, if (RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_LOAN, money32) < MONEY(5000000,00)) { RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_LOAN, money32) += MONEY(1000,00); RCT2_GLOBAL(RCT2_ADDRESS_MAXIMUM_LOAN, money32) = max(RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_LOAN, money32), RCT2_GLOBAL(RCT2_ADDRESS_MAXIMUM_LOAN, money32)); - finance_mark_loan_settings_as_legitimate(); + finance_update_loan_hash(); } else { window_error_open(3250, STR_NONE); } @@ -515,7 +515,7 @@ static void window_editor_scenario_options_financial_mousedown(int widgetIndex, if (RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_LOAN, money32) > MONEY(0,00)) { RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_LOAN, money32) -= MONEY(1000,00); RCT2_GLOBAL(RCT2_ADDRESS_MAXIMUM_LOAN, money32) = max(RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_LOAN, money32), RCT2_GLOBAL(RCT2_ADDRESS_MAXIMUM_LOAN, money32)); - finance_mark_loan_settings_as_legitimate(); + finance_update_loan_hash(); } else { window_error_open(3251, STR_NONE); } @@ -525,7 +525,7 @@ static void window_editor_scenario_options_financial_mousedown(int widgetIndex, if (RCT2_GLOBAL(RCT2_ADDRESS_MAXIMUM_LOAN, money32) < MONEY(5000000,00)) { RCT2_GLOBAL(RCT2_ADDRESS_MAXIMUM_LOAN, money32) += MONEY(1000,00); RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_LOAN, money32) = min(RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_LOAN, money32), RCT2_GLOBAL(RCT2_ADDRESS_MAXIMUM_LOAN, money32)); - finance_mark_loan_settings_as_legitimate(); + finance_update_loan_hash(); } else { window_error_open(3252, STR_NONE); } @@ -535,7 +535,7 @@ static void window_editor_scenario_options_financial_mousedown(int widgetIndex, if (RCT2_GLOBAL(RCT2_ADDRESS_MAXIMUM_LOAN, money32) > MONEY(0,00)) { RCT2_GLOBAL(RCT2_ADDRESS_MAXIMUM_LOAN, money32) -= MONEY(1000,00); RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_LOAN, money32) = min(RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_LOAN, money32), RCT2_GLOBAL(RCT2_ADDRESS_MAXIMUM_LOAN, money32)); - finance_mark_loan_settings_as_legitimate(); + finance_update_loan_hash(); } else { window_error_open(3253, STR_NONE); }