Fix two usages of raw RIDE4 flag usages, rename one, add comment

#5065
OpenRCT2 · Jan 17, 2017 · 6016339 · 6016339
1 parent abad7dd
commit 6016339
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/src/openrct2/peep/peep.c b/src/openrct2/peep/peep.c
@@ -11282,11 +11282,11 @@ static bool sub_69101A(rct_map_element *esi) {
 		return false;
 	}
 
-	if (RideData4[ride->type].flags & 0x2000) {
+	if (RideData4[ride->type].flags & RIDE_TYPE_FLAG4_13) {
 		if ((scenario_rand() & 0xFFFF) > 0x3333) {
 			return true;
 		}
-	} else if (RideData4[ride->type].flags & 0x4000) {
+	} else if (RideData4[ride->type].flags & RIDE_TYPE_FLAG4_14) {
 		if ((scenario_rand() & 0xFFFF) > 0x1000) {
 			return true;
 		}

diff --git a/src/openrct2/ride/ride.c b/src/openrct2/ride/ride.c
@@ -1489,7 +1489,7 @@ static void ride_construction_reset_current_piece()
 		_currentTrackBankEnd = 0;
 		_currentTrackLiftHill = 0;
 		_currentTrackCovered = 0;
-		if (RideData4[ride->type].flags & RIDE_TYPE_FLAG4_15) {
+		if (RideData4[ride->type].flags & RIDE_TYPE_FLAG4_FLYING_RC) {
 			_currentTrackCovered |= 2;
 		}
 		_previousTrackSlopeEnd = 0;
@@ -1946,7 +1946,7 @@ sint32 sub_6CC3FB(sint32 rideIndex)
 	_currentTrackLiftHill = 0;
 	_currentTrackCovered = 0;
 
-	if (RideData4[ride->type].flags & RIDE_TYPE_FLAG4_15)
+	if (RideData4[ride->type].flags & RIDE_TYPE_FLAG4_FLYING_RC)
 		_currentTrackCovered |= 2;
 
 	_previousTrackBankEnd = 0;

diff --git a/src/openrct2/ride/ride_data.c b/src/openrct2/ride/ride_data.c
@@ -1176,8 +1176,8 @@ const rct_ride_data_4 RideData4[RIDE_TYPE_COUNT] = {
 	{	20,	20,	RIDE_TYPE_FLAG4_0 | RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG4_HAS_AIR_TIME | RIDE_TYPE_FLAG4_11 | RIDE_TYPE_FLAG4_13,																	MUSIC_STYLE_ROCK,				0												},	// RIDE_TYPE_WILD_MOUSE
 	{	20,	20,	RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_3 | RIDE_TYPE_FLAG4_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG4_HAS_AIR_TIME | RIDE_TYPE_FLAG4_ALLOW_MULTIPLE_CIRCUITS | RIDE_TYPE_FLAG4_11 | RIDE_TYPE_FLAG4_13,						MUSIC_STYLE_ROCK_STYLE_3,		RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER_ALT	},	// RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER
 	{	20,	20,	RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_13,																																																					MUSIC_STYLE_GENTLE,				0												},	// RIDE_TYPE_MULTI_DIMENSION_ROLLER_COASTER_ALT
-	{	20,	20,	RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_3 | RIDE_TYPE_FLAG4_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG4_HAS_AIR_TIME | RIDE_TYPE_FLAG4_ALLOW_MULTIPLE_CIRCUITS | RIDE_TYPE_FLAG4_11 | RIDE_TYPE_FLAG4_13 | RIDE_TYPE_FLAG4_15,	MUSIC_STYLE_ROCK,				RIDE_TYPE_FLYING_ROLLER_COASTER_ALT				},	// RIDE_TYPE_FLYING_ROLLER_COASTER
-	{	20,	20,	RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_13 | RIDE_TYPE_FLAG4_15,																																																MUSIC_STYLE_GENTLE,				0												},	// RIDE_TYPE_FLYING_ROLLER_COASTER_ALT
+	{	20,	20,	RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_3 | RIDE_TYPE_FLAG4_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG4_HAS_AIR_TIME | RIDE_TYPE_FLAG4_ALLOW_MULTIPLE_CIRCUITS | RIDE_TYPE_FLAG4_11 | RIDE_TYPE_FLAG4_13 | RIDE_TYPE_FLAG4_FLYING_RC,	MUSIC_STYLE_ROCK,				RIDE_TYPE_FLYING_ROLLER_COASTER_ALT				},	// RIDE_TYPE_FLYING_ROLLER_COASTER
+	{	20,	20,	RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_13 | RIDE_TYPE_FLAG4_FLYING_RC,																																																MUSIC_STYLE_GENTLE,				0												},	// RIDE_TYPE_FLYING_ROLLER_COASTER_ALT
 	{	20,	20,	RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG4_HAS_AIR_TIME | RIDE_TYPE_FLAG4_11 | RIDE_TYPE_FLAG4_13,																						MUSIC_STYLE_ROCK,				0												},	// RIDE_TYPE_VIRGINIA_REEL
 	{	20,	20,	RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG4_6 | RIDE_TYPE_FLAG4_HAS_AIR_TIME | RIDE_TYPE_FLAG4_14,																															MUSIC_STYLE_WATER,				0												},	// RIDE_TYPE_SPLASH_BOATS
 	{	15,	0,	RIDE_TYPE_FLAG4_0 | RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG4_6 | RIDE_TYPE_FLAG4_14,																																		MUSIC_STYLE_SUMMER,				0												},	// RIDE_TYPE_MINI_HELICOPTERS

diff --git a/src/openrct2/ride/ride_data.h b/src/openrct2/ride/ride_data.h
@@ -123,7 +123,7 @@ enum {
 	RIDE_TYPE_FLAG4_TRANSPORT_RIDE = (1 << 12),
 	RIDE_TYPE_FLAG4_13 = (1 << 13),
 	RIDE_TYPE_FLAG4_14 = (1 << 14),
-	RIDE_TYPE_FLAG4_15 = (1 << 15),
+	RIDE_TYPE_FLAG4_FLYING_RC = (1 << 15), // This is only set on the Flying RC and its alternative type. It seems to be used in determining the track variety or something like that.
 };
 
 typedef struct rct_shop_item_stats {

diff --git a/src/openrct2/windows/ride_construction.c b/src/openrct2/windows/ride_construction.c
@@ -583,7 +583,7 @@ rct_window *window_ride_construction_open()
 	_currentTrackLiftHill = 0;
 	_currentTrackCovered = 0;
 
-	if (RideData4[ride->type].flags & RIDE_TYPE_FLAG4_15)
+	if (RideData4[ride->type].flags & RIDE_TYPE_FLAG4_FLYING_RC)
 		_currentTrackCovered |= 2;
 
 	_previousTrackBankEnd = 0;