From b707053fce425fb253c3f9b052fcf5edad6ece5a Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Fri, 5 Aug 2016 15:12:03 +0200
Subject: [PATCH] Add defines for colour groups

---
 src/ride/ride_data.c | 93 +++++++++++++-------------------------------
 1 file changed, 26 insertions(+), 67 deletions(-)

diff --git a/src/ride/ride_data.c b/src/ride/ride_data.c
index 2b7e7c9e76..71d3797b15 100644
--- a/src/ride/ride_data.c
+++ b/src/ride/ride_data.c
@@ -2485,7 +2485,10 @@ const uint8 RideConstructionDefaultTrackType[] = {
 	TRACK_ELEM_END_STATION,		// RIDE_TYPE_LIM_LAUNCHED_ROLLER_COASTER
 };
 
-#define TRACK_COLOUR_PRESETS(...)    {countof(((track_colour[]){__VA_ARGS__})), {__VA_ARGS__}}
+#define TRACK_COLOUR_PRESETS(...)		{countof(((track_colour[]){__VA_ARGS__})), {__VA_ARGS__}}
+
+#define DEFAULT_FLAT_RIDE_COLOUR_PRESET	TRACK_COLOUR_PRESETS( { COLOUR_BRIGHT_RED, COLOUR_LIGHT_BLUE, COLOUR_YELLOW } )
+#define DEFAULT_STALL_COLOUR_PRESET		TRACK_COLOUR_PRESETS( { COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED } )
 
 const track_colour_preset_list RideColourPresets[] = {
 	// RIDE_TYPE_SPIRAL_ROLLER_COASTER
@@ -2693,49 +2696,31 @@ const track_colour_preset_list RideColourPresets[] = {
 	),
 
 	// RIDE_TYPE_FOOD_STALL
-	TRACK_COLOUR_PRESETS(
-		{ COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED },
-	),
+	DEFAULT_STALL_COLOUR_PRESET,
 
 	// RIDE_TYPE_1D
-	TRACK_COLOUR_PRESETS(
-		{ COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED },
-	),
+	DEFAULT_STALL_COLOUR_PRESET,
 
 	// RIDE_TYPE_DRINK_STALL
-	TRACK_COLOUR_PRESETS(
-		{ COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED },
-	),
+	DEFAULT_STALL_COLOUR_PRESET,
 
 	// RIDE_TYPE_1F
-	TRACK_COLOUR_PRESETS(
-		{ COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED },
-	),
+	DEFAULT_STALL_COLOUR_PRESET,
 
 	// RIDE_TYPE_SHOP
-	TRACK_COLOUR_PRESETS(
-		{ COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED },
-	),
+	DEFAULT_STALL_COLOUR_PRESET,
 
 	// RIDE_TYPE_MERRY_GO_ROUND
-	TRACK_COLOUR_PRESETS(
-		{ COLOUR_BRIGHT_RED, COLOUR_LIGHT_BLUE, COLOUR_YELLOW },
-	),
+	DEFAULT_FLAT_RIDE_COLOUR_PRESET,
 
 	// RIDE_TYPE_22
-	TRACK_COLOUR_PRESETS(
-		{ COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED },
-	),
+	DEFAULT_STALL_COLOUR_PRESET,
 
 	// RIDE_TYPE_INFORMATION_KIOSK
-	TRACK_COLOUR_PRESETS(
-		{ COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED },
-	),
+	DEFAULT_STALL_COLOUR_PRESET,
 
 	// RIDE_TYPE_TOILETS
-	TRACK_COLOUR_PRESETS(
-		{ COLOUR_BRIGHT_RED, COLOUR_LIGHT_BLUE, COLOUR_YELLOW },
-	),
+	DEFAULT_FLAT_RIDE_COLOUR_PRESET,
 
 	// RIDE_TYPE_FERRIS_WHEEL
 	TRACK_COLOUR_PRESETS(
@@ -2744,14 +2729,10 @@ const track_colour_preset_list RideColourPresets[] = {
 	),
 
 	// RIDE_TYPE_MOTION_SIMULATOR
-	TRACK_COLOUR_PRESETS(
-		{ COLOUR_BRIGHT_RED, COLOUR_LIGHT_BLUE, COLOUR_YELLOW },
-	),
+	DEFAULT_FLAT_RIDE_COLOUR_PRESET,
 
 	// RIDE_TYPE_3D_CINEMA
-	TRACK_COLOUR_PRESETS(
-		{ COLOUR_BRIGHT_RED, COLOUR_LIGHT_BLUE, COLOUR_YELLOW },
-	),
+	DEFAULT_FLAT_RIDE_COLOUR_PRESET,
 
 	// RIDE_TYPE_TOP_SPIN
 	TRACK_COLOUR_PRESETS(
@@ -2761,9 +2742,7 @@ const track_colour_preset_list RideColourPresets[] = {
 	),
 
 	// RIDE_TYPE_SPACE_RINGS
-	TRACK_COLOUR_PRESETS(
-		{ COLOUR_BRIGHT_RED, COLOUR_LIGHT_BLUE, COLOUR_YELLOW },
-	),
+	DEFAULT_FLAT_RIDE_COLOUR_PRESET,
 
 	// RIDE_TYPE_REVERSE_FREEFALL_COASTER
 	TRACK_COLOUR_PRESETS(
@@ -2786,29 +2765,19 @@ const track_colour_preset_list RideColourPresets[] = {
 	),
 
 	// RIDE_TYPE_CASH_MACHINE
-	TRACK_COLOUR_PRESETS(
-		{ COLOUR_BRIGHT_RED, COLOUR_LIGHT_BLUE, COLOUR_YELLOW },
-	),
+	DEFAULT_FLAT_RIDE_COLOUR_PRESET,
 
 	// RIDE_TYPE_TWIST
-	TRACK_COLOUR_PRESETS(
-		{ COLOUR_BRIGHT_RED, COLOUR_LIGHT_BLUE, COLOUR_YELLOW },
-	),
+	DEFAULT_FLAT_RIDE_COLOUR_PRESET,
 
 	// RIDE_TYPE_HAUNTED_HOUSE
-	TRACK_COLOUR_PRESETS(
-		{ COLOUR_BRIGHT_RED, COLOUR_LIGHT_BLUE, COLOUR_YELLOW },
-	),
+	DEFAULT_FLAT_RIDE_COLOUR_PRESET,
 
 	// RIDE_TYPE_FIRST_AID
-	TRACK_COLOUR_PRESETS(
-		{ COLOUR_BRIGHT_RED, COLOUR_LIGHT_BLUE, COLOUR_YELLOW },
-	),
+	DEFAULT_FLAT_RIDE_COLOUR_PRESET,
 
 	// RIDE_TYPE_CIRCUS_SHOW
-	TRACK_COLOUR_PRESETS(
-		{ COLOUR_BRIGHT_RED, COLOUR_LIGHT_BLUE, COLOUR_YELLOW },
-	),
+	DEFAULT_FLAT_RIDE_COLOUR_PRESET,
 
 	// RIDE_TYPE_GHOST_TRAIN
 	TRACK_COLOUR_PRESETS(
@@ -3019,29 +2988,19 @@ const track_colour_preset_list RideColourPresets[] = {
 	),
 
 	// RIDE_TYPE_50
-	TRACK_COLOUR_PRESETS(
-		{ COLOUR_BRIGHT_RED, COLOUR_LIGHT_BLUE, COLOUR_YELLOW },
-	),
+	DEFAULT_FLAT_RIDE_COLOUR_PRESET,
 
 	// RIDE_TYPE_ENTERPRISE
-	TRACK_COLOUR_PRESETS(
-		{ COLOUR_BRIGHT_RED, COLOUR_LIGHT_BLUE, COLOUR_YELLOW },
-	),
+	DEFAULT_FLAT_RIDE_COLOUR_PRESET,
 
 	// RIDE_TYPE_52
-	TRACK_COLOUR_PRESETS(
-		{ COLOUR_BRIGHT_RED, COLOUR_LIGHT_BLUE, COLOUR_YELLOW },
-	),
+	DEFAULT_FLAT_RIDE_COLOUR_PRESET,
 
 	// RIDE_TYPE_53
-	TRACK_COLOUR_PRESETS(
-		{ COLOUR_BRIGHT_RED, COLOUR_LIGHT_BLUE, COLOUR_YELLOW },
-	),
+	DEFAULT_FLAT_RIDE_COLOUR_PRESET,
 
 	// RIDE_TYPE_54
-	TRACK_COLOUR_PRESETS(
-		{ COLOUR_BRIGHT_RED, COLOUR_LIGHT_BLUE, COLOUR_YELLOW },
-	),
+	DEFAULT_FLAT_RIDE_COLOUR_PRESET,
 
 	// RIDE_TYPE_55
 	TRACK_COLOUR_PRESETS(