From 5708b2e7490cf765549856c7507cc9a69da2341d Mon Sep 17 00:00:00 2001 From: Ted John Date: Sat, 15 Oct 2016 17:29:44 +0100 Subject: [PATCH] Fix colours for TD4, version 0 designs --- src/ride/track_design.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/ride/track_design.c b/src/ride/track_design.c index 049e227ec6..9034968dd6 100644 --- a/src/ride/track_design.c +++ b/src/ride/track_design.c @@ -1389,19 +1389,12 @@ static bool sub_6D2189(rct_track_td6 *td6, money32 *cost, uint8 *rideId, uint8 * user_string_free(old_name); } - uint8 version = td6->version_and_colour_scheme >> 2; - if (version == 2) { - ride->entrance_style = td6->entrance_style; - } + ride->entrance_style = td6->entrance_style; - if (version != 0) { - memcpy(&ride->track_colour_main, &td6->track_spine_colour, 4); - memcpy(&ride->track_colour_additional, &td6->track_rail_colour, 4); - memcpy(&ride->track_colour_supports, &td6->track_support_colour, 4); - } else { - memset(&ride->track_colour_main, td6->track_spine_colour_rct1, 4); - memset(&ride->track_colour_additional, td6->track_rail_colour_rct1, 4); - memset(&ride->track_colour_supports, td6->track_support_colour_rct1, 4); + for (int i = 0; i < 4; i++) { + ride->track_colour_main[i] = td6->track_spine_colour[i]; + ride->track_colour_additional[i] = td6->track_rail_colour[i]; + ride->track_colour_supports[i] = td6->track_support_colour[i]; } byte_9D8150 |= 1;