mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #13426: Typo in "repay loan"

This commit is contained in:
maksimdrachov 2020-11-19 19:45:40 +01:00 committed by GitHub
parent f899a045fa
commit 1815a094bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
distribution/openrct2.d.ts vendored
View File

@ -1485,7 +1485,7 @@ declare global {
"monthlyRideIncome" |
"10RollercoastersLength" |
"finish5Rollercoasters" |
"replayLoanAndParkValue" |
"repayLoanAndParkValue" |
"monthlyFoodIncome";
interface ScenarioObjective {

12
src/openrct2-ui/windows/EditorObjectiveOptions.cpp
View File

@ -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;

6
src/openrct2/scenario/Scenario.cpp
View File

@ -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;
}

2
src/openrct2/scenario/Scenario.h
View File

@ -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

8
src/openrct2/scripting/ScScenario.hpp
View File

@ -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;
}

2
src/openrct2/scripting/ScriptEngine.cpp
View File

@ -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
{