diff --git a/src/openrct2-ui/WindowManager.cpp b/src/openrct2-ui/WindowManager.cpp index 6ad62a773f..382f7798d3 100644 --- a/src/openrct2-ui/WindowManager.cpp +++ b/src/openrct2-ui/WindowManager.cpp @@ -906,7 +906,7 @@ public: if (!(flags.hasAny(WindowFlag::stickToBack, WindowFlag::stickToFront))) { wp->flash(); - OpenRCT2::Audio::Play(OpenRCT2::Audio::SoundId::WindowOpen, 0, pos.x + (windowSize.width / 2)); + OpenRCT2::Audio::Play(OpenRCT2::Audio::SoundId::windowOpen, 0, pos.x + (windowSize.width / 2)); } wp->windowPos = pos; diff --git a/src/openrct2-ui/input/MouseInput.cpp b/src/openrct2-ui/input/MouseInput.cpp index 6ab8f9ee73..6718a33c8c 100644 --- a/src/openrct2-ui/input/MouseInput.cpp +++ b/src/openrct2-ui/input/MouseInput.cpp @@ -1125,7 +1125,7 @@ namespace OpenRCT2 case WidgetType::custom: if (!widgetIsDisabled(*w, widgetIndex)) { - OpenRCT2::Audio::Play(OpenRCT2::Audio::SoundId::Click1, 0, w->windowPos.x + widget.midX()); + OpenRCT2::Audio::Play(OpenRCT2::Audio::SoundId::click1, 0, w->windowPos.x + widget.midX()); // Set new cursor down widget gPressedWidget.windowClassification = windowClass; @@ -1420,7 +1420,7 @@ namespace OpenRCT2 { int32_t mid_point_x = widget->midX() + w->windowPos.x; - OpenRCT2::Audio::Play(OpenRCT2::Audio::SoundId::Click2, 0, mid_point_x); + OpenRCT2::Audio::Play(OpenRCT2::Audio::SoundId::click2, 0, mid_point_x); } if (cursor_w_class != w->classification || cursor_w_number != w->number || widgetIndex != cursor_widgetIndex) break; diff --git a/src/openrct2-ui/ride/VehicleSounds.cpp b/src/openrct2-ui/ride/VehicleSounds.cpp index c73010f8e5..33f7296629 100644 --- a/src/openrct2-ui/ride/VehicleSounds.cpp +++ b/src/openrct2-ui/ride/VehicleSounds.cpp @@ -112,7 +112,7 @@ namespace OpenRCT2::Audio if (gLegacyScene == LegacyScene::trackDesigner && getGameState().editorStep != EditorStep::RollercoasterDesigner) return false; - if (vehicle.sound1_id == SoundId::Null && vehicle.sound2_id == SoundId::Null) + if (vehicle.sound1_id == SoundId::null && vehicle.sound2_id == SoundId::null) return false; if (vehicle.x == kLocationNull) @@ -363,8 +363,8 @@ namespace OpenRCT2::Audio if (vehicleSound.id == kSoundIdNull) { vehicleSound.id = sound_params->id; - vehicleSound.trackSound.id = SoundId::Null; - vehicleSound.otherSound.id = SoundId::Null; + vehicleSound.trackSound.id = SoundId::null; + vehicleSound.otherSound.id = SoundId::null; vehicleSound.volume = 0x30; return &vehicleSound; } @@ -377,22 +377,22 @@ namespace OpenRCT2::Audio { switch (id) { - case SoundId::LiftClassic: - case SoundId::TrackFrictionClassicWood: - case SoundId::FrictionClassic: - case SoundId::LiftFrictionWheels: - case SoundId::GoKartEngine: - case SoundId::TrackFrictionTrain: - case SoundId::TrackFrictionWater: - case SoundId::LiftArrow: - case SoundId::LiftWood: - case SoundId::TrackFrictionWood: - case SoundId::LiftWildMouse: - case SoundId::LiftBM: - case SoundId::TrackFrictionBM: - case SoundId::LiftRMC: - case SoundId::TrackFrictionRMC: - case SoundId::LiftFlume: + case SoundId::liftClassic: + case SoundId::trackFrictionClassicWood: + case SoundId::frictionClassic: + case SoundId::liftFrictionWheels: + case SoundId::goKartEngine: + case SoundId::trackFrictionTrain: + case SoundId::trackFrictionWater: + case SoundId::liftArrow: + case SoundId::liftWood: + case SoundId::trackFrictionWood: + case SoundId::liftWildMouse: + case SoundId::liftBM: + case SoundId::trackFrictionBM: + case SoundId::liftRMC: + case SoundId::trackFrictionRMC: + case SoundId::liftFlume: return true; default: return false; @@ -403,17 +403,17 @@ namespace OpenRCT2::Audio { switch (id) { - case SoundId::Scream1: - case SoundId::Scream2: - case SoundId::Scream3: - case SoundId::Scream4: - case SoundId::Scream5: - case SoundId::Scream6: - case SoundId::Scream7: - case SoundId::Scream8: - case SoundId::TrainWhistle: - case SoundId::TrainDeparting: - case SoundId::Tram: + case SoundId::scream1: + case SoundId::scream2: + case SoundId::scream3: + case SoundId::scream4: + case SoundId::scream5: + case SoundId::scream6: + case SoundId::scream7: + case SoundId::scream8: + case SoundId::trainWhistle: + case SoundId::trainDeparting: + case SoundId::tram: return true; default: return false; @@ -424,8 +424,8 @@ namespace OpenRCT2::Audio { switch (id) { - case SoundId::TrackFrictionBM: - case SoundId::TrackFrictionRMC: + case SoundId::trackFrictionBM: + case SoundId::trackFrictionRMC: return true; default: return false; @@ -474,20 +474,20 @@ namespace OpenRCT2::Audio if (sound.channel != nullptr && sound.channel->IsDone() && IsLoopingSound(sound.id)) { - sound.id = SoundId::Null; + sound.id = SoundId::null; sound.channel = nullptr; } - if (id != sound.id && sound.id != SoundId::Null) + if (id != sound.id && sound.id != SoundId::null) { - sound.id = SoundId::Null; + sound.id = SoundId::null; sound.channel->Stop(); } - if (id == SoundId::Null) + if (id == SoundId::null) { return; } - if (sound.id == SoundId::Null) + if (sound.id == SoundId::null) { auto frequency = SoundFrequency(id, sound_params->frequency); auto looping = IsLoopingSound(id); @@ -504,7 +504,7 @@ namespace OpenRCT2::Audio } else { - sound.id = SoundId::Null; + sound.id = SoundId::null; } return; } @@ -567,11 +567,11 @@ namespace OpenRCT2::Audio if (keepPlaying) continue; - if (vehicleSound.trackSound.id != SoundId::Null) + if (vehicleSound.trackSound.id != SoundId::null) { vehicleSound.trackSound.channel->Stop(); } - if (vehicleSound.otherSound.id != SoundId::Null) + if (vehicleSound.otherSound.id != SoundId::null) { vehicleSound.otherSound.channel->Stop(); } diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp index 6d97b6e625..8b96430059 100644 --- a/src/openrct2-ui/windows/EditorObjectSelection.cpp +++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp @@ -616,7 +616,7 @@ namespace OpenRCT2::Ui::Windows invalidate(); const CursorState* state = ContextGetCursorState(); - Audio::Play(Audio::SoundId::Click1, 0, state->position.x); + Audio::Play(Audio::SoundId::click1, 0, state->position.x); if (gLegacyScene == LegacyScene::trackDesignsManager) { diff --git a/src/openrct2-ui/windows/EditorParkEntrance.cpp b/src/openrct2-ui/windows/EditorParkEntrance.cpp index d45f84ec48..5714781102 100644 --- a/src/openrct2-ui/windows/EditorParkEntrance.cpp +++ b/src/openrct2-ui/windows/EditorParkEntrance.cpp @@ -223,7 +223,7 @@ namespace OpenRCT2::Ui::Windows auto result = GameActions::Execute(&gameAction, getGameState()); if (result.Error == GameActions::Status::Ok) { - Audio::Play3D(Audio::SoundId::PlaceItem, result.Position); + Audio::Play3D(Audio::SoundId::placeItem, result.Position); } } } @@ -390,7 +390,7 @@ namespace OpenRCT2::Ui::Windows _selectedEntranceType = selected; - Audio::Play(Audio::SoundId::Click1, 0, windowPos.x + (width / 2)); + Audio::Play(Audio::SoundId::click1, 0, windowPos.x + (width / 2)); invalidate(); } }; diff --git a/src/openrct2-ui/windows/Error.cpp b/src/openrct2-ui/windows/Error.cpp index a0c98c0ae4..2974fc11c7 100644 --- a/src/openrct2-ui/windows/Error.cpp +++ b/src/openrct2-ui/windows/Error.cpp @@ -63,7 +63,7 @@ namespace OpenRCT2::Ui::Windows if (!gDisableErrorWindowSound) { - Audio::Play(Audio::SoundId::Error, 0, windowPos.x + (width / 2)); + Audio::Play(Audio::SoundId::error, 0, windowPos.x + (width / 2)); } } diff --git a/src/openrct2-ui/windows/Footpath.cpp b/src/openrct2-ui/windows/Footpath.cpp index 80ea67ddef..81cde06c1a 100644 --- a/src/openrct2-ui/windows/Footpath.cpp +++ b/src/openrct2-ui/windows/Footpath.cpp @@ -1088,7 +1088,7 @@ namespace OpenRCT2::Ui::Windows // Don't play sound if it is no cost to prevent multiple sounds. TODO: make this work in no money scenarios if (result->Cost != 0) { - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::PlaceItem, result->Position); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::placeItem, result->Position); } } else @@ -1179,7 +1179,7 @@ namespace OpenRCT2::Ui::Windows [footpathLoc](const GameActions::GameAction* ga, const GameActions::Result* result) { if (result->Error == GameActions::Status::Ok) { - Audio::Play3D(OpenRCT2::Audio::SoundId::PlaceItem, result->Position); + Audio::Play3D(OpenRCT2::Audio::SoundId::placeItem, result->Position); } auto* windowMgr = GetWindowManager(); diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index dff2aa6485..df62bb42de 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -485,7 +485,7 @@ namespace OpenRCT2::Ui::Windows auto result = GameActions::Execute(&gameAction, getGameState()); if (result.Error == GameActions::Status::Ok) { - Audio::Play3D(Audio::SoundId::PlaceItem, result.Position); + Audio::Play3D(Audio::SoundId::placeItem, result.Position); } } diff --git a/src/openrct2-ui/windows/MazeConstruction.cpp b/src/openrct2-ui/windows/MazeConstruction.cpp index 8a9ff43dce..4113495335 100644 --- a/src/openrct2-ui/windows/MazeConstruction.cpp +++ b/src/openrct2-ui/windows/MazeConstruction.cpp @@ -367,7 +367,7 @@ namespace OpenRCT2::Ui::Windows if (result->Error != GameActions::Status::Ok) return; - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::PlaceItem, result->Position); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::placeItem, result->Position); auto* windowMgr = Ui::GetWindowManager(); @@ -437,7 +437,7 @@ namespace OpenRCT2::Ui::Windows _currentTrackBegin.y = y; if (_rideConstructionState != RideConstructionState::MazeMove) { - Audio::Play3D(Audio::SoundId::PlaceItem, { x, y, z }); + Audio::Play3D(Audio::SoundId::placeItem, { x, y, z }); } } }; diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index 74e51e6445..1f7fe749b4 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -470,7 +470,7 @@ namespace OpenRCT2::Ui::Windows _newRideVars.SelectedRide = item; - OpenRCT2::Audio::Play(OpenRCT2::Audio::SoundId::Click1, 0, windowPos.x + (width / 2)); + OpenRCT2::Audio::Play(OpenRCT2::Audio::SoundId::click1, 0, windowPos.x + (width / 2)); _newRideVars.SelectedRideCountdown = 8; invalidate(); } diff --git a/src/openrct2-ui/windows/News.cpp b/src/openrct2-ui/windows/News.cpp index 33a44f35f8..708f4dd5f3 100644 --- a/src/openrct2-ui/windows/News.cpp +++ b/src/openrct2-ui/windows/News.cpp @@ -356,7 +356,7 @@ namespace OpenRCT2::Ui::Windows } invalidate(); - Audio::Play(Audio::SoundId::Click2, 0, windowPos.x + (width / 2)); + Audio::Play(Audio::SoundId::click2, 0, windowPos.x + (width / 2)); size_t j = _pressedNewsItemIndex; _pressedNewsItemIndex = -1; @@ -432,7 +432,7 @@ namespace OpenRCT2::Ui::Windows _pressedButtonIndex = buttonIndex; _suspendUpdateTicks = 4; invalidate(); - Audio::Play(Audio::SoundId::Click1, 0, windowPos.x + (width / 2)); + Audio::Play(Audio::SoundId::click1, 0, windowPos.x + (width / 2)); } } diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 95a87a2fc8..48bf20b93a 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -2354,7 +2354,7 @@ namespace OpenRCT2::Ui::Windows return; } - Audio::Play3D(OpenRCT2::Audio::SoundId::PlaceItem, trackPos); + Audio::Play3D(OpenRCT2::Audio::SoundId::placeItem, trackPos); if (Network::GetMode() != Network::Mode::none) { @@ -2670,7 +2670,7 @@ namespace OpenRCT2::Ui::Windows if (result->Error != GameActions::Status::Ok) return; - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::PlaceItem, result->Position); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::placeItem, result->Position); auto* windowMgr = GetWindowManager(); @@ -3737,7 +3737,7 @@ namespace OpenRCT2::Ui::Windows || errorText == STR_CAN_ONLY_BUILD_THIS_ABOVE_GROUND || errorText == STR_TOO_HIGH_FOR_SUPPORTS || zAttempts == (numAttempts - 1) || z < 0) { - Audio::Play(OpenRCT2::Audio::SoundId::Error, 0, state->position.x); + Audio::Play(OpenRCT2::Audio::SoundId::error, 0, state->position.x); w = windowMgr->FindByClass(WindowClass::rideConstruction); if (w != nullptr) { @@ -3755,7 +3755,7 @@ namespace OpenRCT2::Ui::Windows else { windowMgr->CloseByClass(WindowClass::error); - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::PlaceItem, _currentTrackBegin); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::placeItem, _currentTrackBegin); break; } } @@ -3810,7 +3810,7 @@ namespace OpenRCT2::Ui::Windows _currentTrackAlternative = savedCurrentTrackAlternative; _currentTrackHasLiftHill = savedCurrentTrackLiftHill; - OpenRCT2::Audio::Play(OpenRCT2::Audio::SoundId::Error, 0, state->position.x); + OpenRCT2::Audio::Play(OpenRCT2::Audio::SoundId::error, 0, state->position.x); break; } diff --git a/src/openrct2-ui/windows/ScenarioSelect.cpp b/src/openrct2-ui/windows/ScenarioSelect.cpp index bca983c11b..ba884d1429 100644 --- a/src/openrct2-ui/windows/ScenarioSelect.cpp +++ b/src/openrct2-ui/windows/ScenarioSelect.cpp @@ -519,7 +519,7 @@ namespace OpenRCT2::Ui::Windows mutableScreenCoords.y -= scenarioItemHeight; if (mutableScreenCoords.y < 0 && !listItem.scenario.is_locked) { - OpenRCT2::Audio::Play(OpenRCT2::Audio::SoundId::Click1, 0, windowPos.x + (width / 2)); + OpenRCT2::Audio::Play(OpenRCT2::Audio::SoundId::click1, 0, windowPos.x + (width / 2)); gFirstTimeSaving = true; // Callback will likely close this window! So should always return after it. _callback(listItem.scenario.scenario->Path); diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index e76bbf71c0..84d67aa1f8 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -977,7 +977,7 @@ namespace OpenRCT2::Ui::Windows gWindowSceneryRotation = rotation.value(); } gWindowSceneryEyedropperEnabled = false; - Audio::Play(Audio::SoundId::Click1, 0, ContextGetWidth() / 2); + Audio::Play(Audio::SoundId::click1, 0, ContextGetWidth() / 2); _hoverCounter = -16; gSceneryPlaceCost = kMoney64Undefined; invalidate(); @@ -1521,7 +1521,7 @@ namespace OpenRCT2::Ui::Windows _sceneryPaintEnabled = false; gWindowSceneryEyedropperEnabled = false; - Audio::Play(Audio::SoundId::Click1, 0, windowPos.x + (width / 2)); + Audio::Play(Audio::SoundId::click1, 0, windowPos.x + (width / 2)); _hoverCounter = -16; gSceneryPlaceCost = kMoney64Undefined; invalidate(); @@ -3075,7 +3075,7 @@ namespace OpenRCT2::Ui::Windows [=](const GameActions::GameAction* ga, const GameActions::Result* result) { if (result->Error == GameActions::Status::Ok) { - Audio::Play3D(Audio::SoundId::PlaceItem, result->Position); + Audio::Play3D(Audio::SoundId::placeItem, result->Position); } }); auto res = GameActions::Execute(&smallSceneryPlaceAction, gameState); @@ -3109,7 +3109,7 @@ namespace OpenRCT2::Ui::Windows { return; } - Audio::Play3D(Audio::SoundId::PlaceItem, result->Position); + Audio::Play3D(Audio::SoundId::placeItem, result->Position); }); auto res = GameActions::Execute(&footpathAdditionPlaceAction, gameState); break; @@ -3160,7 +3160,7 @@ namespace OpenRCT2::Ui::Windows wallPlaceAction.SetCallback([](const GameActions::GameAction* ga, const GameActions::Result* result) { if (result->Error == GameActions::Status::Ok) { - Audio::Play3D(Audio::SoundId::PlaceItem, result->Position); + Audio::Play3D(Audio::SoundId::placeItem, result->Position); } }); auto res = GameActions::Execute(&wallPlaceAction, gameState); @@ -3213,11 +3213,11 @@ namespace OpenRCT2::Ui::Windows sceneryPlaceAction.SetCallback([=](const GameActions::GameAction* ga, const GameActions::Result* result) { if (result->Error == GameActions::Status::Ok) { - Audio::Play3D(Audio::SoundId::PlaceItem, result->Position); + Audio::Play3D(Audio::SoundId::placeItem, result->Position); } else { - Audio::Play3D(Audio::SoundId::Error, { loc.x, loc.y, gSceneryPlaceZ }); + Audio::Play3D(Audio::SoundId::error, { loc.x, loc.y, gSceneryPlaceZ }); } }); auto res = GameActions::Execute(&sceneryPlaceAction, gameState); @@ -3238,7 +3238,7 @@ namespace OpenRCT2::Ui::Windows if (result->Error == GameActions::Status::Ok) { auto data = result->GetData(); - Audio::Play3D(Audio::SoundId::PlaceItem, result->Position); + Audio::Play3D(Audio::SoundId::placeItem, result->Position); ContextOpenDetailWindow(WindowDetail::banner, data.bannerId.ToUnderlying()); } }); diff --git a/src/openrct2-ui/windows/TrackDesignPlace.cpp b/src/openrct2-ui/windows/TrackDesignPlace.cpp index bad37ef70c..b506bf8c5d 100644 --- a/src/openrct2-ui/windows/TrackDesignPlace.cpp +++ b/src/openrct2-ui/windows/TrackDesignPlace.cpp @@ -278,7 +278,7 @@ namespace OpenRCT2::Ui::Windows if (res.Error != GameActions::Status::Ok) { // Unable to build track - Audio::Play3D(Audio::SoundId::Error, trackLoc); + Audio::Play3D(Audio::SoundId::error, trackLoc); auto windowManager = GetWindowManager(); windowManager->ShowError(res.GetErrorTitle(), res.GetErrorMessage()); @@ -289,7 +289,7 @@ namespace OpenRCT2::Ui::Windows tdAction.SetCallback([&](const GameActions::GameAction*, const GameActions::Result* result) { if (result->Error != GameActions::Status::Ok) { - Audio::Play3D(Audio::SoundId::Error, result->Position); + Audio::Play3D(Audio::SoundId::error, result->Position); return; } @@ -300,7 +300,7 @@ namespace OpenRCT2::Ui::Windows auto* windowMgr = Ui::GetWindowManager(); windowMgr->CloseByClass(WindowClass::error); - Audio::Play3D(Audio::SoundId::PlaceItem, trackLoc); + Audio::Play3D(Audio::SoundId::placeItem, trackLoc); _currentRideIndex = rideId; if (TrackDesignAreEntranceAndExitPlaced()) diff --git a/src/openrct2-ui/windows/TrackList.cpp b/src/openrct2-ui/windows/TrackList.cpp index e1441d9abc..69368c6a0a 100644 --- a/src/openrct2-ui/windows/TrackList.cpp +++ b/src/openrct2-ui/windows/TrackList.cpp @@ -117,7 +117,7 @@ namespace OpenRCT2::Ui::Windows void SelectFromList(int32_t listIndex) { - OpenRCT2::Audio::Play(OpenRCT2::Audio::SoundId::Click1, 0, this->windowPos.x + (this->width / 2)); + OpenRCT2::Audio::Play(OpenRCT2::Audio::SoundId::click1, 0, this->windowPos.x + (this->width / 2)); if (!(gLegacyScene == LegacyScene::trackDesignsManager)) { if (listIndex == 0) diff --git a/src/openrct2/actions/LandLowerAction.cpp b/src/openrct2/actions/LandLowerAction.cpp index fe9043a404..b9faee4af8 100644 --- a/src/openrct2/actions/LandLowerAction.cpp +++ b/src/openrct2/actions/LandLowerAction.cpp @@ -81,7 +81,7 @@ namespace OpenRCT2::GameActions if (isExecuting) { - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::PlaceItem, { _coords.x, _coords.y, TileElementHeight(_coords) }); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::placeItem, { _coords.x, _coords.y, TileElementHeight(_coords) }); } uint8_t maxHeight = MapGetHighestLandHeight(validRange); diff --git a/src/openrct2/actions/LandRaiseAction.cpp b/src/openrct2/actions/LandRaiseAction.cpp index bd85a30659..eeb6652c6b 100644 --- a/src/openrct2/actions/LandRaiseAction.cpp +++ b/src/openrct2/actions/LandRaiseAction.cpp @@ -82,7 +82,7 @@ namespace OpenRCT2::GameActions if (isExecuting) { - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::PlaceItem, { _coords.x, _coords.y, TileElementHeight(_coords) }); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::placeItem, { _coords.x, _coords.y, TileElementHeight(_coords) }); } uint8_t minHeight = MapGetLowestLandHeight(validRange); diff --git a/src/openrct2/actions/LandSetRightsAction.cpp b/src/openrct2/actions/LandSetRightsAction.cpp index 0d65cfefca..5e41dc0328 100644 --- a/src/openrct2/actions/LandSetRightsAction.cpp +++ b/src/openrct2/actions/LandSetRightsAction.cpp @@ -109,7 +109,7 @@ namespace OpenRCT2::GameActions if (isExecuting) { MapCountRemainingLandRights(); - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::PlaceItem, centre); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::placeItem, centre); } return res; } diff --git a/src/openrct2/actions/LandSmoothAction.cpp b/src/openrct2/actions/LandSmoothAction.cpp index 7784c3e96f..240bc263c6 100644 --- a/src/openrct2/actions/LandSmoothAction.cpp +++ b/src/openrct2/actions/LandSmoothAction.cpp @@ -666,7 +666,7 @@ namespace OpenRCT2::GameActions if (isExecuting) { - Audio::Play3D(Audio::SoundId::PlaceItem, { _coords.x, _coords.y, centreZ }); + Audio::Play3D(Audio::SoundId::placeItem, { _coords.x, _coords.y, centreZ }); } res.Cost += result.Cost; return res; diff --git a/src/openrct2/actions/WaterLowerAction.cpp b/src/openrct2/actions/WaterLowerAction.cpp index 1fd96a93c8..13885a78e6 100644 --- a/src/openrct2/actions/WaterLowerAction.cpp +++ b/src/openrct2/actions/WaterLowerAction.cpp @@ -123,7 +123,7 @@ namespace OpenRCT2::GameActions if (isExecuting && hasChanged) { - Audio::Play3D(Audio::SoundId::LayingOutWater, res.Position); + Audio::Play3D(Audio::SoundId::layingOutWater, res.Position); } // Force ride construction to recheck area _currentTrackSelectionFlags.set(TrackSelectionFlag::recheck); diff --git a/src/openrct2/actions/WaterRaiseAction.cpp b/src/openrct2/actions/WaterRaiseAction.cpp index 489850e8d9..8fe24c3f13 100644 --- a/src/openrct2/actions/WaterRaiseAction.cpp +++ b/src/openrct2/actions/WaterRaiseAction.cpp @@ -136,7 +136,7 @@ namespace OpenRCT2::GameActions if (isExecuting && hasChanged) { - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::LayingOutWater, res.Position); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::layingOutWater, res.Position); } // Force ride construction to recheck area _currentTrackSelectionFlags.set(TrackSelectionFlag::recheck); diff --git a/src/openrct2/audio/Audio.cpp b/src/openrct2/audio/Audio.cpp index f8109f144e..75e93da291 100644 --- a/src/openrct2/audio/Audio.cpp +++ b/src/openrct2/audio/Audio.cpp @@ -188,10 +188,10 @@ namespace OpenRCT2::Audio auto& objManager = GetContext()->GetObjectManager(); AudioObject* audioObject{}; uint32_t sampleIndex = EnumValue(id); - if (id >= SoundId::LiftRMC) + if (id >= SoundId::liftRMC) { audioObject = objManager.GetLoadedObject(_soundsAdditionalAudioObjectEntryIndex); - sampleIndex -= EnumValue(SoundId::LiftRMC); + sampleIndex -= EnumValue(SoundId::liftRMC); } else { @@ -440,11 +440,11 @@ namespace OpenRCT2::Audio if (vehicleSound.id != kSoundIdNull) { vehicleSound.id = kSoundIdNull; - if (vehicleSound.trackSound.id != SoundId::Null) + if (vehicleSound.trackSound.id != SoundId::null) { vehicleSound.trackSound.channel->Stop(); } - if (vehicleSound.otherSound.id != SoundId::Null) + if (vehicleSound.otherSound.id != SoundId::null) { vehicleSound.otherSound.channel->Stop(); } diff --git a/src/openrct2/audio/Audio.h b/src/openrct2/audio/Audio.h index 237fd41dab..ab16efe6ba 100644 --- a/src/openrct2/audio/Audio.h +++ b/src/openrct2/audio/Audio.h @@ -62,78 +62,78 @@ namespace OpenRCT2::Audio enum class SoundId : uint8_t { - LiftClassic, - TrackFrictionClassicWood, - FrictionClassic, - Scream1, - Click1, - Click2, - PlaceItem, - Scream2, - Scream3, - Scream4, - Scream5, - Scream6, - LiftFrictionWheels, - Purchase, - Crash, - LayingOutWater, - Water1, - Water2, - TrainWhistle, - TrainDeparting, - WaterSplash, - GoKartEngine, - RideLaunch1, - RideLaunch2, - Cough1, - Cough2, - Cough3, - Cough4, - Rain, - Thunder1, - Thunder2, - TrackFrictionTrain, - TrackFrictionWater, - BalloonPop, - MechanicFix, - Scream7, - ToiletFlush, - Click3, - Quack, - NewsItem, - WindowOpen, - Laugh1, - Laugh2, - Laugh3, - Applause, - HauntedHouseScare, - HauntedHouseScream1, - HauntedHouseScream2, - BlockBrakeClose, - BlockBrakeRelease, - Error, - BrakeRelease, - LiftArrow, - LiftWood, - TrackFrictionWood, - LiftWildMouse, - LiftBM, - TrackFrictionBM, - Scream8, // Blood-curdling, Haunted House-like scream - Tram, - DoorOpen, - DoorClose, - Portcullis, - CrowdAmbience, - LiftRMC, - TrackFrictionRMC, - LiftFlume, - NoScream = 254, - Null = 255 + liftClassic, + trackFrictionClassicWood, + frictionClassic, + scream1, + click1, + click2, + placeItem, + scream2, + scream3, + scream4, + scream5, + scream6, + liftFrictionWheels, + purchase, + crash, + layingOutWater, + water1, + water2, + trainWhistle, + trainDeparting, + waterSplash, + goKartEngine, + rideLaunch1, + rideLaunch2, + cough1, + cough2, + cough3, + cough4, + rain, + thunder1, + thunder2, + trackFrictionTrain, + trackFrictionWater, + balloonPop, + mechanicFix, + scream7, + toiletFlush, + click3, + quack, + newsItem, + windowOpen, + laugh1, + laugh2, + laugh3, + applause, + hauntedHouseScare, + hauntedHouseScream1, + hauntedHouseScream2, + blockBrakeClose, + blockBrakeRelease, + error, + brakeRelease, + liftArrow, + liftWood, + trackFrictionWood, + liftWildMouse, + liftBM, + trackFrictionBM, + scream8, // Blood-curdling, Haunted House-like scream + tram, + doorOpen, + doorClose, + portcullis, + crowdAmbience, + liftRMC, + trackFrictionRMC, + liftFlume, + noScream = 254, + null = 255 }; - constexpr uint8_t kRCT2SoundCount = static_cast(SoundId::Portcullis) + 1; + constexpr uint8_t kRCT2SoundCount = static_cast(SoundId::portcullis) + 1; namespace AudioObjectIdentifiers { diff --git a/src/openrct2/entity/Balloon.cpp b/src/openrct2/entity/Balloon.cpp index 4170e72f72..c01b78e503 100644 --- a/src/openrct2/entity/Balloon.cpp +++ b/src/openrct2/entity/Balloon.cpp @@ -95,7 +95,7 @@ void Balloon::Pop(bool playSound) frame = 0; if (playSound) { - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::BalloonPop, { x, y, z }); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::balloonPop, { x, y, z }); } } diff --git a/src/openrct2/entity/Duck.cpp b/src/openrct2/entity/Duck.cpp index 6aa299f523..a1549af5fa 100644 --- a/src/openrct2/entity/Duck.cpp +++ b/src/openrct2/entity/Duck.cpp @@ -353,7 +353,7 @@ void Duck::Update() void Duck::Press() { - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::Quack, { x, y, z }); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::quack, { x, y, z }); } void Duck::RemoveAll() diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp index 96ebc7070a..15f25db082 100644 --- a/src/openrct2/entity/Guest.cpp +++ b/src/openrct2/entity/Guest.cpp @@ -948,7 +948,7 @@ void Guest::Tick128UpdateGuest(uint32_t index) { if (State == PeepState::Walking || State == PeepState::Sitting) { - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::Crash, GetLocation()); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::crash, GetLocation()); ExplosionCloud::Create({ x, y, z + 16 }); ExplosionFlare::Create({ x, y, z + 16 }); @@ -1826,9 +1826,9 @@ void Guest::OnExitRide(Ride& ride) InsertNewThought(PeepThoughtType::WasGreat, ride.id); static constexpr OpenRCT2::Audio::SoundId laughs[3] = { - OpenRCT2::Audio::SoundId::Laugh1, - OpenRCT2::Audio::SoundId::Laugh2, - OpenRCT2::Audio::SoundId::Laugh3, + OpenRCT2::Audio::SoundId::laugh1, + OpenRCT2::Audio::SoundId::laugh2, + OpenRCT2::Audio::SoundId::laugh3, }; int32_t laughType = ScenarioRand() & 7; if (laughType < 3) @@ -2356,7 +2356,7 @@ void Guest::SpendMoney(money64& peep_expend_type, money64 amount, ExpenditureTyp MoneyEffect::CreateAt(amount, GetLocation(), true); - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::Purchase, GetLocation()); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::purchase, GetLocation()); } void Guest::SetHasRidden(const Ride& ride) @@ -5180,7 +5180,7 @@ void Guest::UpdateRideShopInteract() // Do not play toilet flush sound on title screen as it's considered loud and annoying if (gLegacyScene != LegacyScene::titleSequence) { - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::ToiletFlush, GetLocation()); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::toiletFlush, GetLocation()); } RideSubState = PeepRideSubState::LeaveShop; @@ -6987,7 +6987,7 @@ void Guest::UpdateAnimationGroup() if ((ScenarioRand() & 0xFFFF) <= 13107) { isBalloonPopped = true; - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::BalloonPop, { x, y, z }); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::balloonPop, { x, y, z }); } Balloon::Create({ x, y, z + 9 }, BalloonColour, isBalloonPopped); } @@ -7838,10 +7838,10 @@ void Guest::ThrowUp() Litter::Create({ curLoc, Orientation }, (Id.ToUnderlying() & 1) ? Litter::Type::VomitAlt : Litter::Type::Vomit); static constexpr OpenRCT2::Audio::SoundId coughs[4] = { - OpenRCT2::Audio::SoundId::Cough1, - OpenRCT2::Audio::SoundId::Cough2, - OpenRCT2::Audio::SoundId::Cough3, - OpenRCT2::Audio::SoundId::Cough4, + OpenRCT2::Audio::SoundId::cough1, + OpenRCT2::Audio::SoundId::cough2, + OpenRCT2::Audio::SoundId::cough3, + OpenRCT2::Audio::SoundId::cough4, }; auto soundId = coughs[ScenarioRand() & 3]; OpenRCT2::Audio::Play3D(soundId, curLoc); diff --git a/src/openrct2/entity/Particle.cpp b/src/openrct2/entity/Particle.cpp index f8c5f368f6..0d6e43a53b 100644 --- a/src/openrct2/entity/Particle.cpp +++ b/src/openrct2/entity/Particle.cpp @@ -136,7 +136,7 @@ void VehicleCrashParticle::Update() if (waterZ != 0 && z >= waterZ && newLoc.z <= waterZ) { // Splash - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::Water2, { x, y, waterZ }); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::water2, { x, y, waterZ }); CrashSplashParticle::Create({ x, y, waterZ }); getGameState().entities.EntityRemove(this); return; diff --git a/src/openrct2/entity/Peep.cpp b/src/openrct2/entity/Peep.cpp index 554368d852..7fe3308b7c 100644 --- a/src/openrct2/entity/Peep.cpp +++ b/src/openrct2/entity/Peep.cpp @@ -1201,7 +1201,7 @@ void PeepUpdateCrowdNoise() // Load and play crowd noise if needed and set volume if (_crowdSoundChannel == nullptr || _crowdSoundChannel->IsDone()) { - _crowdSoundChannel = CreateAudioChannel(SoundId::CrowdAmbience, true, 0); + _crowdSoundChannel = CreateAudioChannel(SoundId::crowdAmbience, true, 0); if (_crowdSoundChannel != nullptr) { _crowdSoundChannel->SetGroup(OpenRCT2::Audio::MixerGroup::Sound); @@ -1239,7 +1239,7 @@ void PeepApplause() } // Play applause noise - OpenRCT2::Audio::Play(OpenRCT2::Audio::SoundId::Applause, 0, ContextGetWidth() / 2); + OpenRCT2::Audio::Play(OpenRCT2::Audio::SoundId::applause, 0, ContextGetWidth() / 2); } /** diff --git a/src/openrct2/entity/Staff.cpp b/src/openrct2/entity/Staff.cpp index 85d5a9d3d3..54b7f16e17 100644 --- a/src/openrct2/entity/Staff.cpp +++ b/src/openrct2/entity/Staff.cpp @@ -2467,7 +2467,7 @@ bool Staff::UpdateFixingFixStationBrakes(bool firstRun, Ride& ride) if (AnimationFrameNum == 0x13 || AnimationFrameNum == 0x19 || AnimationFrameNum == 0x1F || AnimationFrameNum == 0x25 || AnimationFrameNum == 0x2B) { - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::MechanicFix, GetLocation()); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::mechanicFix, GetLocation()); } return false; diff --git a/src/openrct2/interface/Chat.cpp b/src/openrct2/interface/Chat.cpp index d3c39093ea..c753c0567a 100644 --- a/src/openrct2/interface/Chat.cpp +++ b/src/openrct2/interface/Chat.cpp @@ -246,7 +246,7 @@ void ChatAddHistory(std::string_view s) // Log to file (src only as logging does its own timestamp) Network::AppendChatLog(s); - CreateAudioChannel(SoundId::NewsItem, 0, kMixerVolumeMax, 0.5f, 1.5f, true); + CreateAudioChannel(SoundId::newsItem, 0, kMixerVolumeMax, 0.5f, 1.5f, true); } void ChatInput(enum ChatInput input) diff --git a/src/openrct2/interface/Screenshot.cpp b/src/openrct2/interface/Screenshot.cpp index 43e4c69b97..9b2dc527fd 100644 --- a/src/openrct2/interface/Screenshot.cpp +++ b/src/openrct2/interface/Screenshot.cpp @@ -91,7 +91,7 @@ void ScreenshotCheck() if (!screenshotPath.empty()) { - OpenRCT2::Audio::Play(OpenRCT2::Audio::SoundId::WindowOpen, 100, ContextGetWidth() / 2); + OpenRCT2::Audio::Play(OpenRCT2::Audio::SoundId::windowOpen, 100, ContextGetWidth() / 2); // Show user that screenshot saved successfully const auto filename = Path::GetFileName(screenshotPath); diff --git a/src/openrct2/management/NewsItem.cpp b/src/openrct2/management/NewsItem.cpp index ea4336abcc..05d7e9931f 100644 --- a/src/openrct2/management/NewsItem.cpp +++ b/src/openrct2/management/NewsItem.cpp @@ -132,7 +132,7 @@ static void TickCurrent() if (ticks == 1 && (gLegacyScene == LegacyScene::playing)) { // Play sound - OpenRCT2::Audio::Play(OpenRCT2::Audio::SoundId::NewsItem, 0, ContextGetWidth() / 2); + OpenRCT2::Audio::Play(OpenRCT2::Audio::SoundId::newsItem, 0, ContextGetWidth() / 2); } } diff --git a/src/openrct2/object/RideObject.cpp b/src/openrct2/object/RideObject.cpp index 9a7b502091..299973daf6 100644 --- a/src/openrct2/object/RideObject.cpp +++ b/src/openrct2/object/RideObject.cpp @@ -595,7 +595,7 @@ namespace OpenRCT2 car.sprite_height_positive = 1; car.flags = CAR_ENTRY_FLAG_SPINNING; car.PaintStyle = VEHICLE_VISUAL_FLAT_RIDE_OR_CAR_RIDE; - car.friction_sound_id = OpenRCT2::Audio::SoundId::Null; + car.friction_sound_id = OpenRCT2::Audio::SoundId::null; car.soundRange = SoundRange::none; car.draw_order = 6; @@ -754,7 +754,7 @@ namespace OpenRCT2 car.spinning_inertia = Json::GetNumber(jCar["spinningInertia"]); car.spinning_friction = Json::GetNumber(jCar["spinningFriction"]); car.friction_sound_id = Json::GetEnum( - jCar["frictionSoundId"], OpenRCT2::Audio::SoundId::Null); + jCar["frictionSoundId"], OpenRCT2::Audio::SoundId::null); car.ReversedCarIndex = Json::GetNumber(jCar["logFlumeReverserVehicleType"]); car.soundRange = Json::GetEnum(jCar["soundRange"], SoundRange::none); car.double_sound_frequency = Json::GetNumber(jCar["doubleSoundFrequency"]); diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 31b8793160..e1c971856a 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -2827,15 +2827,15 @@ namespace OpenRCT2::RCT1 dst->dopplerShift = src->SoundVectorFactor; dst->spin_speed = src->SpinSpeed; dst->sound2_flags = src->Sound2Flags; - dst->sound1_id = OpenRCT2::Audio::SoundId::Null; - dst->sound2_id = OpenRCT2::Audio::SoundId::Null; + dst->sound1_id = OpenRCT2::Audio::SoundId::null; + dst->sound2_id = OpenRCT2::Audio::SoundId::null; dst->var_C0 = src->VarC0; dst->CollisionDetectionTimer = src->CollisionDetectionTimer; dst->animation_frame = src->AnimationFrame; dst->animationState = src->AnimationState; dst->NumLaps = src->NumLaps; dst->var_D3 = src->VarD3; - dst->scream_sound_id = OpenRCT2::Audio::SoundId::Null; + dst->scream_sound_id = OpenRCT2::Audio::SoundId::null; dst->pitch = src->pitch; dst->roll = src->roll; diff --git a/src/openrct2/ride/CableLift.cpp b/src/openrct2/ride/CableLift.cpp index 6c6e824e90..c7466697fc 100644 --- a/src/openrct2/ride/CableLift.cpp +++ b/src/openrct2/ride/CableLift.cpp @@ -53,12 +53,12 @@ Vehicle* CableLiftSegmentCreate( current->spin_sprite = 0; current->spin_speed = 0; current->sound2_flags = 0; - current->sound1_id = OpenRCT2::Audio::SoundId::Null; - current->sound2_id = OpenRCT2::Audio::SoundId::Null; + current->sound1_id = OpenRCT2::Audio::SoundId::null; + current->sound2_id = OpenRCT2::Audio::SoundId::null; current->CollisionDetectionTimer = 0; current->animation_frame = 0; current->animationState = 0; - current->scream_sound_id = OpenRCT2::Audio::SoundId::Null; + current->scream_sound_id = OpenRCT2::Audio::SoundId::null; current->pitch = VehiclePitch::flat; current->roll = VehicleRoll::unbanked; for (auto& peep : current->peep) diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 5468f7b364..02a9eaf890 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -3314,13 +3314,13 @@ static Vehicle* VehicleCreateCar( vehicle->spin_sprite = 0; vehicle->spin_speed = 0; vehicle->sound2_flags = 0; - vehicle->sound1_id = OpenRCT2::Audio::SoundId::Null; - vehicle->sound2_id = OpenRCT2::Audio::SoundId::Null; + vehicle->sound1_id = OpenRCT2::Audio::SoundId::null; + vehicle->sound2_id = OpenRCT2::Audio::SoundId::null; vehicle->next_vehicle_on_train = EntityId::GetNull(); vehicle->CollisionDetectionTimer = 0; vehicle->animation_frame = 0; vehicle->animationState = 0; - vehicle->scream_sound_id = OpenRCT2::Audio::SoundId::Null; + vehicle->scream_sound_id = OpenRCT2::Audio::SoundId::null; vehicle->pitch = VehiclePitch::flat; vehicle->roll = VehicleRoll::unbanked; vehicle->target_seat_rotation = 4; diff --git a/src/openrct2/ride/RideData.cpp b/src/openrct2/ride/RideData.cpp index de8a2d4fd7..6f56d7658f 100644 --- a/src/openrct2/ride/RideData.cpp +++ b/src/openrct2/ride/RideData.cpp @@ -188,7 +188,7 @@ const CarEntry kCableLiftVehicle = { .no_seating_rows = 0, .spinning_inertia = 0, .spinning_friction = 255, - .friction_sound_id = Audio::SoundId::LiftClassic, + .friction_sound_id = Audio::SoundId::liftClassic, .ReversedCarIndex = 0, .soundRange = SoundRange::screamsMisc, .double_sound_frequency = 0, diff --git a/src/openrct2/ride/RideData.h b/src/openrct2/ride/RideData.h index 754208b35a..0487cf9a07 100644 --- a/src/openrct2/ride/RideData.h +++ b/src/openrct2/ride/RideData.h @@ -623,7 +623,7 @@ constexpr RideTypeDescriptor kDummyRTD = .AvailableBreakdowns = 0, .Heights = { 12, 64, 0, 0, }, .MaxMass = 255, - .LiftData = { OpenRCT2::Audio::SoundId::Null, 5, 5 }, + .LiftData = { OpenRCT2::Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 0, 0, 0 }, .UpkeepCosts = { 50, 1, 0, 0, 0, 0 }, .BuildCosts = { 0.00_GBP, 0.00_GBP, 1 }, diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index e8e9624735..9a031c38ae 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -96,17 +96,17 @@ Vehicle* _vehicleFrontVehicle; CoordsXYZ _vehicleCurPosition; static constexpr OpenRCT2::Audio::SoundId _screamSetMisc[] = { - OpenRCT2::Audio::SoundId::Scream8, - OpenRCT2::Audio::SoundId::Scream1, + OpenRCT2::Audio::SoundId::scream8, + OpenRCT2::Audio::SoundId::scream1, }; static constexpr OpenRCT2::Audio::SoundId _screamSetWooden[] = { - OpenRCT2::Audio::SoundId::Scream3, OpenRCT2::Audio::SoundId::Scream1, OpenRCT2::Audio::SoundId::Scream5, - OpenRCT2::Audio::SoundId::Scream6, OpenRCT2::Audio::SoundId::Scream7, OpenRCT2::Audio::SoundId::Scream2, - OpenRCT2::Audio::SoundId::Scream4, + OpenRCT2::Audio::SoundId::scream3, OpenRCT2::Audio::SoundId::scream1, OpenRCT2::Audio::SoundId::scream5, + OpenRCT2::Audio::SoundId::scream6, OpenRCT2::Audio::SoundId::scream7, OpenRCT2::Audio::SoundId::scream2, + OpenRCT2::Audio::SoundId::scream4, }; static constexpr OpenRCT2::Audio::SoundId _screamSetSteel[] = { - OpenRCT2::Audio::SoundId::Scream1, - OpenRCT2::Audio::SoundId::Scream6, + OpenRCT2::Audio::SoundId::scream1, + OpenRCT2::Audio::SoundId::scream6, }; // clang-format off @@ -437,16 +437,16 @@ static constexpr int32_t kUnk9A39C4[] = { }; static constexpr OpenRCT2::Audio::SoundId kDoorOpenSoundIds[] = { - OpenRCT2::Audio::SoundId::Null, // DoorSoundType::none - OpenRCT2::Audio::SoundId::DoorOpen, // DoorSoundType::door - OpenRCT2::Audio::SoundId::Portcullis, // DoorSoundType::portcullis + OpenRCT2::Audio::SoundId::null, // DoorSoundType::none + OpenRCT2::Audio::SoundId::doorOpen, // DoorSoundType::door + OpenRCT2::Audio::SoundId::portcullis, // DoorSoundType::portcullis }; static_assert(std::size(kDoorOpenSoundIds) == OpenRCT2::Audio::kDoorSoundTypeCount); static constexpr OpenRCT2::Audio::SoundId kDoorCloseSoundIds[] = { - OpenRCT2::Audio::SoundId::Null, // DoorSoundType::none - OpenRCT2::Audio::SoundId::DoorClose, // DoorSoundType::door - OpenRCT2::Audio::SoundId::Portcullis, // DoorSoundType::portcullis + OpenRCT2::Audio::SoundId::null, // DoorSoundType::none + OpenRCT2::Audio::SoundId::doorClose, // DoorSoundType::door + OpenRCT2::Audio::SoundId::portcullis, // DoorSoundType::portcullis }; static_assert(std::size(kDoorCloseSoundIds) == OpenRCT2::Audio::kDoorSoundTypeCount); @@ -1208,7 +1208,7 @@ static SoundIdVolume VehicleSoundFadeInOut( OpenRCT2::Audio::SoundId currentSoundId, uint8_t currentVolume, OpenRCT2::Audio::SoundId targetSoundId, uint8_t targetVolume) { - if (currentSoundId != OpenRCT2::Audio::SoundId::Null) + if (currentSoundId != OpenRCT2::Audio::SoundId::null) { if (currentSoundId == targetSoundId) { @@ -1230,14 +1230,14 @@ static SoundIdVolume VehicleSoundFadeInOut( void Vehicle::GetLiftHillSound(const Ride& curRide, SoundIdVolume& curSound) { - scream_sound_id = OpenRCT2::Audio::SoundId::Null; + scream_sound_id = OpenRCT2::Audio::SoundId::null; if (curRide.type < std::size(kRideTypeDescriptors)) { // Get lift hill sound curSound.id = GetRideTypeDescriptor(curRide.type).LiftData.sound_id; curSound.volume = 243; if (!(sound2_flags & VEHICLE_SOUND2_FLAGS_LIFT_HILL)) - curSound.id = OpenRCT2::Audio::SoundId::Null; + curSound.id = OpenRCT2::Audio::SoundId::null; } } @@ -2529,15 +2529,15 @@ void Vehicle::UpdateDeparting() if (rideEntry->flags & RIDE_ENTRY_FLAG_PLAY_DEPART_SOUND) { - auto soundId = (rideEntry->Cars[0].soundRange == SoundRange::tramBell) ? OpenRCT2::Audio::SoundId::Tram - : OpenRCT2::Audio::SoundId::TrainDeparting; + auto soundId = (rideEntry->Cars[0].soundRange == SoundRange::tramBell) ? OpenRCT2::Audio::SoundId::tram + : OpenRCT2::Audio::SoundId::trainDeparting; OpenRCT2::Audio::Play3D(soundId, GetLocation()); } if (curRide->mode == RideMode::upwardLaunch || (curRide->mode == RideMode::downwardLaunch && NumLaunches > 1)) { - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::RideLaunch2, GetLocation()); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::rideLaunch2, GetLocation()); } if (!(curRide->lifecycleFlags & RIDE_LIFECYCLE_TESTED)) @@ -2743,7 +2743,7 @@ void Vehicle::FinishDeparting() if (NumLaunches >= 1 && (14 << 16) > velocity) return; - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::RideLaunch1, GetLocation()); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::rideLaunch1, GetLocation()); } if (curRide->mode == RideMode::upwardLaunch) @@ -2751,7 +2751,7 @@ void Vehicle::FinishDeparting() if ((curRide->launchSpeed << 16) > velocity) return; - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::RideLaunch1, GetLocation()); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::rideLaunch1, GetLocation()); } if (curRide->mode != RideMode::race && !curRide->isBlockSectioned()) @@ -2887,7 +2887,7 @@ void Vehicle::UpdateCollisionSetup() #endif const auto trainLoc = train->GetLocation(); - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::Crash, trainLoc); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::crash, trainLoc); ExplosionCloud::Create(trainLoc); @@ -2947,7 +2947,7 @@ void Vehicle::UpdateCrashSetup() if (NumPeepsUntilTrainTail() != 0) { - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::HauntedHouseScream2, GetLocation()); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::hauntedHouseScream2, GetLocation()); } int32_t edx = velocity >> 10; @@ -3384,7 +3384,7 @@ void Vehicle::UpdateArriving() if ((curRide->mode == RideMode::upwardLaunch || curRide->mode == RideMode::downwardLaunch) && NumLaunches < 2) { - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::RideLaunch2, GetLocation()); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::rideLaunch2, GetLocation()); velocity = 0; acceleration = 0; SetState(Vehicle::Status::Departing, 1); @@ -4393,24 +4393,24 @@ void Vehicle::UpdateHauntedHouseOperating() switch (current_time) { case 45: - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::HauntedHouseScare, GetLocation()); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::hauntedHouseScare, GetLocation()); break; case 75: flatRideAnimationFrame = 1; Invalidate(); break; case 400: - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::HauntedHouseScream1, GetLocation()); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::hauntedHouseScream1, GetLocation()); break; case 745: - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::HauntedHouseScare, GetLocation()); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::hauntedHouseScare, GetLocation()); break; case 775: flatRideAnimationFrame = 1; Invalidate(); break; case 1100: - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::HauntedHouseScream2, GetLocation()); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::hauntedHouseScream2, GetLocation()); break; } } @@ -4674,7 +4674,7 @@ void Vehicle::CrashOnLand() sub_state = 2; const auto curLoc = GetLocation(); - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::Crash, curLoc); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::crash, curLoc); ExplosionCloud::Create(curLoc); ExplosionFlare::Create(curLoc); @@ -4742,7 +4742,7 @@ void Vehicle::CrashOnWater() sub_state = 2; const auto curLoc = GetLocation(); - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::Water1, curLoc); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::water1, curLoc); CrashSplashParticle::Create(curLoc); CrashSplashParticle::Create(curLoc + CoordsXYZ{ -8, -9, 0 }); @@ -4863,9 +4863,9 @@ void Vehicle::UpdateCrash() void Vehicle::UpdateSound() { // frictionVolume (bl) should be set before hand - SoundIdVolume frictionSound = { OpenRCT2::Audio::SoundId::Null, 255 }; + SoundIdVolume frictionSound = { OpenRCT2::Audio::SoundId::null, 255 }; // bh screamVolume should be set before hand - SoundIdVolume screamSound = { OpenRCT2::Audio::SoundId::Null, 255 }; + SoundIdVolume screamSound = { OpenRCT2::Audio::SoundId::null, 255 }; auto curRide = GetRide(); if (curRide == nullptr) @@ -4894,7 +4894,7 @@ void Vehicle::UpdateSound() screamSound.id = scream_sound_id; if (!(currentTicks & 0x7F)) { - if (velocity < 4.0_mph || scream_sound_id != OpenRCT2::Audio::SoundId::Null) + if (velocity < 4.0_mph || scream_sound_id != OpenRCT2::Audio::SoundId::null) { GetLiftHillSound(*curRide, screamSound); break; @@ -4902,13 +4902,13 @@ void Vehicle::UpdateSound() if ((ScenarioRand() & 0xFFFF) <= 0x5555) { - scream_sound_id = OpenRCT2::Audio::SoundId::TrainWhistle; + scream_sound_id = OpenRCT2::Audio::SoundId::trainWhistle; screamSound.volume = 255; break; } } - if (screamSound.id == OpenRCT2::Audio::SoundId::NoScream) - screamSound.id = OpenRCT2::Audio::SoundId::Null; + if (screamSound.id == OpenRCT2::Audio::SoundId::noScream) + screamSound.id = OpenRCT2::Audio::SoundId::null; screamSound.volume = 255; break; @@ -4916,7 +4916,7 @@ void Vehicle::UpdateSound() screamSound.id = scream_sound_id; if (!(currentTicks & 0x7F)) { - if (velocity < 4.0_mph || scream_sound_id != OpenRCT2::Audio::SoundId::Null) + if (velocity < 4.0_mph || scream_sound_id != OpenRCT2::Audio::SoundId::null) { GetLiftHillSound(*curRide, screamSound); break; @@ -4924,13 +4924,13 @@ void Vehicle::UpdateSound() if ((ScenarioRand() & 0xFFFF) <= 0x5555) { - scream_sound_id = OpenRCT2::Audio::SoundId::Tram; + scream_sound_id = OpenRCT2::Audio::SoundId::tram; screamSound.volume = 255; break; } } - if (screamSound.id == OpenRCT2::Audio::SoundId::NoScream) - screamSound.id = OpenRCT2::Audio::SoundId::Null; + if (screamSound.id == OpenRCT2::Audio::SoundId::noScream) + screamSound.id = OpenRCT2::Audio::SoundId::null; screamSound.volume = 255; break; @@ -4938,12 +4938,12 @@ void Vehicle::UpdateSound() if ((carEntry.flags & CAR_ENTRY_FLAG_RIDERS_SCREAM)) { screamSound.id = UpdateScreamSound(); - if (screamSound.id == OpenRCT2::Audio::SoundId::NoScream) + if (screamSound.id == OpenRCT2::Audio::SoundId::noScream) { - screamSound.id = OpenRCT2::Audio::SoundId::Null; + screamSound.id = OpenRCT2::Audio::SoundId::null; break; } - if (screamSound.id != OpenRCT2::Audio::SoundId::Null) + if (screamSound.id != OpenRCT2::Audio::SoundId::null) { break; } @@ -4977,12 +4977,12 @@ OpenRCT2::Audio::SoundId Vehicle::UpdateScreamSound() { int32_t totalNumPeeps = NumPeepsUntilTrainTail(); if (totalNumPeeps == 0) - return OpenRCT2::Audio::SoundId::Null; + return OpenRCT2::Audio::SoundId::null; if (velocity < 0) { if (velocity > -2.75_mph) - return OpenRCT2::Audio::SoundId::Null; + return OpenRCT2::Audio::SoundId::null; for (Vehicle* vehicle2 = getGameState().entities.GetEntity(Id); vehicle2 != nullptr; vehicle2 = getGameState().entities.GetEntity(vehicle2->next_vehicle_on_train)) @@ -5000,11 +5000,11 @@ OpenRCT2::Audio::SoundId Vehicle::UpdateScreamSound() if (vehicle2->pitch == VehiclePitch::up50) return ProduceScreamSound(totalNumPeeps); } - return OpenRCT2::Audio::SoundId::Null; + return OpenRCT2::Audio::SoundId::null; } if (velocity < 2.75_mph) - return OpenRCT2::Audio::SoundId::Null; + return OpenRCT2::Audio::SoundId::null; for (Vehicle* vehicle2 = getGameState().entities.GetEntity(Id); vehicle2 != nullptr; vehicle2 = getGameState().entities.GetEntity(vehicle2->next_vehicle_on_train)) @@ -5022,7 +5022,7 @@ OpenRCT2::Audio::SoundId Vehicle::UpdateScreamSound() if (vehicle2->pitch == VehiclePitch::down50) return ProduceScreamSound(totalNumPeeps); } - return OpenRCT2::Audio::SoundId::Null; + return OpenRCT2::Audio::SoundId::null; } OpenRCT2::Audio::SoundId Vehicle::ProduceScreamSound(const int32_t totalNumPeeps) @@ -5031,7 +5031,7 @@ OpenRCT2::Audio::SoundId Vehicle::ProduceScreamSound(const int32_t totalNumPeeps const auto& carEntry = rideEntry->Cars[vehicle_type]; - if (scream_sound_id == OpenRCT2::Audio::SoundId::Null) + if (scream_sound_id == OpenRCT2::Audio::SoundId::null) { auto r = ScenarioRand(); if (totalNumPeeps >= static_cast(r % 16)) @@ -5048,13 +5048,13 @@ OpenRCT2::Audio::SoundId Vehicle::ProduceScreamSound(const int32_t totalNumPeeps scream_sound_id = _screamSetSteel[r % std::size(_screamSetSteel)]; break; default: - scream_sound_id = OpenRCT2::Audio::SoundId::NoScream; + scream_sound_id = OpenRCT2::Audio::SoundId::noScream; break; } } else { - scream_sound_id = OpenRCT2::Audio::SoundId::NoScream; + scream_sound_id = OpenRCT2::Audio::SoundId::noScream; } } return scream_sound_id; @@ -5663,11 +5663,11 @@ static void BlockBrakesOpenPreviousSection(const Ride& ride, const CoordsXYZ& ve auto trackType = trackElement->GetTrackType(); if (trackType == TrackElemType::EndStation) { - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::BlockBrakeClose, location); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::blockBrakeClose, location); } else if (TrackTypeIsBlockBrakes(trackType)) { - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::BlockBrakeClose, location); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::blockBrakeClose, location); BlockBrakeSetLinkedBrakesClosed(location, *trackElement, false); } } @@ -6489,7 +6489,7 @@ static void vehicle_update_play_water_splash_sound() } OpenRCT2::Audio::Play3D( - OpenRCT2::Audio::SoundId::WaterSplash, { _vehicleCurPosition.x, _vehicleCurPosition.y, _vehicleCurPosition.z }); + OpenRCT2::Audio::SoundId::waterSplash, { _vehicleCurPosition.x, _vehicleCurPosition.y, _vehicleCurPosition.z }); } /** @@ -6979,7 +6979,7 @@ bool Vehicle::UpdateTrackMotionForwardsGetNewTrack( { if (!(rideEntry.Cars[0].flags & CAR_ENTRY_FLAG_POWERED)) { - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::BlockBrakeRelease, TrackLocation); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::blockBrakeRelease, TrackLocation); } } MapInvalidateElement(TrackLocation, tileElement); @@ -7191,7 +7191,7 @@ bool Vehicle::UpdateTrackMotionForwards(const CarEntry* carEntry, const Ride& cu if (_vehicleF64E2C == 0) { _vehicleF64E2C++; - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::BrakeRelease, { x, y, z }); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::brakeRelease, { x, y, z }); } } } @@ -8927,10 +8927,10 @@ void Vehicle::Claxon() const switch (rideEntry->Cars[vehicle_type].soundRange) { case SoundRange::steamWhistle: - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::TrainWhistle, { x, y, z }); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::trainWhistle, { x, y, z }); break; case SoundRange::tramBell: - OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::Tram, { x, y, z }); + OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::tram, { x, y, z }); break; default: break; diff --git a/src/openrct2/ride/rtd/coaster/AirPoweredVerticalCoaster.h b/src/openrct2/ride/rtd/coaster/AirPoweredVerticalCoaster.h index c721b27252..f2bd725c52 100644 --- a/src/openrct2/ride/rtd/coaster/AirPoweredVerticalCoaster.h +++ b/src/openrct2/ride/rtd/coaster/AirPoweredVerticalCoaster.h @@ -40,7 +40,7 @@ constexpr RideTypeDescriptor AirPoweredVerticalCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 255, 32, 4, 7, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 44, 66, 10 }, .UpkeepCosts = { 90, 20, 0, 0, 0, 10 }, .BuildCosts = { 100.00_GBP, 0.00_GBP, 45, }, diff --git a/src/openrct2/ride/rtd/coaster/AlpineCoaster.h b/src/openrct2/ride/rtd/coaster/AlpineCoaster.h index d5dc09b0ff..325e472337 100644 --- a/src/openrct2/ride/rtd/coaster/AlpineCoaster.h +++ b/src/openrct2/ride/rtd/coaster/AlpineCoaster.h @@ -41,7 +41,7 @@ constexpr RideTypeDescriptor AlpineCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = {18, 24, 3, 7}, .MaxMass = 4, - .LiftData = { Audio::SoundId::Null, 4, 5 }, + .LiftData = { Audio::SoundId::null, 4, 5 }, .RatingsMultipliers = { 50, 30, 10 }, .UpkeepCosts = { 35, 20, 80, 8, 3, 10 }, .BuildCosts = { 22.50_GBP, 2.50_GBP, 50}, diff --git a/src/openrct2/ride/rtd/coaster/BobsleighCoaster.h b/src/openrct2/ride/rtd/coaster/BobsleighCoaster.h index 4f9cc1cab7..0c13d8d357 100644 --- a/src/openrct2/ride/rtd/coaster/BobsleighCoaster.h +++ b/src/openrct2/ride/rtd/coaster/BobsleighCoaster.h @@ -38,7 +38,7 @@ constexpr RideTypeDescriptor BobsleighCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 19, 24, 5, 7, }, .MaxMass = 25, - .LiftData = { Audio::SoundId::LiftFrictionWheels, 4, 5 }, + .LiftData = { Audio::SoundId::liftFrictionWheels, 4, 5 }, .RatingsMultipliers = { 50, 30, 10 }, .UpkeepCosts = { 40, 20, 80, 10, 3, 10 }, .BuildCosts = { 40.00_GBP, 2.50_GBP, 45, }, diff --git a/src/openrct2/ride/rtd/coaster/ClassicMiniRollerCoaster.h b/src/openrct2/ride/rtd/coaster/ClassicMiniRollerCoaster.h index f57214d7bd..feb70bdc42 100644 --- a/src/openrct2/ride/rtd/coaster/ClassicMiniRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ClassicMiniRollerCoaster.h @@ -40,7 +40,7 @@ constexpr RideTypeDescriptor ClassicMiniRollerCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 15, 24, 4, 7, }, .MaxMass = 18, - .LiftData = { Audio::SoundId::LiftFrictionWheels, 4, 6 }, + .LiftData = { Audio::SoundId::liftFrictionWheels, 4, 6 }, .RatingsMultipliers = { 50, 30, 10 }, .UpkeepCosts = { 40, 20, 80, 8, 3, 5 }, .BuildCosts = { 22.50_GBP, 2.00_GBP, 40, }, diff --git a/src/openrct2/ride/rtd/coaster/ClassicStandUpRollerCoaster.h b/src/openrct2/ride/rtd/coaster/ClassicStandUpRollerCoaster.h index 004abe1ee0..4c64595d3e 100644 --- a/src/openrct2/ride/rtd/coaster/ClassicStandUpRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ClassicStandUpRollerCoaster.h @@ -39,7 +39,7 @@ constexpr RideTypeDescriptor ClassicStandUpRollerCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 30, 24, 9, 11, }, .MaxMass = 18, - .LiftData = { Audio::SoundId::LiftClassic, 4, 6 }, + .LiftData = { Audio::SoundId::liftClassic, 4, 6 }, .RatingsMultipliers = { 50, 30, 10 }, .UpkeepCosts = { 40, 20, 80, 10, 3, 10 }, .BuildCosts = { 50.00_GBP, 2.50_GBP, 50, }, diff --git a/src/openrct2/ride/rtd/coaster/ClassicWoodenRollerCoaster.h b/src/openrct2/ride/rtd/coaster/ClassicWoodenRollerCoaster.h index 23154067c9..2ac60aa5fe 100644 --- a/src/openrct2/ride/rtd/coaster/ClassicWoodenRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ClassicWoodenRollerCoaster.h @@ -40,7 +40,7 @@ constexpr RideTypeDescriptor ClassicWoodenRollerCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 24, 24, 8, 11, }, .MaxMass = 19, - .LiftData = { Audio::SoundId::LiftWood, 3, 5 }, + .LiftData = { Audio::SoundId::liftWood, 3, 5 }, .RatingsMultipliers = { 52, 33, 4 }, .UpkeepCosts = { 40, 20, 80, 10, 3, 10 }, .BuildCosts = {37.50_GBP, 3.50_GBP, 50, }, diff --git a/src/openrct2/ride/rtd/coaster/ClassicWoodenTwisterRollerCoaster.h b/src/openrct2/ride/rtd/coaster/ClassicWoodenTwisterRollerCoaster.h index 29de12d602..f0288c7402 100644 --- a/src/openrct2/ride/rtd/coaster/ClassicWoodenTwisterRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ClassicWoodenTwisterRollerCoaster.h @@ -40,7 +40,7 @@ constexpr RideTypeDescriptor ClassicWoodenTwisterRollerCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 24, 24, 8, 11, }, .MaxMass = 19, - .LiftData = { Audio::SoundId::LiftWood, 3, 5 }, + .LiftData = { Audio::SoundId::liftWood, 3, 5 }, .RatingsMultipliers = { 52, 33, 4 }, .UpkeepCosts = { 40, 20, 80, 10, 3, 10 }, .BuildCosts = {37.50_GBP, 3.50_GBP, 50, }, diff --git a/src/openrct2/ride/rtd/coaster/CompactInvertedCoaster.h b/src/openrct2/ride/rtd/coaster/CompactInvertedCoaster.h index 48e1c0ce4e..b95ec0f80b 100644 --- a/src/openrct2/ride/rtd/coaster/CompactInvertedCoaster.h +++ b/src/openrct2/ride/rtd/coaster/CompactInvertedCoaster.h @@ -39,7 +39,7 @@ constexpr RideTypeDescriptor CompactInvertedCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 27, 40, 29, 8, }, .MaxMass = 18, - .LiftData = { Audio::SoundId::LiftClassic, 4, 6 }, + .LiftData = { Audio::SoundId::liftClassic, 4, 6 }, .RatingsMultipliers = { 50, 30, 10 }, .UpkeepCosts = { 40, 20, 80, 13, 3, 10 }, .BuildCosts = { 50.00_GBP, 2.50_GBP, 50, }, diff --git a/src/openrct2/ride/rtd/coaster/CorkscrewRollerCoaster.h b/src/openrct2/ride/rtd/coaster/CorkscrewRollerCoaster.h index e295a55b94..91436f9fda 100644 --- a/src/openrct2/ride/rtd/coaster/CorkscrewRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/CorkscrewRollerCoaster.h @@ -41,7 +41,7 @@ constexpr RideTypeDescriptor CorkscrewRollerCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 28, 24, 8, 11, }, .MaxMass = 18, - .LiftData = { Audio::SoundId::LiftArrow, 4, 6 }, + .LiftData = { Audio::SoundId::liftArrow, 4, 6 }, .RatingsMultipliers = { 50, 30, 10 }, .UpkeepCosts = { 40, 20, 80, 11, 3, 10 }, .BuildCosts = { 52.50_GBP, 2.50_GBP, 50, }, diff --git a/src/openrct2/ride/rtd/coaster/FlyingRollerCoaster.h b/src/openrct2/ride/rtd/coaster/FlyingRollerCoaster.h index a9b5a19681..2a0646fa2b 100644 --- a/src/openrct2/ride/rtd/coaster/FlyingRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/FlyingRollerCoaster.h @@ -47,7 +47,7 @@ constexpr RideTypeDescriptor FlyingRollerCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 30, 24, 8, 11, }, .MaxMass = 35, - .LiftData = { Audio::SoundId::LiftBM, 4, 6 }, + .LiftData = { Audio::SoundId::liftBM, 4, 6 }, .RatingsMultipliers = { 50, 30, 10 }, .UpkeepCosts = { 49, 20, 90, 11, 3, 15 }, .BuildCosts = { 62.50_GBP, 2.50_GBP, 50, }, @@ -122,7 +122,7 @@ constexpr RideTypeDescriptor FlyingRollerCoasterAltRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 30, 24, 8, 11, }, .MaxMass = 35, - .LiftData = { Audio::SoundId::LiftBM, 4, 6 }, + .LiftData = { Audio::SoundId::liftBM, 4, 6 }, .RatingsMultipliers = { 50, 30, 10 }, .UpkeepCosts = { 49, 20, 90, 11, 3, 15 }, .BuildCosts = { 62.50_GBP, 2.50_GBP, 50, }, diff --git a/src/openrct2/ride/rtd/coaster/GigaCoaster.h b/src/openrct2/ride/rtd/coaster/GigaCoaster.h index fd8429e670..cc2aa4d3ec 100644 --- a/src/openrct2/ride/rtd/coaster/GigaCoaster.h +++ b/src/openrct2/ride/rtd/coaster/GigaCoaster.h @@ -42,7 +42,7 @@ constexpr RideTypeDescriptor GigaCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 86, 24, 9, 11, }, .MaxMass = 31, - .LiftData = { Audio::SoundId::LiftClassic, 5, 8 }, + .LiftData = { Audio::SoundId::liftClassic, 5, 8 }, .RatingsMultipliers = { 51, 32, 10 }, .UpkeepCosts = { 10, 20, 80, 12, 3, 40 }, .BuildCosts = { 60.00_GBP, 2.50_GBP, 55, }, diff --git a/src/openrct2/ride/rtd/coaster/HeartlineTwisterCoaster.h b/src/openrct2/ride/rtd/coaster/HeartlineTwisterCoaster.h index 11b75a7cf8..5a27b99d2b 100644 --- a/src/openrct2/ride/rtd/coaster/HeartlineTwisterCoaster.h +++ b/src/openrct2/ride/rtd/coaster/HeartlineTwisterCoaster.h @@ -41,7 +41,7 @@ constexpr RideTypeDescriptor HeartlineTwisterCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 22, 24, 15, 9, }, .MaxMass = 18, - .LiftData = { Audio::SoundId::LiftClassic, 4, 6 }, + .LiftData = { Audio::SoundId::liftClassic, 4, 6 }, .RatingsMultipliers = { 50, 30, 10 }, .UpkeepCosts = { 47, 20, 80, 11, 3, 10 }, .BuildCosts = { 72.50_GBP, 3.50_GBP, 30, }, diff --git a/src/openrct2/ride/rtd/coaster/HybridCoaster.h b/src/openrct2/ride/rtd/coaster/HybridCoaster.h index a03d7d832b..1080ef2825 100644 --- a/src/openrct2/ride/rtd/coaster/HybridCoaster.h +++ b/src/openrct2/ride/rtd/coaster/HybridCoaster.h @@ -40,7 +40,7 @@ constexpr RideTypeDescriptor HybridCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 43, 24, 13, 13}, .MaxMass = 18, - .LiftData = { Audio::SoundId::LiftRMC, 5, 11 }, + .LiftData = { Audio::SoundId::liftRMC, 5, 11 }, .RatingsMultipliers = { 52, 36, 10 }, .UpkeepCosts = { 40, 20, 80, 10, 3, 10 }, .BuildCosts = { 65.00_GBP, 3.50_GBP, 55}, diff --git a/src/openrct2/ride/rtd/coaster/HyperTwister.h b/src/openrct2/ride/rtd/coaster/HyperTwister.h index 4300644aa9..95f6eb040a 100644 --- a/src/openrct2/ride/rtd/coaster/HyperTwister.h +++ b/src/openrct2/ride/rtd/coaster/HyperTwister.h @@ -43,7 +43,7 @@ constexpr RideTypeDescriptor HyperTwisterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 61, 24, 8, 9, }, .MaxMass = 31, - .LiftData = { Audio::SoundId::LiftBM, 5, 8 }, + .LiftData = { Audio::SoundId::liftBM, 5, 8 }, .RatingsMultipliers = { 52, 36, 10 }, .UpkeepCosts = { 43, 20, 80, 11, 3, 10 }, .BuildCosts = { 60.00_GBP, 2.50_GBP, 55, }, diff --git a/src/openrct2/ride/rtd/coaster/Hypercoaster.h b/src/openrct2/ride/rtd/coaster/Hypercoaster.h index fb7cb83311..22accb8a5b 100644 --- a/src/openrct2/ride/rtd/coaster/Hypercoaster.h +++ b/src/openrct2/ride/rtd/coaster/Hypercoaster.h @@ -42,7 +42,7 @@ constexpr RideTypeDescriptor HypercoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 55, 24, 8, 11, }, .MaxMass = 18, - .LiftData = { Audio::SoundId::LiftArrow, 4, 6 }, + .LiftData = { Audio::SoundId::liftArrow, 4, 6 }, .RatingsMultipliers = { 50, 30, 10 }, .UpkeepCosts = { 40, 20, 80, 11, 3, 10 }, .BuildCosts = { 52.50_GBP, 2.50_GBP, 50, }, diff --git a/src/openrct2/ride/rtd/coaster/InvertedHairpinCoaster.h b/src/openrct2/ride/rtd/coaster/InvertedHairpinCoaster.h index 5fbc95b7fc..37f79f03c1 100644 --- a/src/openrct2/ride/rtd/coaster/InvertedHairpinCoaster.h +++ b/src/openrct2/ride/rtd/coaster/InvertedHairpinCoaster.h @@ -38,7 +38,7 @@ constexpr RideTypeDescriptor InvertedHairpinCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 16, 24, 24, 7, }, .MaxMass = 4, - .LiftData = { Audio::SoundId::LiftWildMouse, 4, 6 }, + .LiftData = { Audio::SoundId::liftWildMouse, 4, 6 }, .RatingsMultipliers = { 50, 30, 30 }, .UpkeepCosts = { 40, 20, 80, 9, 3, 10 }, .BuildCosts = { 33.50_GBP, 2.00_GBP, 40, }, diff --git a/src/openrct2/ride/rtd/coaster/InvertedImpulseCoaster.h b/src/openrct2/ride/rtd/coaster/InvertedImpulseCoaster.h index 9cc7840e7e..a7eff1cb16 100644 --- a/src/openrct2/ride/rtd/coaster/InvertedImpulseCoaster.h +++ b/src/openrct2/ride/rtd/coaster/InvertedImpulseCoaster.h @@ -41,7 +41,7 @@ constexpr RideTypeDescriptor InvertedImpulseCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 45, 40, 29, 8, }, .MaxMass = 23, - .LiftData = { Audio::SoundId::LiftClassic, 4, 7 }, + .LiftData = { Audio::SoundId::liftClassic, 4, 7 }, .RatingsMultipliers = { 50, 30, 10 }, .UpkeepCosts = { 180, 20, 80, 11, 3, 10 }, .BuildCosts = { 62.50_GBP, 2.50_GBP, 25, }, diff --git a/src/openrct2/ride/rtd/coaster/InvertedRollerCoaster.h b/src/openrct2/ride/rtd/coaster/InvertedRollerCoaster.h index 02e0223d78..c81d48a286 100644 --- a/src/openrct2/ride/rtd/coaster/InvertedRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/InvertedRollerCoaster.h @@ -41,7 +41,7 @@ constexpr RideTypeDescriptor InvertedRollerCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 42, 40, 29, 8, }, .MaxMass = 27, - .LiftData = { Audio::SoundId::LiftBM, 5, 7 }, + .LiftData = { Audio::SoundId::liftBM, 5, 7 }, .RatingsMultipliers = { 50, 30, 10 }, .UpkeepCosts = { 40, 20, 80, 13, 3, 10 }, .BuildCosts = { 65.00_GBP, 2.50_GBP, 50, }, diff --git a/src/openrct2/ride/rtd/coaster/JuniorRollerCoaster.h b/src/openrct2/ride/rtd/coaster/JuniorRollerCoaster.h index 2ab9cdd8e3..5fbef682ff 100644 --- a/src/openrct2/ride/rtd/coaster/JuniorRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/JuniorRollerCoaster.h @@ -41,7 +41,7 @@ constexpr RideTypeDescriptor JuniorRollerCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 12, 24, 4, 7, }, .MaxMass = 18, - .LiftData = { Audio::SoundId::LiftFrictionWheels, 4, 6 }, + .LiftData = { Audio::SoundId::liftFrictionWheels, 4, 6 }, .RatingsMultipliers = { 50, 30, 10 }, .UpkeepCosts = { 40, 20, 80, 8, 3, 5 }, .BuildCosts = { 22.50_GBP, 2.00_GBP, 40, }, diff --git a/src/openrct2/ride/rtd/coaster/LIMLaunchedRollerCoaster.h b/src/openrct2/ride/rtd/coaster/LIMLaunchedRollerCoaster.h index f479266da8..98c88effbe 100644 --- a/src/openrct2/ride/rtd/coaster/LIMLaunchedRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/LIMLaunchedRollerCoaster.h @@ -41,7 +41,7 @@ constexpr RideTypeDescriptor LIMLaunchedRollerCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 35, 24, 5, 7, }, .MaxMass = 18, - .LiftData = { Audio::SoundId::Null, 4, 6 }, + .LiftData = { Audio::SoundId::null, 4, 6 }, .RatingsMultipliers = { 50, 30, 10 }, .UpkeepCosts = { 42, 20, 80, 9, 3, 10 }, .BuildCosts = { 47.50_GBP, 2.50_GBP, 50, }, diff --git a/src/openrct2/ride/rtd/coaster/LSMLaunchedRollerCoaster.h b/src/openrct2/ride/rtd/coaster/LSMLaunchedRollerCoaster.h index 31517df8fd..e755dc72b2 100644 --- a/src/openrct2/ride/rtd/coaster/LSMLaunchedRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/LSMLaunchedRollerCoaster.h @@ -42,7 +42,7 @@ constexpr RideTypeDescriptor LSMLaunchedRollerCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 33, 24, 9, 11, }, .MaxMass = 31, - .LiftData = { Audio::SoundId::LiftClassic, 5, 5 }, + .LiftData = { Audio::SoundId::liftClassic, 5, 5 }, .RatingsMultipliers = { 51, 32, 10 }, .UpkeepCosts = { 10, 20, 80, 12, 3, 40 }, .BuildCosts = { 57.00_GBP, 2.50_GBP, 55, }, diff --git a/src/openrct2/ride/rtd/coaster/LayDownRollerCoaster.h b/src/openrct2/ride/rtd/coaster/LayDownRollerCoaster.h index 3b706eadaa..b63acb9402 100644 --- a/src/openrct2/ride/rtd/coaster/LayDownRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/LayDownRollerCoaster.h @@ -50,7 +50,7 @@ constexpr RideTypeDescriptor LayDownRollerCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 26, 24, 8, 11, }, .MaxMass = 25, - .LiftData = { Audio::SoundId::LiftClassic, 4, 6 }, + .LiftData = { Audio::SoundId::liftClassic, 4, 6 }, .RatingsMultipliers = { 50, 30, 10 }, .UpkeepCosts = { 49, 20, 90, 11, 3, 15 }, .BuildCosts = { 53.50_GBP, 2.50_GBP, 50, }, @@ -121,7 +121,7 @@ constexpr RideTypeDescriptor LayDownRollerCoasterAltRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 26, 24, 8, 11, }, .MaxMass = 25, - .LiftData = { Audio::SoundId::LiftClassic, 4, 6 }, + .LiftData = { Audio::SoundId::liftClassic, 4, 6 }, .RatingsMultipliers = { 50, 30, 10 }, .UpkeepCosts = { 49, 20, 90, 11, 3, 15 }, .BuildCosts = { 53.50_GBP, 2.50_GBP, 50, }, diff --git a/src/openrct2/ride/rtd/coaster/LoopingRollerCoaster.h b/src/openrct2/ride/rtd/coaster/LoopingRollerCoaster.h index 861230adcd..fb417955b8 100644 --- a/src/openrct2/ride/rtd/coaster/LoopingRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/LoopingRollerCoaster.h @@ -41,7 +41,7 @@ constexpr RideTypeDescriptor LoopingRollerCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 35, 24, 5, 7, }, .MaxMass = 18, - .LiftData = { Audio::SoundId::LiftClassic, 4, 6 }, + .LiftData = { Audio::SoundId::liftClassic, 4, 6 }, .RatingsMultipliers = { 50, 30, 10 }, .UpkeepCosts = { 40, 20, 80, 10, 3, 10 }, .BuildCosts = { 45.00_GBP, 2.50_GBP, 50, }, diff --git a/src/openrct2/ride/rtd/coaster/MineRide.h b/src/openrct2/ride/rtd/coaster/MineRide.h index d7796b3fd1..c4ff7c9024 100644 --- a/src/openrct2/ride/rtd/coaster/MineRide.h +++ b/src/openrct2/ride/rtd/coaster/MineRide.h @@ -38,7 +38,7 @@ constexpr RideTypeDescriptor MineRideRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 13, 24, 9, 11, }, .MaxMass = 27, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 60, 20, 10 }, .UpkeepCosts = { 50, 20, 80, 10, 3, 10 }, .BuildCosts = { 42.50_GBP, 2.00_GBP, 40, }, diff --git a/src/openrct2/ride/rtd/coaster/MineTrainCoaster.h b/src/openrct2/ride/rtd/coaster/MineTrainCoaster.h index 5f89cca1a9..a5440cdb2e 100644 --- a/src/openrct2/ride/rtd/coaster/MineTrainCoaster.h +++ b/src/openrct2/ride/rtd/coaster/MineTrainCoaster.h @@ -39,7 +39,7 @@ constexpr RideTypeDescriptor MineTrainCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 21, 24, 4, 7, }, .MaxMass = 15, - .LiftData = { Audio::SoundId::LiftArrow, 4, 6 }, + .LiftData = { Audio::SoundId::liftArrow, 4, 6 }, .RatingsMultipliers = { 50, 30, 10 }, .UpkeepCosts = { 40, 20, 80, 10, 3, 10 }, .BuildCosts = { 41.00_GBP, 3.00_GBP, 50, }, diff --git a/src/openrct2/ride/rtd/coaster/MiniRollerCoaster.h b/src/openrct2/ride/rtd/coaster/MiniRollerCoaster.h index c0375f12e8..6b5af8fc79 100644 --- a/src/openrct2/ride/rtd/coaster/MiniRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/MiniRollerCoaster.h @@ -40,7 +40,7 @@ constexpr RideTypeDescriptor MiniRollerCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 16, 24, 9, 11, }, .MaxMass = 10, - .LiftData = { Audio::SoundId::LiftClassic, 4, 6 }, + .LiftData = { Audio::SoundId::liftClassic, 4, 6 }, .RatingsMultipliers = { 50, 30, 10 }, .UpkeepCosts = { 35, 20, 80, 8, 3, 10 }, .BuildCosts = { 32.50_GBP, 2.00_GBP, 40, }, diff --git a/src/openrct2/ride/rtd/coaster/MiniSuspendedCoaster.h b/src/openrct2/ride/rtd/coaster/MiniSuspendedCoaster.h index 517e54332b..caae9bed77 100644 --- a/src/openrct2/ride/rtd/coaster/MiniSuspendedCoaster.h +++ b/src/openrct2/ride/rtd/coaster/MiniSuspendedCoaster.h @@ -38,7 +38,7 @@ constexpr RideTypeDescriptor MiniSuspendedCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 10, 24, 24, 8, }, .MaxMass = 3, - .LiftData = { Audio::SoundId::LiftFrictionWheels, 4, 5 }, + .LiftData = { Audio::SoundId::liftFrictionWheels, 4, 5 }, .RatingsMultipliers = { 50, 30, 10 }, .UpkeepCosts = { 40, 20, 80, 10, 3, 10 }, .BuildCosts = { 30.00_GBP, 2.50_GBP, 40, }, diff --git a/src/openrct2/ride/rtd/coaster/MultiDimensionRollerCoaster.h b/src/openrct2/ride/rtd/coaster/MultiDimensionRollerCoaster.h index b6df4db17a..2e43731e8c 100644 --- a/src/openrct2/ride/rtd/coaster/MultiDimensionRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/MultiDimensionRollerCoaster.h @@ -47,7 +47,7 @@ constexpr RideTypeDescriptor MultiDimensionRollerCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 40, 24, 8, 11, }, .MaxMass = 78, - .LiftData = { Audio::SoundId::LiftFrictionWheels, 4, 6 }, + .LiftData = { Audio::SoundId::liftFrictionWheels, 4, 6 }, .RatingsMultipliers = { 50, 30, 10 }, .UpkeepCosts = { 75, 20, 90, 11, 3, 15 }, .BuildCosts = { 90.00_GBP, 2.50_GBP, 50, }, @@ -121,7 +121,7 @@ constexpr RideTypeDescriptor MultiDimensionRollerCoasterAltRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 40, 24, 8, 11, }, .MaxMass = 78, - .LiftData = { Audio::SoundId::LiftFrictionWheels, 4, 6 }, + .LiftData = { Audio::SoundId::liftFrictionWheels, 4, 6 }, .RatingsMultipliers = { 50, 30, 10 }, .UpkeepCosts = { 75, 20, 90, 11, 3, 15 }, .BuildCosts = { 90.00_GBP, 2.50_GBP, 50, }, diff --git a/src/openrct2/ride/rtd/coaster/ReverseFreefallCoaster.h b/src/openrct2/ride/rtd/coaster/ReverseFreefallCoaster.h index aa0d08e84f..3e845cb9e4 100644 --- a/src/openrct2/ride/rtd/coaster/ReverseFreefallCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ReverseFreefallCoaster.h @@ -41,7 +41,7 @@ constexpr RideTypeDescriptor ReverseFreefallCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 255, 32, 4, 7, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 44, 66, 10 }, .UpkeepCosts = { 80, 20, 0, 0, 0, 10 }, .BuildCosts = { 100.00_GBP, 0.00_GBP, 45, }, diff --git a/src/openrct2/ride/rtd/coaster/ReverserRollerCoaster.h b/src/openrct2/ride/rtd/coaster/ReverserRollerCoaster.h index 94a4ebac80..9392d5632b 100644 --- a/src/openrct2/ride/rtd/coaster/ReverserRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/ReverserRollerCoaster.h @@ -38,7 +38,7 @@ constexpr RideTypeDescriptor ReverserRollerCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 18, 24, 8, 11, }, .MaxMass = 15, - .LiftData = { Audio::SoundId::LiftWood, 3, 5 }, + .LiftData = { Audio::SoundId::liftWood, 3, 5 }, .RatingsMultipliers = { 48, 28, 7 }, .UpkeepCosts = { 39, 20, 80, 10, 3, 10 }, .BuildCosts = { 27.50_GBP, 3.00_GBP, 37, }, diff --git a/src/openrct2/ride/rtd/coaster/SideFrictionRollerCoaster.h b/src/openrct2/ride/rtd/coaster/SideFrictionRollerCoaster.h index 8ccf2cf78d..c8d9a32f0d 100644 --- a/src/openrct2/ride/rtd/coaster/SideFrictionRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/SideFrictionRollerCoaster.h @@ -38,7 +38,7 @@ constexpr RideTypeDescriptor SideFrictionRollerCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 18, 24, 4, 11, }, .MaxMass = 15, - .LiftData = { Audio::SoundId::LiftWood, 3, 5 }, + .LiftData = { Audio::SoundId::liftWood, 3, 5 }, .RatingsMultipliers = { 48, 28, 7 }, .UpkeepCosts = { 39, 20, 80, 10, 3, 10 }, .BuildCosts = { 27.50_GBP, 3.00_GBP, 37, }, diff --git a/src/openrct2/ride/rtd/coaster/SingleRailRollerCoaster.h b/src/openrct2/ride/rtd/coaster/SingleRailRollerCoaster.h index d33362ce73..8692250707 100644 --- a/src/openrct2/ride/rtd/coaster/SingleRailRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/SingleRailRollerCoaster.h @@ -39,7 +39,7 @@ constexpr RideTypeDescriptor SingleRailRollerCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 28, 24, 5, 7}, .MaxMass = 18, - .LiftData = { Audio::SoundId::LiftRMC, 5, 8 }, + .LiftData = { Audio::SoundId::liftRMC, 5, 8 }, .RatingsMultipliers = { 52, 36, 10 }, .UpkeepCosts = { 40, 20, 80, 10, 3, 10 }, .BuildCosts = { 37.50_GBP, 2.50_GBP, 50}, diff --git a/src/openrct2/ride/rtd/coaster/SpinningWildMouse.h b/src/openrct2/ride/rtd/coaster/SpinningWildMouse.h index 79c35ddfe5..d841aeb3c3 100644 --- a/src/openrct2/ride/rtd/coaster/SpinningWildMouse.h +++ b/src/openrct2/ride/rtd/coaster/SpinningWildMouse.h @@ -37,7 +37,7 @@ constexpr RideTypeDescriptor SpinningWildMouseRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 16, 24, 4, 7, }, .MaxMass = 4, - .LiftData = { Audio::SoundId::LiftWildMouse, 4, 6 }, + .LiftData = { Audio::SoundId::liftWildMouse, 4, 6 }, .RatingsMultipliers = { 50, 30, 30 }, .UpkeepCosts = { 40, 20, 80, 9, 3, 10 }, .BuildCosts = { 27.50_GBP, 2.00_GBP, 40, }, diff --git a/src/openrct2/ride/rtd/coaster/SpiralRollerCoaster.h b/src/openrct2/ride/rtd/coaster/SpiralRollerCoaster.h index ee7c107824..7dbe837a4a 100644 --- a/src/openrct2/ride/rtd/coaster/SpiralRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/SpiralRollerCoaster.h @@ -41,7 +41,7 @@ constexpr RideTypeDescriptor SpiralRollerCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 19, 24, 9, 11, }, .MaxMass = 31, - .LiftData = { Audio::SoundId::LiftFrictionWheels, 7, 7 }, + .LiftData = { Audio::SoundId::liftFrictionWheels, 7, 7 }, .RatingsMultipliers = { 50, 30, 10 }, .UpkeepCosts = { 41, 20, 80, 10, 3, 10 }, .BuildCosts = { 35.00_GBP, 2.50_GBP, 50, }, diff --git a/src/openrct2/ride/rtd/coaster/StandUpRollerCoaster.h b/src/openrct2/ride/rtd/coaster/StandUpRollerCoaster.h index 33ac93eba1..f107f92df6 100644 --- a/src/openrct2/ride/rtd/coaster/StandUpRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/StandUpRollerCoaster.h @@ -39,7 +39,7 @@ constexpr RideTypeDescriptor StandUpRollerCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 25, 24, 9, 11, }, .MaxMass = 18, - .LiftData = { Audio::SoundId::LiftClassic, 4, 6 }, + .LiftData = { Audio::SoundId::liftClassic, 4, 6 }, .RatingsMultipliers = { 50, 30, 10 }, .UpkeepCosts = { 40, 20, 80, 10, 3, 10 }, .BuildCosts = { 50.00_GBP, 2.50_GBP, 50, }, diff --git a/src/openrct2/ride/rtd/coaster/SteelWildMouse.h b/src/openrct2/ride/rtd/coaster/SteelWildMouse.h index 0b11c8c7da..0583dfa1ab 100644 --- a/src/openrct2/ride/rtd/coaster/SteelWildMouse.h +++ b/src/openrct2/ride/rtd/coaster/SteelWildMouse.h @@ -38,7 +38,7 @@ constexpr RideTypeDescriptor SteelWildMouseRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 16, 24, 4, 7, }, .MaxMass = 4, - .LiftData = { Audio::SoundId::LiftWildMouse, 4, 6 }, + .LiftData = { Audio::SoundId::liftWildMouse, 4, 6 }, .RatingsMultipliers = { 50, 30, 30 }, .UpkeepCosts = { 40, 20, 80, 9, 3, 10 }, .BuildCosts = { 27.50_GBP, 2.00_GBP, 40, }, diff --git a/src/openrct2/ride/rtd/coaster/Steeplechase.h b/src/openrct2/ride/rtd/coaster/Steeplechase.h index 00e6e22b86..0b75784036 100644 --- a/src/openrct2/ride/rtd/coaster/Steeplechase.h +++ b/src/openrct2/ride/rtd/coaster/Steeplechase.h @@ -37,7 +37,7 @@ constexpr RideTypeDescriptor SteeplechaseRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 14, 24, 7, 7, }, .MaxMass = 4, - .LiftData = { Audio::SoundId::LiftClassic, 4, 5 }, + .LiftData = { Audio::SoundId::liftClassic, 4, 5 }, .RatingsMultipliers = { 50, 30, 10 }, .UpkeepCosts = { 40, 20, 80, 10, 3, 10 }, .BuildCosts = { 28.50_GBP, 2.00_GBP, 40, }, diff --git a/src/openrct2/ride/rtd/coaster/SuspendedSwingingCoaster.h b/src/openrct2/ride/rtd/coaster/SuspendedSwingingCoaster.h index 06a5159835..0ab562b09d 100644 --- a/src/openrct2/ride/rtd/coaster/SuspendedSwingingCoaster.h +++ b/src/openrct2/ride/rtd/coaster/SuspendedSwingingCoaster.h @@ -37,7 +37,7 @@ constexpr RideTypeDescriptor SuspendedSwingingCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 24, 40, 29, 8, }, .MaxMass = 26, - .LiftData = { Audio::SoundId::LiftClassic, 4, 6 }, + .LiftData = { Audio::SoundId::liftClassic, 4, 6 }, .RatingsMultipliers = { 50, 30, 10 }, .UpkeepCosts = { 40, 20, 80, 20, 3, 10 }, .BuildCosts = { 47.50_GBP, 2.50_GBP, 50, }, diff --git a/src/openrct2/ride/rtd/coaster/TwisterRollerCoaster.h b/src/openrct2/ride/rtd/coaster/TwisterRollerCoaster.h index 83a1ca18c4..2c4bc21784 100644 --- a/src/openrct2/ride/rtd/coaster/TwisterRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/TwisterRollerCoaster.h @@ -42,7 +42,7 @@ constexpr RideTypeDescriptor TwisterRollerCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 40, 24, 8, 9, }, .MaxMass = 31, - .LiftData = { Audio::SoundId::LiftBM, 5, 8 }, + .LiftData = { Audio::SoundId::liftBM, 5, 8 }, .RatingsMultipliers = { 52, 36, 10 }, .UpkeepCosts = { 43, 20, 80, 11, 3, 10 }, .BuildCosts = { 60.00_GBP, 2.50_GBP, 55, }, diff --git a/src/openrct2/ride/rtd/coaster/VerticalDropCoaster.h b/src/openrct2/ride/rtd/coaster/VerticalDropCoaster.h index 6a2d0a0b30..34bfaedbf2 100644 --- a/src/openrct2/ride/rtd/coaster/VerticalDropCoaster.h +++ b/src/openrct2/ride/rtd/coaster/VerticalDropCoaster.h @@ -41,7 +41,7 @@ constexpr RideTypeDescriptor VerticalDropCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 55, 24, 8, 11, }, .MaxMass = 25, - .LiftData = { Audio::SoundId::LiftBM, 4, 5 }, + .LiftData = { Audio::SoundId::liftBM, 4, 5 }, .RatingsMultipliers = { 52, 38, 10 }, .UpkeepCosts = { 44, 20, 80, 11, 3, 10 }, .BuildCosts = { 60.00_GBP, 2.50_GBP, 42, }, diff --git a/src/openrct2/ride/rtd/coaster/VirginiaReel.h b/src/openrct2/ride/rtd/coaster/VirginiaReel.h index e93f7c6594..6dd525fba3 100644 --- a/src/openrct2/ride/rtd/coaster/VirginiaReel.h +++ b/src/openrct2/ride/rtd/coaster/VirginiaReel.h @@ -37,7 +37,7 @@ constexpr RideTypeDescriptor VirginiaReelRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 14, 24, 6, 7, }, .MaxMass = 15, - .LiftData = { Audio::SoundId::LiftClassic, 3, 5 }, + .LiftData = { Audio::SoundId::liftClassic, 3, 5 }, .RatingsMultipliers = { 30, 15, 25 }, .UpkeepCosts = { 39, 20, 80, 10, 3, 10 }, .BuildCosts = { 26.50_GBP, 3.00_GBP, 25, }, diff --git a/src/openrct2/ride/rtd/coaster/WaterCoaster.h b/src/openrct2/ride/rtd/coaster/WaterCoaster.h index 490e26eb58..81020ec5bc 100644 --- a/src/openrct2/ride/rtd/coaster/WaterCoaster.h +++ b/src/openrct2/ride/rtd/coaster/WaterCoaster.h @@ -54,7 +54,7 @@ constexpr RideTypeDescriptor WaterCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 18, 24, 4, 7, }, .MaxMass = 13, - .LiftData = { Audio::SoundId::LiftClassic, 4, 6 }, + .LiftData = { Audio::SoundId::liftClassic, 4, 6 }, .RatingsMultipliers = { 50, 30, 10 }, .UpkeepCosts = { 60, 20, 80, 8, 3, 10 }, .BuildCosts = { 27.50_GBP, 2.00_GBP, 40, }, diff --git a/src/openrct2/ride/rtd/coaster/WoodenRollerCoaster.h b/src/openrct2/ride/rtd/coaster/WoodenRollerCoaster.h index d741e21834..fe4f3ff563 100644 --- a/src/openrct2/ride/rtd/coaster/WoodenRollerCoaster.h +++ b/src/openrct2/ride/rtd/coaster/WoodenRollerCoaster.h @@ -40,7 +40,7 @@ constexpr RideTypeDescriptor WoodenRollerCoasterRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 41, 24, 8, 11, }, .MaxMass = 19, - .LiftData = { Audio::SoundId::LiftWood, 5, 7 }, + .LiftData = { Audio::SoundId::liftWood, 5, 7 }, .RatingsMultipliers = { 52, 33, 8 }, .UpkeepCosts = { 40, 20, 80, 10, 3, 10 }, .BuildCosts = { 37.50_GBP, 3.50_GBP, 50, }, diff --git a/src/openrct2/ride/rtd/coaster/WoodenWildMouse.h b/src/openrct2/ride/rtd/coaster/WoodenWildMouse.h index e1ad28c9b2..663d600a7f 100644 --- a/src/openrct2/ride/rtd/coaster/WoodenWildMouse.h +++ b/src/openrct2/ride/rtd/coaster/WoodenWildMouse.h @@ -38,7 +38,7 @@ constexpr RideTypeDescriptor WoodenWildMouseRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), .Heights = { 14, 24, 4, 7, }, .MaxMass = 4, - .LiftData = { Audio::SoundId::LiftClassic, 4, 5 }, + .LiftData = { Audio::SoundId::liftClassic, 4, 5 }, .RatingsMultipliers = { 50, 30, 30 }, .UpkeepCosts = { 40, 20, 80, 9, 3, 10 }, .BuildCosts = { 25.00_GBP, 3.00_GBP, 40, }, diff --git a/src/openrct2/ride/rtd/gentle/CarRide.h b/src/openrct2/ride/rtd/gentle/CarRide.h index 619657b5f6..4489baaa50 100644 --- a/src/openrct2/ride/rtd/gentle/CarRide.h +++ b/src/openrct2/ride/rtd/gentle/CarRide.h @@ -42,7 +42,7 @@ constexpr RideTypeDescriptor CarRideRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 6, 24, 4, 7, }, .MaxMass = 2, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 70, 10, 10 }, .UpkeepCosts = { 70, 20, 0, 8, 3, 5 }, .BuildCosts = { 12.50_GBP, 2.50_GBP, 30, }, diff --git a/src/openrct2/ride/rtd/gentle/Circus.h b/src/openrct2/ride/rtd/gentle/Circus.h index f02c0b40ce..6f21b9b416 100644 --- a/src/openrct2/ride/rtd/gentle/Circus.h +++ b/src/openrct2/ride/rtd/gentle/Circus.h @@ -39,7 +39,7 @@ constexpr RideTypeDescriptor CircusRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 12, 128, 3, 2, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 20, 10, 0 }, .UpkeepCosts = { 50, 1, 0, 0, 0, 0 }, .BuildCosts = { 62.50_GBP, 1.00_GBP, 1, }, diff --git a/src/openrct2/ride/rtd/gentle/CrookedHouse.h b/src/openrct2/ride/rtd/gentle/CrookedHouse.h index 4d33826ab9..489c5a9fda 100644 --- a/src/openrct2/ride/rtd/gentle/CrookedHouse.h +++ b/src/openrct2/ride/rtd/gentle/CrookedHouse.h @@ -39,7 +39,7 @@ constexpr RideTypeDescriptor CrookedHouseRTD = .AvailableBreakdowns = 0, .Heights = { 16, 96, 3, 2, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 15, 8, 0 }, .UpkeepCosts = { 30, 1, 0, 0, 0, 0 }, .BuildCosts = { 32.50_GBP, 1.00_GBP, 1, }, diff --git a/src/openrct2/ride/rtd/gentle/Dodgems.h b/src/openrct2/ride/rtd/gentle/Dodgems.h index f454b71fe7..b5f97990c3 100644 --- a/src/openrct2/ride/rtd/gentle/Dodgems.h +++ b/src/openrct2/ride/rtd/gentle/Dodgems.h @@ -41,7 +41,7 @@ constexpr RideTypeDescriptor DodgemsRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 9, 48, 2, 2, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 40, 20, 0 }, .UpkeepCosts = { 50, 1, 0, 5, 0, 0 }, .BuildCosts = { 27.50_GBP, 1.00_GBP, 1, }, diff --git a/src/openrct2/ride/rtd/gentle/FerrisWheel.h b/src/openrct2/ride/rtd/gentle/FerrisWheel.h index 5109bdf04e..4613d694df 100644 --- a/src/openrct2/ride/rtd/gentle/FerrisWheel.h +++ b/src/openrct2/ride/rtd/gentle/FerrisWheel.h @@ -40,7 +40,7 @@ constexpr RideTypeDescriptor FerrisWheelRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 16, 176, 3, 2, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 60, 20, 10 }, .UpkeepCosts = { 50, 1, 0, 0, 0, 0 }, .BuildCosts = { 112.50_GBP, 1.00_GBP, 1, }, diff --git a/src/openrct2/ride/rtd/gentle/FlyingSaucers.h b/src/openrct2/ride/rtd/gentle/FlyingSaucers.h index bae83d1cfb..028cf13d30 100644 --- a/src/openrct2/ride/rtd/gentle/FlyingSaucers.h +++ b/src/openrct2/ride/rtd/gentle/FlyingSaucers.h @@ -40,7 +40,7 @@ constexpr RideTypeDescriptor FlyingSaucersRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 9, 48, 2, 2, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 50, 25, 0 }, .UpkeepCosts = { 90, 1, 0, 5, 0, 0 }, .BuildCosts = { 35.00_GBP, 2.00_GBP, 1, }, diff --git a/src/openrct2/ride/rtd/gentle/GhostTrain.h b/src/openrct2/ride/rtd/gentle/GhostTrain.h index 4b40903e40..ed32455b44 100644 --- a/src/openrct2/ride/rtd/gentle/GhostTrain.h +++ b/src/openrct2/ride/rtd/gentle/GhostTrain.h @@ -43,7 +43,7 @@ constexpr RideTypeDescriptor GhostTrainRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 8, 24, 6, 7, }, .MaxMass = 2, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 70, 10, 10 }, .UpkeepCosts = { 80, 20, 0, 8, 3, 5 }, .BuildCosts = { 13.00_GBP, 2.50_GBP, 30, }, diff --git a/src/openrct2/ride/rtd/gentle/HauntedHouse.h b/src/openrct2/ride/rtd/gentle/HauntedHouse.h index a0edf5c0e9..36739bdc0e 100644 --- a/src/openrct2/ride/rtd/gentle/HauntedHouse.h +++ b/src/openrct2/ride/rtd/gentle/HauntedHouse.h @@ -39,7 +39,7 @@ constexpr RideTypeDescriptor HauntedHouseRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 16, 160, 3, 2, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 20, 10, 0 }, .UpkeepCosts = { 50, 1, 0, 0, 0, 0 }, .BuildCosts = { 42.50_GBP, 1.00_GBP, 1, }, diff --git a/src/openrct2/ride/rtd/gentle/Maze.h b/src/openrct2/ride/rtd/gentle/Maze.h index 71e99d0e9c..47c01b07b6 100644 --- a/src/openrct2/ride/rtd/gentle/Maze.h +++ b/src/openrct2/ride/rtd/gentle/Maze.h @@ -40,7 +40,7 @@ constexpr RideTypeDescriptor MazeRTD = .AvailableBreakdowns = 0, .Heights = { 6, 24, 0, 1, }, .MaxMass = 18, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 50, 0, 0 }, .UpkeepCosts = { 50, 1, 0, 0, 0, 0 }, .BuildCosts = { 27.50_GBP, 1.00_GBP, 8, }, diff --git a/src/openrct2/ride/rtd/gentle/MerryGoRound.h b/src/openrct2/ride/rtd/gentle/MerryGoRound.h index 0f77c62a95..9a381f5f94 100644 --- a/src/openrct2/ride/rtd/gentle/MerryGoRound.h +++ b/src/openrct2/ride/rtd/gentle/MerryGoRound.h @@ -41,7 +41,7 @@ constexpr RideTypeDescriptor MerryGoRoundRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_CONTROL_FAILURE), .Heights = { 12, 64, 3, 2, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 50, 10, 0 }, .UpkeepCosts = { 50, 1, 0, 0, 0, 0 }, .BuildCosts = { 57.50_GBP, 1.00_GBP, 1, }, diff --git a/src/openrct2/ride/rtd/gentle/MiniGolf.h b/src/openrct2/ride/rtd/gentle/MiniGolf.h index df14f454de..45d12536d9 100644 --- a/src/openrct2/ride/rtd/gentle/MiniGolf.h +++ b/src/openrct2/ride/rtd/gentle/MiniGolf.h @@ -37,7 +37,7 @@ constexpr RideTypeDescriptor MiniGolfRTD = .AvailableBreakdowns = 0, .Heights = { 7, 32, 2, 2, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 50, 30, 10 }, .UpkeepCosts = { 30, 60, 0, 0, 0, 0 }, .BuildCosts = { 25.00_GBP, 3.50_GBP, 20, }, diff --git a/src/openrct2/ride/rtd/gentle/MiniHelicopters.h b/src/openrct2/ride/rtd/gentle/MiniHelicopters.h index 87aeae6396..587678a760 100644 --- a/src/openrct2/ride/rtd/gentle/MiniHelicopters.h +++ b/src/openrct2/ride/rtd/gentle/MiniHelicopters.h @@ -42,7 +42,7 @@ constexpr RideTypeDescriptor MiniHelicoptersRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 7, 24, 4, 7, }, .MaxMass = 2, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 70, 10, 10 }, .UpkeepCosts = { 70, 20, 0, 8, 3, 5 }, .BuildCosts = { 12.50_GBP, 2.50_GBP, 30, }, diff --git a/src/openrct2/ride/rtd/gentle/MonorailCycles.h b/src/openrct2/ride/rtd/gentle/MonorailCycles.h index 8ef0c5885a..cc9aa7c239 100644 --- a/src/openrct2/ride/rtd/gentle/MonorailCycles.h +++ b/src/openrct2/ride/rtd/gentle/MonorailCycles.h @@ -41,7 +41,7 @@ constexpr RideTypeDescriptor MonorailCyclesRTD = .AvailableBreakdowns = (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 5, 24, 8, 7, }, .MaxMass = 2, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 50, 10, 10 }, .UpkeepCosts = { 47, 20, 0, 8, 3, 5 }, .BuildCosts = { 10.00_GBP, 2.50_GBP, 30, }, diff --git a/src/openrct2/ride/rtd/gentle/MonsterTrucks.h b/src/openrct2/ride/rtd/gentle/MonsterTrucks.h index 2d188714f8..627fc05a7d 100644 --- a/src/openrct2/ride/rtd/gentle/MonsterTrucks.h +++ b/src/openrct2/ride/rtd/gentle/MonsterTrucks.h @@ -42,7 +42,7 @@ constexpr RideTypeDescriptor MonsterTrucksRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 18, 24, 4, 7, }, .MaxMass = 2, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 70, 10, 10 }, .UpkeepCosts = { 70, 20, 0, 8, 3, 5 }, .BuildCosts = { 12.50_GBP, 2.50_GBP, 30, }, diff --git a/src/openrct2/ride/rtd/gentle/ObservationTower.h b/src/openrct2/ride/rtd/gentle/ObservationTower.h index e1a6724007..55f3fedf9a 100644 --- a/src/openrct2/ride/rtd/gentle/ObservationTower.h +++ b/src/openrct2/ride/rtd/gentle/ObservationTower.h @@ -39,7 +39,7 @@ constexpr RideTypeDescriptor ObservationTowerRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 255, 32, 3, 2, }, .MaxMass = 15, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 80, 10, 0 }, .UpkeepCosts = { 50, 20, 0, 10, 0, 0 }, .BuildCosts = { 18.50_GBP, 0.00_GBP, 4, }, diff --git a/src/openrct2/ride/rtd/gentle/SpaceRings.h b/src/openrct2/ride/rtd/gentle/SpaceRings.h index d737deadd4..ca0e7f6fda 100644 --- a/src/openrct2/ride/rtd/gentle/SpaceRings.h +++ b/src/openrct2/ride/rtd/gentle/SpaceRings.h @@ -38,7 +38,7 @@ constexpr RideTypeDescriptor SpaceRingsRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 16, 48, 3, 2, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 12, 4, 4 }, .UpkeepCosts = { 50, 1, 0, 0, 0, 0 }, .BuildCosts = { 36.00_GBP, 1.00_GBP, 1, }, diff --git a/src/openrct2/ride/rtd/gentle/SpiralSlide.h b/src/openrct2/ride/rtd/gentle/SpiralSlide.h index f85c3d7ff1..4200bcd793 100644 --- a/src/openrct2/ride/rtd/gentle/SpiralSlide.h +++ b/src/openrct2/ride/rtd/gentle/SpiralSlide.h @@ -40,7 +40,7 @@ constexpr RideTypeDescriptor SpiralSlideRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 15, 128, 0, 2, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 50, 10, 0 }, .UpkeepCosts = { 50, 1, 0, 0, 0, 0 }, .BuildCosts = { 82.50_GBP, 1.00_GBP, 1, }, diff --git a/src/openrct2/ride/rtd/shops/CashMachine.h b/src/openrct2/ride/rtd/shops/CashMachine.h index 5dbdb8e90e..658079c6b9 100644 --- a/src/openrct2/ride/rtd/shops/CashMachine.h +++ b/src/openrct2/ride/rtd/shops/CashMachine.h @@ -36,7 +36,7 @@ constexpr RideTypeDescriptor CashMachineRTD = .AvailableBreakdowns = 0, .Heights = { 12, kDefaultCashMachineHeight, 0, 0, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 0, 0, 0 }, .UpkeepCosts = { 40, 1, 0, 0, 0, 0 }, .BuildCosts = { 200.00_GBP, 0.00_GBP, 1, }, diff --git a/src/openrct2/ride/rtd/shops/DrinkStall.h b/src/openrct2/ride/rtd/shops/DrinkStall.h index 6641c7c155..ffea6a132d 100644 --- a/src/openrct2/ride/rtd/shops/DrinkStall.h +++ b/src/openrct2/ride/rtd/shops/DrinkStall.h @@ -37,7 +37,7 @@ constexpr RideTypeDescriptor DrinkStallRTD = .AvailableBreakdowns = 0, .Heights = { 12, kDefaultDrinksStallHeight, 0, 0, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 0, 0, 0 }, .UpkeepCosts = { 50, 1, 0, 0, 0, 0 }, .BuildCosts = { 250.00_GBP, 0.00_GBP, 1, }, diff --git a/src/openrct2/ride/rtd/shops/FirstAid.h b/src/openrct2/ride/rtd/shops/FirstAid.h index d826819dda..add59e2a72 100644 --- a/src/openrct2/ride/rtd/shops/FirstAid.h +++ b/src/openrct2/ride/rtd/shops/FirstAid.h @@ -38,7 +38,7 @@ constexpr RideTypeDescriptor FirstAidRTD = .AvailableBreakdowns = 0, .Heights = { 12, kDefaultFirstAidHeight, 0, 0, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 0, 0, 0 }, .UpkeepCosts = { 45, 1, 0, 0, 0, 0 }, .BuildCosts = { 250.00_GBP, 0.00_GBP, 1, }, diff --git a/src/openrct2/ride/rtd/shops/FoodStall.h b/src/openrct2/ride/rtd/shops/FoodStall.h index cee382b025..2c8105c517 100644 --- a/src/openrct2/ride/rtd/shops/FoodStall.h +++ b/src/openrct2/ride/rtd/shops/FoodStall.h @@ -37,7 +37,7 @@ constexpr RideTypeDescriptor FoodStallRTD = .AvailableBreakdowns = 0, .Heights = { 12, kDefaultFoodStallHeight, 0, 0, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 0, 0, 0 }, .UpkeepCosts = { 50, 1, 0, 0, 0, 0 }, .BuildCosts = { 300.00_GBP, 0.00_GBP, 1, }, diff --git a/src/openrct2/ride/rtd/shops/InformationKiosk.h b/src/openrct2/ride/rtd/shops/InformationKiosk.h index 58688364a5..b1662cbaa6 100644 --- a/src/openrct2/ride/rtd/shops/InformationKiosk.h +++ b/src/openrct2/ride/rtd/shops/InformationKiosk.h @@ -37,7 +37,7 @@ constexpr RideTypeDescriptor InformationKioskRTD = .AvailableBreakdowns = 0, .Heights = { 12, kDefaultInformationKioskHeight, 0, 0, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 0, 0, 0 }, .UpkeepCosts = { 50, 1, 0, 0, 0, 0 }, .BuildCosts = { 250.00_GBP, 0.00_GBP, 1, }, diff --git a/src/openrct2/ride/rtd/shops/Shop.h b/src/openrct2/ride/rtd/shops/Shop.h index 5883163e87..55d33e575a 100644 --- a/src/openrct2/ride/rtd/shops/Shop.h +++ b/src/openrct2/ride/rtd/shops/Shop.h @@ -37,7 +37,7 @@ constexpr RideTypeDescriptor ShopRTD = .AvailableBreakdowns = 0, .Heights = { 12, kDefaultShopHeight, 0, 0, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 0, 0, 0 }, .UpkeepCosts = { 50, 1, 0, 0, 0, 0 }, .BuildCosts = { 200.00_GBP, 0.00_GBP, 1, }, diff --git a/src/openrct2/ride/rtd/shops/Toilets.h b/src/openrct2/ride/rtd/shops/Toilets.h index 8cad0c0f33..e6927767a8 100644 --- a/src/openrct2/ride/rtd/shops/Toilets.h +++ b/src/openrct2/ride/rtd/shops/Toilets.h @@ -38,7 +38,7 @@ constexpr RideTypeDescriptor ToiletsRTD = .AvailableBreakdowns = 0, .Heights = { 12, kDefaultToiletHeight, 0, 0, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 0, 0, 0 }, .UpkeepCosts = { 50, 1, 0, 0, 0, 0 }, .BuildCosts = { 225.00_GBP, 0.00_GBP, 1, }, diff --git a/src/openrct2/ride/rtd/thrill/3DCinema.h b/src/openrct2/ride/rtd/thrill/3DCinema.h index 5fd770546e..66f2cd8a02 100644 --- a/src/openrct2/ride/rtd/thrill/3DCinema.h +++ b/src/openrct2/ride/rtd/thrill/3DCinema.h @@ -39,7 +39,7 @@ constexpr RideTypeDescriptor CinemaRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 12, 128, 3, 2, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 20, 10, 0 }, .UpkeepCosts = { 50, 1, 0, 0, 0, 0 }, .BuildCosts = { 70.00_GBP, 1.00_GBP, 1, }, diff --git a/src/openrct2/ride/rtd/thrill/Enterprise.h b/src/openrct2/ride/rtd/thrill/Enterprise.h index b4bb72b554..abbfad15d5 100644 --- a/src/openrct2/ride/rtd/thrill/Enterprise.h +++ b/src/openrct2/ride/rtd/thrill/Enterprise.h @@ -39,7 +39,7 @@ constexpr RideTypeDescriptor EnterpriseRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 16, 160, 3, 2, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 50, 10, 0 }, .UpkeepCosts = { 50, 1, 0, 0, 0, 0 }, .BuildCosts = { 50.00_GBP, 1.00_GBP, 1, }, diff --git a/src/openrct2/ride/rtd/thrill/GoKarts.h b/src/openrct2/ride/rtd/thrill/GoKarts.h index 1c572d33c6..270c5c6f02 100644 --- a/src/openrct2/ride/rtd/thrill/GoKarts.h +++ b/src/openrct2/ride/rtd/thrill/GoKarts.h @@ -40,7 +40,7 @@ constexpr RideTypeDescriptor GoKartsRTD = .AvailableBreakdowns = (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 8, 24, 2, 1, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 120, 20, 0 }, .UpkeepCosts = { 50, 20, 0, 8, 0, 0 }, .BuildCosts = { 31.00_GBP, 2.00_GBP, 20, }, diff --git a/src/openrct2/ride/rtd/thrill/LaunchedFreefall.h b/src/openrct2/ride/rtd/thrill/LaunchedFreefall.h index 3ef498581e..ba54005283 100644 --- a/src/openrct2/ride/rtd/thrill/LaunchedFreefall.h +++ b/src/openrct2/ride/rtd/thrill/LaunchedFreefall.h @@ -39,7 +39,7 @@ constexpr RideTypeDescriptor LaunchedFreefallRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 255, 32, 3, 2, }, .MaxMass = 15, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 50, 50, 10 }, .UpkeepCosts = { 50, 20, 0, 10, 0, 0 }, .BuildCosts = { 25.00_GBP, 0.00_GBP, 4, }, diff --git a/src/openrct2/ride/rtd/thrill/MagicCarpet.h b/src/openrct2/ride/rtd/thrill/MagicCarpet.h index 19bcb16b57..4b16eb4dc4 100644 --- a/src/openrct2/ride/rtd/thrill/MagicCarpet.h +++ b/src/openrct2/ride/rtd/thrill/MagicCarpet.h @@ -40,7 +40,7 @@ constexpr RideTypeDescriptor MagicCarpetRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 15, 176, 7, 11, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 50, 30, 10 }, .UpkeepCosts = { 50, 1, 0, 0, 0, 0 }, .BuildCosts = { 99.00_GBP, 1.00_GBP, 1, }, diff --git a/src/openrct2/ride/rtd/thrill/MotionSimulator.h b/src/openrct2/ride/rtd/thrill/MotionSimulator.h index 0ace84d692..7656c3c731 100644 --- a/src/openrct2/ride/rtd/thrill/MotionSimulator.h +++ b/src/openrct2/ride/rtd/thrill/MotionSimulator.h @@ -38,7 +38,7 @@ constexpr RideTypeDescriptor MotionSimulatorRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 12, 64, 3, 2, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 24, 20, 10 }, .UpkeepCosts = { 50, 1, 0, 0, 0, 0 }, .BuildCosts = { 110.00_GBP, 1.00_GBP, 1, }, diff --git a/src/openrct2/ride/rtd/thrill/RotoDrop.h b/src/openrct2/ride/rtd/thrill/RotoDrop.h index d44456f9e7..8cd04eb40a 100644 --- a/src/openrct2/ride/rtd/thrill/RotoDrop.h +++ b/src/openrct2/ride/rtd/thrill/RotoDrop.h @@ -39,7 +39,7 @@ constexpr RideTypeDescriptor RotoDropRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 255, 32, 3, 2, }, .MaxMass = 15, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 50, 50, 10 }, .UpkeepCosts = { 50, 20, 0, 10, 0, 0 }, .BuildCosts = { 22.50_GBP, 0.00_GBP, 4, }, diff --git a/src/openrct2/ride/rtd/thrill/SwingingInverterShip.h b/src/openrct2/ride/rtd/thrill/SwingingInverterShip.h index 94a6555e06..86ed3408b6 100644 --- a/src/openrct2/ride/rtd/thrill/SwingingInverterShip.h +++ b/src/openrct2/ride/rtd/thrill/SwingingInverterShip.h @@ -40,7 +40,7 @@ constexpr RideTypeDescriptor SwingingInverterShipRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 15, 176, 7, 11, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 50, 30, 10 }, .UpkeepCosts = { 50, 1, 0, 0, 0, 0 }, .BuildCosts = { 106.00_GBP, 1.00_GBP, 1, }, diff --git a/src/openrct2/ride/rtd/thrill/SwingingShip.h b/src/openrct2/ride/rtd/thrill/SwingingShip.h index ec39d27f66..b40aeef214 100644 --- a/src/openrct2/ride/rtd/thrill/SwingingShip.h +++ b/src/openrct2/ride/rtd/thrill/SwingingShip.h @@ -41,7 +41,7 @@ constexpr RideTypeDescriptor SwingingShipRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 12, 112, 7, 11, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 50, 30, 10 }, .UpkeepCosts = { 50, 1, 0, 0, 0, 0 }, .BuildCosts = { 77.50_GBP, 1.00_GBP, 1, }, diff --git a/src/openrct2/ride/rtd/thrill/TopSpin.h b/src/openrct2/ride/rtd/thrill/TopSpin.h index 0033eeae31..3565cc8ff1 100644 --- a/src/openrct2/ride/rtd/thrill/TopSpin.h +++ b/src/openrct2/ride/rtd/thrill/TopSpin.h @@ -39,7 +39,7 @@ constexpr RideTypeDescriptor TopSpinRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 16, 112, 3, 2, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 24, 20, 10 }, .UpkeepCosts = { 50, 1, 0, 0, 0, 0 }, .BuildCosts = { 72.50_GBP, 1.00_GBP, 1, }, diff --git a/src/openrct2/ride/rtd/thrill/Twist.h b/src/openrct2/ride/rtd/thrill/Twist.h index debaac1e59..b75cce3e68 100644 --- a/src/openrct2/ride/rtd/thrill/Twist.h +++ b/src/openrct2/ride/rtd/thrill/Twist.h @@ -38,7 +38,7 @@ constexpr RideTypeDescriptor TwistRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 12, 64, 3, 2, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 40, 20, 10 }, .UpkeepCosts = { 50, 1, 0, 0, 0, 0 }, .BuildCosts = { 45.00_GBP, 1.00_GBP, 1, }, diff --git a/src/openrct2/ride/rtd/transport/Chairlift.h b/src/openrct2/ride/rtd/transport/Chairlift.h index d0d81290e2..4085d4cdb5 100644 --- a/src/openrct2/ride/rtd/transport/Chairlift.h +++ b/src/openrct2/ride/rtd/transport/Chairlift.h @@ -42,7 +42,7 @@ constexpr RideTypeDescriptor ChairliftRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 40, 32, 28, 2, }, .MaxMass = 18, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 70, 10, 0 }, .UpkeepCosts = { 60, 20, 0, 4, 3, 10 }, .BuildCosts = { 32.50_GBP, 0.50_GBP, 30, }, diff --git a/src/openrct2/ride/rtd/transport/Lift.h b/src/openrct2/ride/rtd/transport/Lift.h index 3d63c02b6c..67c9ec7d09 100644 --- a/src/openrct2/ride/rtd/transport/Lift.h +++ b/src/openrct2/ride/rtd/transport/Lift.h @@ -38,7 +38,7 @@ constexpr RideTypeDescriptor LiftRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_DOORS_STUCK_CLOSED) | (1 << BREAKDOWN_DOORS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 255, 32, 3, 2, }, .MaxMass = 15, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 80, 10, 0 }, .UpkeepCosts = { 50, 20, 0, 10, 0, 0 }, .BuildCosts = { 19.50_GBP, 0.00_GBP, 4, }, diff --git a/src/openrct2/ride/rtd/transport/MiniatureRailway.h b/src/openrct2/ride/rtd/transport/MiniatureRailway.h index dcae2fd7cd..217d0b3719 100644 --- a/src/openrct2/ride/rtd/transport/MiniatureRailway.h +++ b/src/openrct2/ride/rtd/transport/MiniatureRailway.h @@ -42,7 +42,7 @@ constexpr RideTypeDescriptor MiniatureRailwayRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 7, 32, 5, 9, }, .MaxMass = 39, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 70, 6, -10 }, .UpkeepCosts = { 60, 20, 0, 10, 3, 5 }, .BuildCosts = { 17.50_GBP, 3.00_GBP, 50, }, diff --git a/src/openrct2/ride/rtd/transport/Monorail.h b/src/openrct2/ride/rtd/transport/Monorail.h index ab3011de48..b7ea7b22b9 100644 --- a/src/openrct2/ride/rtd/transport/Monorail.h +++ b/src/openrct2/ride/rtd/transport/Monorail.h @@ -41,7 +41,7 @@ constexpr RideTypeDescriptor MonorailRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_DOORS_STUCK_CLOSED) | (1 << BREAKDOWN_DOORS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 8, 32, 8, 9, }, .MaxMass = 78, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 70, 6, -10 }, .UpkeepCosts = { 65, 20, 0, 10, 3, 10 }, .BuildCosts = { 21.00_GBP, 2.50_GBP, 50, }, diff --git a/src/openrct2/ride/rtd/transport/SuspendedMonorail.h b/src/openrct2/ride/rtd/transport/SuspendedMonorail.h index e61c13697b..91b35e3664 100644 --- a/src/openrct2/ride/rtd/transport/SuspendedMonorail.h +++ b/src/openrct2/ride/rtd/transport/SuspendedMonorail.h @@ -42,7 +42,7 @@ constexpr RideTypeDescriptor SuspendedMonorailRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_DOORS_STUCK_CLOSED) | (1 << BREAKDOWN_DOORS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 12, 40, 32, 8, }, .MaxMass = 78, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 70, 6, -10 }, .UpkeepCosts = { 70, 20, 0, 10, 3, 10 }, .BuildCosts = { 32.50_GBP, 2.50_GBP, 50, }, diff --git a/src/openrct2/ride/rtd/water/BoatHire.h b/src/openrct2/ride/rtd/water/BoatHire.h index 181b0881d1..efbf98fd35 100644 --- a/src/openrct2/ride/rtd/water/BoatHire.h +++ b/src/openrct2/ride/rtd/water/BoatHire.h @@ -38,7 +38,7 @@ constexpr RideTypeDescriptor BoatHireRTD = .AvailableBreakdowns = (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 255, 16, 0, 3, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 70, 6, 0 }, .UpkeepCosts = { 50, 1, 0, 4, 0, 0 }, .BuildCosts = { 27.50_GBP, 0.00_GBP, 5, }, diff --git a/src/openrct2/ride/rtd/water/DinghySlide.h b/src/openrct2/ride/rtd/water/DinghySlide.h index 1e8494c2f3..0ec9c0fecc 100644 --- a/src/openrct2/ride/rtd/water/DinghySlide.h +++ b/src/openrct2/ride/rtd/water/DinghySlide.h @@ -55,7 +55,7 @@ constexpr RideTypeDescriptor DinghySlideRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 15, 24, 5, 7, }, .MaxMass = 5, - .LiftData = { Audio::SoundId::LiftFrictionWheels, 4, 5 }, + .LiftData = { Audio::SoundId::liftFrictionWheels, 4, 5 }, .RatingsMultipliers = { 50, 30, 10 }, .UpkeepCosts = { 40, 20, 80, 4, 3, 10 }, .BuildCosts = { 20.00_GBP, 2.00_GBP, 40, }, diff --git a/src/openrct2/ride/rtd/water/LogFlume.h b/src/openrct2/ride/rtd/water/LogFlume.h index 244ad65eec..69395d0941 100644 --- a/src/openrct2/ride/rtd/water/LogFlume.h +++ b/src/openrct2/ride/rtd/water/LogFlume.h @@ -41,7 +41,7 @@ constexpr RideTypeDescriptor LogFlumeRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_CONTROL_FAILURE), .Heights = { 10, 24, 7, 9, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::LiftFlume, 5, 5 }, + .LiftData = { 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/rtd/water/RiverRafts.h b/src/openrct2/ride/rtd/water/RiverRafts.h index 88078d2009..0d4c9e12f2 100644 --- a/src/openrct2/ride/rtd/water/RiverRafts.h +++ b/src/openrct2/ride/rtd/water/RiverRafts.h @@ -41,7 +41,7 @@ constexpr RideTypeDescriptor RiverRaftsRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT), .Heights = { 12, 24, 7, 11, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 80, 34, 6 }, .UpkeepCosts = { 50, 20, 0, 9, 0, 10 }, .BuildCosts = { 20.00_GBP, 2.50_GBP, 30, }, diff --git a/src/openrct2/ride/rtd/water/RiverRapids.h b/src/openrct2/ride/rtd/water/RiverRapids.h index 6a1f746868..3a92ec1f54 100644 --- a/src/openrct2/ride/rtd/water/RiverRapids.h +++ b/src/openrct2/ride/rtd/water/RiverRapids.h @@ -42,7 +42,7 @@ constexpr RideTypeDescriptor RiverRapidsRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_CONTROL_FAILURE), .Heights = { 9, 32, 14, 15, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::LiftFlume, 5, 5 }, + .LiftData = { 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/rtd/water/SplashBoats.h b/src/openrct2/ride/rtd/water/SplashBoats.h index 4e6d29ae03..14f3b5a459 100644 --- a/src/openrct2/ride/rtd/water/SplashBoats.h +++ b/src/openrct2/ride/rtd/water/SplashBoats.h @@ -42,7 +42,7 @@ constexpr RideTypeDescriptor SplashBoatsRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_CONTROL_FAILURE), .Heights = { 16, 24, 7, 11, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::LiftFlume, 5, 5 }, + .LiftData = { Audio::SoundId::liftFlume, 5, 5 }, .RatingsMultipliers = { 80, 34, 6 }, .UpkeepCosts = { 70, 20, 0, 9, 0, 10 }, .BuildCosts = { 28.50_GBP, 2.50_GBP, 30, }, diff --git a/src/openrct2/ride/rtd/water/SubmarineRide.h b/src/openrct2/ride/rtd/water/SubmarineRide.h index 5e4dff8f9b..70987097da 100644 --- a/src/openrct2/ride/rtd/water/SubmarineRide.h +++ b/src/openrct2/ride/rtd/water/SubmarineRide.h @@ -41,7 +41,7 @@ constexpr RideTypeDescriptor SubmarineRideRTD = .AvailableBreakdowns = (1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), .Heights = { 255, 16, 0, 3, }, .MaxMass = 255, - .LiftData = { Audio::SoundId::Null, 5, 5 }, + .LiftData = { Audio::SoundId::null, 5, 5 }, .RatingsMultipliers = { 70, 6, 0 }, .UpkeepCosts = { 50, 1, 0, 4, 0, 0 }, .BuildCosts = { 35.00_GBP, 2.50_GBP, 5, }, diff --git a/src/openrct2/scenes/intro/IntroScene.cpp b/src/openrct2/scenes/intro/IntroScene.cpp index 04b81dc5b0..92eeec0a0a 100644 --- a/src/openrct2/scenes/intro/IntroScene.cpp +++ b/src/openrct2/scenes/intro/IntroScene.cpp @@ -79,7 +79,7 @@ namespace OpenRCT2 _introStateCounter = -580; // Play the chain lift sound - _soundChannel = Audio::CreateAudioChannel(SoundId::LiftBM, true); + _soundChannel = Audio::CreateAudioChannel(SoundId::liftBM, true); _chainLiftFinished = false; _introState = IntroState::PublisherScroll; break; @@ -118,7 +118,7 @@ namespace OpenRCT2 // Play the track friction sound _soundChannel = Audio::CreateAudioChannel( - SoundId::TrackFrictionBM, true, Audio::kMixerVolumeMax, 0.25f, 0.75); + SoundId::trackFrictionBM, true, Audio::kMixerVolumeMax, 0.25f, 0.75); } // Check if logo is off the screen...ish @@ -132,7 +132,7 @@ namespace OpenRCT2 } // Play long peep scream sound - _soundChannel = Audio::CreateAudioChannel(SoundId::Scream1); + _soundChannel = Audio::CreateAudioChannel(SoundId::scream1); _introState = IntroState::LogoFadeIn; _introStateCounter = 0; diff --git a/src/openrct2/scripting/bindings/world/ScMap.cpp b/src/openrct2/scripting/bindings/world/ScMap.cpp index 7845a85d46..286ccc1015 100644 --- a/src/openrct2/scripting/bindings/world/ScMap.cpp +++ b/src/openrct2/scripting/bindings/world/ScMap.cpp @@ -357,10 +357,10 @@ namespace OpenRCT2::Scripting entity->MoveTo(entityPos); // Reset some important vehicle vars to their null values - entity->sound1_id = OpenRCT2::Audio::SoundId::Null; - entity->sound2_id = OpenRCT2::Audio::SoundId::Null; + entity->sound1_id = OpenRCT2::Audio::SoundId::null; + entity->sound2_id = OpenRCT2::Audio::SoundId::null; entity->next_vehicle_on_train = EntityId::GetNull(); - entity->scream_sound_id = OpenRCT2::Audio::SoundId::Null; + entity->scream_sound_id = OpenRCT2::Audio::SoundId::null; for (size_t i = 0; i < std::size(entity->peep); i++) { entity->peep[i] = EntityId::GetNull(); diff --git a/src/openrct2/world/Climate.cpp b/src/openrct2/world/Climate.cpp index a142484ef5..ebc868b6e7 100644 --- a/src/openrct2/world/Climate.cpp +++ b/src/openrct2/world/Climate.cpp @@ -368,7 +368,7 @@ static void ClimateUpdateWeatherSound() // Start playing the weather sound if (_weatherSoundChannel == nullptr || _weatherSoundChannel->IsDone()) { - _weatherSoundChannel = CreateAudioChannel(SoundId::Rain, true, DStoMixerVolume(-4000)); + _weatherSoundChannel = CreateAudioChannel(SoundId::rain, true, DStoMixerVolume(-4000)); } if (_weatherVolume == 1) { @@ -466,8 +466,8 @@ static void ClimateUpdateThunder() if (_thunderStatus[0] == ThunderStatus::none && _thunderStatus[1] == ThunderStatus::none) { // Play thunder on left side - _thunderSoundId = (randomNumber & 0x20000) ? OpenRCT2::Audio::SoundId::Thunder1 - : OpenRCT2::Audio::SoundId::Thunder2; + _thunderSoundId = (randomNumber & 0x20000) ? OpenRCT2::Audio::SoundId::thunder1 + : OpenRCT2::Audio::SoundId::thunder2; _thunderVolume = (-(static_cast((randomNumber >> 18) & 0xFF))) * 8; ClimatePlayThunder(0, _thunderSoundId, _thunderVolume, -10000); @@ -479,8 +479,8 @@ static void ClimateUpdateThunder() { if (_thunderStatus[0] == ThunderStatus::none) { - _thunderSoundId = (randomNumber & 0x20000) ? OpenRCT2::Audio::SoundId::Thunder1 - : OpenRCT2::Audio::SoundId::Thunder2; + _thunderSoundId = (randomNumber & 0x20000) ? OpenRCT2::Audio::SoundId::thunder1 + : OpenRCT2::Audio::SoundId::thunder2; int32_t pan = (((randomNumber >> 18) & 0xFF) - 128) * 16; ClimatePlayThunder(0, _thunderSoundId, 0, pan); }