From 82aba96728e5e46d6d97492fe93cfaead9925526 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Sat, 10 Nov 2018 14:30:41 +0100 Subject: [PATCH] Cheats: use 'weather' instead of 'climate' (#8246) --- data/language/en-GB.txt | 6 +++--- src/openrct2-ui/windows/Cheats.cpp | 16 ++++++++-------- src/openrct2/Cheats.cpp | 16 ++++++++-------- src/openrct2/Cheats.h | 4 ++-- src/openrct2/localisation/StringIds.h | 8 ++++---- src/openrct2/network/Network.cpp | 4 ++-- src/openrct2/world/Climate.cpp | 2 +- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index 6e9a96781e..26c867070e 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -2092,8 +2092,8 @@ STR_2756 :Remove litter STR_2763 :??? STR_2765 :Large Tram STR_2766 :Win scenario -STR_2767 :Freeze Climate -STR_2768 :Unfreeze Climate +STR_2767 :Freeze weather +STR_2768 :Unfreeze weather STR_2769 :Open Park STR_2770 :Close Park STR_2773 :Windowed @@ -2966,7 +2966,7 @@ STR_5461 :Set guests' parameters STR_5462 :{CURRENCY} STR_5463 :Goal: Have fun! STR_5464 :General -STR_5465 :Climate +STR_5465 :Weather STR_5466 :Staff STR_5467 :ALT + STR_5468 :Recent messages diff --git a/src/openrct2-ui/windows/Cheats.cpp b/src/openrct2-ui/windows/Cheats.cpp index 3a5e7e0f0a..bb43db1c33 100644 --- a/src/openrct2-ui/windows/Cheats.cpp +++ b/src/openrct2-ui/windows/Cheats.cpp @@ -130,8 +130,8 @@ enum WINDOW_CHEATS_WIDGET_IDX WIDX_WIN_SCENARIO, WIDX_HAVE_FUN, WIDX_NEVERENDING_MARKETING, - WIDX_CLIMATE_GROUP, - WIDX_FREEZE_CLIMATE, + WIDX_WEATHER_GROUP, + WIDX_FREEZE_WEATHER, WIDX_WEATHER, WIDX_WEATHER_DROPDOWN_BUTTON, WIDX_STAFF_GROUP, @@ -273,8 +273,8 @@ static rct_widget window_cheats_misc_widgets[] = { WWT_BUTTON, 1, XPL(0), WPL(0), YPL(6), HPL(6), STR_CHEAT_WIN_SCENARIO, STR_NONE }, // Win scenario { WWT_BUTTON, 1, XPL(1), WPL(1), YPL(6), HPL(6), STR_CHEAT_HAVE_FUN, STR_NONE }, // Have fun! { WWT_CHECKBOX, 1, XPL(0), OWPL, YPL(7), HPL(7), STR_CHEAT_NEVERENDING_MARKETING, STR_CHEAT_NEVERENDING_MARKETING_TIP }, // never ending marketing campaigns - { WWT_GROUPBOX, 1, XPL(0) - GROUP_SPACE, WPL(1) + GROUP_SPACE, YPL(8.25), HPL(10.5), STR_CHEAT_CLIMATE_GROUP, STR_NONE }, // Climate group - { WWT_BUTTON, 1, XPL(0), WPL(0), YPL(9), HPL(9), STR_CHEAT_FREEZE_CLIMATE, STR_CHEAT_FREEZE_CLIMATE_TIP }, // Freeze climate + { WWT_GROUPBOX, 1, XPL(0) - GROUP_SPACE, WPL(1) + GROUP_SPACE, YPL(8.25), HPL(10.5), STR_CHEAT_WEATHER_GROUP, STR_NONE }, // Weather group + { WWT_BUTTON, 1, XPL(0), WPL(0), YPL(9), HPL(9), STR_CHEAT_FREEZE_WEATHER, STR_CHEAT_FREEZE_WEATHER_TIP }, // Freeze weather { WWT_DROPDOWN, 1, XPL(1), WPL(1), YPL(10) + 2, YPL(10) + 13, STR_NONE, STR_FORCE_WEATHER_TOOLTIP }, // Force weather { WWT_BUTTON, 1, WPL(1) - 11, WPL(1) - 1, YPL(10) + 3, YPL(10) + 12, STR_DROPDOWN_GLYPH, STR_FORCE_WEATHER_TOOLTIP }, // Force weather { WWT_GROUPBOX, 1, XPL(0) - GROUP_SPACE, WPL(1) + GROUP_SPACE, YPL(12), HPL(17.5), STR_CHEAT_STAFF_GROUP, STR_NONE }, // Staff group @@ -530,7 +530,7 @@ static uint64_t window_cheats_page_enabled_widgets[] = { (1ULL << WIDX_DISABLE_LITTERING), MAIN_CHEAT_ENABLED_WIDGETS | - (1ULL << WIDX_FREEZE_CLIMATE) | + (1ULL << WIDX_FREEZE_WEATHER) | (1ULL << WIDX_OPEN_CLOSE_PARK) | (1ULL << WIDX_WEATHER) | (1ULL << WIDX_WEATHER_DROPDOWN_BUTTON) | @@ -936,8 +936,8 @@ static void window_cheats_misc_mouseup(rct_window* w, rct_widgetindex widgetInde case WIDX_TAB_4: window_cheats_set_page(w, widgetIndex - WIDX_TAB_1); break; - case WIDX_FREEZE_CLIMATE: - game_do_command(0, GAME_COMMAND_FLAG_APPLY, CHEAT_FREEZECLIMATE, !gCheatsFreezeClimate, GAME_COMMAND_CHEAT, 0, 0); + case WIDX_FREEZE_WEATHER: + game_do_command(0, GAME_COMMAND_FLAG_APPLY, CHEAT_FREEZEWEATHER, !gCheatsFreezeWeather, GAME_COMMAND_CHEAT, 0, 0); break; case WIDX_OPEN_CLOSE_PARK: game_do_command(0, GAME_COMMAND_FLAG_APPLY, CHEAT_OPENCLOSEPARK, 0, GAME_COMMAND_CHEAT, 0, 0); @@ -1174,7 +1174,7 @@ static void window_cheats_invalidate(rct_window* w) : STR_CHEAT_OPEN_PARK; widget_set_checkbox_value(w, WIDX_FORCE_PARK_RATING, get_forced_park_rating() >= 0); w->widgets[WIDX_SANDBOX_MODE].text = gCheatsSandboxMode ? STR_CHEAT_SANDBOX_MODE_DISABLE : STR_CHEAT_SANDBOX_MODE; - w->widgets[WIDX_FREEZE_CLIMATE].text = gCheatsFreezeClimate ? STR_CHEAT_UNFREEZE_CLIMATE : STR_CHEAT_FREEZE_CLIMATE; + w->widgets[WIDX_FREEZE_WEATHER].text = gCheatsFreezeWeather ? STR_CHEAT_UNFREEZE_WEATHER : STR_CHEAT_FREEZE_WEATHER; widget_set_checkbox_value(w, WIDX_NEVERENDING_MARKETING, gCheatsNeverendingMarketing); widget_set_checkbox_value(w, WIDX_DISABLE_PLANT_AGING, gCheatsDisablePlantAging); break; diff --git a/src/openrct2/Cheats.cpp b/src/openrct2/Cheats.cpp index e36f61b4a2..49d14d883b 100644 --- a/src/openrct2/Cheats.cpp +++ b/src/openrct2/Cheats.cpp @@ -40,7 +40,7 @@ bool gCheatsIgnoreRideIntensity = false; bool gCheatsDisableVandalism = false; bool gCheatsDisableLittering = false; bool gCheatsNeverendingMarketing = false; -bool gCheatsFreezeClimate = false; +bool gCheatsFreezeWeather = false; bool gCheatsDisableTrainLengthLimit = false; bool gCheatsDisablePlantAging = false; bool gCheatsEnableChainLiftOnAllTrack = false; @@ -617,8 +617,8 @@ void game_command_cheat( case CHEAT_FORCEWEATHER: climate_force_weather(*edx); break; - case CHEAT_FREEZECLIMATE: - gCheatsFreezeClimate = *edx != 0; + case CHEAT_FREEZEWEATHER: + gCheatsFreezeWeather = *edx != 0; break; case CHEAT_NEVERENDINGMARKETING: gCheatsNeverendingMarketing = *edx != 0; @@ -683,7 +683,7 @@ void cheats_reset() gCheatsDisableVandalism = false; gCheatsDisableLittering = false; gCheatsNeverendingMarketing = false; - gCheatsFreezeClimate = false; + gCheatsFreezeWeather = false; gCheatsDisablePlantAging = false; gCheatsAllowArbitraryRideTypeChanges = false; gCheatsDisableRideValueAging = false; @@ -947,14 +947,14 @@ const char* cheats_get_cheat_string(int cheat, int edx, int edi) } return cheat_string; } - case CHEAT_FREEZECLIMATE: - if (gCheatsFreezeClimate) + case CHEAT_FREEZEWEATHER: + if (gCheatsFreezeWeather) { - return language_get_string(STR_CHEAT_UNFREEZE_CLIMATE); + return language_get_string(STR_CHEAT_UNFREEZE_WEATHER); } else { - return language_get_string(STR_CHEAT_FREEZE_CLIMATE); + return language_get_string(STR_CHEAT_FREEZE_WEATHER); } case CHEAT_NEVERENDINGMARKETING: return language_get_string(STR_CHEAT_NEVERENDING_MARKETING); diff --git a/src/openrct2/Cheats.h b/src/openrct2/Cheats.h index 50ef750050..bcc8a18880 100644 --- a/src/openrct2/Cheats.h +++ b/src/openrct2/Cheats.h @@ -25,7 +25,7 @@ extern bool gCheatsIgnoreRideIntensity; extern bool gCheatsDisableVandalism; extern bool gCheatsDisableLittering; extern bool gCheatsNeverendingMarketing; -extern bool gCheatsFreezeClimate; +extern bool gCheatsFreezeWeather; extern bool gCheatsDisableTrainLengthLimit; extern bool gCheatsDisablePlantAging; extern bool gCheatsDisableRideValueAging; @@ -73,7 +73,7 @@ enum CHEAT_10MINUTEINSPECTIONS, CHEAT_WINSCENARIO, CHEAT_FORCEWEATHER, - CHEAT_FREEZECLIMATE, + CHEAT_FREEZEWEATHER, CHEAT_OPENCLOSEPARK, CHEAT_HAVEFUN, CHEAT_SETFORCEDPARKRATING, diff --git a/src/openrct2/localisation/StringIds.h b/src/openrct2/localisation/StringIds.h index d910c2488a..51f4320d8d 100644 --- a/src/openrct2/localisation/StringIds.h +++ b/src/openrct2/localisation/StringIds.h @@ -2171,8 +2171,8 @@ enum // STR_2764 : STR_CHEAT_LARGE_TRAM_GUESTS = 2765, STR_CHEAT_WIN_SCENARIO = 2766, - STR_CHEAT_FREEZE_CLIMATE = 2767, - STR_CHEAT_UNFREEZE_CLIMATE = 2768, + STR_CHEAT_FREEZE_WEATHER = 2767, + STR_CHEAT_UNFREEZE_WEATHER = 2768, STR_CHEAT_OPEN_PARK = 2769, STR_CHEAT_CLOSE_PARK = 2770, // STR_2771 :Slower Gamespeed @@ -3061,7 +3061,7 @@ enum STR_CHEAT_CURRENCY_FORMAT = 5462, STR_CHEAT_HAVE_FUN = 5463, STR_CHEAT_GENERAL_GROUP = 5464, - STR_CHEAT_CLIMATE_GROUP = 5465, + STR_CHEAT_WEATHER_GROUP = 5465, STR_CHEAT_STAFF_GROUP = 5466, STR_ALT_PLUS = 5467, STR_SHOW_RECENT_MESSAGES_ON_TOOLBAR = 5468, @@ -3355,7 +3355,7 @@ enum STR_CHEAT_MAKE_DESTRUCTABLE_TIP = 5794, STR_CHEAT_IGNORE_INTENSITY_TIP = 5795, STR_CHEAT_OPEN_PARK_TIP = 5796, - STR_CHEAT_FREEZE_CLIMATE_TIP = 5797, + STR_CHEAT_FREEZE_WEATHER_TIP = 5797, STR_CHEAT_BUILD_IN_PAUSE_MODE_TIP = 5798, STR_CHEAT_DISABLE_BRAKES_FAILURE_TIP = 5799, STR_CHEAT_DISABLE_BREAKDOWNS_TIP = 5800, diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index d28d2c9964..c003091d76 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -2264,7 +2264,7 @@ bool Network::LoadMap(IStream* stream) gCheatsDisableVandalism = stream->ReadValue() != 0; gCheatsDisableLittering = stream->ReadValue() != 0; gCheatsNeverendingMarketing = stream->ReadValue() != 0; - gCheatsFreezeClimate = stream->ReadValue() != 0; + gCheatsFreezeWeather = stream->ReadValue() != 0; gCheatsDisablePlantAging = stream->ReadValue() != 0; gCheatsAllowArbitraryRideTypeChanges = stream->ReadValue() != 0; gCheatsDisableRideValueAging = stream->ReadValue() != 0; @@ -2311,7 +2311,7 @@ bool Network::SaveMap(IStream* stream, const std::vectorWriteValue(gCheatsDisableVandalism); stream->WriteValue(gCheatsDisableLittering); stream->WriteValue(gCheatsNeverendingMarketing); - stream->WriteValue(gCheatsFreezeClimate); + stream->WriteValue(gCheatsFreezeWeather); stream->WriteValue(gCheatsDisablePlantAging); stream->WriteValue(gCheatsAllowArbitraryRideTypeChanges); stream->WriteValue(gCheatsDisableRideValueAging); diff --git a/src/openrct2/world/Climate.cpp b/src/openrct2/world/Climate.cpp index 82551e543e..ba94319234 100644 --- a/src/openrct2/world/Climate.cpp +++ b/src/openrct2/world/Climate.cpp @@ -114,7 +114,7 @@ void climate_update() if (gScreenFlags & (~SCREEN_FLAGS_PLAYING)) return; - if (!gCheatsFreezeClimate) + if (!gCheatsFreezeWeather) { if (gClimateUpdateTimer) {