From 9401afa68fc185743d23d4c264faded30096d9c1 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Thu, 28 Jul 2016 23:17:28 +0200 Subject: [PATCH] Use constants for colour preview images --- src/sprites.h | 133 +++++++++++++++++++++++++++++++++++++++++++++ src/windows/ride.c | 104 ++++++++++++++++++++++++++++++++++- 2 files changed, 235 insertions(+), 2 deletions(-) diff --git a/src/sprites.h b/src/sprites.h index 751a204db2..c615e77bab 100644 --- a/src/sprites.h +++ b/src/sprites.h @@ -445,6 +445,139 @@ enum { SPR_CONSTRUCTION_FOOTPATH_LAND = 5639, SPR_CONSTRUCTION_FOOTPATH_BRIDGE = 5640, + SPR_RIDE_DESIGN_PREVIEW_SPIRAL_ROLLER_COASTER_TRACK = 14222, + SPR_RIDE_DESIGN_PREVIEW_SPIRAL_ROLLER_COASTER_SUPPORTS = 14223, + SPR_RIDE_DESIGN_PREVIEW_STAND_UP_ROLLER_COASTER_TRACK = 14224, + SPR_RIDE_DESIGN_PREVIEW_STAND_UP_ROLLER_COASTER_SUPPORTS = 14225, + SPR_RIDE_DESIGN_PREVIEW_SUSPENDED_SWINGING_COASTER_TRACK = 14226, + SPR_RIDE_DESIGN_PREVIEW_SUSPENDED_SWINGING_COASTER_SUPPORTS = 14227, + SPR_RIDE_DESIGN_PREVIEW_INVERTED_ROLLER_COASTER_TRACK = 14228, + SPR_RIDE_DESIGN_PREVIEW_INVERTED_ROLLER_COASTER_SUPPORTS = 14229, + SPR_RIDE_DESIGN_PREVIEW_JUNIOR_ROLLER_COASTER_TRACK = 14230, + SPR_RIDE_DESIGN_PREVIEW_JUNIOR_ROLLER_COASTER_SUPPORTS = 14231, + SPR_RIDE_DESIGN_PREVIEW_MINIATURE_RAILWAY_TRACK = 14232, + SPR_RIDE_DESIGN_PREVIEW_MINIATURE_RAILWAY_SUPPORTS = 14233, + SPR_RIDE_DESIGN_PREVIEW_MONORAIL_TRACK = 14234, + SPR_RIDE_DESIGN_PREVIEW_MONORAIL_SUPPORTS = 14235, + SPR_RIDE_DESIGN_PREVIEW_MINI_SUSPENDED_COASTER_TRACK = 14236, + SPR_RIDE_DESIGN_PREVIEW_MINI_SUSPENDED_COASTER_SUPPORTS = 14237, + SPR_RIDE_DESIGN_PREVIEW_BOAT_RIDE_TRACK = 14238, + SPR_RIDE_DESIGN_PREVIEW_BOAT_RIDE_SUPPORTS = 14239, + SPR_RIDE_DESIGN_PREVIEW_WOODEN_WILD_MOUSE_TRACK = 14240, + SPR_RIDE_DESIGN_PREVIEW_WOODEN_WILD_MOUSE_SUPPORTS = 14241, + SPR_RIDE_DESIGN_PREVIEW_STEEPLECHASE_TRACK = 14242, + SPR_RIDE_DESIGN_PREVIEW_STEEPLECHASE_SUPPORTS = 14243, + SPR_RIDE_DESIGN_PREVIEW_CAR_RIDE_TRACK = 14244, + SPR_RIDE_DESIGN_PREVIEW_CAR_RIDE_SUPPORTS = 14245, + SPR_RIDE_DESIGN_PREVIEW_LAUNCHED_FREEFALL_TRACK = 14246, + SPR_RIDE_DESIGN_PREVIEW_LAUNCHED_FREEFALL_SUPPORTS = 14247, + SPR_RIDE_DESIGN_PREVIEW_BOBSLEIGH_COASTER_TRACK = 14248, + SPR_RIDE_DESIGN_PREVIEW_BOBSLEIGH_COASTER_SUPPORTS = 14249, + SPR_RIDE_DESIGN_PREVIEW_OBSERVATION_TOWER_TRACK = 14250, + SPR_RIDE_DESIGN_PREVIEW_OBSERVATION_TOWER_SUPPORTS = 14251, + SPR_RIDE_DESIGN_PREVIEW_LOOPING_ROLLER_COASTER_TRACK = 14252, + SPR_RIDE_DESIGN_PREVIEW_LOOPING_ROLLER_COASTER_SUPPORTS = 14253, + SPR_RIDE_DESIGN_PREVIEW_DINGHY_SLIDE_TRACK = 14254, + SPR_RIDE_DESIGN_PREVIEW_DINGHY_SLIDE_SUPPORTS = 14255, + SPR_RIDE_DESIGN_PREVIEW_MINE_TRAIN_COASTER_TRACK = 14256, + SPR_RIDE_DESIGN_PREVIEW_MINE_TRAIN_COASTER_SUPPORTS = 14257, + SPR_RIDE_DESIGN_PREVIEW_CHAIRLIFT_TRACK = 14258, + SPR_RIDE_DESIGN_PREVIEW_CHAIRLIFT_SUPPORTS = 14259, + SPR_RIDE_DESIGN_PREVIEW_CORKSCREW_ROLLER_COASTER_TRACK = 14260, + SPR_RIDE_DESIGN_PREVIEW_CORKSCREW_ROLLER_COASTER_SUPPORTS = 14261, + + SPR_RIDE_DESIGN_PREVIEW_SPIRAL_SLIDE_TRACK = 14264, + + SPR_RIDE_DESIGN_PREVIEW_GO_KARTS_TRACK = 14266, + SPR_RIDE_DESIGN_PREVIEW_GO_KARTS_SUPPORTS = 14267, + SPR_RIDE_DESIGN_PREVIEW_LOG_FLUME_TRACK = 14268, + SPR_RIDE_DESIGN_PREVIEW_LOG_FLUME_SUPPORTS = 14269, + SPR_RIDE_DESIGN_PREVIEW_RIVER_RAPIDS_TRACK = 14270, + SPR_RIDE_DESIGN_PREVIEW_RIVER_RAPIDS_SUPPORTS = 14271, + SPR_RIDE_DESIGN_PREVIEW_DODGEMS_TRACK = 14272, + SPR_RIDE_DESIGN_PREVIEW_DODGEMS_SUPPORTS = 14273, + SPR_RIDE_DESIGN_PREVIEW_PIRATE_SHIP_TRACK = 14274, + SPR_RIDE_DESIGN_PREVIEW_PIRATE_SHIP_SUPPORTS = 14275, + SPR_RIDE_DESIGN_PREVIEW_SWINGING_INVERTER_SHIP_TRACK = 14276, + SPR_RIDE_DESIGN_PREVIEW_SWINGING_INVERTER_SHIP_SUPPORTS = 14277, + + SPR_RIDE_DESIGN_PREVIEW_FERRIS_WHEEL_TRACK = 14296, + + SPR_RIDE_DESIGN_PREVIEW_TOP_SPIN_TRACK = 14302, + + SPR_RIDE_DESIGN_PREVIEW_REVERSE_FREEFALL_COASTER_TRACK = 14306, + SPR_RIDE_DESIGN_PREVIEW_REVERSE_FREEFALL_COASTER_SUPPORTS = 14307, + SPR_RIDE_DESIGN_PREVIEW_LIFT_TRACK = 14308, + + SPR_RIDE_DESIGN_PREVIEW_VERTICAL_DROP_ROLLER_COASTER_TRACK = 14310, + SPR_RIDE_DESIGN_PREVIEW_VERTICAL_DROP_ROLLER_COASTER_SUPPORTS = 14311, + + SPR_RIDE_DESIGN_PREVIEW_GHOST_TRAIN_TRACK = 14322, + SPR_RIDE_DESIGN_PREVIEW_GHOST_TRAIN_SUPPORTS = 14323, + SPR_RIDE_DESIGN_PREVIEW_TWISTER_ROLLER_COASTER_TRACK = 14324, + SPR_RIDE_DESIGN_PREVIEW_TWISTER_ROLLER_COASTER_SUPPORTS = 14325, + SPR_RIDE_DESIGN_PREVIEW_WOODEN_ROLLER_COASTER_TRACK = 14326, + SPR_RIDE_DESIGN_PREVIEW_WOODEN_ROLLER_COASTER_SUPPORTS = 14327, + SPR_RIDE_DESIGN_PREVIEW_SIDE_FRICTION_ROLLER_COASTER_TRACK = 14328, + SPR_RIDE_DESIGN_PREVIEW_SIDE_FRICTION_ROLLER_COASTER_SUPPORTS = 14329, + SPR_RIDE_DESIGN_PREVIEW_WILD_MOUSE_TRACK = 14330, + SPR_RIDE_DESIGN_PREVIEW_WILD_MOUSE_SUPPORTS = 14331, + SPR_RIDE_DESIGN_PREVIEW_MULTI_DIMENSION_ROLLER_COASTER_TRACK = 14332, + SPR_RIDE_DESIGN_PREVIEW_MULTI_DIMENSION_ROLLER_COASTER_SUPPORTS = 14333, + + SPR_RIDE_DESIGN_PREVIEW_FLYING_ROLLER_COASTER_TRACK = 14336, + SPR_RIDE_DESIGN_PREVIEW_FLYING_ROLLER_COASTER_SUPPORTS = 14337, + + SPR_RIDE_DESIGN_PREVIEW_VIRGINIA_REEL_TRACK = 14340, + SPR_RIDE_DESIGN_PREVIEW_VIRGINIA_REEL_SUPPORTS = 14341, + SPR_RIDE_DESIGN_PREVIEW_SPLASH_BOATS_TRACK = 14342, + SPR_RIDE_DESIGN_PREVIEW_SPLASH_BOATS_SUPPORTS = 14343, + SPR_RIDE_DESIGN_PREVIEW_MINI_HELICOPTERS_TRACK = 14344, + SPR_RIDE_DESIGN_PREVIEW_MINI_HELICOPTERS_SUPPORTS = 14345, + SPR_RIDE_DESIGN_PREVIEW_LAY_DOWN_ROLLER_COASTER_TRACK = 14346, + SPR_RIDE_DESIGN_PREVIEW_LAY_DOWN_ROLLER_COASTER_SUPPORTS = 14347, + SPR_RIDE_DESIGN_PREVIEW_SUSPENDED_MONORAIL_TRACK = 14348, + SPR_RIDE_DESIGN_PREVIEW_SUSPENDED_MONORAIL_SUPPORTS = 14349, + + SPR_RIDE_DESIGN_PREVIEW_REVERSER_ROLLER_COASTER_TRACK = 14352, + SPR_RIDE_DESIGN_PREVIEW_REVERSER_ROLLER_COASTER_SUPPORTS = 14353, + SPR_RIDE_DESIGN_PREVIEW_HEARTLINE_TWISTER_COASTER_TRACK = 14354, + SPR_RIDE_DESIGN_PREVIEW_HEARTLINE_TWISTER_COASTER_SUPPORTS = 14355, + SPR_RIDE_DESIGN_PREVIEW_MINI_GOLF_TRACK = 14356, + SPR_RIDE_DESIGN_PREVIEW_MINI_GOLF_SUPPORTS = 14357, + SPR_RIDE_DESIGN_PREVIEW_GIGA_COASTER_TRACK = 14358, + SPR_RIDE_DESIGN_PREVIEW_GIGA_COASTER_SUPPORTS = 14359, + SPR_RIDE_DESIGN_PREVIEW_ROTO_DROP_TRACK = 14360, + SPR_RIDE_DESIGN_PREVIEW_ROTO_DROP_SUPPORTS = 14361, + SPR_RIDE_DESIGN_PREVIEW_FLYING_SAUCERS_TRACK = 14362, + + SPR_RIDE_DESIGN_PREVIEW_MONORAIL_CYCLES_TRACK = 14366, + SPR_RIDE_DESIGN_PREVIEW_MONORAIL_CYCLES_SUPPORTS = 14367, + SPR_RIDE_DESIGN_PREVIEW_COMPACT_INVERTED_COASTER_TRACK = 14368, + SPR_RIDE_DESIGN_PREVIEW_COMPACT_INVERTED_COASTER_SUPPORTS = 14369, + SPR_RIDE_DESIGN_PREVIEW_WATER_COASTER_TRACK = 14370, + SPR_RIDE_DESIGN_PREVIEW_WATER_COASTER_SUPPORTS = 14371, + SPR_RIDE_DESIGN_PREVIEW_AIR_POWERED_VERTICAL_COASTER_TRACK = 14372, + SPR_RIDE_DESIGN_PREVIEW_AIR_POWERED_VERTICAL_COASTER_SUPPORTS = 14373, + SPR_RIDE_DESIGN_PREVIEW_INVERTED_HAIRPIN_COASTER_TRACK = 14374, + SPR_RIDE_DESIGN_PREVIEW_INVERTED_HAIRPIN_COASTER_SUPPORTS = 14375, + SPR_RIDE_DESIGN_PREVIEW_MAGIC_CARPET_TRACK = 14376, + SPR_RIDE_DESIGN_PREVIEW_MAGIC_CARPET_SUPPORTS = 14377, + SPR_RIDE_DESIGN_PREVIEW_SUBMARINE_RIDE_TRACK = 14378, + SPR_RIDE_DESIGN_PREVIEW_SUBMARINE_RIDE_SUPPORTS = 14379, + SPR_RIDE_DESIGN_PREVIEW_RIVER_RAFTS_TRACK = 14380, + SPR_RIDE_DESIGN_PREVIEW_RIVER_RAFTS_SUPPORTS = 14381, + + SPR_RIDE_DESIGN_PREVIEW_INVERTED_IMPULSE_COASTER_TRACK = 14394, + SPR_RIDE_DESIGN_PREVIEW_INVERTED_IMPULSE_COASTER_SUPPORTS = 14395, + SPR_RIDE_DESIGN_PREVIEW_MINI_ROLLER_COASTER_TRACK = 14396, + SPR_RIDE_DESIGN_PREVIEW_MINI_ROLLER_COASTER_SUPPORTS = 14397, + SPR_RIDE_DESIGN_PREVIEW_MINE_RIDE_TRACK = 14398, + SPR_RIDE_DESIGN_PREVIEW_MINE_RIDE_SUPPORTS = 14399, + + SPR_RIDE_DESIGN_PREVIEW_LIM_LAUNCHED_ROLLER_COASTER_TRACK = 14402, + SPR_RIDE_DESIGN_PREVIEW_LIM_LAUNCHED_ROLLER_COASTER_SUPPORTS = 14403, + SPR_RIDE_DESIGN_PREVIEW_MAZE_BRICK_WALLS = 21990, SPR_RIDE_DESIGN_PREVIEW_MAZE_HEDGES = 21991, SPR_RIDE_DESIGN_PREVIEW_MAZE_ICE_BLOCKS = 21992, diff --git a/src/windows/ride.c b/src/windows/ride.c index 23c13d9a45..bb869d1495 100644 --- a/src/windows/ride.c +++ b/src/windows/ride.c @@ -1140,6 +1140,106 @@ static const window_ride_maze_design_option MazeOptions[] = { { STR_RIDE_DESIGN_MAZE_WOODEN_FENCES, SPR_RIDE_DESIGN_PREVIEW_MAZE_WOODEN_FENCES }, }; +typedef struct window_ride_colour_preview +{ + uint32 track; + uint32 supports; +} window_ride_colour_preview; + +static const window_ride_colour_preview TrackColourPreviews[] = { + { SPR_RIDE_DESIGN_PREVIEW_SPIRAL_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_SPIRAL_ROLLER_COASTER_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_STAND_UP_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_STAND_UP_ROLLER_COASTER_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_SUSPENDED_SWINGING_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_SUSPENDED_SWINGING_COASTER_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_INVERTED_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_INVERTED_ROLLER_COASTER_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_JUNIOR_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_JUNIOR_ROLLER_COASTER_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_MINIATURE_RAILWAY_TRACK, SPR_RIDE_DESIGN_PREVIEW_MINIATURE_RAILWAY_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_MONORAIL_TRACK, SPR_RIDE_DESIGN_PREVIEW_MONORAIL_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_MINI_SUSPENDED_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_MINI_SUSPENDED_COASTER_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_BOAT_RIDE_TRACK, SPR_RIDE_DESIGN_PREVIEW_BOAT_RIDE_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_WOODEN_WILD_MOUSE_TRACK, SPR_RIDE_DESIGN_PREVIEW_WOODEN_WILD_MOUSE_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_STEEPLECHASE_TRACK, SPR_RIDE_DESIGN_PREVIEW_STEEPLECHASE_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_CAR_RIDE_TRACK, SPR_RIDE_DESIGN_PREVIEW_CAR_RIDE_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_LAUNCHED_FREEFALL_TRACK, SPR_RIDE_DESIGN_PREVIEW_LAUNCHED_FREEFALL_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_BOBSLEIGH_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_BOBSLEIGH_COASTER_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_OBSERVATION_TOWER_TRACK, SPR_RIDE_DESIGN_PREVIEW_OBSERVATION_TOWER_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_LOOPING_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_LOOPING_ROLLER_COASTER_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_DINGHY_SLIDE_TRACK, SPR_RIDE_DESIGN_PREVIEW_DINGHY_SLIDE_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_MINE_TRAIN_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_MINE_TRAIN_COASTER_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_CHAIRLIFT_TRACK, SPR_RIDE_DESIGN_PREVIEW_CHAIRLIFT_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_CORKSCREW_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_CORKSCREW_ROLLER_COASTER_SUPPORTS}, + { 0, 0 }, // MAZE + { SPR_RIDE_DESIGN_PREVIEW_SPIRAL_SLIDE_TRACK, 0}, + { SPR_RIDE_DESIGN_PREVIEW_GO_KARTS_TRACK, SPR_RIDE_DESIGN_PREVIEW_GO_KARTS_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_LOG_FLUME_TRACK, SPR_RIDE_DESIGN_PREVIEW_LOG_FLUME_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_RIVER_RAPIDS_TRACK, SPR_RIDE_DESIGN_PREVIEW_RIVER_RAPIDS_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_DODGEMS_TRACK, SPR_RIDE_DESIGN_PREVIEW_DODGEMS_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_PIRATE_SHIP_TRACK, SPR_RIDE_DESIGN_PREVIEW_PIRATE_SHIP_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_SWINGING_INVERTER_SHIP_TRACK, SPR_RIDE_DESIGN_PREVIEW_SWINGING_INVERTER_SHIP_SUPPORTS}, + { 0, 0 }, // FOOD_STALL + { 0, 0 }, // 1D + { 0, 0 }, // DRINK_STALL + { 0, 0 }, // 1F + { 0, 0 }, // SHOP + { 0, 0 }, // MERRY_GO_ROUND + { 0, 0 }, // 22 + { 0, 0 }, // INFORMATION_KIOSK + { 0, 0 }, // TOILETS + { SPR_RIDE_DESIGN_PREVIEW_FERRIS_WHEEL_TRACK, 0}, + { 0, 0 }, // MOTION_SIMULATOR + { 0, 0 }, // 3D_CINEMA + { SPR_RIDE_DESIGN_PREVIEW_TOP_SPIN_TRACK, 0}, + { 0, 0 }, // SPACE_RINGS + { SPR_RIDE_DESIGN_PREVIEW_REVERSE_FREEFALL_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_REVERSE_FREEFALL_COASTER_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_LIFT_TRACK, 0}, + { SPR_RIDE_DESIGN_PREVIEW_VERTICAL_DROP_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_VERTICAL_DROP_ROLLER_COASTER_SUPPORTS}, + { 0, 0 }, // CASH_MACHINE + { 0, 0 }, // TWIST_TRACK + { 0, 0 }, // HAUNTED_HOUSE + { 0, 0 }, // FIRST_AID + { 0, 0 }, // CIRCUS_SHOW + { SPR_RIDE_DESIGN_PREVIEW_GHOST_TRAIN_TRACK, SPR_RIDE_DESIGN_PREVIEW_GHOST_TRAIN_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_TWISTER_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_TWISTER_ROLLER_COASTER_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_WOODEN_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_WOODEN_ROLLER_COASTER_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_SIDE_FRICTION_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_SIDE_FRICTION_ROLLER_COASTER_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_WILD_MOUSE_TRACK, SPR_RIDE_DESIGN_PREVIEW_WILD_MOUSE_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_MULTI_DIMENSION_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_MULTI_DIMENSION_ROLLER_COASTER_SUPPORTS}, + { 0, 0 }, // 38 + { SPR_RIDE_DESIGN_PREVIEW_FLYING_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_FLYING_ROLLER_COASTER_SUPPORTS}, + { 0, 0 }, // 3A + { SPR_RIDE_DESIGN_PREVIEW_VIRGINIA_REEL_TRACK, SPR_RIDE_DESIGN_PREVIEW_VIRGINIA_REEL_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_SPLASH_BOATS_TRACK, SPR_RIDE_DESIGN_PREVIEW_SPLASH_BOATS_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_MINI_HELICOPTERS_TRACK, SPR_RIDE_DESIGN_PREVIEW_MINI_HELICOPTERS_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_LAY_DOWN_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_LAY_DOWN_ROLLER_COASTER_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_SUSPENDED_MONORAIL_TRACK, SPR_RIDE_DESIGN_PREVIEW_SUSPENDED_MONORAIL_SUPPORTS}, + { 0, 0 }, // 40 + { SPR_RIDE_DESIGN_PREVIEW_REVERSER_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_REVERSER_ROLLER_COASTER_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_HEARTLINE_TWISTER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_HEARTLINE_TWISTER_COASTER_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_MINI_GOLF_TRACK, SPR_RIDE_DESIGN_PREVIEW_MINI_GOLF_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_GIGA_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_GIGA_COASTER_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_ROTO_DROP_TRACK, SPR_RIDE_DESIGN_PREVIEW_ROTO_DROP_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_FLYING_SAUCERS_TRACK, 0}, + { 0, 0 }, // CROOKED_HOUSE + { SPR_RIDE_DESIGN_PREVIEW_MONORAIL_CYCLES_TRACK, SPR_RIDE_DESIGN_PREVIEW_MONORAIL_CYCLES_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_COMPACT_INVERTED_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_COMPACT_INVERTED_COASTER_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_WATER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_WATER_COASTER_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_AIR_POWERED_VERTICAL_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_AIR_POWERED_VERTICAL_COASTER_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_INVERTED_HAIRPIN_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_INVERTED_HAIRPIN_COASTER_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_MAGIC_CARPET_TRACK, SPR_RIDE_DESIGN_PREVIEW_MAGIC_CARPET_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_SUBMARINE_RIDE_TRACK, SPR_RIDE_DESIGN_PREVIEW_SUBMARINE_RIDE_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_RIVER_RAFTS_TRACK, SPR_RIDE_DESIGN_PREVIEW_RIVER_RAFTS_SUPPORTS}, + { 0, 0 }, // 50 + { 0, 0 }, // ENTERPRISE + { 0, 0 }, // 52 + { 0, 0 }, // 53 + { 0, 0 }, // 54 + { 0, 0 }, // 55 + { SPR_RIDE_DESIGN_PREVIEW_INVERTED_IMPULSE_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_INVERTED_IMPULSE_COASTER_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_MINI_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_MINI_ROLLER_COASTER_SUPPORTS}, + { SPR_RIDE_DESIGN_PREVIEW_MINE_RIDE_TRACK, SPR_RIDE_DESIGN_PREVIEW_MINE_RIDE_SUPPORTS}, + { 0, 0 }, // 59 + { SPR_RIDE_DESIGN_PREVIEW_LIM_LAUNCHED_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_LIM_LAUNCHED_ROLLER_COASTER_SUPPORTS}, +}; + static void window_ride_draw_tab_image(rct_drawpixelinfo *dpi, rct_window *w, int page, int spriteIndex) { int widgetIndex = WIDX_TAB_1 + page; @@ -4478,13 +4578,13 @@ static void window_ride_colour_paint(rct_window *w, rct_drawpixelinfo *dpi) spriteIndex = MazeOptions[trackColour.supports].sprite; gfx_draw_sprite(dpi, spriteIndex, x, y, 0); } else { - spriteIndex = 14222 + (ride->type * 2); + spriteIndex = TrackColourPreviews[ride->type].track; spriteIndex |= (trackColour.additional << 24) | (trackColour.main << 19); spriteIndex |= 0xA0000000; gfx_draw_sprite(dpi, spriteIndex, x, y, 0); // Supports - spriteIndex = 14222 + (ride->type * 2) + 1; + spriteIndex = TrackColourPreviews[ride->type].supports; spriteIndex |= trackColour.supports << 19; spriteIndex |= 0x20000000; gfx_draw_sprite(dpi, spriteIndex, x, y, 0);