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

Fix import of Merry-go-round colours

This commit is contained in:
Gymnasiast 2015-08-19 08:55:35 +02:00 committed by Ted John
parent 8169969756
commit 5ad1c224a6
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/rct1.c
View File

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