From e2ec6e0970c095c01bdac37640fafb1db671805b Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Fri, 18 Sep 2015 11:55:52 +0200 Subject: [PATCH] Move 'show all operating modes' to Cheats window --- src/localisation/string_ids.h | 3 ++- src/windows/cheats.c | 10 ++++++++-- src/windows/top_toolbar.c | 11 ++--------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/localisation/string_ids.h b/src/localisation/string_ids.h index db3e1437fb..d366b4b736 100644 --- a/src/localisation/string_ids.h +++ b/src/localisation/string_ids.h @@ -2104,7 +2104,8 @@ enum { STR_CHEAT_DISABLE_VANDALISM_TIP = 5515, STR_COLOUR_NAMES_START = 5516, - STR_SHOW_ALL_OPERATING_MODES = 5548, + + STR_CHEAT_SHOW_ALL_OPERATING_MODES = 5548, // 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/windows/cheats.c b/src/windows/cheats.c index 80435be664..f0aa95a46b 100644 --- a/src/windows/cheats.c +++ b/src/windows/cheats.c @@ -117,7 +117,8 @@ enum WINDOW_CHEATS_WIDGET_IDX { WIDX_DISABLE_BRAKES_FAILURE, WIDX_DISABLE_ALL_BREAKDOWNS, WIDX_BUILD_IN_PAUSE_MODE, - WIDX_RESET_CRASH_STATUS + WIDX_RESET_CRASH_STATUS, + WIDX_SHOW_ALL_OPERATING_MODES }; enum { @@ -257,6 +258,7 @@ static rct_widget window_cheats_rides_widgets[] = { { WWT_CHECKBOX, 2, XPL(0), OWPL, YPL(10), OHPL(10), STR_CHEAT_DISABLE_BREAKDOWNS, STR_NONE }, // Disable all breakdowns { WWT_CHECKBOX, 2, XPL(0), OWPL, YPL(8), OHPL(8), STR_CHEAT_BUILD_IN_PAUSE_MODE, STR_NONE }, // Build in pause mode { WWT_CLOSEBOX, 1, XPL(0), WPL(0), YPL(2), HPL(2), STR_CHEAT_RESET_CRASH_STATUS, STR_NONE }, // Reset crash status + { WWT_CHECKBOX, 2, XPL(0), OWPL, YPL(7), OHPL(7), STR_CHEAT_SHOW_ALL_OPERATING_MODES, STR_NONE }, // Show all operating modes { WIDGETS_END }, }; @@ -412,7 +414,7 @@ static uint64 window_cheats_page_enabled_widgets[] = { (1ULL << WIDX_CLOSE) | (1ULL << WIDX_TAB_1) | (1ULL << WIDX_TAB_2) | (1ULL << WIDX_TAB_3) | (1ULL << WIDX_TAB_4) | (1ULL << WIDX_HIGH_MONEY) | (1ULL << WIDX_CLEAR_LOAN), (1ULL << WIDX_CLOSE) | (1ULL << WIDX_TAB_1) | (1ULL << WIDX_TAB_2) | (1ULL << WIDX_TAB_3) | (1ULL << WIDX_TAB_4) | (1ULL << WIDX_GUEST_PARAMETERS_GROUP) | (1ULL << WIDX_GUEST_HAPPINESS_MAX) | (1ULL << WIDX_GUEST_HAPPINESS_MIN) | (1ULL << WIDX_GUEST_ENERGY_MAX) | (1ULL << WIDX_GUEST_ENERGY_MIN) | (1ULL << WIDX_GUEST_HUNGER_MAX) | (1ULL << WIDX_GUEST_HUNGER_MIN) | (1ULL << WIDX_GUEST_THIRST_MAX) | (1ULL << WIDX_GUEST_THIRST_MIN) | (1ULL << WIDX_GUEST_NAUSEA_MAX) | (1ULL << WIDX_GUEST_NAUSEA_MIN) | (1ULL << WIDX_GUEST_NAUSEA_TOLERANCE_MAX) | (1ULL << WIDX_GUEST_NAUSEA_TOLERANCE_MIN) | (1ULL << WIDX_GUEST_BATHROOM_MAX) | (1ULL << WIDX_GUEST_BATHROOM_MIN) | (1ULL << WIDX_GUEST_RIDE_INTENSITY_MORE_THAN_1) | (1ULL << WIDX_GUEST_RIDE_INTENSITY_LESS_THAN_15) | (1ULL << WIDX_GUEST_IGNORE_RIDE_INTENSITY) | (1ULL << WIDX_GIVE_ALL_GUESTS_GROUP) | (1ULL << WIDX_GIVE_GUESTS_MONEY) | (1ULL << WIDX_GIVE_GUESTS_PARK_MAPS) | (1ULL << WIDX_GIVE_GUESTS_BALLOONS) | (1ULL << WIDX_GIVE_GUESTS_UMBRELLAS) | (1ULL << WIDX_TRAM_GUESTS) | (1ULL << WIDX_REMOVE_ALL_GUESTS) | (1ULL << WIDX_EXPLODE_GUESTS) | (1ULL << WIDX_DISABLE_VANDALISM), (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_SUN) | (1ULL << WIDX_WEATHER_THUNDER) | (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_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) | (1ULL << WIDX_MAKE_DESTRUCTIBLE) | (1ULL << WIDX_FIX_ALL) | (1ULL << WIDX_FAST_LIFT_HILL) | (1ULL << WIDX_DISABLE_BRAKES_FAILURE) | (1ULL << WIDX_DISABLE_ALL_BREAKDOWNS) | (1ULL << WIDX_BUILD_IN_PAUSE_MODE) | (1ULL << WIDX_RESET_CRASH_STATUS) + (1ULL << WIDX_CLOSE) | (1ULL << WIDX_TAB_1) | (1ULL << WIDX_TAB_2) | (1ULL << WIDX_TAB_3) | (1ULL << WIDX_TAB_4) | (1ULL << WIDX_RENEW_RIDES) | (1ULL << WIDX_MAKE_DESTRUCTIBLE) | (1ULL << WIDX_FIX_ALL) | (1ULL << WIDX_FAST_LIFT_HILL) | (1ULL << WIDX_DISABLE_BRAKES_FAILURE) | (1ULL << WIDX_DISABLE_ALL_BREAKDOWNS) | (1ULL << WIDX_BUILD_IN_PAUSE_MODE) | (1ULL << WIDX_RESET_CRASH_STATUS) | (1ULL << WIDX_SHOW_ALL_OPERATING_MODES) }; static rct_string_id window_cheats_page_titles[] = { @@ -1006,6 +1008,9 @@ static void window_cheats_rides_mouseup(rct_window *w, int widgetIndex) case WIDX_RESET_CRASH_STATUS: cheat_reset_crash_status(); break; + case WIDX_SHOW_ALL_OPERATING_MODES: + gCheatsShowAllOperatingModes = !gCheatsShowAllOperatingModes; + break; } } @@ -1069,6 +1074,7 @@ static void window_cheats_invalidate(rct_window *w) widget_set_checkbox_value(w, WIDX_DISABLE_BRAKES_FAILURE, gConfigCheat.disable_brakes_failure); widget_set_checkbox_value(w, WIDX_DISABLE_ALL_BREAKDOWNS, gConfigCheat.disable_all_breakdowns); widget_set_checkbox_value(w, WIDX_BUILD_IN_PAUSE_MODE, gConfigCheat.build_in_pause_mode); + widget_set_checkbox_value(w, WIDX_SHOW_ALL_OPERATING_MODES, gCheatsShowAllOperatingModes); break; } diff --git a/src/windows/top_toolbar.c b/src/windows/top_toolbar.c index 44dd45fcd8..3e6e307336 100644 --- a/src/windows/top_toolbar.c +++ b/src/windows/top_toolbar.c @@ -116,8 +116,7 @@ enum { DDIDX_CHEATS, DDIDX_ENABLE_SANDBOX_MODE = 2, DDIDX_DISABLE_CLEARANCE_CHECKS, - DDIDX_DISABLE_SUPPORT_LIMITS, - DDIDX_SHOW_ALL_OPERATING_MODES + DDIDX_DISABLE_SUPPORT_LIMITS }; #pragma region Toolbar_widget_ordering @@ -422,19 +421,17 @@ static void window_top_toolbar_mousedown(int widgetIndex, rct_window*w, rct_widg gDropdownItemsFormat[2] = 1156; gDropdownItemsFormat[3] = 1156; gDropdownItemsFormat[4] = 1156; - gDropdownItemsFormat[5] = 1156; gDropdownItemsArgs[0] = 5217; gDropdownItemsArgs[2] = STR_ENABLE_SANDBOX_MODE; gDropdownItemsArgs[3] = STR_DISABLE_CLEARANCE_CHECKS; gDropdownItemsArgs[4] = STR_DISABLE_SUPPORT_LIMITS; - gDropdownItemsArgs[5] = STR_SHOW_ALL_OPERATING_MODES; window_dropdown_show_text( w->x + widget->left, w->y + widget->top, widget->bottom - widget->top + 1, w->colours[0] | 0x80, 0, - 6 + 5 ); if (gCheatsSandboxMode) gDropdownItemsChecked |= (1 << DDIDX_ENABLE_SANDBOX_MODE); @@ -442,8 +439,6 @@ static void window_top_toolbar_mousedown(int widgetIndex, rct_window*w, rct_widg gDropdownItemsChecked |= (1 << DDIDX_DISABLE_CLEARANCE_CHECKS); if (gCheatsDisableSupportLimits) gDropdownItemsChecked |= (1 << DDIDX_DISABLE_SUPPORT_LIMITS); - if (gCheatsShowAllOperatingModes) - gDropdownItemsChecked |= (1 << DDIDX_SHOW_ALL_OPERATING_MODES); RCT2_GLOBAL(0x009DEBA2, uint16) = 0; break; case WIDX_VIEW_MENU: @@ -561,8 +556,6 @@ static void window_top_toolbar_dropdown(rct_window *w, int widgetIndex, int drop case DDIDX_DISABLE_SUPPORT_LIMITS: gCheatsDisableSupportLimits = !gCheatsDisableSupportLimits; break; - case DDIDX_SHOW_ALL_OPERATING_MODES: - gCheatsShowAllOperatingModes = !gCheatsShowAllOperatingModes; } break; case WIDX_VIEW_MENU: