mirror of https://github.com/OpenRCT2/OpenRCT2.git
Fix S6 import of entrance style
This commit is contained in:
parent
3927c91b6a
commit
eae2cde747
|
@ -760,7 +760,7 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
auto musicStyle = OBJECT_ENTRY_INDEX_NULL;
|
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;
|
musicStyle = src->music;
|
||||||
}
|
}
|
||||||
|
@ -768,11 +768,11 @@ public:
|
||||||
|
|
||||||
// In SV7, "plain" entrances are invisible.
|
// In SV7, "plain" entrances are invisible.
|
||||||
auto entranceStyle = OBJECT_ENTRY_INDEX_NULL;
|
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;
|
entranceStyle = src->entrance_style;
|
||||||
}
|
}
|
||||||
dst->entrance_style = src->entrance_style;
|
dst->entrance_style = entranceStyle;
|
||||||
|
|
||||||
dst->vehicle_change_timeout = src->vehicle_change_timeout;
|
dst->vehicle_change_timeout = src->vehicle_change_timeout;
|
||||||
dst->num_block_brakes = src->num_block_brakes;
|
dst->num_block_brakes = src->num_block_brakes;
|
||||||
|
|
Loading…
Reference in New Issue