From 8968c7d3fef5143a7a65e8bc2cf96e34bd538b80 Mon Sep 17 00:00:00 2001 From: AuraSpecs Date: Wed, 10 Jul 2024 09:43:52 +0200 Subject: [PATCH] Update OpenMusic to version 1.6 (#22262) --- CMakeLists.txt | 4 ++-- contributors.md | 1 + distribution/changelog.txt | 1 + openrct2.proj | 4 ++-- src/openrct2/object/DefaultObjects.cpp | 1 + src/openrct2/object/DefaultObjects.h | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0142c4b5e1..ceefab30fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,9 +72,9 @@ set(OPENSFX_VERSION "1.0.5") set(OPENSFX_URL "https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v${OPENSFX_VERSION}/opensound.zip") set(OPENSFX_SHA1 "b1b1f1b241d2cbff63a1889c4dc5a09bdf769bfb") -set(OPENMSX_VERSION "1.5") +set(OPENMSX_VERSION "1.6") set(OPENMSX_URL "https://github.com/OpenRCT2/OpenMusic/releases/download/v${OPENMSX_VERSION}/openmusic.zip") -set(OPENMSX_SHA1 "f3c707e576281758637598ce68880416891fe5f9") +set(OPENMSX_SHA1 "ba170fa6d777b309c15420f4b6eb3fa25082a9d1") set(REPLAYS_VERSION "0.0.79") set(REPLAYS_URL "https://github.com/OpenRCT2/replays/releases/download/v${REPLAYS_VERSION}/replays.zip") diff --git a/contributors.md b/contributors.md index 57e2bf1de8..64bf6e2217 100644 --- a/contributors.md +++ b/contributors.md @@ -313,6 +313,7 @@ Appreciation for contributors who have provided substantial work, but are no lon * Herman Riddering - Owner of the 35er Voigt, which provided new recordings for the Fairground organ styles. * (Skyshard) * (Blackend Blue) +* Andrew Sinclair (Approaching Nirvana) - Progressive style ## Sound Effects * Karst van Galen Last (AuraSpecs) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 2df5592d7f..007dcb8b2e 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -4,6 +4,7 @@ - Feature: [#20832] The ride music tab now shows a track listing for the current music style. - Feature: [#22172] [Plugin] Expose ride satisfaction ratings to the plugin API. - Feature: [#22213] [Plugin] Allow plugins to focus on textboxes in custom windows. +- Feature: [OpenMusic#54] Added Progressive ride music style (feat. Approaching Nirvana). - Change: [#22230] The plugin/script engine is now initialised off the main thread. - Change: [#22251] Hide author info in the scenery window unless debug tools are active. diff --git a/openrct2.proj b/openrct2.proj index e001693d4d..a083556518 100644 --- a/openrct2.proj +++ b/openrct2.proj @@ -49,8 +49,8 @@ 49852246ba3d3a44f143e0c4de8f4d2e8f950c10 https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v1.0.5/opensound.zip b1b1f1b241d2cbff63a1889c4dc5a09bdf769bfb - https://github.com/OpenRCT2/OpenMusic/releases/download/v1.5/openmusic.zip - f3c707e576281758637598ce68880416891fe5f9 + https://github.com/OpenRCT2/OpenMusic/releases/download/v1.6/openmusic.zip + ba170fa6d777b309c15420f4b6eb3fa25082a9d1 https://github.com/OpenRCT2/replays/releases/download/v0.0.79/replays.zip 34457077DBA9448A08FF6AC95E5CB92D65252E0C diff --git a/src/openrct2/object/DefaultObjects.cpp b/src/openrct2/object/DefaultObjects.cpp index 294c73de3d..062173c309 100644 --- a/src/openrct2/object/DefaultObjects.cpp +++ b/src/openrct2/object/DefaultObjects.cpp @@ -123,6 +123,7 @@ const std::string_view DefaultSelectedObjects[] = { "openrct2.music.prehistoric", "openrct2.music.mystic", "openrct2.music.rock4", + "openrct2.music.progressive", // Footpath surfaces "rct2.footpath_surface.tarmac", diff --git a/src/openrct2/object/DefaultObjects.h b/src/openrct2/object/DefaultObjects.h index f4a355e738..5a35660d5c 100644 --- a/src/openrct2/object/DefaultObjects.h +++ b/src/openrct2/object/DefaultObjects.h @@ -12,5 +12,5 @@ #include "Object.h" extern const std::string_view MinimumRequiredObjects[2]; -extern const std::string_view DefaultSelectedObjects[113]; +extern const std::string_view DefaultSelectedObjects[114]; extern const std::string_view DesignerSelectedObjects[39];