From 809e45949537ac533d11ed82fd186a01ade6b97d Mon Sep 17 00:00:00 2001 From: Goddesen Date: Sun, 29 May 2016 03:12:31 +0200 Subject: [PATCH] Added cheat to disable plant aging --- data/language/en-GB.txt | 2 ++ src/cheats.c | 3 +++ src/cheats.h | 2 ++ src/localisation/string_ids.h | 3 +++ src/rct2/S6Exporter.cpp | 1 + src/rct2/S6Importer.cpp | 1 + src/windows/cheats.c | 16 +++++++++++----- src/world/scenery.c | 6 ++++++ 8 files changed, 29 insertions(+), 5 deletions(-) diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index 287c7602f1..ff30e63791 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -4121,6 +4121,8 @@ STR_5811 :{SMALLFONT}{BLACK}If checked, you can have up to{NEWLINE}255 cars p STR_5812 :Show multiplayer window STR_5813 :{OPENQUOTES}{STRING}{ENDQUOTES} STR_5814 :{WINDOW_COLOUR_1}{OPENQUOTES}{STRING}{ENDQUOTES} +STR_5871 :Plants don't age. +STR_5872 :{SMALLFONT}{BLACK}Disable plant aging such that they don't wilt. #tooltips STR_5815 :{SMALLFONT}{BLACK}Display FPS counter in-game diff --git a/src/cheats.c b/src/cheats.c index 8d26fe3fb0..fe6e2b51c7 100644 --- a/src/cheats.c +++ b/src/cheats.c @@ -41,6 +41,7 @@ bool gCheatsDisableLittering = false; bool gCheatsNeverendingMarketing = false; bool gCheatsFreezeClimate = false; bool gCheatsDisableTrainLengthLimit = false; +bool gCheatsDisablePlantAging = false; int park_rating_spinner_value; @@ -398,6 +399,7 @@ void game_command_cheat(int* eax, int* ebx, int* ecx, int* edx, int* esi, int* e case CHEAT_WATERPLANTS: cheat_water_plants(); break; case CHEAT_FIXVANDALISM: cheat_fix_vandalism(); break; case CHEAT_REMOVELITTER: cheat_remove_litter(); break; + case CHEAT_DISABLEPLANTAGING: gCheatsDisablePlantAging = !gCheatsDisablePlantAging; break; case CHEAT_SETSTAFFSPEED: cheat_set_staff_speed(*edx); break; case CHEAT_RENEWRIDES: cheat_renew_rides(); break; case CHEAT_MAKEDESTRUCTIBLE: cheat_make_destructible(); break; @@ -437,4 +439,5 @@ void cheats_reset() gCheatsDisableLittering = false; gCheatsNeverendingMarketing = false; gCheatsFreezeClimate = false; + gCheatsDisablePlantAging = false; } diff --git a/src/cheats.h b/src/cheats.h index 9e66437744..81520490ad 100644 --- a/src/cheats.h +++ b/src/cheats.h @@ -35,6 +35,7 @@ extern bool gCheatsDisableLittering; extern bool gCheatsNeverendingMarketing; extern bool gCheatsFreezeClimate; extern bool gCheatsDisableTrainLengthLimit; +extern bool gCheatsDisablePlantAging; enum { CHEAT_SANDBOXMODE, @@ -60,6 +61,7 @@ enum { CHEAT_GIVEALLGUESTS, CHEAT_SETGRASSLENGTH, CHEAT_WATERPLANTS, + CHEAT_DISABLEPLANTAGING, CHEAT_FIXVANDALISM, CHEAT_REMOVELITTER, CHEAT_SETSTAFFSPEED, diff --git a/src/localisation/string_ids.h b/src/localisation/string_ids.h index ffccf487f5..4569dffa72 100644 --- a/src/localisation/string_ids.h +++ b/src/localisation/string_ids.h @@ -2644,6 +2644,9 @@ enum { STR_PROVIDER_WEBSITE = 5869, STR_SHOW_SERVER_INFO_TIP = 5870, + STR_CHEAT_DISABLE_PLANT_AGING = 5871, + STR_CHEAT_DISABLE_PLANT_AGING_TIP = 5872, + // Have to include resource strings (from scenarios and objects) for the time being now that language is partially working STR_COUNT = 32768 }; diff --git a/src/rct2/S6Exporter.cpp b/src/rct2/S6Exporter.cpp index a03bff4dd6..ba69341cb5 100644 --- a/src/rct2/S6Exporter.cpp +++ b/src/rct2/S6Exporter.cpp @@ -562,6 +562,7 @@ extern "C" SDL_WriteU8(rw, gCheatsDisableLittering); SDL_WriteU8(rw, gCheatsNeverendingMarketing); SDL_WriteU8(rw, gCheatsFreezeClimate); + SDL_WriteU8(rw, gCheatsDisablePlantAging); gfx_invalidate_screen(); return 1; diff --git a/src/rct2/S6Importer.cpp b/src/rct2/S6Importer.cpp index ddb1d70407..406c087a00 100644 --- a/src/rct2/S6Importer.cpp +++ b/src/rct2/S6Importer.cpp @@ -518,6 +518,7 @@ extern "C" gCheatsDisableLittering = SDL_ReadU8(rw) != 0; gCheatsNeverendingMarketing = SDL_ReadU8(rw) != 0; gCheatsFreezeClimate = SDL_ReadU8(rw) != 0; + gCheatsDisablePlantAging = SDL_ReadU8(rw) != 0; gLastAutoSaveTick = SDL_GetTicks(); return 1; diff --git a/src/windows/cheats.c b/src/windows/cheats.c index 4c71203379..95706d423d 100644 --- a/src/windows/cheats.c +++ b/src/windows/cheats.c @@ -105,6 +105,7 @@ enum WINDOW_CHEATS_WIDGET_IDX { WIDX_WATER_PLANTS, WIDX_FIX_VANDALISM, WIDX_REMOVE_LITTER, + WIDX_DISABLE_PLANT_AGING, WIDX_FAST_STAFF, WIDX_NORMAL_STAFF, WIDX_RENEW_RIDES = 8, @@ -220,14 +221,15 @@ static rct_widget window_cheats_misc_widgets[] = { { WWT_CLOSEBOX, 1, XPL(0), WPL(0), YPL(8), HPL(8), STR_CHEAT_FREEZE_CLIMATE, STR_CHEAT_FREEZE_CLIMATE_TIP }, // Freeze climate { WWT_DROPDOWN, 1, XPL(1), WPL(1), YPL(9) + 2, YPL(9) + 13, STR_NONE, STR_FORCE_WEATHER_TOOLTIP }, // Force weather { WWT_DROPDOWN_BUTTON, 1, WPL(1) - 11, WPL(1) - 1, YPL(9) + 3, YPL(9) + 12, STR_DROPDOWN_GLYPH, STR_FORCE_WEATHER_TOOLTIP }, // Force weather - { WWT_GROUPBOX, 1, XPL(0) - GROUP_SPACE, WPL(1) + GROUP_SPACE, YPL(11), HPL(15.5), STR_CHEAT_STAFF_GROUP, STR_NONE }, // Staff group + { WWT_GROUPBOX, 1, XPL(0) - GROUP_SPACE, WPL(1) + GROUP_SPACE, YPL(11), HPL(16.5), STR_CHEAT_STAFF_GROUP, STR_NONE }, // Staff group { WWT_CLOSEBOX, 1, XPL(0), WPL(0), YPL(12), HPL(12), STR_CHEAT_CLEAR_GRASS, STR_NONE}, // Clear grass { WWT_CLOSEBOX, 1, XPL(1), WPL(1), YPL(12), HPL(12), STR_CHEAT_MOWED_GRASS, STR_NONE}, // Mowed grass { WWT_CLOSEBOX, 1, XPL(0), WPL(0), YPL(13), HPL(13), STR_CHEAT_WATER_PLANTS, STR_NONE}, // Water plants { WWT_CLOSEBOX, 1, XPL(1), WPL(1), YPL(13), HPL(13), STR_CHEAT_FIX_VANDALISM, STR_NONE}, // Fix vandalism { WWT_CLOSEBOX, 1, XPL(0), WPL(0), YPL(14), HPL(14), STR_CHEAT_REMOVE_LITTER, STR_NONE}, // Remove litter - { WWT_CLOSEBOX, 1, MAX_BTN_LEFT, MAX_BTN_RIGHT, YPL(15), HPL(15), STR_FAST, STR_NONE }, // Fast staff - { WWT_CLOSEBOX, 1, MIN_BTN_LEFT, MIN_BTN_RIGHT, YPL(15), HPL(15), STR_NORMAL, STR_NONE }, // Normal staff + { WWT_CHECKBOX, 1, XPL(0), WPL(0), YPL(15), HPL(15), STR_CHEAT_DISABLE_PLANT_AGING, STR_CHEAT_DISABLE_PLANT_AGING_TIP}, // Disable plant aging + { WWT_CLOSEBOX, 1, MAX_BTN_LEFT, MAX_BTN_RIGHT, YPL(16), HPL(16), STR_FAST, STR_NONE }, // Fast staff + { WWT_CLOSEBOX, 1, MIN_BTN_LEFT, MIN_BTN_RIGHT, YPL(16), HPL(16), STR_NORMAL, STR_NONE }, // Normal staff { WIDGETS_END }, @@ -411,7 +413,7 @@ static uint64 window_cheats_page_enabled_widgets[] = { (1ULL << WIDX_DISABLE_VANDALISM) | (1ULL << WIDX_DISABLE_LITTERING), (1ULL << WIDX_CLOSE) | (1ULL << WIDX_TAB_1) | (1ULL << WIDX_TAB_2) | (1ULL << WIDX_TAB_3) | (1ULL << WIDX_TAB_4) | (1ULL << WIDX_FREEZE_CLIMATE) | (1ULL << WIDX_OPEN_CLOSE_PARK) | (1ULL << WIDX_WEATHER) | (1ULL << WIDX_WEATHER_DROPDOWN_BUTTON) | (1ULL << WIDX_CLEAR_GRASS) | (1ULL << WIDX_MOWED_GRASS) | - (1ULL << WIDX_WATER_PLANTS) | (1ULL << WIDX_FIX_VANDALISM) | (1ULL << WIDX_REMOVE_LITTER) | (1ULL << WIDX_WIN_SCENARIO) | (1ULL << WIDX_HAVE_FUN) | + (1ULL << WIDX_WATER_PLANTS) | (1ULL << WIDX_DISABLE_PLANT_AGING) | (1ULL << WIDX_FIX_VANDALISM) | (1ULL << WIDX_REMOVE_LITTER) | (1ULL << WIDX_WIN_SCENARIO) | (1ULL << WIDX_HAVE_FUN) | (1ULL << WIDX_NEVERENDING_MARKETING) | (1ULL << WIDX_UNLOCK_ALL_PRICES) | (1ULL << WIDX_SANDBOX_MODE) | (1ULL << WIDX_FAST_STAFF) | (1ULL << WIDX_NORMAL_STAFF) | (1ULL << WIDX_PARK_PARAMETERS) | (1ULL << WIDX_FORCE_PARK_RATING) | (1ULL << WIDX_INCREASE_PARK_RATING) | (1ULL << WIDX_DECREASE_PARK_RATING), (1ULL << WIDX_CLOSE) | (1ULL << WIDX_TAB_1) | (1ULL << WIDX_TAB_2) | (1ULL << WIDX_TAB_3) | (1ULL << WIDX_TAB_4) | (1ULL << WIDX_RENEW_RIDES) | @@ -631,6 +633,9 @@ static void window_cheats_misc_mouseup(rct_window *w, int widgetIndex) case WIDX_REMOVE_LITTER: game_do_command(0, GAME_COMMAND_FLAG_APPLY, CHEAT_REMOVELITTER, 0, GAME_COMMAND_CHEAT, 0, 0); break; + case WIDX_DISABLE_PLANT_AGING: + game_do_command(0, GAME_COMMAND_FLAG_APPLY, CHEAT_DISABLEPLANTAGING, 0, GAME_COMMAND_CHEAT, 0, 0); + break; case WIDX_WIN_SCENARIO: game_do_command(0, GAME_COMMAND_FLAG_APPLY, CHEAT_WINSCENARIO, 0, GAME_COMMAND_CHEAT, 0, 0); break; @@ -796,6 +801,7 @@ static void window_cheats_invalidate(rct_window *w) w->widgets[WIDX_SANDBOX_MODE].image = gCheatsSandboxMode ? STR_CHEAT_SANDBOX_MODE_DISABLE : STR_CHEAT_SANDBOX_MODE; w->widgets[WIDX_FREEZE_CLIMATE].image = gCheatsFreezeClimate ? STR_CHEAT_UNFREEZE_CLIMATE : STR_CHEAT_FREEZE_CLIMATE; widget_set_checkbox_value(w, WIDX_NEVERENDING_MARKETING, gCheatsNeverendingMarketing); + widget_set_checkbox_value(w, WIDX_DISABLE_PLANT_AGING, gCheatsDisablePlantAging); break; case WINDOW_CHEATS_PAGE_RIDES: set_format_arg(0, uint16, 255); @@ -834,7 +840,7 @@ static void window_cheats_paint(rct_window *w, rct_drawpixelinfo *dpi) gfx_draw_string_left(dpi, STR_CHEAT_CLEAR_LOAN_TIP, NULL, 0, w->x + XPL(0) + TXTO, w->y + YPL(2) + TXTO); } else if(w->page == WINDOW_CHEATS_PAGE_MISC){ - gfx_draw_string_left(dpi, STR_CHEAT_STAFF_SPEED, NULL, 0, w->x + XPL(0) + TXTO, w->y + YPL(15) + TXTO); + gfx_draw_string_left(dpi, STR_CHEAT_STAFF_SPEED, NULL, 0, w->x + XPL(0) + TXTO, w->y + YPL(16) + TXTO); gfx_draw_string_left(dpi, STR_FORCE_WEATHER, NULL, 0, w->x + XPL(0) + TXTO, w->y + YPL(9) + TXTO); gfx_draw_string_right(dpi, 5182, &park_rating_spinner_value, w->colours[2], w->x + WPL(1) - 10 - TXTO, w->y + YPL(4) + TXTO); } diff --git a/src/world/scenery.c b/src/world/scenery.c index 5ca5ed329e..611f0a040d 100644 --- a/src/world/scenery.c +++ b/src/world/scenery.c @@ -19,6 +19,7 @@ #include "../common.h" #include "../localisation/localisation.h" #include "../scenario.h" +#include "../cheats.h" #include "climate.h" #include "fountain.h" #include "map.h" @@ -102,6 +103,11 @@ void scenery_update_age(int x, int y, rct_map_element *mapElement) rct_scenery_entry *sceneryEntry; sceneryEntry = get_small_scenery_entry(mapElement->properties.scenery.type); + if (gCheatsDisablePlantAging && + (sceneryEntry->small_scenery.flags & SMALL_SCENERY_FLAG_CAN_BE_WATERED)) { + return; + } + if ( !(sceneryEntry->small_scenery.flags & SMALL_SCENERY_FLAG_CAN_BE_WATERED) || (gClimateCurrentWeather < WEATHER_RAIN) ||