From 1815a094bb9753c0f9fcdcf0961f24ccebfe5ccc Mon Sep 17 00:00:00 2001 From: maksimdrachov <39975120+maksimdrachov@users.noreply.github.com> Date: Thu, 19 Nov 2020 19:45:40 +0100 Subject: [PATCH] Fix #13426: Typo in "repay loan" --- distribution/openrct2.d.ts | 2 +- src/openrct2-ui/windows/EditorObjectiveOptions.cpp | 12 ++++++------ src/openrct2/scenario/Scenario.cpp | 6 +++--- src/openrct2/scenario/Scenario.h | 2 +- src/openrct2/scripting/ScScenario.hpp | 8 ++++---- src/openrct2/scripting/ScriptEngine.cpp | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/distribution/openrct2.d.ts b/distribution/openrct2.d.ts index 33582bf9fd..179c52857b 100644 --- a/distribution/openrct2.d.ts +++ b/distribution/openrct2.d.ts @@ -1485,7 +1485,7 @@ declare global { "monthlyRideIncome" | "10RollercoastersLength" | "finish5Rollercoasters" | - "replayLoanAndParkValue" | + "repayLoanAndParkValue" | "monthlyFoodIncome"; interface ScenarioObjective { diff --git a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp index 6a62a88ed8..51338928d1 100644 --- a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp +++ b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp @@ -344,7 +344,7 @@ static void window_editor_objective_options_set_objective(rct_window* w, int32_t case OBJECTIVE_FINISH_5_ROLLERCOASTERS: gScenarioObjective.MinimumExcitement = FIXED_2DP(6, 70); break; - case OBJECTIVE_REPLAY_LOAN_AND_PARK_VALUE: + case OBJECTIVE_REPAY_LOAN_AND_PARK_VALUE: gScenarioObjective.Currency = MONEY(50000, 00); break; case OBJECTIVE_MONTHLY_FOOD_INCOME: @@ -457,7 +457,7 @@ static void window_editor_objective_options_arg_1_increase(rct_window* w) { case OBJECTIVE_PARK_VALUE_BY: case OBJECTIVE_MONTHLY_RIDE_INCOME: - case OBJECTIVE_REPLAY_LOAN_AND_PARK_VALUE: + case OBJECTIVE_REPAY_LOAN_AND_PARK_VALUE: if (gScenarioObjective.Currency >= MONEY(2000000, 00)) { context_show_error(STR_CANT_INCREASE_FURTHER, STR_NONE, {}); @@ -521,7 +521,7 @@ static void window_editor_objective_options_arg_1_decrease(rct_window* w) { case OBJECTIVE_PARK_VALUE_BY: case OBJECTIVE_MONTHLY_RIDE_INCOME: - case OBJECTIVE_REPLAY_LOAN_AND_PARK_VALUE: + case OBJECTIVE_REPAY_LOAN_AND_PARK_VALUE: if (gScenarioObjective.Currency <= MONEY(1000, 00)) { context_show_error(STR_CANT_REDUCE_FURTHER, STR_NONE, {}); @@ -756,7 +756,7 @@ static void window_editor_objective_options_main_invalidate(rct_window* w) case OBJECTIVE_MONTHLY_RIDE_INCOME: case OBJECTIVE_10_ROLLERCOASTERS_LENGTH: case OBJECTIVE_FINISH_5_ROLLERCOASTERS: - case OBJECTIVE_REPLAY_LOAN_AND_PARK_VALUE: + case OBJECTIVE_REPAY_LOAN_AND_PARK_VALUE: case OBJECTIVE_MONTHLY_FOOD_INCOME: window_editor_objective_options_main_widgets[WIDX_OBJECTIVE_ARG_1].type = WWT_SPINNER; window_editor_objective_options_main_widgets[WIDX_OBJECTIVE_ARG_1_INCREASE].type = WWT_BUTTON; @@ -815,7 +815,7 @@ static void window_editor_objective_options_main_paint(rct_window* w, rct_drawpi stringId = STR_WINDOW_OBJECTIVE_GUEST_COUNT; break; case OBJECTIVE_PARK_VALUE_BY: - case OBJECTIVE_REPLAY_LOAN_AND_PARK_VALUE: + case OBJECTIVE_REPAY_LOAN_AND_PARK_VALUE: stringId = STR_WINDOW_OBJECTIVE_PARK_VALUE; break; case OBJECTIVE_MONTHLY_RIDE_INCOME: @@ -844,7 +844,7 @@ static void window_editor_objective_options_main_paint(rct_window* w, rct_drawpi arg = gScenarioObjective.NumGuests; break; case OBJECTIVE_PARK_VALUE_BY: - case OBJECTIVE_REPLAY_LOAN_AND_PARK_VALUE: + case OBJECTIVE_REPAY_LOAN_AND_PARK_VALUE: case OBJECTIVE_MONTHLY_RIDE_INCOME: case OBJECTIVE_MONTHLY_FOOD_INCOME: stringId = STR_CURRENCY_FORMAT_LABEL; diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp index 99759b02e9..fd44000b00 100644 --- a/src/openrct2/scenario/Scenario.cpp +++ b/src/openrct2/scenario/Scenario.cpp @@ -294,7 +294,7 @@ static void scenario_day_update() case OBJECTIVE_GUESTS_AND_RATING: case OBJECTIVE_10_ROLLERCOASTERS_LENGTH: case OBJECTIVE_FINISH_5_ROLLERCOASTERS: - case OBJECTIVE_REPLAY_LOAN_AND_PARK_VALUE: + case OBJECTIVE_REPAY_LOAN_AND_PARK_VALUE: scenario_objective_check(); break; default: @@ -981,7 +981,7 @@ ObjectiveStatus Objective::Check() const return Check10RollerCoastersLength(); case OBJECTIVE_FINISH_5_ROLLERCOASTERS: return CheckFinish5RollerCoasters(); - case OBJECTIVE_REPLAY_LOAN_AND_PARK_VALUE: + case OBJECTIVE_REPAY_LOAN_AND_PARK_VALUE: return CheckRepayLoanAndParkValue(); case OBJECTIVE_MONTHLY_FOOD_INCOME: return CheckMonthlyFoodIncome(); @@ -996,7 +996,7 @@ bool ObjectiveNeedsMoney(const uint8_t objective) { case OBJECTIVE_PARK_VALUE_BY: case OBJECTIVE_MONTHLY_RIDE_INCOME: - case OBJECTIVE_REPLAY_LOAN_AND_PARK_VALUE: + case OBJECTIVE_REPAY_LOAN_AND_PARK_VALUE: case OBJECTIVE_MONTHLY_FOOD_INCOME: return true; } diff --git a/src/openrct2/scenario/Scenario.h b/src/openrct2/scenario/Scenario.h index 3c0890c21d..23ed8d54f4 100644 --- a/src/openrct2/scenario/Scenario.h +++ b/src/openrct2/scenario/Scenario.h @@ -343,7 +343,7 @@ enum OBJECTIVE_MONTHLY_RIDE_INCOME, OBJECTIVE_10_ROLLERCOASTERS_LENGTH, OBJECTIVE_FINISH_5_ROLLERCOASTERS, - OBJECTIVE_REPLAY_LOAN_AND_PARK_VALUE, + OBJECTIVE_REPAY_LOAN_AND_PARK_VALUE, OBJECTIVE_MONTHLY_FOOD_INCOME, OBJECTIVE_COUNT diff --git a/src/openrct2/scripting/ScScenario.hpp b/src/openrct2/scripting/ScScenario.hpp index 33e1998abb..5a2174a846 100644 --- a/src/openrct2/scripting/ScScenario.hpp +++ b/src/openrct2/scripting/ScScenario.hpp @@ -35,7 +35,7 @@ namespace OpenRCT2::Scripting { "monthlyRideIncome", OBJECTIVE_MONTHLY_RIDE_INCOME }, { "10RollercoastersLength", OBJECTIVE_10_ROLLERCOASTERS_LENGTH }, { "finish5Rollercoasters", OBJECTIVE_FINISH_5_ROLLERCOASTERS }, - { "replayLoanAndParkValue", OBJECTIVE_REPLAY_LOAN_AND_PARK_VALUE }, + { "repayLoanAndParkValue", OBJECTIVE_REPAY_LOAN_AND_PARK_VALUE }, { "monthlyFoodIncome", OBJECTIVE_MONTHLY_FOOD_INCOME }, }); @@ -128,7 +128,7 @@ namespace OpenRCT2::Scripting money32 parkValue_get() { if (gScenarioObjective.Type == OBJECTIVE_PARK_VALUE_BY - || gScenarioObjective.Type == OBJECTIVE_REPLAY_LOAN_AND_PARK_VALUE) + || gScenarioObjective.Type == OBJECTIVE_REPAY_LOAN_AND_PARK_VALUE) { return gScenarioObjective.Currency; } @@ -139,7 +139,7 @@ namespace OpenRCT2::Scripting { ThrowIfGameStateNotMutable(); if (gScenarioObjective.Type == OBJECTIVE_PARK_VALUE_BY - || gScenarioObjective.Type == OBJECTIVE_REPLAY_LOAN_AND_PARK_VALUE) + || gScenarioObjective.Type == OBJECTIVE_REPAY_LOAN_AND_PARK_VALUE) { gScenarioObjective.Currency = value; } @@ -159,7 +159,7 @@ namespace OpenRCT2::Scripting { ThrowIfGameStateNotMutable(); if (gScenarioObjective.Type == OBJECTIVE_PARK_VALUE_BY - || gScenarioObjective.Type == OBJECTIVE_REPLAY_LOAN_AND_PARK_VALUE) + || gScenarioObjective.Type == OBJECTIVE_REPAY_LOAN_AND_PARK_VALUE) { gScenarioObjective.Currency = value; } diff --git a/src/openrct2/scripting/ScriptEngine.cpp b/src/openrct2/scripting/ScriptEngine.cpp index 49bf283c2a..1abf0bb3de 100644 --- a/src/openrct2/scripting/ScriptEngine.cpp +++ b/src/openrct2/scripting/ScriptEngine.cpp @@ -43,7 +43,7 @@ using namespace OpenRCT2; using namespace OpenRCT2::Scripting; -static constexpr int32_t OPENRCT2_PLUGIN_API_VERSION = 11; +static constexpr int32_t OPENRCT2_PLUGIN_API_VERSION = 12; struct ExpressionStringifier final {