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

Also take AA in account when importing merry-go-rounds and make version detection more robust

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

6
src/rct1.c
View File

@ -2112,7 +2112,7 @@ static void rct1_import_ride(rct1_s4 *s4, rct_ride *dst, rct1_ride *src)
// Colours
dst->colour_scheme_type = src->colour_scheme;
if (s4->game_version == 108166) {
if (s4->game_version < 110000) {
dst->track_colour_main[0] = RCT1ColourConversionTable[src->track_primary_colour];
dst->track_colour_additional[0] = RCT1ColourConversionTable[src->track_secondary_colour];
dst->track_colour_supports[0] = RCT1ColourConversionTable[src->track_support_colour];
@ -2124,8 +2124,8 @@ static void rct1_import_ride(rct1_s4 *s4, rct_ride *dst, rct1_ride *src)
}
}
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
if(s4->game_version < 120000 && dst->type == RIDE_TYPE_MERRY_GO_ROUND) {
// The merry-go-round in pre-LL versions was always yellow with red
dst->vehicle_colours[0].body_colour = 18;
dst->vehicle_colours[0].trim_colour = 28;
} else {