From eae2cde74718372bba5032e36c9596b41143e075 Mon Sep 17 00:00:00 2001 From: Ted John Date: Sun, 11 Apr 2021 13:13:29 +0100 Subject: [PATCH] Fix S6 import of entrance style --- src/openrct2/rct2/S6Importer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 4d1a7a475c..0681a9dd64 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -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;