From 5ad1c224a65a5825ac4d9f0b939688c1764a88d8 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Wed, 19 Aug 2015 08:55:35 +0200 Subject: [PATCH] Fix import of Merry-go-round colours --- src/rct1.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/rct1.c b/src/rct1.c index 079f8f0e26..848bded9e1 100644 --- a/src/rct1.c +++ b/src/rct1.c @@ -2123,9 +2123,16 @@ static void rct1_import_ride(rct1_s4 *s4, rct_ride *dst, rct1_ride *src) dst->track_colour_supports[i] = RCT1ColourConversionTable[src->track_colour_supports[i]]; } } - for (int i = 0; i < 12; i++) { - dst->vehicle_colours[i].body_colour = RCT1ColourConversionTable[src->vehicle_colours[i].body]; - dst->vehicle_colours[i].trim_colour = RCT1ColourConversionTable[src->vehicle_colours[i].trim]; + + if(s4->game_version == 108166 && dst->type == RIDE_TYPE_MERRY_GO_ROUND) { + // The merry-go-round in the base game was always yellow with red + dst->vehicle_colours[0].body_colour = 18; + dst->vehicle_colours[0].trim_colour = 28; + } else { + for (int i = 0; i < 12; i++) { + dst->vehicle_colours[i].body_colour = RCT1ColourConversionTable[src->vehicle_colours[i].body]; + dst->vehicle_colours[i].trim_colour = RCT1ColourConversionTable[src->vehicle_colours[i].trim]; + } } // Maintenance