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

Fix S6 import of entrance style

This commit is contained in:
Ted John 2021-04-11 13:13:29 +01:00
parent 3927c91b6a
commit eae2cde747
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/openrct2/rct2/S6Importer.cpp
View File

@ -760,7 +760,7 @@ public:
}
auto musicStyle = OBJECT_ENTRY_INDEX_NULL;
if (!GetRideTypeDescriptor(dst->type).HasFlag(RIDE_TYPE_FLAG_ALLOW_MUSIC))
if (GetRideTypeDescriptor(dst->type).HasFlag(RIDE_TYPE_FLAG_ALLOW_MUSIC))
{
musicStyle = src->music;
}
@ -768,11 +768,11 @@ public:
// In SV7, "plain" entrances are invisible.
auto entranceStyle = OBJECT_ENTRY_INDEX_NULL;
if (!_isSV7 && !GetRideTypeDescriptor(dst->type).HasFlag(RIDE_TYPE_FLAG_HAS_ENTRANCE_EXIT))
if (!_isSV7 && GetRideTypeDescriptor(dst->type).HasFlag(RIDE_TYPE_FLAG_HAS_ENTRANCE_EXIT))
{
entranceStyle = src->entrance_style;
}
dst->entrance_style = src->entrance_style;
dst->entrance_style = entranceStyle;
dst->vehicle_change_timeout = src->vehicle_change_timeout;
dst->num_block_brakes = src->num_block_brakes;