diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c551951e4..0f8047729c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,9 +68,9 @@ set(OBJECTS_VERSION "1.3.13") set(OBJECTS_URL "https://github.com/OpenRCT2/objects/releases/download/v${OBJECTS_VERSION}/objects.zip") set(OBJECTS_SHA1 "15a60424d5f4f0b94ac07763b6967ba0e6ae3a7d") -set(OPENSFX_VERSION "1.0.4") +set(OPENSFX_VERSION "1.0.5") set(OPENSFX_URL "https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v${OPENSFX_VERSION}/opensound.zip") -set(OPENSFX_SHA1 "95e71b3684c9eb84c642563dd2cbf2f6e099a8a5") +set(OPENSFX_SHA1 "b1b1f1b241d2cbff63a1889c4dc5a09bdf769bfb") set(OPENMSX_VERSION "1.5") set(OPENMSX_URL "https://github.com/OpenRCT2/OpenMusic/releases/download/v${OPENMSX_VERSION}/openmusic.zip") diff --git a/distribution/changelog.txt b/distribution/changelog.txt index c6f1302a33..8d703ee030 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -3,6 +3,7 @@ - Feature: [#20376] Add Ukrainian language. - Feature: [#20709] [Plugin] Plugins can now check metadata from all registered plugins. - Feature: [#21376] Add option to reload an object (for object developers). +- Feature: [#21413, OpenSFX#19] Add log flume lift sound effect (when “chainlift” is enabled). - Feature: [#21455] Add option to control hidden scenery. - Improved: [#21356] Resize the title bar when moving between displays with different scaling factors on Windows systems. - Improved: [#21388] Tooltips will now show even when an error message is present. diff --git a/openrct2.proj b/openrct2.proj index 401ea05aed..5bfa4912a7 100644 --- a/openrct2.proj +++ b/openrct2.proj @@ -47,8 +47,8 @@ 80fefc6ebbabc42a6f4703412daa5c62f661420d https://github.com/OpenRCT2/objects/releases/download/v1.3.13/objects.zip 15a60424d5f4f0b94ac07763b6967ba0e6ae3a7d - https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v1.0.4/opensound.zip - 95e71b3684c9eb84c642563dd2cbf2f6e099a8a5 + 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/replays/releases/download/v0.0.78/replays.zip diff --git a/src/openrct2/audio/audio.h b/src/openrct2/audio/audio.h index a4be1ac50a..1fe76571d6 100644 --- a/src/openrct2/audio/audio.h +++ b/src/openrct2/audio/audio.h @@ -130,6 +130,7 @@ namespace OpenRCT2::Audio CrowdAmbience, LiftRMC, TrackFrictionRMC, + LiftFlume, NoScream = 254, Null = 255 }; diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index 7be34690e1..c05c080c91 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -46,7 +46,7 @@ using namespace OpenRCT2; // It is used for making sure only compatible builds get connected, even within // single OpenRCT2 version. -#define NETWORK_STREAM_VERSION "2" +#define NETWORK_STREAM_VERSION "3" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION diff --git a/src/openrct2/ride/water/meta/LogFlume.h b/src/openrct2/ride/water/meta/LogFlume.h index 5de6e0732a..70598a0c9c 100644 --- a/src/openrct2/ride/water/meta/LogFlume.h +++ b/src/openrct2/ride/water/meta/LogFlume.h @@ -39,7 +39,7 @@ constexpr RideTypeDescriptor LogFlumeRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_CONTROL_FAILURE), .Heights = { 10, 24, 7, 9, }, .MaxMass = 255, - .LiftData = { OpenRCT2::Audio::SoundId::Null, 5, 5 }, + .LiftData = { OpenRCT2::Audio::SoundId::LiftFlume, 5, 5 }, .RatingsMultipliers = { 80, 34, 6 }, .UpkeepCosts = { 80, 20, 0, 9, 0, 10 }, .BuildCosts = { 22.50_GBP, 2.50_GBP, 40, }, diff --git a/src/openrct2/ride/water/meta/RiverRapids.h b/src/openrct2/ride/water/meta/RiverRapids.h index 773bc27091..b188f18d45 100644 --- a/src/openrct2/ride/water/meta/RiverRapids.h +++ b/src/openrct2/ride/water/meta/RiverRapids.h @@ -40,7 +40,7 @@ constexpr RideTypeDescriptor RiverRapidsRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_CONTROL_FAILURE), .Heights = { 9, 32, 14, 15, }, .MaxMass = 255, - .LiftData = { OpenRCT2::Audio::SoundId::Null, 5, 5 }, + .LiftData = { OpenRCT2::Audio::SoundId::LiftFlume, 5, 5 }, .RatingsMultipliers = { 72, 26, 6 }, .UpkeepCosts = { 82, 20, 0, 10, 0, 10 }, .BuildCosts = { 31.00_GBP, 3.00_GBP, 40, }, diff --git a/src/openrct2/ride/water/meta/SplashBoats.h b/src/openrct2/ride/water/meta/SplashBoats.h index d28d491a26..3c403329f7 100644 --- a/src/openrct2/ride/water/meta/SplashBoats.h +++ b/src/openrct2/ride/water/meta/SplashBoats.h @@ -40,7 +40,7 @@ constexpr RideTypeDescriptor SplashBoatsRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_CONTROL_FAILURE), .Heights = { 16, 24, 7, 11, }, .MaxMass = 255, - .LiftData = { OpenRCT2::Audio::SoundId::Null, 5, 5 }, + .LiftData = { OpenRCT2::Audio::SoundId::LiftFlume, 5, 5 }, .RatingsMultipliers = { 80, 34, 6 }, .UpkeepCosts = { 70, 20, 0, 9, 0, 10 }, .BuildCosts = { 28.50_GBP, 2.50_GBP, 30, },