From fd715c7c5d17cf099656a250919b77fb82545985 Mon Sep 17 00:00:00 2001
From: Gymnasiast <m.o.steenbeek@gmail.com>
Date: Wed, 12 Aug 2015 00:21:53 +0200
Subject: [PATCH] Name RIDE_TYPE_FLAG_8 and _12

---
 src/ride/ride.c                 | 2 +-
 src/ride/ride.h                 | 4 ++--
 src/windows/ride_construction.c | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/ride/ride.c b/src/ride/ride.c
index 9180760cc7..4ebe33d133 100644
--- a/src/ride/ride.c
+++ b/src/ride/ride.c
@@ -1641,7 +1641,7 @@ int ride_modify(rct_xy_element *input)
 	if (ride->type == RIDE_TYPE_MAZE)
 		return ride_modify_maze(mapElement.element, mapElement.x, mapElement.y);
 
-	if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_8)) {
+	if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_CANNOT_HAVE_GAPS)) {
 		if (ride_find_track_gap(&mapElement, &endOfTrackElement))
 			mapElement = endOfTrackElement;
 	}
diff --git a/src/ride/ride.h b/src/ride/ride.h
index d99221f299..1ce610aea4 100644
--- a/src/ride/ride.h
+++ b/src/ride/ride.h
@@ -744,11 +744,11 @@ enum {
 	RIDE_TYPE_FLAG_CAN_SYNCHRONISE_ADJACENT_STATIONS = 1 << 5,
 	RIDE_TYPE_FLAG_6 = 1 << 6,									// used only by boat ride and submarine ride
 	RIDE_TYPE_FLAG_HAS_G_FORCES = 1 << 7,
-	RIDE_TYPE_FLAG_8 = 1 << 8,									// something to do with track, maybe whether it can have gaps
+	RIDE_TYPE_FLAG_CANNOT_HAVE_GAPS = 1 << 8,					// used by rides that can't have gaps, like those with a vertical tower, such as the observation tower
 	RIDE_TYPE_FLAG_HAS_DATA_LOGGING = 1 << 9,
 	RIDE_TYPE_FLAG_HAS_DROPS = 1 << 10,
 	RIDE_TYPE_FLAG_NO_TEST_MODE = 1 << 11,
-	RIDE_TYPE_FLAG_12 = 1 << 12,								// used only by dinghy slide and water coaster
+	RIDE_TYPE_FLAG_TRACK_ELEMENTS_HAVE_TWO_VARIATIES = 1 << 12,	// used by rides with two variaties, like the u and o shapes of the dinghy slide and the dry and submerged track of the water coaster
 	RIDE_TYPE_FLAG_13 = 1 << 13,								// used only by maze, spiral slide and shops
 	RIDE_TYPE_FLAG_HAS_LOAD_OPTIONS = 1 << 14,
 	RIDE_TYPE_FLAG_15 = 1 << 15,								// something to do with station, price and viewport zoom
diff --git a/src/windows/ride_construction.c b/src/windows/ride_construction.c
index f5934a231c..d19f090627 100644
--- a/src/windows/ride_construction.c
+++ b/src/windows/ride_construction.c
@@ -1139,7 +1139,7 @@ static void window_ride_construction_resize(rct_window *w)
 			disabledWidgets |= (1ULL << WIDX_CONSTRUCT);
 		}
 	}
-	if (ride_type_has_flag(rideType, RIDE_TYPE_FLAG_12)) {
+	if (ride_type_has_flag(rideType, RIDE_TYPE_FLAG_TRACK_ELEMENTS_HAVE_TWO_VARIATIES)) {
 		disabledWidgets &= ~(1ULL << WIDX_BANKING_GROUPBOX);
 	}
 	if (_rideConstructionState == RIDE_CONSTRUCTION_STATE_ENTRANCE_EXIT || _rideConstructionState == RIDE_CONSTRUCTION_STATE_SELECTED) {
@@ -2879,7 +2879,7 @@ static void window_ride_construction_update_widgets(rct_window *w)
 			window_ride_construction_widgets[WIDX_BANK_STRAIGHT].type = WWT_FLATBTN;
 			window_ride_construction_widgets[WIDX_BANK_RIGHT].type = WWT_FLATBTN;
 		}
-		if (ride_type_has_flag(rideType, RIDE_TYPE_FLAG_12)) {
+		if (ride_type_has_flag(rideType, RIDE_TYPE_FLAG_TRACK_ELEMENTS_HAVE_TWO_VARIATIES)) {
 			if (rideType == RIDE_TYPE_WATER_COASTER) {
 				window_ride_construction_widgets[WIDX_U_TRACK].image = 5158;
 				window_ride_construction_widgets[WIDX_O_TRACK].image = 5159;
@@ -2969,7 +2969,7 @@ static void window_ride_construction_update_widgets(rct_window *w)
 	window_ride_construction_widgets[WIDX_CONSTRUCT].type = WWT_EMPTY;
 	window_ride_construction_widgets[WIDX_DEMOLISH].type = WWT_FLATBTN;
 	window_ride_construction_widgets[WIDX_ROTATE].type = WWT_EMPTY;
-	if (ride_type_has_flag(rideType, RIDE_TYPE_FLAG_8)) {
+	if (ride_type_has_flag(rideType, RIDE_TYPE_FLAG_CANNOT_HAVE_GAPS)) {
 		window_ride_construction_widgets[WIDX_PREVIOUS_SECTION].type = WWT_EMPTY;
 		window_ride_construction_widgets[WIDX_NEXT_SECTION].type = WWT_EMPTY;
 	} else {
@@ -3061,7 +3061,7 @@ static void window_ride_construction_update_widgets(rct_window *w)
 	pressedWidgets |= (1ULL << widgetIndex);
 
 	if (RCT2_GLOBAL(0x00F440D3, uint8) == 0) {
-		if (ride_type_has_flag(rideType, RIDE_TYPE_FLAG_12)) {
+		if (ride_type_has_flag(rideType, RIDE_TYPE_FLAG_TRACK_ELEMENTS_HAVE_TWO_VARIATIES)) {
 			if (_currentTrackCovered & 1) {
 				w->pressed_widgets |= (1ULL << WIDX_O_TRACK);
 			} else {