From 5ed8948e4f94ba35b2a95a77d3e6310dd7017a0e Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Mon, 27 Jul 2015 21:47:55 +0200 Subject: [PATCH 1/2] Remove Six Flags branding and limitations, mark the lifecycle flag as deprecated, rename previously unidentified flag --- data/language/english_uk.txt | 2 +- src/localisation/string_ids.h | 1 - src/management/award.c | 2 +- src/ride/ride.c | 18 +----------------- src/ride/ride.h | 4 ++-- src/ride/track.c | 9 +-------- src/ride/track.h | 2 +- src/windows/cheats.c | 19 +------------------ src/windows/ride.c | 22 ++++++++-------------- src/windows/title_scenarioselect.c | 4 ---- src/windows/track_list.c | 5 ----- 11 files changed, 16 insertions(+), 72 deletions(-) diff --git a/data/language/english_uk.txt b/data/language/english_uk.txt index f71a258c92..26ffe96b3b 100644 --- a/data/language/english_uk.txt +++ b/data/language/english_uk.txt @@ -3460,7 +3460,7 @@ STR_5120 :Finances STR_5121 :Research STR_5122 :Select rides by track type (like in RCT1) STR_5123 :Renew rides -STR_5124 :No Six Flags +STR_5124 : STR_5125 :All destructable STR_5126 :Random title music STR_5127 :{SMALLFONT}{BLACK}Disable land elevation diff --git a/src/localisation/string_ids.h b/src/localisation/string_ids.h index 9608794c8f..050676970e 100644 --- a/src/localisation/string_ids.h +++ b/src/localisation/string_ids.h @@ -1243,7 +1243,6 @@ enum { // Rides STR_CHEAT_RENEW_RIDES = 5123, - STR_CHEAT_REMOVE_FLAGS = 5124, STR_CHEAT_MAKE_DESTRUCTABLE = 5125, STR_CHEAT_FIX_ALL_RIDES = 5132, STR_CHEAT_410_HILL_LIFT = 5137, diff --git a/src/management/award.c b/src/management/award.c index 7b7762f3b6..6448725c79 100644 --- a/src/management/award.c +++ b/src/management/award.c @@ -463,7 +463,7 @@ static int award_is_deserved_best_custom_designed_rides(int awardType, int activ FOR_ALL_RIDES(i, ride) { if (!ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_HAS_TRACK)) continue; - if (ride->lifecycle_flags & RIDE_LIFECYCLE_18) + if (ride->lifecycle_flags & RIDE_LIFECYCLE_NOT_CUSTOM_DESIGN) continue; if (ride->excitement < RIDE_RATING(5, 50)) continue; diff --git a/src/ride/ride.c b/src/ride/ride.c index 06de016512..87ec7617ce 100644 --- a/src/ride/ride.c +++ b/src/ride/ride.c @@ -1629,13 +1629,6 @@ int ride_modify(rct_xy_element *input) return 0; } - if (ride->lifecycle_flags & RIDE_LIFECYCLE_SIX_FLAGS) { - RCT2_GLOBAL(0x013CE952 + 6, uint16) = ride->name; - RCT2_GLOBAL(0x013CE952 + 8, uint32) = ride->name_arguments; - window_error_open(STR_CANT_START_CONSTRUCTION_ON, STR_THIS_RIDE_CANNOT_BE_MODIFIED); - return 0; - } - ride_clear_for_construction(rideIndex); ride_remove_peeps(rideIndex); @@ -2168,7 +2161,7 @@ static int ride_get_new_breakdown_problem(rct_ride *ride) return -1; monthsOld = RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_MONTH_YEAR, uint8) - ride->build_date; - if (monthsOld < 16 || ride->reliability > (50 << 8) || ride->lifecycle_flags & RIDE_LIFECYCLE_SIX_FLAGS) + if (monthsOld < 16 || ride->reliability > (50 << 8)) return -1; return BREAKDOWN_BRAKES_FAILURE; @@ -3601,15 +3594,6 @@ void game_command_set_ride_setting(int *eax, int *ebx, int *ecx, int *edx, int * } } - if (ride->lifecycle_flags & RIDE_LIFECYCLE_SIX_FLAGS){ - if (setting == 0 || setting == 4 || setting == 8 || setting == 9) - { - RCT2_GLOBAL(0x141E9AC, uint16) = 1797; - *ebx = MONEY32_UNDEFINED; - return; - } - } - if (setting == 9 && ride->lifecycle_flags & RIDE_LIFECYCLE_CABLE_LIFT && new_value > 1){ diff --git a/src/ride/ride.h b/src/ride/ride.h index d802ec541d..6d322b45ba 100644 --- a/src/ride/ride.h +++ b/src/ride/ride.h @@ -393,8 +393,8 @@ enum { RIDE_LIFECYCLE_INDESTRUCTIBLE_TRACK = 1 << 15, RIDE_LIFECYCLE_16 = 1 << 16, RIDE_LIFECYCLE_CABLE_LIFT = 1 << 17, - RIDE_LIFECYCLE_18 = 1 << 18, - RIDE_LIFECYCLE_SIX_FLAGS = 1 << 19 + RIDE_LIFECYCLE_NOT_CUSTOM_DESIGN = 1 << 18, // Used for the Award for Best Custom-designed Rides + RIDE_LIFECYCLE_SIX_FLAGS_DEPRECATED = 1 << 19 // Not used anymore }; // Constants used by the ride_type->flags property at 0x008 diff --git a/src/ride/track.c b/src/ride/track.c index c55c3d0cd8..5a2172e5bc 100644 --- a/src/ride/track.c +++ b/src/ride/track.c @@ -2931,9 +2931,6 @@ int ride_to_td6(uint8 rideIndex){ track_design->flags = 0; track_design->var_6C = 0; - if (ride->lifecycle_flags & RIDE_LIFECYCLE_SIX_FLAGS) - track_design->var_6C |= (1 << 31); - uint8* track_elements = RCT2_ADDRESS(0x9D821B, uint8); memset(track_elements, 0, 8000); @@ -3278,11 +3275,7 @@ void game_command_place_track_design(int* eax, int* ebx, int* ecx, int* edx, int rct_ride* ride = GET_RIDE(rideIndex); - ride->lifecycle_flags |= RIDE_LIFECYCLE_18; - - if (track_design->var_6C & (1 << 31)){ - ride->lifecycle_flags |= RIDE_LIFECYCLE_SIX_FLAGS; - } + ride->lifecycle_flags |= RIDE_LIFECYCLE_NOT_CUSTOM_DESIGN; ride->colour_scheme_type = track_design->version_and_colour_scheme & 3; diff --git a/src/ride/track.h b/src/ride/track.h index 89a302f241..c9eabb1c97 100644 --- a/src/ride/track.h +++ b/src/ride/track.h @@ -173,7 +173,7 @@ typedef struct { uint8 track_spine_colour[4]; // 0x60 uint8 track_rail_colour[4]; // 0x64 uint8 track_support_colour[4]; // 0x68 - uint32 var_6C; + uint32 var_6C; // some flags rct_object_entry vehicle_object; // 0x70 uint8 space_required_x; // 0x80 uint8 space_required_y; // 0x81 diff --git a/src/windows/cheats.c b/src/windows/cheats.c index 0fe18bd813..d48374eeb9 100644 --- a/src/windows/cheats.c +++ b/src/windows/cheats.c @@ -110,7 +110,6 @@ enum WINDOW_CHEATS_WIDGET_IDX { WIDX_FAST_STAFF, WIDX_NORMAL_STAFF, WIDX_RENEW_RIDES = 8, - WIDX_REMOVE_SIX_FLAGS, WIDX_MAKE_DESTRUCTIBLE, WIDX_FIX_ALL, WIDX_FAST_LIFT_HILL, @@ -249,7 +248,6 @@ static rct_widget window_cheats_misc_widgets[] = { static rct_widget window_cheats_rides_widgets[] = { MAIN_CHEATS_WIDGETS, { WWT_CLOSEBOX, 1, XPL(0), WPL(0), YPL(0), HPL(0), STR_CHEAT_RENEW_RIDES, STR_NONE}, // Renew rides - { WWT_CLOSEBOX, 1, XPL(1), WPL(1), YPL(0), HPL(0), STR_CHEAT_REMOVE_FLAGS, STR_NONE}, // Remove flags { WWT_CLOSEBOX, 1, XPL(1), WPL(1), YPL(1), HPL(1), STR_CHEAT_MAKE_DESTRUCTABLE, STR_NONE}, // Make destructable { WWT_CLOSEBOX, 1, XPL(0), WPL(0), YPL(1), HPL(1), STR_CHEAT_FIX_ALL_RIDES, STR_NONE }, // Fix all rides { WWT_CHECKBOX, 2, XPL(0), OWPL, YPL(11), OHPL(11) + 8, STR_CHEAT_410_HILL_LIFT, STR_NONE }, // 410 km/h lift hill @@ -414,7 +412,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_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_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_ZERO_CLEARANCE) | (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_REMOVE_SIX_FLAGS) | (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) }; static rct_string_id window_cheats_page_titles[] = { @@ -555,18 +553,6 @@ static void cheat_renew_rides() window_invalidate_by_class(WC_RIDE); } -static void cheat_remove_six_flags() -{ - int i; - rct_ride *ride; - FOR_ALL_RIDES(i, ride) - { - if (ride->lifecycle_flags & RIDE_LIFECYCLE_SIX_FLAGS) - ride->lifecycle_flags&=~RIDE_LIFECYCLE_SIX_FLAGS; - } - window_invalidate_by_class(WC_RIDE); -} - static void cheat_make_destructible() { int i; @@ -986,9 +972,6 @@ static void window_cheats_rides_mouseup(rct_window *w, int widgetIndex) case WIDX_RENEW_RIDES: cheat_renew_rides(); break; - case WIDX_REMOVE_SIX_FLAGS: - cheat_remove_six_flags(); - break; case WIDX_MAKE_DESTRUCTIBLE: cheat_make_destructible(); break; diff --git a/src/windows/ride.c b/src/windows/ride.c index a39bd33402..9debc78f25 100644 --- a/src/windows/ride.c +++ b/src/windows/ride.c @@ -2003,8 +2003,6 @@ static void window_ride_main_invalidate(rct_window *w) w->disabled_widgets &= ~((1 << 22) | (1 << 19)); if (ride->lifecycle_flags & (RIDE_LIFECYCLE_INDESTRUCTIBLE | RIDE_LIFECYCLE_INDESTRUCTIBLE_TRACK)) w->disabled_widgets |= (1 << 22); - if (ride->lifecycle_flags & RIDE_LIFECYCLE_SIX_FLAGS) - w->disabled_widgets |= (1 << 19); RCT2_GLOBAL(0x013CE952 + 0, uint16) = ride->name; RCT2_GLOBAL(0x013CE952 + 2, uint32) = ride->name_arguments; @@ -4774,15 +4772,14 @@ static void window_ride_measurements_invalidate(rct_window *w) window_ride_measurements_widgets[WIDX_RESET_SELECTION].type = WWT_EMPTY; window_ride_measurements_widgets[WIDX_SAVE_DESIGN].type = WWT_EMPTY; window_ride_measurements_widgets[WIDX_CANCEL_DESIGN].type = WWT_EMPTY; - if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_SIX_FLAGS)) { - if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_HAS_TRACK)) { - window_ride_measurements_widgets[WIDX_SAVE_TRACK_DESIGN].type = WWT_FLATBTN; - w->disabled_widgets |= (1 << WIDX_SAVE_TRACK_DESIGN); - if (ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED) { - if (ride->excitement != -1) { - w->disabled_widgets &= ~(1 << WIDX_SAVE_TRACK_DESIGN); - window_ride_measurements_widgets[WIDX_SAVE_TRACK_DESIGN].tooltip = STR_SAVE_TRACK_DESIGN; - } + + if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_HAS_TRACK)) { + window_ride_measurements_widgets[WIDX_SAVE_TRACK_DESIGN].type = WWT_FLATBTN; + w->disabled_widgets |= (1 << WIDX_SAVE_TRACK_DESIGN); + if (ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED) { + if (ride->excitement != -1) { + w->disabled_widgets &= ~(1 << WIDX_SAVE_TRACK_DESIGN); + window_ride_measurements_widgets[WIDX_SAVE_TRACK_DESIGN].tooltip = STR_SAVE_TRACK_DESIGN; } } } @@ -4821,9 +4818,6 @@ static void window_ride_measurements_paint(rct_window *w, rct_drawpixelinfo *dpi } else { ride = GET_RIDE(w->number); - if (ride->lifecycle_flags & RIDE_LIFECYCLE_SIX_FLAGS) - gfx_draw_sprite(dpi, 23225, w->x + w->width - 53, w->y + w->height - 73, 0); - x = w->x + window_ride_measurements_widgets[WIDX_PAGE_BACKGROUND].left + 4; y = w->y + window_ride_measurements_widgets[WIDX_PAGE_BACKGROUND].top + 4; diff --git a/src/windows/title_scenarioselect.c b/src/windows/title_scenarioselect.c index cb2997252f..b817b6113a 100644 --- a/src/windows/title_scenarioselect.c +++ b/src/windows/title_scenarioselect.c @@ -282,10 +282,6 @@ static void window_scenarioselect_paint(rct_window *w, rct_drawpixelinfo *dpi) if (scenario == NULL) return; - // Draw SixFlags image - if (scenario->flags & SCENARIO_FLAGS_SIXFLAGS) - gfx_draw_sprite(dpi, SPR_SIX_FLAGS, w->x + w->width - 55, w->y + w->height - 75, 0); - // Scenario name x = w->x + window_scenarioselect_widgets[WIDX_SCENARIOLIST].right + 4; y = w->y + window_scenarioselect_widgets[WIDX_TABCONTENT].top + 5; diff --git a/src/windows/track_list.c b/src/windows/track_list.c index f32d4722b4..3288317456 100644 --- a/src/windows/track_list.c +++ b/src/windows/track_list.c @@ -449,11 +449,6 @@ static void window_track_list_paint(rct_window *w, rct_drawpixelinfo *dpi) x = w->x + widget->left + 1; y = w->y + widget->bottom + 2; - if (track_td6->var_6C & 0x80000000) { - // Six flags logo - gfx_draw_sprite(dpi, SPR_SIX_FLAGS, w->x + widget->right - 50, y + 4, 0); - } - // Stats rating = track_td6->excitement * 10; gfx_draw_string_left(dpi, STR_TRACK_LIST_EXCITEMENT_RATING, &rating, 0, x, y); From 9976b9673a1a1bdcb2848e15297c4fcad87b8ce8 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Tue, 28 Jul 2015 10:13:16 +0200 Subject: [PATCH 2/2] Remove rest of Six Flags branding. --- data/language/english_uk.txt | 2 +- src/localisation/string_ids.h | 1 - src/sprites.h | 1 - src/windows/editor_objective_options.c | 23 ++--------------------- src/windows/install_track.c | 7 +------ src/world/park.h | 2 +- 6 files changed, 5 insertions(+), 31 deletions(-) diff --git a/data/language/english_uk.txt b/data/language/english_uk.txt index 26ffe96b3b..cf8efe8e80 100644 --- a/data/language/english_uk.txt +++ b/data/language/english_uk.txt @@ -3344,7 +3344,7 @@ STR_3333 :Export plug-in objects with saved games STR_3334 :{SMALLFONT}{BLACK}Select whether to save any additional plug-in object data required (add-in data not supplied with the main product) in saved game or scenario files, allowing them to be loaded by someone who doesn't have the additional object data STR_3335 :Roller Coaster Designer - Select Ride Types & Vehicles STR_3336 :Track Designs Manager - Select Ride Type -STR_3337 :Six Flags Park +STR_3337 : STR_3338 :{BLACK}Custom-designed layout STR_3339 :{BLACK}{COMMA16} design available, or custom-designed layout STR_3340 :{BLACK}{COMMA16} designs available, or custom-designed layout diff --git a/src/localisation/string_ids.h b/src/localisation/string_ids.h index 050676970e..11b72cdccf 100644 --- a/src/localisation/string_ids.h +++ b/src/localisation/string_ids.h @@ -1632,7 +1632,6 @@ enum { STR_SAVE_PLUGIN_DATA_TIP = 3334, STR_ROLLER_COASTER_DESIGNER_SELECT_RIDE_TYPES_VEHICLES = 3335, STR_TRACK_DESIGNS_MANAGER_SELECT_RIDE_TYPE = 3336, - STR_SIX_FLAGS_PARK = 3337, STR_GAME_TOOLS = 3341, STR_SCENARIO_EDITOR = 3342, diff --git a/src/sprites.h b/src/sprites.h index f0935e0748..67c8d71a4f 100644 --- a/src/sprites.h +++ b/src/sprites.h @@ -339,7 +339,6 @@ enum { SPR_INTRO_LOGO_11 = SPR_INTRO_LOGO_00 + 4, SPR_INTRO_LOGO_21 = SPR_INTRO_LOGO_00 + 5, - SPR_SIX_FLAGS = 23225, SPR_INTRO_INFOGRAMES_00 = 23226, SPR_INTRO_INFOGRAMES_10 = SPR_INTRO_INFOGRAMES_00 + 1, SPR_INTRO_INFOGRAMES_01 = SPR_INTRO_INFOGRAMES_00 + 2, diff --git a/src/windows/editor_objective_options.c b/src/windows/editor_objective_options.c index 8a6b489875..df340dcbf0 100644 --- a/src/windows/editor_objective_options.c +++ b/src/windows/editor_objective_options.c @@ -30,8 +30,6 @@ #include "error.h" #include "../interface/themes.h" -#define DISABLE_SIX_FLAGS_CHECKBOX - #pragma region Widgets enum { @@ -63,7 +61,6 @@ enum { WIDX_CATEGORY, WIDX_CATEGORY_DROPDOWN, WIDX_DETAILS, - WIDX_SIX_FLAGS, WIDX_RIDES = 6 }; @@ -90,7 +87,6 @@ static rct_widget window_editor_objective_options_main_widgets[] = { { WWT_DROPDOWN, 1, 98, 277, 150, 161, STR_NONE, STR_SELECT_WHICH_GROUP_THIS_SCENARIO_APPEARS_IN }, { WWT_DROPDOWN_BUTTON, 1, 266, 276, 151, 160, STR_DROPDOWN_GLYPH, STR_SELECT_WHICH_GROUP_THIS_SCENARIO_APPEARS_IN }, { WWT_DROPDOWN_BUTTON, 1, 370, 444, 167, 178, STR_CHANGE, STR_CHANGE_DETAIL_NOTES_ABOUT_PARK_SCENARIO_TIP }, - { WWT_CHECKBOX, 1, 8, 441, 215, 226, STR_SIX_FLAGS_PARK, STR_NONE }, { WIDGETS_END } }; @@ -222,8 +218,7 @@ static uint64 window_editor_objective_options_page_enabled_widgets[] = { (1 << WIDX_SCENARIO_NAME) | (1 << WIDX_CATEGORY) | (1 << WIDX_CATEGORY_DROPDOWN) | - (1 << WIDX_DETAILS) | - (1 << WIDX_SIX_FLAGS), + (1 << WIDX_DETAILS), (1 << WIDX_CLOSE) | (1 << WIDX_TAB_1) | @@ -417,10 +412,6 @@ static void window_editor_objective_options_main_mouseup(rct_window *w, int widg strcpy((char*)0x009BC677, s6Info->details); window_text_input_open(w, WIDX_DETAILS, 3315, 3316, 3165, 0, 256); break; - case WIDX_SIX_FLAGS: - RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) ^= PARK_FLAGS_SIX_FLAGS; - window_invalidate(w); - break; } } @@ -826,16 +817,6 @@ static void window_editor_objective_options_main_invalidate(rct_window *w) window_editor_objective_options_set_pressed_tab(w); - // This options was only available in development version -#ifdef DISABLE_SIX_FLAGS_CHECKBOX - window_editor_objective_options_main_widgets[WIDX_SIX_FLAGS].type = WWT_EMPTY; -#endif - - if (RCT2_GLOBAL(RCT2_ADDRESS_PARK_FLAGS, uint32) & PARK_FLAGS_SIX_FLAGS) - w->pressed_widgets |= (1 << WIDX_SIX_FLAGS); - else - w->pressed_widgets &= ~(1 << WIDX_SIX_FLAGS); - if (stex == NULL) w->disabled_widgets &= ~(WIDX_PARK_NAME | WIDX_SCENARIO_NAME); else @@ -1249,4 +1230,4 @@ static void window_editor_objective_options_update_disabled_widgets(rct_window * } else { w->disabled_widgets |= (1 << WIDX_TAB_2); } -} \ No newline at end of file +} diff --git a/src/windows/install_track.c b/src/windows/install_track.c index 6a8a25517c..70615409f6 100644 --- a/src/windows/install_track.c +++ b/src/windows/install_track.c @@ -346,11 +346,6 @@ static void window_install_track_paint(rct_window *w, rct_drawpixelinfo *dpi) y = w->y + widget->bottom + 2; // 0x006D3CF1 -- 0x006d3d71 missing - if (track_td6->var_6C & 0x80000000) { - // Six flags logo - gfx_draw_sprite(dpi, SPR_SIX_FLAGS, w->x + widget->right - 50, y + 4, 0); - } - // Stats rating = track_td6->excitement * 10; gfx_draw_string_left(dpi, STR_TRACK_LIST_EXCITEMENT_RATING, &rating, 0, x, y); @@ -472,4 +467,4 @@ static void window_install_track_text_input(rct_window *w, int widgetIndex, char strcpy(track_dest_name, text); window_event_mouse_up_call(w, WIDX_INSTALL); } -} \ No newline at end of file +} diff --git a/src/world/park.h b/src/world/park.h index 9be1c31621..2c66a3321a 100644 --- a/src/world/park.h +++ b/src/world/park.h @@ -43,7 +43,7 @@ enum { PARK_FLAGS_DIFFICULT_PARK_RATING = (1 << 14), PARK_FLAGS_NO_MONEY_SCENARIO = (1 << 17), // equivalent to PARK_FLAGS_NO_MONEY, but used in scenario editor PARK_FLAGS_18 = (1 << 18), - PARK_FLAGS_SIX_FLAGS = (1 << 19) + PARK_FLAGS_SIX_FLAGS_DEPRECATED = (1 << 19) }; extern uint8 *gParkRatingHistory;