mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add defines for colour groups

This commit is contained in:
Marijn van der Werf 2016-08-05 15:12:03 +02:00
parent d556281a5a
commit b707053fce
1 changed files with 26 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
src/ride/ride_data.c
View File

@ -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(