Remove rest of Six Flags branding.

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    :<not used anymore>
 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

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,

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,

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);
 	}
-}
+}

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);
 	}
-}
+}

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;