From 3c451a4af4648cd8fd52eefe8a90b3e63bb181c3 Mon Sep 17 00:00:00 2001 From: Ted John Date: Wed, 1 Sep 2021 10:16:44 +0200 Subject: [PATCH] Use music objects instead of IDs --- src/openrct2/actions/RideCreateAction.cpp | 29 ++++++++---- src/openrct2/object/ObjectManager.cpp | 20 ++++++++ src/openrct2/object/ObjectManager.h | 2 + src/openrct2/rct1/S4Importer.cpp | 36 +++++++++------ src/openrct2/rct12/RCT12.cpp | 46 +++++++++++++++++++ src/openrct2/rct12/RCT12.h | 1 + src/openrct2/rct2/S6Importer.cpp | 7 ++- src/openrct2/ride/Ride.h | 2 +- src/openrct2/ride/RideData.h | 18 +++++++- .../coaster/meta/AirPoweredVerticalCoaster.h | 2 +- .../ride/coaster/meta/BobsleighCoaster.h | 2 +- .../coaster/meta/ClassicMiniRollerCoaster.h | 2 +- .../coaster/meta/CompactInvertedCoaster.h | 2 +- .../coaster/meta/CorkscrewRollerCoaster.h | 2 +- .../ride/coaster/meta/FlyingRollerCoaster.h | 4 +- src/openrct2/ride/coaster/meta/GigaCoaster.h | 2 +- .../coaster/meta/HeartlineTwisterCoaster.h | 2 +- .../ride/coaster/meta/HybridCoaster.h | 2 +- src/openrct2/ride/coaster/meta/HyperTwister.h | 2 +- src/openrct2/ride/coaster/meta/Hypercoaster.h | 2 +- .../coaster/meta/InvertedHairpinCoaster.h | 2 +- .../coaster/meta/InvertedImpulseCoaster.h | 2 +- .../ride/coaster/meta/InvertedRollerCoaster.h | 2 +- .../ride/coaster/meta/JuniorRollerCoaster.h | 2 +- .../coaster/meta/LIMLaunchedRollerCoaster.h | 2 +- .../ride/coaster/meta/LayDownRollerCoaster.h | 4 +- .../ride/coaster/meta/LoopingRollerCoaster.h | 2 +- src/openrct2/ride/coaster/meta/MineRide.h | 2 +- .../ride/coaster/meta/MineTrainCoaster.h | 2 +- .../ride/coaster/meta/MiniRollerCoaster.h | 2 +- .../ride/coaster/meta/MiniSuspendedCoaster.h | 2 +- .../meta/MultiDimensionRollerCoaster.h | 4 +- .../coaster/meta/ReverseFreefallCoaster.h | 2 +- .../ride/coaster/meta/ReverserRollerCoaster.h | 2 +- .../coaster/meta/SideFrictionRollerCoaster.h | 2 +- .../coaster/meta/SingleRailRollerCoaster.h | 2 +- .../ride/coaster/meta/SpinningWildMouse.h | 2 +- .../ride/coaster/meta/SpiralRollerCoaster.h | 2 +- .../ride/coaster/meta/StandUpRollerCoaster.h | 2 +- .../ride/coaster/meta/SteelWildMouse.h | 2 +- src/openrct2/ride/coaster/meta/Steeplechase.h | 2 +- .../coaster/meta/SuspendedSwingingCoaster.h | 2 +- .../ride/coaster/meta/TwisterRollerCoaster.h | 2 +- .../ride/coaster/meta/VerticalDropCoaster.h | 2 +- src/openrct2/ride/coaster/meta/VirginiaReel.h | 2 +- src/openrct2/ride/coaster/meta/WaterCoaster.h | 2 +- .../ride/coaster/meta/WoodenRollerCoaster.h | 2 +- .../ride/coaster/meta/WoodenWildMouse.h | 2 +- src/openrct2/ride/gentle/meta/CarRide.h | 2 +- src/openrct2/ride/gentle/meta/Circus.h | 2 +- src/openrct2/ride/gentle/meta/CrookedHouse.h | 2 +- src/openrct2/ride/gentle/meta/Dodgems.h | 2 +- src/openrct2/ride/gentle/meta/FerrisWheel.h | 2 +- src/openrct2/ride/gentle/meta/FlyingSaucers.h | 2 +- src/openrct2/ride/gentle/meta/GhostTrain.h | 2 +- src/openrct2/ride/gentle/meta/HauntedHouse.h | 2 +- src/openrct2/ride/gentle/meta/Maze.h | 2 +- src/openrct2/ride/gentle/meta/MerryGoRound.h | 2 +- src/openrct2/ride/gentle/meta/MiniGolf.h | 2 +- .../ride/gentle/meta/MiniHelicopters.h | 2 +- .../ride/gentle/meta/MonorailCycles.h | 2 +- src/openrct2/ride/gentle/meta/MonsterTrucks.h | 2 +- .../ride/gentle/meta/ObservationTower.h | 2 +- src/openrct2/ride/gentle/meta/SpaceRings.h | 2 +- src/openrct2/ride/gentle/meta/SpiralSlide.h | 2 +- src/openrct2/ride/shops/meta/CashMachine.h | 2 +- src/openrct2/ride/shops/meta/DrinkStall.h | 2 +- src/openrct2/ride/shops/meta/FirstAid.h | 2 +- src/openrct2/ride/shops/meta/FoodStall.h | 2 +- .../ride/shops/meta/InformationKiosk.h | 2 +- src/openrct2/ride/shops/meta/Shop.h | 2 +- src/openrct2/ride/shops/meta/Toilets.h | 2 +- src/openrct2/ride/thrill/meta/3DCinema.h | 2 +- src/openrct2/ride/thrill/meta/Enterprise.h | 2 +- src/openrct2/ride/thrill/meta/GoKarts.h | 2 +- .../ride/thrill/meta/LaunchedFreefall.h | 2 +- src/openrct2/ride/thrill/meta/MagicCarpet.h | 2 +- .../ride/thrill/meta/MotionSimulator.h | 2 +- src/openrct2/ride/thrill/meta/RotoDrop.h | 2 +- .../ride/thrill/meta/SwingingInverterShip.h | 2 +- src/openrct2/ride/thrill/meta/SwingingShip.h | 2 +- src/openrct2/ride/thrill/meta/TopSpin.h | 2 +- src/openrct2/ride/thrill/meta/Twist.h | 2 +- src/openrct2/ride/transport/meta/Chairlift.h | 2 +- src/openrct2/ride/transport/meta/Lift.h | 2 +- .../ride/transport/meta/MiniatureRailway.h | 2 +- src/openrct2/ride/transport/meta/Monorail.h | 2 +- .../ride/transport/meta/SuspendedMonorail.h | 2 +- src/openrct2/ride/water/meta/BoatHire.h | 2 +- src/openrct2/ride/water/meta/DinghySlide.h | 2 +- src/openrct2/ride/water/meta/LogFlume.h | 2 +- src/openrct2/ride/water/meta/RiverRafts.h | 2 +- src/openrct2/ride/water/meta/RiverRapids.h | 2 +- src/openrct2/ride/water/meta/SplashBoats.h | 2 +- src/openrct2/ride/water/meta/SubmarineRide.h | 2 +- 95 files changed, 223 insertions(+), 116 deletions(-) diff --git a/src/openrct2/actions/RideCreateAction.cpp b/src/openrct2/actions/RideCreateAction.cpp index 3b57344c95..f142b1729f 100644 --- a/src/openrct2/actions/RideCreateAction.cpp +++ b/src/openrct2/actions/RideCreateAction.cpp @@ -10,11 +10,13 @@ #include "RideCreateAction.h" #include "../Cheats.h" +#include "../Context.h" #include "../core/Memory.hpp" #include "../core/MemoryStream.h" #include "../interface/Window.h" #include "../localisation/Date.h" #include "../localisation/StringIds.h" +#include "../object/ObjectManager.h" #include "../rct1/RCT1.h" #include "../ride/Ride.h" #include "../ride/RideData.h" @@ -167,16 +169,25 @@ GameActions::Result::Ptr RideCreateAction::Execute() const ride->min_waiting_time = 10; ride->max_waiting_time = 60; ride->depart_flags = RIDE_DEPART_WAIT_FOR_MINIMUM_LENGTH | 3; - if (ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_MUSIC_ON_DEFAULT)) - { - ride->lifecycle_flags |= RIDE_LIFECYCLE_MUSIC; - } - ride->music = ride->GetRideTypeDescriptor().DefaultMusic; - const auto& operatingSettings = ride->GetRideTypeDescriptor().OperatingSettings; + const auto& rtd = ride->GetRideTypeDescriptor(); + if (rtd.HasFlag(RIDE_TYPE_FLAG_ALLOW_MUSIC)) + { + auto& objManager = OpenRCT2::GetContext()->GetObjectManager(); + ride->music = objManager.GetLoadedObjectEntryIndex(rtd.DefaultMusic); + if (ride->music != OBJECT_ENTRY_INDEX_NULL) + { + if (rtd.HasFlag(RIDE_TYPE_FLAG_MUSIC_ON_DEFAULT)) + { + ride->lifecycle_flags |= RIDE_LIFECYCLE_MUSIC; + } + } + } + + const auto& operatingSettings = rtd.OperatingSettings; ride->operation_option = (operatingSettings.MinValue * 3 + operatingSettings.MaxValue) / 4; - ride->lift_hill_speed = ride->GetRideTypeDescriptor().LiftData.minimum_speed; + ride->lift_hill_speed = rtd.LiftData.minimum_speed; ride->measurement = {}; ride->excitement = RIDE_RATING_UNDEFINED; @@ -193,7 +204,7 @@ GameActions::Result::Ptr RideCreateAction::Execute() const { for (auto i = 0; i < NUM_SHOP_ITEMS_PER_RIDE; i++) { - ride->price[i] = ride->GetRideTypeDescriptor().DefaultPrices[i]; + ride->price[i] = rtd.DefaultPrices[i]; } if (rideEntry->shop_item[0] == ShopItem::None) @@ -245,7 +256,7 @@ GameActions::Result::Ptr RideCreateAction::Execute() const } // Set the on-ride photo price, whether the ride has one or not (except shops). - if (!ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_IS_SHOP) && shop_item_has_common_price(ShopItem::Photo)) + if (!rtd.HasFlag(RIDE_TYPE_FLAG_IS_SHOP) && shop_item_has_common_price(ShopItem::Photo)) { money32 price = shop_item_get_common_price(ride, ShopItem::Photo); if (price != MONEY32_UNDEFINED) diff --git a/src/openrct2/object/ObjectManager.cpp b/src/openrct2/object/ObjectManager.cpp index b72f6c0bd8..e32acc427f 100644 --- a/src/openrct2/object/ObjectManager.cpp +++ b/src/openrct2/object/ObjectManager.cpp @@ -91,6 +91,26 @@ public: return loadedObject; } + ObjectEntryIndex GetLoadedObjectEntryIndex(std::string_view identifier) override + { + const auto* obj = GetLoadedObject(ObjectEntryDescriptor(identifier)); + if (obj != nullptr) + { + return GetLoadedObjectEntryIndex(obj); + } + return OBJECT_ENTRY_INDEX_NULL; + } + + ObjectEntryIndex GetLoadedObjectEntryIndex(const ObjectEntryDescriptor& descriptor) override + { + auto obj = GetLoadedObject(descriptor); + if (obj != nullptr) + { + return GetLoadedObjectEntryIndex(obj); + } + return OBJECT_ENTRY_INDEX_NULL; + } + ObjectEntryIndex GetLoadedObjectEntryIndex(const Object* object) override { ObjectEntryIndex result = OBJECT_ENTRY_INDEX_NULL; diff --git a/src/openrct2/object/ObjectManager.h b/src/openrct2/object/ObjectManager.h index 1dbf7fc2a5..38329a6e9b 100644 --- a/src/openrct2/object/ObjectManager.h +++ b/src/openrct2/object/ObjectManager.h @@ -27,6 +27,8 @@ struct IObjectManager virtual Object* GetLoadedObject(size_t index) abstract; virtual Object* GetLoadedObject(ObjectType objectType, size_t index) abstract; virtual Object* GetLoadedObject(const ObjectEntryDescriptor& entry) abstract; + virtual ObjectEntryIndex GetLoadedObjectEntryIndex(std::string_view identifier) abstract; + virtual ObjectEntryIndex GetLoadedObjectEntryIndex(const ObjectEntryDescriptor& descriptor) abstract; virtual ObjectEntryIndex GetLoadedObjectEntryIndex(const Object* object) abstract; virtual std::vector GetInvalidObjects(const rct_object_entry* entries) abstract; diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index dcdca4c08e..62a3d1367e 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -859,25 +859,33 @@ namespace RCT1 // RCT1 used 5mph / 8 km/h for every lift hill dst->lift_hill_speed = 5; - if (_gameVersion == FILE_VERSION_RCT1) + dst->music = OBJECT_ENTRY_INDEX_NULL; + if (GetRideTypeDescriptor(dst->type).HasFlag(RIDE_TYPE_FLAG_ALLOW_MUSIC)) { - // Original RCT had no music settings, take default style - dst->music = GetRideTypeDescriptor(dst->type).DefaultMusic; - - // Only merry-go-round and dodgems had music and used - // the same flag as synchronise stations for the option to enable it - if (src->type == RCT1_RIDE_TYPE_MERRY_GO_ROUND || src->type == RCT1_RIDE_TYPE_DODGEMS) + if (_gameVersion == FILE_VERSION_RCT1) { - if (src->depart_flags & RCT1_RIDE_DEPART_PLAY_MUSIC) + // Original RCT had no music settings, take default style + auto style = GetStyleFromMusicIdentifier(GetRideTypeDescriptor(dst->type).DefaultMusic); + if (style) { - dst->depart_flags &= ~RCT1_RIDE_DEPART_PLAY_MUSIC; - dst->lifecycle_flags |= RIDE_LIFECYCLE_MUSIC; + dst->music = *style; + } + + // Only merry-go-round and dodgems had music and used + // the same flag as synchronise stations for the option to enable it + if (src->type == RCT1_RIDE_TYPE_MERRY_GO_ROUND || src->type == RCT1_RIDE_TYPE_DODGEMS) + { + if (src->depart_flags & RCT1_RIDE_DEPART_PLAY_MUSIC) + { + dst->depart_flags &= ~RCT1_RIDE_DEPART_PLAY_MUSIC; + dst->lifecycle_flags |= RIDE_LIFECYCLE_MUSIC; + } } } - } - else - { - dst->music = src->music; + else + { + dst->music = src->music; + } } if (src->operating_mode == RCT1_RIDE_MODE_POWERED_LAUNCH) diff --git a/src/openrct2/rct12/RCT12.cpp b/src/openrct2/rct12/RCT12.cpp index 438ad3f979..96a9df55ca 100644 --- a/src/openrct2/rct12/RCT12.cpp +++ b/src/openrct2/rct12/RCT12.cpp @@ -1366,3 +1366,49 @@ money32 OpenRCT2CompletedCompanyValueToRCT12(money64 origValue) return ToMoney32(origValue); } + +static constexpr std::string_view _musicStyles[] = { + "rct2.music.dodgems", + "rct2.music.fairground", + "rct2.music.roman", + "rct2.music.oriental", + "rct2.music.martian", + "rct2.music.jungle", + "rct2.music.egyptian", + "rct2.music.toyland", + "", // CIRCUS + "rct2.music.space", + "rct2.music.horror", + "rct2.music.techno", + "rct2.music.gentle", + "rct2.music.summer", + "rct2.music.water", + "rct2.music.wildwest", + "rct2.music.jurassic", + "rct2.music.rock1", + "rct2.music.ragtime", + "rct2.music.fantasy", + "rct2.music.rock2", + "rct2.music.ice", + "rct2.music.snow", + "rct2.music.custom1", + "rct2.music.custom2", + "rct2.music.medieval", + "rct2.music.urban", + "rct2.music.organ", + "rct2.music.mechanical", + "rct2.music.modern", + "rct2.music.pirate", + "rct2.music.rock3", + "rct2.music.candy", +}; + +std::optional GetStyleFromMusicIdentifier(std::string_view identifier) +{ + auto it = std::find(std::begin(_musicStyles), std::end(_musicStyles), identifier); + if (it != std::end(_musicStyles)) + { + return std::distance(std::begin(_musicStyles), it); + } + return {}; +} diff --git a/src/openrct2/rct12/RCT12.h b/src/openrct2/rct12/RCT12.h index 53982f8e18..b9e4dd52b1 100644 --- a/src/openrct2/rct12/RCT12.h +++ b/src/openrct2/rct12/RCT12.h @@ -937,6 +937,7 @@ std::string ConvertFormattedStringToRCT2(std::string_view buffer, size_t maxLeng std::string GetTruncatedRCT2String(std::string_view src, size_t maxLength); track_type_t RCT12FlatTrackTypeToOpenRCT2(RCT12TrackType origTrackType); RCT12TrackType OpenRCT2FlatTrackTypeToRCT12(track_type_t origTrackType); +std::optional GetStyleFromMusicIdentifier(std::string_view identifier); static constexpr money32 RCT12_COMPANY_VALUE_ON_FAILED_OBJECTIVE = 0x80000001; diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index ae440fa402..9083050b38 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -800,7 +800,12 @@ public: } } - dst->music = src->music; + auto musicStyle = OBJECT_ENTRY_INDEX_NULL; + if (GetRideTypeDescriptor(dst->type).HasFlag(RIDE_TYPE_FLAG_ALLOW_MUSIC)) + { + musicStyle = src->music; + } + dst->music = musicStyle; auto entranceStyle = src->entrance_style; // In SV7, "plain" entrances are invisible. diff --git a/src/openrct2/ride/Ride.h b/src/openrct2/ride/Ride.h index be14e2431a..b23ea3b5e1 100644 --- a/src/openrct2/ride/Ride.h +++ b/src/openrct2/ride/Ride.h @@ -361,7 +361,7 @@ public: money64 income_per_hour; money64 profit; TrackColour track_colour[NUM_COLOUR_SCHEMES]; - uint8_t music; + ObjectEntryIndex music; ObjectEntryIndex entrance_style; uint16_t vehicle_change_timeout; uint8_t num_block_brakes; diff --git a/src/openrct2/ride/RideData.h b/src/openrct2/ride/RideData.h index 1905c17d96..76e92a533e 100644 --- a/src/openrct2/ride/RideData.h +++ b/src/openrct2/ride/RideData.h @@ -167,7 +167,7 @@ struct RideTypeDescriptor // rct2: 0x0097DD78 RideBuildCost BuildCosts; money16 DefaultPrices[NUM_SHOP_ITEMS_PER_RIDE]; - uint8_t DefaultMusic; + std::string_view DefaultMusic; /** rct2: 0x0097D7CB */ ShopItemIndex PhotoItem; /** rct2: 0x0097D21E */ @@ -295,6 +295,20 @@ constexpr const RideComponentName RideComponentNames[] = }; // clang-format on +constexpr std::string_view MUSIC_OBJECT_DODGEMS = "rct2.music.dodgems"; +constexpr std::string_view MUSIC_OBJECT_EGYPTIAN = "rct2.music.egyptian"; +constexpr std::string_view MUSIC_OBJECT_FAIRGROUND = "rct2.music.fairground"; +constexpr std::string_view MUSIC_OBJECT_GENTLE = "rct2.music.gentle"; +constexpr std::string_view MUSIC_OBJECT_HORROR = "rct2.music.horror"; +constexpr std::string_view MUSIC_OBJECT_PIRATE = "rct2.music.pirate"; +constexpr std::string_view MUSIC_OBJECT_ROCK_1 = "rct2.music.rock1"; +constexpr std::string_view MUSIC_OBJECT_ROCK_2 = "rct2.music.rock2"; +constexpr std::string_view MUSIC_OBJECT_ROCK_3 = "rct2.music.rock3"; +constexpr std::string_view MUSIC_OBJECT_SUMMER = "rct2.music.summer"; +constexpr std::string_view MUSIC_OBJECT_TECHNO = "rct2.music.techno"; +constexpr std::string_view MUSIC_OBJECT_WATER = "rct2.music.water"; +constexpr std::string_view MUSIC_OBJECT_WILD_WEST = "rct2.music.wildwest"; + constexpr const RideComponentName& GetRideComponentName(const RideComponentType type) { return RideComponentNames[EnumValue(type)]; @@ -343,7 +357,7 @@ constexpr const RideTypeDescriptor DummyRTD = SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), SET_FIELD(BuildCosts, { 0, 0, 1 }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_GENTLE), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 0), SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET), diff --git a/src/openrct2/ride/coaster/meta/AirPoweredVerticalCoaster.h b/src/openrct2/ride/coaster/meta/AirPoweredVerticalCoaster.h index 7f9c161f9c..17e3a117c7 100644 --- a/src/openrct2/ride/coaster/meta/AirPoweredVerticalCoaster.h +++ b/src/openrct2/ride/coaster/meta/AirPoweredVerticalCoaster.h @@ -40,7 +40,7 @@ constexpr const RideTypeDescriptor AirPoweredVerticalCoasterRTD = SET_FIELD(UpkeepCosts, { 90, 20, 0, 0, 0, 10 }), SET_FIELD(BuildCosts, { 200, 0, 45, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK_STYLE_2), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_2), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 70), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/BobsleighCoaster.h b/src/openrct2/ride/coaster/meta/BobsleighCoaster.h index f71545918f..f917fd0cbc 100644 --- a/src/openrct2/ride/coaster/meta/BobsleighCoaster.h +++ b/src/openrct2/ride/coaster/meta/BobsleighCoaster.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor BobsleighCoasterRTD = SET_FIELD(UpkeepCosts, { 40, 20, 80, 10, 3, 10 }), SET_FIELD(BuildCosts, { 80, 5, 45, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 75), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/ClassicMiniRollerCoaster.h b/src/openrct2/ride/coaster/meta/ClassicMiniRollerCoaster.h index ef3f48959d..a89e64f0b8 100644 --- a/src/openrct2/ride/coaster/meta/ClassicMiniRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/ClassicMiniRollerCoaster.h @@ -45,7 +45,7 @@ constexpr const RideTypeDescriptor ClassicMiniRollerCoasterRTD = SET_FIELD(UpkeepCosts, { 40, 20, 80, 8, 3, 5 }), SET_FIELD(BuildCosts, { 45, 4, 40, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 60), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/CompactInvertedCoaster.h b/src/openrct2/ride/coaster/meta/CompactInvertedCoaster.h index 6909e40528..c364eda627 100644 --- a/src/openrct2/ride/coaster/meta/CompactInvertedCoaster.h +++ b/src/openrct2/ride/coaster/meta/CompactInvertedCoaster.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor CompactInvertedCoasterRTD = SET_FIELD(UpkeepCosts, { 40, 20, 80, 13, 3, 10 }), SET_FIELD(BuildCosts, { 100, 5, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_TECHNO), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_TECHNO), SET_FIELD(PhotoItem, ShopItem::Photo2), SET_FIELD(BonusValue, 80), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h b/src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h index 26593b440d..a0700c7174 100644 --- a/src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/CorkscrewRollerCoaster.h @@ -47,7 +47,7 @@ constexpr const RideTypeDescriptor CorkscrewRollerCoasterRTD = SET_FIELD(UpkeepCosts, { 40, 20, 80, 11, 3, 10 }), SET_FIELD(BuildCosts, { 105, 5, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 100), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h b/src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h index 459f061589..2024be3ca6 100644 --- a/src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/FlyingRollerCoaster.h @@ -44,7 +44,7 @@ constexpr const RideTypeDescriptor FlyingRollerCoasterRTD = SET_FIELD(UpkeepCosts, { 49, 20, 90, 11, 3, 15 }), SET_FIELD(BuildCosts, { 125, 5, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo2), SET_FIELD(BonusValue, 100), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( @@ -84,7 +84,7 @@ constexpr const RideTypeDescriptor FlyingRollerCoasterAltRTD = SET_FIELD(UpkeepCosts, { 49, 20, 90, 11, 3, 15 }), SET_FIELD(BuildCosts, { 125, 5, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo2), SET_FIELD(BonusValue, 100), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/GigaCoaster.h b/src/openrct2/ride/coaster/meta/GigaCoaster.h index a73b4ef050..baadb2ce97 100644 --- a/src/openrct2/ride/coaster/meta/GigaCoaster.h +++ b/src/openrct2/ride/coaster/meta/GigaCoaster.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor GigaCoasterRTD = SET_FIELD(UpkeepCosts, { 10, 20, 80, 12, 3, 40 }), SET_FIELD(BuildCosts, { 120, 5, 55, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK_STYLE_3), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_3), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 120), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h b/src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h index bf13341e1f..d3ef1c3329 100644 --- a/src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h +++ b/src/openrct2/ride/coaster/meta/HeartlineTwisterCoaster.h @@ -41,7 +41,7 @@ constexpr const RideTypeDescriptor HeartlineTwisterCoasterRTD = SET_FIELD(UpkeepCosts, { 47, 20, 80, 11, 3, 10 }), SET_FIELD(BuildCosts, { 135, 7, 30, }), SET_FIELD(DefaultPrices, { 15, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_TECHNO), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_TECHNO), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 35), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/HybridCoaster.h b/src/openrct2/ride/coaster/meta/HybridCoaster.h index 9ba4481b90..a703e5a354 100644 --- a/src/openrct2/ride/coaster/meta/HybridCoaster.h +++ b/src/openrct2/ride/coaster/meta/HybridCoaster.h @@ -40,7 +40,7 @@ constexpr const RideTypeDescriptor HybridCoasterRTD = SET_FIELD(UpkeepCosts, { 40, 20, 80, 10, 3, 10 }), SET_FIELD(BuildCosts, { 110, 7, 55}), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK_STYLE_2), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_2), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 120), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/HyperTwister.h b/src/openrct2/ride/coaster/meta/HyperTwister.h index a8b4ec0225..87f2634d0a 100644 --- a/src/openrct2/ride/coaster/meta/HyperTwister.h +++ b/src/openrct2/ride/coaster/meta/HyperTwister.h @@ -46,7 +46,7 @@ constexpr const RideTypeDescriptor HyperTwisterRTD = SET_FIELD(UpkeepCosts, { 43, 20, 80, 11, 3, 10 }), SET_FIELD(BuildCosts, { 120, 5, 55, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 120), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/Hypercoaster.h b/src/openrct2/ride/coaster/meta/Hypercoaster.h index 867a269c5e..880e6efc7a 100644 --- a/src/openrct2/ride/coaster/meta/Hypercoaster.h +++ b/src/openrct2/ride/coaster/meta/Hypercoaster.h @@ -45,7 +45,7 @@ constexpr const RideTypeDescriptor HypercoasterRTD = SET_FIELD(UpkeepCosts, { 40, 20, 80, 11, 3, 10 }), SET_FIELD(BuildCosts, { 105, 5, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 100), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/InvertedHairpinCoaster.h b/src/openrct2/ride/coaster/meta/InvertedHairpinCoaster.h index fa80cbe46d..0324379fb8 100644 --- a/src/openrct2/ride/coaster/meta/InvertedHairpinCoaster.h +++ b/src/openrct2/ride/coaster/meta/InvertedHairpinCoaster.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor InvertedHairpinCoasterRTD = SET_FIELD(UpkeepCosts, { 40, 20, 80, 9, 3, 10 }), SET_FIELD(BuildCosts, { 67, 4, 40, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK_STYLE_2), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_2), SET_FIELD(PhotoItem, ShopItem::Photo2), SET_FIELD(BonusValue, 55), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h b/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h index d3e787ffd8..021a1b9c2a 100644 --- a/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h +++ b/src/openrct2/ride/coaster/meta/InvertedImpulseCoaster.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor InvertedImpulseCoasterRTD = SET_FIELD(UpkeepCosts, { 180, 20, 80, 11, 3, 10 }), SET_FIELD(BuildCosts, { 125, 5, 25, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo2), SET_FIELD(BonusValue, 75), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h b/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h index 6d50a74f5f..180901769d 100644 --- a/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/InvertedRollerCoaster.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor InvertedRollerCoasterRTD = SET_FIELD(UpkeepCosts, { 40, 20, 80, 13, 3, 10 }), SET_FIELD(BuildCosts, { 110, 5, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_TECHNO), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_TECHNO), SET_FIELD(PhotoItem, ShopItem::Photo2), SET_FIELD(BonusValue, 100), SET_FIELD(ColourPresets,TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h b/src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h index 101532831b..0d2c167da6 100644 --- a/src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/JuniorRollerCoaster.h @@ -46,7 +46,7 @@ constexpr const RideTypeDescriptor JuniorRollerCoasterRTD = SET_FIELD(UpkeepCosts, { 40, 20, 80, 8, 3, 5 }), SET_FIELD(BuildCosts, { 45, 4, 40, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 60), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h b/src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h index 35f8900276..9638a8030e 100644 --- a/src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/LIMLaunchedRollerCoaster.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor LIMLaunchedRollerCoasterRTD = SET_FIELD(UpkeepCosts, { 42, 20, 80, 9, 3, 10 }), SET_FIELD(BuildCosts, { 95, 5, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 55), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h b/src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h index 5900df08f2..a7ad21562e 100644 --- a/src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/LayDownRollerCoaster.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor LayDownRollerCoasterRTD = SET_FIELD(UpkeepCosts, { 49, 20, 90, 11, 3, 15 }), SET_FIELD(BuildCosts, { 107, 5, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo2), SET_FIELD(BonusValue, 100), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( @@ -80,7 +80,7 @@ constexpr const RideTypeDescriptor LayDownRollerCoasterAltRTD = SET_FIELD(UpkeepCosts, { 49, 20, 90, 11, 3, 15 }), SET_FIELD(BuildCosts, { 107, 5, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo2), SET_FIELD(BonusValue, 100), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h b/src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h index 2374d1dbc0..a0e33a11a3 100644 --- a/src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/LoopingRollerCoaster.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor LoopingRollerCoasterRTD = SET_FIELD(UpkeepCosts, { 40, 20, 80, 10, 3, 10 }), SET_FIELD(BuildCosts, { 90, 5, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 95), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/MineRide.h b/src/openrct2/ride/coaster/meta/MineRide.h index 82f3d4c3ce..0b89d897fd 100644 --- a/src/openrct2/ride/coaster/meta/MineRide.h +++ b/src/openrct2/ride/coaster/meta/MineRide.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor MineRideRTD = SET_FIELD(UpkeepCosts, { 50, 20, 80, 10, 3, 10 }), SET_FIELD(BuildCosts, { 85, 4, 40, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_WILD_WEST), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_WILD_WEST), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 70), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/MineTrainCoaster.h b/src/openrct2/ride/coaster/meta/MineTrainCoaster.h index b2133f19af..a712b8cc0a 100644 --- a/src/openrct2/ride/coaster/meta/MineTrainCoaster.h +++ b/src/openrct2/ride/coaster/meta/MineTrainCoaster.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor MineTrainCoasterRTD = SET_FIELD(UpkeepCosts, { 40, 20, 80, 10, 3, 10 }), SET_FIELD(BuildCosts, { 82, 6, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_WILD_WEST), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_WILD_WEST), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 85), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/MiniRollerCoaster.h b/src/openrct2/ride/coaster/meta/MiniRollerCoaster.h index 1d6b4991b3..e62b371285 100644 --- a/src/openrct2/ride/coaster/meta/MiniRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/MiniRollerCoaster.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor MiniRollerCoasterRTD = SET_FIELD(UpkeepCosts, { 35, 20, 80, 8, 3, 10 }), SET_FIELD(BuildCosts, { 65, 4, 40, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 60), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/MiniSuspendedCoaster.h b/src/openrct2/ride/coaster/meta/MiniSuspendedCoaster.h index 32c11d91dc..c82713aa5f 100644 --- a/src/openrct2/ride/coaster/meta/MiniSuspendedCoaster.h +++ b/src/openrct2/ride/coaster/meta/MiniSuspendedCoaster.h @@ -43,7 +43,7 @@ constexpr const RideTypeDescriptor MiniSuspendedCoasterRTD = SET_FIELD(UpkeepCosts, { 40, 20, 80, 10, 3, 10 }), SET_FIELD(BuildCosts, { 60, 5, 40, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_WILD_WEST), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_WILD_WEST), SET_FIELD(PhotoItem, ShopItem::Photo2), SET_FIELD(BonusValue, 50), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h b/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h index 7e049d21fd..7e68ced6b4 100644 --- a/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/MultiDimensionRollerCoaster.h @@ -43,7 +43,7 @@ constexpr const RideTypeDescriptor MultiDimensionRollerCoasterRTD = SET_FIELD(UpkeepCosts, { 75, 20, 90, 11, 3, 15 }), SET_FIELD(BuildCosts, { 180, 5, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK_STYLE_3), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_3), SET_FIELD(PhotoItem, ShopItem::Photo2), SET_FIELD(BonusValue, 100), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( @@ -81,7 +81,7 @@ constexpr const RideTypeDescriptor MultiDimensionRollerCoasterAltRTD = SET_FIELD(UpkeepCosts, { 75, 20, 90, 11, 3, 15 }), SET_FIELD(BuildCosts, { 180, 5, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK_STYLE_3), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_3), SET_FIELD(PhotoItem, ShopItem::Photo2), SET_FIELD(BonusValue, 100), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h b/src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h index edabe9571a..c36f4c54e3 100644 --- a/src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h +++ b/src/openrct2/ride/coaster/meta/ReverseFreefallCoaster.h @@ -40,7 +40,7 @@ constexpr const RideTypeDescriptor ReverseFreefallCoasterRTD = SET_FIELD(UpkeepCosts, { 80, 20, 0, 0, 0, 10 }), SET_FIELD(BuildCosts, { 200, 0, 45, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 70), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h b/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h index 76301d644f..f9c4b750cb 100644 --- a/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/ReverserRollerCoaster.h @@ -41,7 +41,7 @@ constexpr const RideTypeDescriptor ReverserRollerCoasterRTD = SET_FIELD(UpkeepCosts, { 39, 20, 80, 10, 3, 10 }), SET_FIELD(BuildCosts, { 55, 6, 37, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_TECHNO), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_TECHNO), SET_FIELD(PhotoItem, ShopItem::Photo3), SET_FIELD(BonusValue, 65), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h b/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h index 13b1482f9e..02efb37468 100644 --- a/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/SideFrictionRollerCoaster.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor SideFrictionRollerCoasterRTD = SET_FIELD(UpkeepCosts, { 39, 20, 80, 10, 3, 10 }), SET_FIELD(BuildCosts, { 55, 6, 37, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_GENTLE), SET_FIELD(PhotoItem, ShopItem::Photo3), SET_FIELD(BonusValue, 65), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/SingleRailRollerCoaster.h b/src/openrct2/ride/coaster/meta/SingleRailRollerCoaster.h index cd21cd9032..f2125e6927 100644 --- a/src/openrct2/ride/coaster/meta/SingleRailRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/SingleRailRollerCoaster.h @@ -40,7 +40,7 @@ constexpr const RideTypeDescriptor SingleRailRollerCoasterRTD = SET_FIELD(UpkeepCosts, { 40, 20, 80, 10, 3, 10 }), SET_FIELD(BuildCosts, { 75, 5, 50}), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 80), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/SpinningWildMouse.h b/src/openrct2/ride/coaster/meta/SpinningWildMouse.h index fee738531b..7aa8ce1dc3 100644 --- a/src/openrct2/ride/coaster/meta/SpinningWildMouse.h +++ b/src/openrct2/ride/coaster/meta/SpinningWildMouse.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor SpinningWildMouseRTD = SET_FIELD(UpkeepCosts, { 40, 20, 80, 9, 3, 10 }), SET_FIELD(BuildCosts, { 55, 4, 40, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 55), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h b/src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h index 12e6a20755..20fbc5c740 100644 --- a/src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/SpiralRollerCoaster.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor SpiralRollerCoasterRTD = SET_FIELD(UpkeepCosts, { 41, 20, 80, 10, 3, 10 }), SET_FIELD(BuildCosts, { 70, 5, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK_STYLE_3), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_3), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 85), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/StandUpRollerCoaster.h b/src/openrct2/ride/coaster/meta/StandUpRollerCoaster.h index 17c354bdd8..437eb1b634 100644 --- a/src/openrct2/ride/coaster/meta/StandUpRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/StandUpRollerCoaster.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor StandUpRollerCoasterRTD = SET_FIELD(UpkeepCosts, { 40, 20, 80, 10, 3, 10 }), SET_FIELD(BuildCosts, { 100, 5, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_TECHNO), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_TECHNO), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 90), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/SteelWildMouse.h b/src/openrct2/ride/coaster/meta/SteelWildMouse.h index dff98628af..f73ea3258a 100644 --- a/src/openrct2/ride/coaster/meta/SteelWildMouse.h +++ b/src/openrct2/ride/coaster/meta/SteelWildMouse.h @@ -45,7 +45,7 @@ constexpr const RideTypeDescriptor SteelWildMouseRTD = SET_FIELD(UpkeepCosts, { 40, 20, 80, 9, 3, 10 }), SET_FIELD(BuildCosts, { 55, 4, 40, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 55), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/Steeplechase.h b/src/openrct2/ride/coaster/meta/Steeplechase.h index ea84b71a93..19d8161c58 100644 --- a/src/openrct2/ride/coaster/meta/Steeplechase.h +++ b/src/openrct2/ride/coaster/meta/Steeplechase.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor SteeplechaseRTD = SET_FIELD(UpkeepCosts, { 40, 20, 80, 10, 3, 10 }), SET_FIELD(BuildCosts, { 57, 4, 40, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 60), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h b/src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h index 4fa2861672..263d95e49f 100644 --- a/src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h +++ b/src/openrct2/ride/coaster/meta/SuspendedSwingingCoaster.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor SuspendedSwingingCoasterRTD = SET_FIELD(UpkeepCosts, { 40, 20, 80, 20, 3, 10 }), SET_FIELD(BuildCosts, { 95, 5, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo2), SET_FIELD(BonusValue, 90), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h b/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h index f6c7597726..55b9fae6de 100644 --- a/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/TwisterRollerCoaster.h @@ -50,7 +50,7 @@ constexpr const RideTypeDescriptor TwisterRollerCoasterRTD = SET_FIELD(UpkeepCosts, { 43, 20, 80, 11, 3, 10 }), SET_FIELD(BuildCosts, { 120, 5, 55, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 120), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h b/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h index e2b180f293..74578315d2 100644 --- a/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h +++ b/src/openrct2/ride/coaster/meta/VerticalDropCoaster.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor VerticalDropCoasterRTD = SET_FIELD(UpkeepCosts, { 44, 20, 80, 11, 3, 10 }), SET_FIELD(BuildCosts, { 120, 5, 42, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 95), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/VirginiaReel.h b/src/openrct2/ride/coaster/meta/VirginiaReel.h index 0e867f273b..eb76ae6a6a 100644 --- a/src/openrct2/ride/coaster/meta/VirginiaReel.h +++ b/src/openrct2/ride/coaster/meta/VirginiaReel.h @@ -41,7 +41,7 @@ constexpr const RideTypeDescriptor VirginiaReelRTD = SET_FIELD(UpkeepCosts, { 39, 20, 80, 10, 3, 10 }), SET_FIELD(BuildCosts, { 53, 6, 25, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo3), SET_FIELD(BonusValue, 50), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/WaterCoaster.h b/src/openrct2/ride/coaster/meta/WaterCoaster.h index 9d222b43de..aa98ee9b43 100644 --- a/src/openrct2/ride/coaster/meta/WaterCoaster.h +++ b/src/openrct2/ride/coaster/meta/WaterCoaster.h @@ -44,7 +44,7 @@ constexpr const RideTypeDescriptor WaterCoasterRTD = SET_FIELD(UpkeepCosts, { 60, 20, 80, 8, 3, 10 }), SET_FIELD(BuildCosts, { 55, 4, 40, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_WATER), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_WATER), SET_FIELD(PhotoItem, ShopItem::Photo4), SET_FIELD(BonusValue, 60), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h b/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h index 63285a2648..01f9dbf921 100644 --- a/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h +++ b/src/openrct2/ride/coaster/meta/WoodenRollerCoaster.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor WoodenRollerCoasterRTD = SET_FIELD(UpkeepCosts, { 40, 20, 80, 10, 3, 10 }), SET_FIELD(BuildCosts, { 75, 7, 50, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_WILD_WEST), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_WILD_WEST), SET_FIELD(PhotoItem, ShopItem::Photo3), SET_FIELD(BonusValue, 105), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/coaster/meta/WoodenWildMouse.h b/src/openrct2/ride/coaster/meta/WoodenWildMouse.h index 69dd57d352..167a23ad51 100644 --- a/src/openrct2/ride/coaster/meta/WoodenWildMouse.h +++ b/src/openrct2/ride/coaster/meta/WoodenWildMouse.h @@ -43,7 +43,7 @@ constexpr const RideTypeDescriptor WoodenWildMouseRTD = SET_FIELD(UpkeepCosts, { 40, 20, 80, 9, 3, 10 }), SET_FIELD(BuildCosts, { 50, 6, 40, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_WILD_WEST), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_WILD_WEST), SET_FIELD(PhotoItem, ShopItem::Photo3), SET_FIELD(BonusValue, 55), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/gentle/meta/CarRide.h b/src/openrct2/ride/gentle/meta/CarRide.h index 79714b4c4d..50d18a0b4c 100644 --- a/src/openrct2/ride/gentle/meta/CarRide.h +++ b/src/openrct2/ride/gentle/meta/CarRide.h @@ -46,7 +46,7 @@ constexpr const RideTypeDescriptor CarRideRTD = SET_FIELD(UpkeepCosts, { 70, 20, 0, 8, 3, 5 }), SET_FIELD(BuildCosts, { 25, 5, 30, }), SET_FIELD(DefaultPrices, { 15, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 50), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/gentle/meta/Circus.h b/src/openrct2/ride/gentle/meta/Circus.h index 61e8aec3eb..034adfbce0 100644 --- a/src/openrct2/ride/gentle/meta/Circus.h +++ b/src/openrct2/ride/gentle/meta/Circus.h @@ -43,7 +43,7 @@ constexpr const RideTypeDescriptor CircusRTD = SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), SET_FIELD(BuildCosts, { 125, 2, 1, }), SET_FIELD(DefaultPrices, { 15, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_CIRCUS_SHOW), + SET_FIELD(DefaultMusic, {}), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 39), SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET), diff --git a/src/openrct2/ride/gentle/meta/CrookedHouse.h b/src/openrct2/ride/gentle/meta/CrookedHouse.h index 1b7de29e60..9884f4fcab 100644 --- a/src/openrct2/ride/gentle/meta/CrookedHouse.h +++ b/src/openrct2/ride/gentle/meta/CrookedHouse.h @@ -43,7 +43,7 @@ constexpr const RideTypeDescriptor CrookedHouseRTD = SET_FIELD(UpkeepCosts, { 30, 1, 0, 0, 0, 0 }), SET_FIELD(BuildCosts, { 65, 2, 1, }), SET_FIELD(DefaultPrices, { 10, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_GENTLE), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 22), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/gentle/meta/Dodgems.h b/src/openrct2/ride/gentle/meta/Dodgems.h index 0daa624b6e..8e032b7809 100644 --- a/src/openrct2/ride/gentle/meta/Dodgems.h +++ b/src/openrct2/ride/gentle/meta/Dodgems.h @@ -43,7 +43,7 @@ constexpr const RideTypeDescriptor DodgemsRTD = SET_FIELD(UpkeepCosts, { 50, 1, 0, 5, 0, 0 }), SET_FIELD(BuildCosts, { 55, 2, 1, }), SET_FIELD(DefaultPrices, { 15, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_DODGEMS_BEAT), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_DODGEMS), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 35), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/gentle/meta/FerrisWheel.h b/src/openrct2/ride/gentle/meta/FerrisWheel.h index 335ad0de9f..2345449c46 100644 --- a/src/openrct2/ride/gentle/meta/FerrisWheel.h +++ b/src/openrct2/ride/gentle/meta/FerrisWheel.h @@ -43,7 +43,7 @@ constexpr const RideTypeDescriptor FerrisWheelRTD = SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), SET_FIELD(BuildCosts, { 225, 2, 1, }), SET_FIELD(DefaultPrices, { 10, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 45), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/gentle/meta/FlyingSaucers.h b/src/openrct2/ride/gentle/meta/FlyingSaucers.h index 495e362a94..633e3d07a1 100644 --- a/src/openrct2/ride/gentle/meta/FlyingSaucers.h +++ b/src/openrct2/ride/gentle/meta/FlyingSaucers.h @@ -44,7 +44,7 @@ constexpr const RideTypeDescriptor FlyingSaucersRTD = SET_FIELD(UpkeepCosts, { 90, 1, 0, 5, 0, 0 }), SET_FIELD(BuildCosts, { 70, 4, 1, }), SET_FIELD(DefaultPrices, { 15, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 35), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/gentle/meta/GhostTrain.h b/src/openrct2/ride/gentle/meta/GhostTrain.h index a2bbe1bc3f..8201874a7d 100644 --- a/src/openrct2/ride/gentle/meta/GhostTrain.h +++ b/src/openrct2/ride/gentle/meta/GhostTrain.h @@ -46,7 +46,7 @@ constexpr const RideTypeDescriptor GhostTrainRTD = SET_FIELD(UpkeepCosts, { 80, 20, 0, 8, 3, 5 }), SET_FIELD(BuildCosts, { 26, 5, 30, }), SET_FIELD(DefaultPrices, { 15, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_HORROR), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_HORROR), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 50), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/gentle/meta/HauntedHouse.h b/src/openrct2/ride/gentle/meta/HauntedHouse.h index a0e9652a5d..1409b473c3 100644 --- a/src/openrct2/ride/gentle/meta/HauntedHouse.h +++ b/src/openrct2/ride/gentle/meta/HauntedHouse.h @@ -43,7 +43,7 @@ constexpr const RideTypeDescriptor HauntedHouseRTD = SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), SET_FIELD(BuildCosts, { 85, 2, 1, }), SET_FIELD(DefaultPrices, { 10, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_HORROR), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_HORROR), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 22), SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET), diff --git a/src/openrct2/ride/gentle/meta/Maze.h b/src/openrct2/ride/gentle/meta/Maze.h index 57e8243971..22346da43c 100644 --- a/src/openrct2/ride/gentle/meta/Maze.h +++ b/src/openrct2/ride/gentle/meta/Maze.h @@ -41,7 +41,7 @@ constexpr const RideTypeDescriptor MazeRTD = SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), SET_FIELD(BuildCosts, { 55, 2, 8, }), SET_FIELD(DefaultPrices, { 10, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 40), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/gentle/meta/MerryGoRound.h b/src/openrct2/ride/gentle/meta/MerryGoRound.h index 2c32bf84c7..ae7b5e50a3 100644 --- a/src/openrct2/ride/gentle/meta/MerryGoRound.h +++ b/src/openrct2/ride/gentle/meta/MerryGoRound.h @@ -43,7 +43,7 @@ constexpr const RideTypeDescriptor MerryGoRoundRTD = SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), SET_FIELD(BuildCosts, { 115, 2, 1, }), SET_FIELD(DefaultPrices, { 10, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_FAIRGROUND_ORGAN), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_FAIRGROUND), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 45), SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET), diff --git a/src/openrct2/ride/gentle/meta/MiniGolf.h b/src/openrct2/ride/gentle/meta/MiniGolf.h index b68f2b68bf..c8e3b0e2f6 100644 --- a/src/openrct2/ride/gentle/meta/MiniGolf.h +++ b/src/openrct2/ride/gentle/meta/MiniGolf.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor MiniGolfRTD = SET_FIELD(UpkeepCosts, { 30, 20, 80, 11, 3, 10 }), SET_FIELD(BuildCosts, { 50, 7, 20, }), SET_FIELD(DefaultPrices, { 10, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 23), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/gentle/meta/MiniHelicopters.h b/src/openrct2/ride/gentle/meta/MiniHelicopters.h index 624f94f23b..9f4d215aba 100644 --- a/src/openrct2/ride/gentle/meta/MiniHelicopters.h +++ b/src/openrct2/ride/gentle/meta/MiniHelicopters.h @@ -45,7 +45,7 @@ constexpr const RideTypeDescriptor MiniHelicoptersRTD = SET_FIELD(UpkeepCosts, { 70, 20, 0, 8, 3, 5 }), SET_FIELD(BuildCosts, { 25, 5, 30, }), SET_FIELD(DefaultPrices, { 15, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 45), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/gentle/meta/MonorailCycles.h b/src/openrct2/ride/gentle/meta/MonorailCycles.h index 1d1f3f4983..c093ebe1fc 100644 --- a/src/openrct2/ride/gentle/meta/MonorailCycles.h +++ b/src/openrct2/ride/gentle/meta/MonorailCycles.h @@ -44,7 +44,7 @@ constexpr const RideTypeDescriptor MonorailCyclesRTD = SET_FIELD(UpkeepCosts, { 47, 20, 0, 8, 3, 5 }), SET_FIELD(BuildCosts, { 20, 5, 30, }), SET_FIELD(DefaultPrices, { 15, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 45), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/gentle/meta/MonsterTrucks.h b/src/openrct2/ride/gentle/meta/MonsterTrucks.h index 3f4f6c28e0..5d9c4b329b 100644 --- a/src/openrct2/ride/gentle/meta/MonsterTrucks.h +++ b/src/openrct2/ride/gentle/meta/MonsterTrucks.h @@ -45,7 +45,7 @@ constexpr const RideTypeDescriptor MonsterTrucksRTD = SET_FIELD(UpkeepCosts, { 70, 20, 0, 8, 3, 5 }), SET_FIELD(BuildCosts, { 25, 5, 30, }), SET_FIELD(DefaultPrices, { 15, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 50), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/gentle/meta/ObservationTower.h b/src/openrct2/ride/gentle/meta/ObservationTower.h index 3001175af8..871845fa01 100644 --- a/src/openrct2/ride/gentle/meta/ObservationTower.h +++ b/src/openrct2/ride/gentle/meta/ObservationTower.h @@ -43,7 +43,7 @@ constexpr const RideTypeDescriptor ObservationTowerRTD = SET_FIELD(UpkeepCosts, { 50, 20, 0, 10, 0, 0 }), SET_FIELD(BuildCosts, { 37, 0, 4, }), SET_FIELD(DefaultPrices, { 10, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 45), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/gentle/meta/SpaceRings.h b/src/openrct2/ride/gentle/meta/SpaceRings.h index 82a75a4372..f6b873f3a2 100644 --- a/src/openrct2/ride/gentle/meta/SpaceRings.h +++ b/src/openrct2/ride/gentle/meta/SpaceRings.h @@ -43,7 +43,7 @@ constexpr const RideTypeDescriptor SpaceRingsRTD = SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), SET_FIELD(BuildCosts, { 72, 2, 1, }), SET_FIELD(DefaultPrices, { 5, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_GENTLE), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 30), SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET), diff --git a/src/openrct2/ride/gentle/meta/SpiralSlide.h b/src/openrct2/ride/gentle/meta/SpiralSlide.h index fcff0d58a5..e5181f34d8 100644 --- a/src/openrct2/ride/gentle/meta/SpiralSlide.h +++ b/src/openrct2/ride/gentle/meta/SpiralSlide.h @@ -43,7 +43,7 @@ constexpr const RideTypeDescriptor SpiralSlideRTD = SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), SET_FIELD(BuildCosts, { 165, 2, 1, }), SET_FIELD(DefaultPrices, { 15, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 40), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/shops/meta/CashMachine.h b/src/openrct2/ride/shops/meta/CashMachine.h index 987a28abec..54b5d197a7 100644 --- a/src/openrct2/ride/shops/meta/CashMachine.h +++ b/src/openrct2/ride/shops/meta/CashMachine.h @@ -40,7 +40,7 @@ constexpr const RideTypeDescriptor CashMachineRTD = SET_FIELD(UpkeepCosts, { 40, 1, 0, 0, 0, 0 }), SET_FIELD(BuildCosts, { 400, 0, 1, }), SET_FIELD(DefaultPrices, { 0, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_GENTLE), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 5), SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET), diff --git a/src/openrct2/ride/shops/meta/DrinkStall.h b/src/openrct2/ride/shops/meta/DrinkStall.h index f2f61afa22..0a2276b901 100644 --- a/src/openrct2/ride/shops/meta/DrinkStall.h +++ b/src/openrct2/ride/shops/meta/DrinkStall.h @@ -41,7 +41,7 @@ constexpr const RideTypeDescriptor DrinkStallRTD = SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), SET_FIELD(BuildCosts, { 500, 0, 1, }), SET_FIELD(DefaultPrices, { 0, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_GENTLE), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 15), SET_FIELD(ColourPresets, DEFAULT_STALL_COLOUR_PRESET), diff --git a/src/openrct2/ride/shops/meta/FirstAid.h b/src/openrct2/ride/shops/meta/FirstAid.h index 573c7c0afa..92cf762c75 100644 --- a/src/openrct2/ride/shops/meta/FirstAid.h +++ b/src/openrct2/ride/shops/meta/FirstAid.h @@ -41,7 +41,7 @@ constexpr const RideTypeDescriptor FirstAidRTD = SET_FIELD(UpkeepCosts, { 45, 1, 0, 0, 0, 0 }), SET_FIELD(BuildCosts, { 500, 0, 1, }), SET_FIELD(DefaultPrices, { 0, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_GENTLE), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 5), SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET), diff --git a/src/openrct2/ride/shops/meta/FoodStall.h b/src/openrct2/ride/shops/meta/FoodStall.h index a558bbcd89..4dfbb3d1c3 100644 --- a/src/openrct2/ride/shops/meta/FoodStall.h +++ b/src/openrct2/ride/shops/meta/FoodStall.h @@ -41,7 +41,7 @@ constexpr const RideTypeDescriptor FoodStallRTD = SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), SET_FIELD(BuildCosts, { 600, 0, 1, }), SET_FIELD(DefaultPrices, { 0, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_GENTLE), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 15), SET_FIELD(ColourPresets, DEFAULT_STALL_COLOUR_PRESET), diff --git a/src/openrct2/ride/shops/meta/InformationKiosk.h b/src/openrct2/ride/shops/meta/InformationKiosk.h index 3a14abde31..576a8dc772 100644 --- a/src/openrct2/ride/shops/meta/InformationKiosk.h +++ b/src/openrct2/ride/shops/meta/InformationKiosk.h @@ -41,7 +41,7 @@ constexpr const RideTypeDescriptor InformationKioskRTD = SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), SET_FIELD(BuildCosts, { 500, 0, 1, }), SET_FIELD(DefaultPrices, { 0, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_GENTLE), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 15), SET_FIELD(ColourPresets, DEFAULT_STALL_COLOUR_PRESET), diff --git a/src/openrct2/ride/shops/meta/Shop.h b/src/openrct2/ride/shops/meta/Shop.h index de1149c499..792a734c92 100644 --- a/src/openrct2/ride/shops/meta/Shop.h +++ b/src/openrct2/ride/shops/meta/Shop.h @@ -41,7 +41,7 @@ constexpr const RideTypeDescriptor ShopRTD = SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), SET_FIELD(BuildCosts, { 400, 0, 1, }), SET_FIELD(DefaultPrices, { 0, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_GENTLE), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 15), SET_FIELD(ColourPresets, DEFAULT_STALL_COLOUR_PRESET), diff --git a/src/openrct2/ride/shops/meta/Toilets.h b/src/openrct2/ride/shops/meta/Toilets.h index 39b43a0c86..408ba0def4 100644 --- a/src/openrct2/ride/shops/meta/Toilets.h +++ b/src/openrct2/ride/shops/meta/Toilets.h @@ -41,7 +41,7 @@ constexpr const RideTypeDescriptor ToiletsRTD = SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), SET_FIELD(BuildCosts, { 450, 0, 1, }), SET_FIELD(DefaultPrices, { 0, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_GENTLE), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 5), SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET), diff --git a/src/openrct2/ride/thrill/meta/3DCinema.h b/src/openrct2/ride/thrill/meta/3DCinema.h index 8be884f1a9..bf75114b6e 100644 --- a/src/openrct2/ride/thrill/meta/3DCinema.h +++ b/src/openrct2/ride/thrill/meta/3DCinema.h @@ -43,7 +43,7 @@ constexpr const RideTypeDescriptor CinemaRTD = SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), SET_FIELD(BuildCosts, { 140, 2, 1, }), SET_FIELD(DefaultPrices, { 20, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 45), SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET), diff --git a/src/openrct2/ride/thrill/meta/Enterprise.h b/src/openrct2/ride/thrill/meta/Enterprise.h index 782cdf98d3..f88d090b16 100644 --- a/src/openrct2/ride/thrill/meta/Enterprise.h +++ b/src/openrct2/ride/thrill/meta/Enterprise.h @@ -43,7 +43,7 @@ constexpr const RideTypeDescriptor EnterpriseRTD = SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), SET_FIELD(BuildCosts, { 100, 2, 1, }), SET_FIELD(DefaultPrices, { 20, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK_STYLE_2), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_2), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 45), SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET), diff --git a/src/openrct2/ride/thrill/meta/GoKarts.h b/src/openrct2/ride/thrill/meta/GoKarts.h index 0bae76b34e..c419d96a61 100644 --- a/src/openrct2/ride/thrill/meta/GoKarts.h +++ b/src/openrct2/ride/thrill/meta/GoKarts.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor GoKartsRTD = SET_FIELD(UpkeepCosts, { 50, 20, 0, 8, 0, 0 }), SET_FIELD(BuildCosts, { 62, 4, 20, }), SET_FIELD(DefaultPrices, { 20, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_TECHNO), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_TECHNO), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 55), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/thrill/meta/LaunchedFreefall.h b/src/openrct2/ride/thrill/meta/LaunchedFreefall.h index e81bf617d3..37be700e2f 100644 --- a/src/openrct2/ride/thrill/meta/LaunchedFreefall.h +++ b/src/openrct2/ride/thrill/meta/LaunchedFreefall.h @@ -43,7 +43,7 @@ constexpr const RideTypeDescriptor LaunchedFreefallRTD = SET_FIELD(UpkeepCosts, { 50, 20, 0, 10, 0, 0 }), SET_FIELD(BuildCosts, { 50, 0, 4, }), SET_FIELD(DefaultPrices, { 20, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_TECHNO), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_TECHNO), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 65), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/thrill/meta/MagicCarpet.h b/src/openrct2/ride/thrill/meta/MagicCarpet.h index a7dbb534fc..3abaff3776 100644 --- a/src/openrct2/ride/thrill/meta/MagicCarpet.h +++ b/src/openrct2/ride/thrill/meta/MagicCarpet.h @@ -44,7 +44,7 @@ constexpr const RideTypeDescriptor MagicCarpetRTD = SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), SET_FIELD(BuildCosts, { 198, 2, 1, }), SET_FIELD(DefaultPrices, { 15, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_EGYPTIAN), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_EGYPTIAN), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 35), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/thrill/meta/MotionSimulator.h b/src/openrct2/ride/thrill/meta/MotionSimulator.h index bee3798611..b4a97a3bb8 100644 --- a/src/openrct2/ride/thrill/meta/MotionSimulator.h +++ b/src/openrct2/ride/thrill/meta/MotionSimulator.h @@ -43,7 +43,7 @@ constexpr const RideTypeDescriptor MotionSimulatorRTD = SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), SET_FIELD(BuildCosts, { 220, 2, 1, }), SET_FIELD(DefaultPrices, { 20, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 45), SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET), diff --git a/src/openrct2/ride/thrill/meta/RotoDrop.h b/src/openrct2/ride/thrill/meta/RotoDrop.h index 84b8b89964..1d769241aa 100644 --- a/src/openrct2/ride/thrill/meta/RotoDrop.h +++ b/src/openrct2/ride/thrill/meta/RotoDrop.h @@ -44,7 +44,7 @@ constexpr const RideTypeDescriptor RotoDropRTD = SET_FIELD(UpkeepCosts, { 50, 20, 0, 10, 0, 0 }), SET_FIELD(BuildCosts, { 55, 0, 4, }), SET_FIELD(DefaultPrices, { 20, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_ROCK), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_ROCK_1), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 45), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/thrill/meta/SwingingInverterShip.h b/src/openrct2/ride/thrill/meta/SwingingInverterShip.h index f034b39b72..57b57a1a21 100644 --- a/src/openrct2/ride/thrill/meta/SwingingInverterShip.h +++ b/src/openrct2/ride/thrill/meta/SwingingInverterShip.h @@ -43,7 +43,7 @@ constexpr const RideTypeDescriptor SwingingInverterShipRTD = SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), SET_FIELD(BuildCosts, { 212, 2, 1, }), SET_FIELD(DefaultPrices, { 15, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_TECHNO), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_TECHNO), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 35), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/thrill/meta/SwingingShip.h b/src/openrct2/ride/thrill/meta/SwingingShip.h index 83ab4511d2..9d085310aa 100644 --- a/src/openrct2/ride/thrill/meta/SwingingShip.h +++ b/src/openrct2/ride/thrill/meta/SwingingShip.h @@ -44,7 +44,7 @@ constexpr const RideTypeDescriptor SwingingShipRTD = SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), SET_FIELD(BuildCosts, { 155, 2, 1, }), SET_FIELD(DefaultPrices, { 15, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_PIRATES), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_PIRATE), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 35), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/thrill/meta/TopSpin.h b/src/openrct2/ride/thrill/meta/TopSpin.h index 2321b0f69a..331dfb0755 100644 --- a/src/openrct2/ride/thrill/meta/TopSpin.h +++ b/src/openrct2/ride/thrill/meta/TopSpin.h @@ -43,7 +43,7 @@ constexpr const RideTypeDescriptor TopSpinRTD = SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), SET_FIELD(BuildCosts, { 145, 2, 1, }), SET_FIELD(DefaultPrices, { 20, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_TECHNO), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_TECHNO), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 55), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/thrill/meta/Twist.h b/src/openrct2/ride/thrill/meta/Twist.h index 6f77545457..3fd14a8560 100644 --- a/src/openrct2/ride/thrill/meta/Twist.h +++ b/src/openrct2/ride/thrill/meta/Twist.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor TwistRTD = SET_FIELD(UpkeepCosts, { 50, 1, 0, 0, 0, 0 }), SET_FIELD(BuildCosts, { 90, 2, 1, }), SET_FIELD(DefaultPrices, { 10, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_GENTLE), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 40), SET_FIELD(ColourPresets, DEFAULT_FLAT_RIDE_COLOUR_PRESET), diff --git a/src/openrct2/ride/transport/meta/Chairlift.h b/src/openrct2/ride/transport/meta/Chairlift.h index 3f7a110347..60f7a7c58a 100644 --- a/src/openrct2/ride/transport/meta/Chairlift.h +++ b/src/openrct2/ride/transport/meta/Chairlift.h @@ -44,7 +44,7 @@ constexpr const RideTypeDescriptor ChairliftRTD = SET_FIELD(UpkeepCosts, { 60, 20, 0, 4, 3, 10 }), SET_FIELD(BuildCosts, { 65, 1, 30, }), SET_FIELD(DefaultPrices, { 10, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 55), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/transport/meta/Lift.h b/src/openrct2/ride/transport/meta/Lift.h index 33d557d756..7046b0e1c4 100644 --- a/src/openrct2/ride/transport/meta/Lift.h +++ b/src/openrct2/ride/transport/meta/Lift.h @@ -43,7 +43,7 @@ constexpr const RideTypeDescriptor LiftRTD = SET_FIELD(UpkeepCosts, { 50, 20, 0, 10, 0, 0 }), SET_FIELD(BuildCosts, { 39, 0, 4, }), SET_FIELD(DefaultPrices, { 10, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 45), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/transport/meta/MiniatureRailway.h b/src/openrct2/ride/transport/meta/MiniatureRailway.h index 12bcce0f79..a470bd0e7e 100644 --- a/src/openrct2/ride/transport/meta/MiniatureRailway.h +++ b/src/openrct2/ride/transport/meta/MiniatureRailway.h @@ -45,7 +45,7 @@ constexpr const RideTypeDescriptor MiniatureRailwayRTD = SET_FIELD(UpkeepCosts, { 60, 20, 0, 10, 3, 5 }), SET_FIELD(BuildCosts, { 35, 6, 50, }), SET_FIELD(DefaultPrices, { 10, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 50), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/transport/meta/Monorail.h b/src/openrct2/ride/transport/meta/Monorail.h index 9c68694177..bddd24d97b 100644 --- a/src/openrct2/ride/transport/meta/Monorail.h +++ b/src/openrct2/ride/transport/meta/Monorail.h @@ -45,7 +45,7 @@ constexpr const RideTypeDescriptor MonorailRTD = SET_FIELD(UpkeepCosts, { 65, 20, 0, 10, 3, 10 }), SET_FIELD(BuildCosts, { 42, 5, 50, }), SET_FIELD(DefaultPrices, { 10, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 60), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/transport/meta/SuspendedMonorail.h b/src/openrct2/ride/transport/meta/SuspendedMonorail.h index 88c46671a3..147baff8d3 100644 --- a/src/openrct2/ride/transport/meta/SuspendedMonorail.h +++ b/src/openrct2/ride/transport/meta/SuspendedMonorail.h @@ -46,7 +46,7 @@ constexpr const RideTypeDescriptor SuspendedMonorailRTD = SET_FIELD(UpkeepCosts, { 70, 20, 0, 10, 3, 10 }), SET_FIELD(BuildCosts, { 65, 5, 50, }), SET_FIELD(DefaultPrices, { 10, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_SUMMER), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_SUMMER), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 60), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/water/meta/BoatHire.h b/src/openrct2/ride/water/meta/BoatHire.h index 4f0c8cd8a0..30efcf34b4 100644 --- a/src/openrct2/ride/water/meta/BoatHire.h +++ b/src/openrct2/ride/water/meta/BoatHire.h @@ -42,7 +42,7 @@ constexpr const RideTypeDescriptor BoatHireRTD = SET_FIELD(UpkeepCosts, { 50, 1, 0, 4, 0, 0 }), SET_FIELD(BuildCosts, { 55, 5, 5, }), SET_FIELD(DefaultPrices, { 10, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_WATER), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_WATER), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 40), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/water/meta/DinghySlide.h b/src/openrct2/ride/water/meta/DinghySlide.h index c40b35f541..e428fcbec5 100644 --- a/src/openrct2/ride/water/meta/DinghySlide.h +++ b/src/openrct2/ride/water/meta/DinghySlide.h @@ -54,7 +54,7 @@ constexpr const RideTypeDescriptor DinghySlideRTD = SET_FIELD(UpkeepCosts, { 40, 20, 80, 4, 3, 10 }), SET_FIELD(BuildCosts, { 40, 4, 40, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_WATER), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_WATER), SET_FIELD(PhotoItem, ShopItem::Photo4), SET_FIELD(BonusValue, 55), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/water/meta/LogFlume.h b/src/openrct2/ride/water/meta/LogFlume.h index 017fd299da..5d2f7fccb7 100644 --- a/src/openrct2/ride/water/meta/LogFlume.h +++ b/src/openrct2/ride/water/meta/LogFlume.h @@ -45,7 +45,7 @@ constexpr const RideTypeDescriptor LogFlumeRTD = SET_FIELD(UpkeepCosts, { 80, 20, 0, 9, 0, 10 }), SET_FIELD(BuildCosts, { 45, 5, 40, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_WATER), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_WATER), SET_FIELD(PhotoItem, ShopItem::Photo4), SET_FIELD(BonusValue, 65), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/water/meta/RiverRafts.h b/src/openrct2/ride/water/meta/RiverRafts.h index b947579d71..6554deb094 100644 --- a/src/openrct2/ride/water/meta/RiverRafts.h +++ b/src/openrct2/ride/water/meta/RiverRafts.h @@ -45,7 +45,7 @@ constexpr const RideTypeDescriptor RiverRaftsRTD = SET_FIELD(UpkeepCosts, { 50, 20, 0, 9, 0, 10 }), SET_FIELD(BuildCosts, { 40, 5, 30, }), SET_FIELD(DefaultPrices, { 10, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_GENTLE), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_GENTLE), SET_FIELD(PhotoItem, ShopItem::Photo4), SET_FIELD(BonusValue, 65), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/water/meta/RiverRapids.h b/src/openrct2/ride/water/meta/RiverRapids.h index 89357f0e67..859f012d53 100644 --- a/src/openrct2/ride/water/meta/RiverRapids.h +++ b/src/openrct2/ride/water/meta/RiverRapids.h @@ -46,7 +46,7 @@ constexpr const RideTypeDescriptor RiverRapidsRTD = SET_FIELD(UpkeepCosts, { 82, 20, 0, 10, 0, 10 }), SET_FIELD(BuildCosts, { 62, 6, 40, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_WATER), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_WATER), SET_FIELD(PhotoItem, ShopItem::Photo4), SET_FIELD(BonusValue, 70), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/water/meta/SplashBoats.h b/src/openrct2/ride/water/meta/SplashBoats.h index 9390ebcc12..90659891f4 100644 --- a/src/openrct2/ride/water/meta/SplashBoats.h +++ b/src/openrct2/ride/water/meta/SplashBoats.h @@ -45,7 +45,7 @@ constexpr const RideTypeDescriptor SplashBoatsRTD = SET_FIELD(UpkeepCosts, { 70, 20, 0, 9, 0, 10 }), SET_FIELD(BuildCosts, { 57, 5, 30, }), SET_FIELD(DefaultPrices, { 20, 20 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_WATER), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_WATER), SET_FIELD(PhotoItem, ShopItem::Photo4), SET_FIELD(BonusValue, 65), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS( diff --git a/src/openrct2/ride/water/meta/SubmarineRide.h b/src/openrct2/ride/water/meta/SubmarineRide.h index 4d88ba60db..742827aa22 100644 --- a/src/openrct2/ride/water/meta/SubmarineRide.h +++ b/src/openrct2/ride/water/meta/SubmarineRide.h @@ -44,7 +44,7 @@ constexpr const RideTypeDescriptor SubmarineRideRTD = SET_FIELD(UpkeepCosts, { 50, 1, 0, 4, 0, 0 }), SET_FIELD(BuildCosts, { 70, 0, 5, }), SET_FIELD(DefaultPrices, { 10, 0 }), - SET_FIELD(DefaultMusic, MUSIC_STYLE_WATER), + SET_FIELD(DefaultMusic, MUSIC_OBJECT_WATER), SET_FIELD(PhotoItem, ShopItem::Photo), SET_FIELD(BonusValue, 40), SET_FIELD(ColourPresets, TRACK_COLOUR_PRESETS(