From c7c703515e878bd45e75a9af8c4efee7b7b00c84 Mon Sep 17 00:00:00 2001 From: 73 <94884086+733737@users.noreply.github.com> Date: Mon, 17 Feb 2025 07:24:03 -0500 Subject: [PATCH] Rename audio.h to Audio.h (#23842) --- src/openrct2-ui/audio/AudioMixer.h | 2 +- src/openrct2-ui/input/MouseInput.cpp | 2 +- src/openrct2-ui/input/Shortcuts.cpp | 2 +- src/openrct2-ui/interface/Window.cpp | 2 +- src/openrct2-ui/ride/VehicleSounds.cpp | 2 +- src/openrct2-ui/windows/EditorBottomToolbar.cpp | 2 +- src/openrct2-ui/windows/EditorObjectSelection.cpp | 2 +- src/openrct2-ui/windows/EditorParkEntrance.cpp | 2 +- src/openrct2-ui/windows/Error.cpp | 2 +- src/openrct2-ui/windows/Footpath.cpp | 2 +- src/openrct2-ui/windows/InstallTrack.cpp | 2 +- src/openrct2-ui/windows/LoadSave.cpp | 2 +- src/openrct2-ui/windows/Map.cpp | 2 +- src/openrct2-ui/windows/MazeConstruction.cpp | 2 +- src/openrct2-ui/windows/NewRide.cpp | 2 +- src/openrct2-ui/windows/News.cpp | 2 +- src/openrct2-ui/windows/Options.cpp | 2 +- src/openrct2-ui/windows/Ride.cpp | 2 +- src/openrct2-ui/windows/RideConstruction.cpp | 2 +- src/openrct2-ui/windows/SavePrompt.cpp | 2 +- src/openrct2-ui/windows/ScenarioSelect.cpp | 2 +- src/openrct2-ui/windows/Scenery.cpp | 2 +- src/openrct2-ui/windows/TopToolbar.cpp | 2 +- src/openrct2-ui/windows/TrackDesignPlace.cpp | 2 +- src/openrct2-ui/windows/TrackList.cpp | 2 +- src/openrct2-ui/windows/Viewport.cpp | 2 +- src/openrct2/Context.cpp | 2 +- src/openrct2/Editor.cpp | 2 +- src/openrct2/Game.cpp | 2 +- src/openrct2/actions/LandBuyRightsAction.cpp | 2 +- src/openrct2/actions/LandLowerAction.cpp | 2 +- src/openrct2/actions/LandRaiseAction.cpp | 2 +- src/openrct2/actions/LandSetRightsAction.cpp | 2 +- src/openrct2/actions/LandSmoothAction.cpp | 2 +- src/openrct2/actions/WaterLowerAction.cpp | 2 +- src/openrct2/actions/WaterRaiseAction.cpp | 2 +- src/openrct2/audio/Audio.cpp | 2 +- src/openrct2/audio/{audio.h => Audio.h} | 0 src/openrct2/entity/Balloon.cpp | 2 +- src/openrct2/entity/Duck.cpp | 2 +- src/openrct2/entity/Guest.cpp | 2 +- src/openrct2/entity/Particle.cpp | 2 +- src/openrct2/entity/Peep.cpp | 2 +- src/openrct2/entity/Staff.cpp | 2 +- src/openrct2/interface/Chat.cpp | 2 +- src/openrct2/interface/Screenshot.cpp | 2 +- src/openrct2/interface/Window.cpp | 2 +- src/openrct2/libopenrct2.vcxproj | 2 +- src/openrct2/management/NewsItem.cpp | 2 +- src/openrct2/object/ObjectFactory.cpp | 2 +- src/openrct2/object/ObjectManager.cpp | 2 +- src/openrct2/object/RideObject.cpp | 2 +- src/openrct2/rct1/S4Importer.cpp | 2 +- src/openrct2/ride/CableLift.cpp | 2 +- src/openrct2/ride/Ride.cpp | 2 +- src/openrct2/ride/RideAudio.cpp | 2 +- src/openrct2/ride/RideData.cpp | 2 +- src/openrct2/ride/RideData.h | 2 +- src/openrct2/ride/Track.cpp | 2 +- src/openrct2/ride/TrackDesign.cpp | 2 +- src/openrct2/ride/TrackDesignSave.cpp | 2 +- src/openrct2/ride/Vehicle.cpp | 2 +- src/openrct2/ride/Vehicle.h | 2 +- src/openrct2/scenario/Scenario.cpp | 2 +- src/openrct2/scenes/game/GameScene.cpp | 2 +- src/openrct2/scenes/intro/IntroScene.cpp | 2 +- src/openrct2/scenes/preloader/PreloaderScene.cpp | 2 +- src/openrct2/scenes/title/TitleScene.cpp | 2 +- src/openrct2/world/Climate.cpp | 2 +- src/openrct2/world/Map.cpp | 2 +- 70 files changed, 69 insertions(+), 69 deletions(-) rename src/openrct2/audio/{audio.h => Audio.h} (100%) diff --git a/src/openrct2-ui/audio/AudioMixer.h b/src/openrct2-ui/audio/AudioMixer.h index f89657a094..549cb89b91 100644 --- a/src/openrct2-ui/audio/AudioMixer.h +++ b/src/openrct2-ui/audio/AudioMixer.h @@ -19,10 +19,10 @@ #include #include #include +#include #include #include #include -#include #include namespace OpenRCT2::Audio diff --git a/src/openrct2-ui/input/MouseInput.cpp b/src/openrct2-ui/input/MouseInput.cpp index 59446c8ba3..fea008c3b6 100644 --- a/src/openrct2-ui/input/MouseInput.cpp +++ b/src/openrct2-ui/input/MouseInput.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/input/Shortcuts.cpp b/src/openrct2-ui/input/Shortcuts.cpp index 9a9b88b7f2..6337839534 100644 --- a/src/openrct2-ui/input/Shortcuts.cpp +++ b/src/openrct2-ui/input/Shortcuts.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/interface/Window.cpp b/src/openrct2-ui/interface/Window.cpp index 80ae4974e4..1851e9be76 100644 --- a/src/openrct2-ui/interface/Window.cpp +++ b/src/openrct2-ui/interface/Window.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/ride/VehicleSounds.cpp b/src/openrct2-ui/ride/VehicleSounds.cpp index 9f081c4c8a..9d85af9713 100644 --- a/src/openrct2-ui/ride/VehicleSounds.cpp +++ b/src/openrct2-ui/ride/VehicleSounds.cpp @@ -9,9 +9,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/windows/EditorBottomToolbar.cpp b/src/openrct2-ui/windows/EditorBottomToolbar.cpp index 52c77abc59..19b96951e9 100644 --- a/src/openrct2-ui/windows/EditorBottomToolbar.cpp +++ b/src/openrct2-ui/windows/EditorBottomToolbar.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp index 3846d3e415..6ba8b646f7 100644 --- a/src/openrct2-ui/windows/EditorObjectSelection.cpp +++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/EditorParkEntrance.cpp b/src/openrct2-ui/windows/EditorParkEntrance.cpp index 8d80fa5c42..87c39574ed 100644 --- a/src/openrct2-ui/windows/EditorParkEntrance.cpp +++ b/src/openrct2-ui/windows/EditorParkEntrance.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Error.cpp b/src/openrct2-ui/windows/Error.cpp index cf86b14ee3..faa6502832 100644 --- a/src/openrct2-ui/windows/Error.cpp +++ b/src/openrct2-ui/windows/Error.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Footpath.cpp b/src/openrct2-ui/windows/Footpath.cpp index ec1b1e3933..4e8fbcc780 100644 --- a/src/openrct2-ui/windows/Footpath.cpp +++ b/src/openrct2-ui/windows/Footpath.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/InstallTrack.cpp b/src/openrct2-ui/windows/InstallTrack.cpp index f68eb6b989..03e44a6a35 100644 --- a/src/openrct2-ui/windows/InstallTrack.cpp +++ b/src/openrct2-ui/windows/InstallTrack.cpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/LoadSave.cpp b/src/openrct2-ui/windows/LoadSave.cpp index b976ea7624..f5a5253417 100644 --- a/src/openrct2-ui/windows/LoadSave.cpp +++ b/src/openrct2-ui/windows/LoadSave.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index 162d0f9722..f11cdeaa37 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/MazeConstruction.cpp b/src/openrct2-ui/windows/MazeConstruction.cpp index 9c07738872..80393fc4d7 100644 --- a/src/openrct2-ui/windows/MazeConstruction.cpp +++ b/src/openrct2-ui/windows/MazeConstruction.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index b68ad1d142..f5263b5af8 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/News.cpp b/src/openrct2-ui/windows/News.cpp index 167e03042c..42ee360b66 100644 --- a/src/openrct2-ui/windows/News.cpp +++ b/src/openrct2-ui/windows/News.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index ccb51b97b2..f4f3717637 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -22,9 +22,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index a5a79a9a6b..84d13e2bc8 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 4d04f41a0d..cdc348df4a 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/SavePrompt.cpp b/src/openrct2-ui/windows/SavePrompt.cpp index 396a4f0ef8..8d28e3d177 100644 --- a/src/openrct2-ui/windows/SavePrompt.cpp +++ b/src/openrct2-ui/windows/SavePrompt.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/ScenarioSelect.cpp b/src/openrct2-ui/windows/ScenarioSelect.cpp index 6c45024ab6..501b89f722 100644 --- a/src/openrct2-ui/windows/ScenarioSelect.cpp +++ b/src/openrct2-ui/windows/ScenarioSelect.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp index 40d4517ad8..520bda1a03 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index d17a572103..37b59c63e9 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TrackDesignPlace.cpp b/src/openrct2-ui/windows/TrackDesignPlace.cpp index 2cbdf960ad..be4df91c89 100644 --- a/src/openrct2-ui/windows/TrackDesignPlace.cpp +++ b/src/openrct2-ui/windows/TrackDesignPlace.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/TrackList.cpp b/src/openrct2-ui/windows/TrackList.cpp index 9a1c49d490..293b487e56 100644 --- a/src/openrct2-ui/windows/TrackList.cpp +++ b/src/openrct2-ui/windows/TrackList.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Viewport.cpp b/src/openrct2-ui/windows/Viewport.cpp index 36aa8b742e..78d380fcb1 100644 --- a/src/openrct2-ui/windows/Viewport.cpp +++ b/src/openrct2-ui/windows/Viewport.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index 8cce5815ec..b7908acd30 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -25,8 +25,8 @@ #include "ReplayManager.h" #include "Version.h" #include "actions/GameAction.h" +#include "audio/Audio.h" #include "audio/AudioContext.h" -#include "audio/audio.h" #include "config/Config.h" #include "core/Console.hpp" #include "core/File.h" diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp index 35804326da..4bfae5c73e 100644 --- a/src/openrct2/Editor.cpp +++ b/src/openrct2/Editor.cpp @@ -19,7 +19,7 @@ #include "actions/LandBuyRightsAction.h" #include "actions/LandSetRightsAction.h" #include "actions/ResultWithMessage.h" -#include "audio/audio.h" +#include "audio/Audio.h" #include "core/EnumUtils.hpp" #include "core/Path.hpp" #include "core/String.hpp" diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp index edbb709c97..7df0dcd5e2 100644 --- a/src/openrct2/Game.cpp +++ b/src/openrct2/Game.cpp @@ -23,7 +23,7 @@ #include "ReplayManager.h" #include "actions/GameSetSpeedAction.h" #include "actions/LoadOrQuitAction.h" -#include "audio/audio.h" +#include "audio/Audio.h" #include "config/Config.h" #include "core/Console.hpp" #include "core/File.h" diff --git a/src/openrct2/actions/LandBuyRightsAction.cpp b/src/openrct2/actions/LandBuyRightsAction.cpp index a155fb3728..4e76034d20 100644 --- a/src/openrct2/actions/LandBuyRightsAction.cpp +++ b/src/openrct2/actions/LandBuyRightsAction.cpp @@ -14,7 +14,7 @@ #include "../GameState.h" #include "../OpenRCT2.h" #include "../actions/LandSetHeightAction.h" -#include "../audio/audio.h" +#include "../audio/Audio.h" #include "../core/EnumUtils.hpp" #include "../localisation/StringIds.h" #include "../management/Finance.h" diff --git a/src/openrct2/actions/LandLowerAction.cpp b/src/openrct2/actions/LandLowerAction.cpp index d28fca2a44..f0140b74f7 100644 --- a/src/openrct2/actions/LandLowerAction.cpp +++ b/src/openrct2/actions/LandLowerAction.cpp @@ -13,7 +13,7 @@ #include "../GameState.h" #include "../OpenRCT2.h" #include "../actions/LandSetHeightAction.h" -#include "../audio/audio.h" +#include "../audio/Audio.h" #include "../localisation/StringIds.h" #include "../management/Finance.h" #include "../ride/RideConstruction.h" diff --git a/src/openrct2/actions/LandRaiseAction.cpp b/src/openrct2/actions/LandRaiseAction.cpp index 401d777ca9..00c3a52b4a 100644 --- a/src/openrct2/actions/LandRaiseAction.cpp +++ b/src/openrct2/actions/LandRaiseAction.cpp @@ -14,7 +14,7 @@ #include "../GameState.h" #include "../OpenRCT2.h" #include "../actions/LandSetHeightAction.h" -#include "../audio/audio.h" +#include "../audio/Audio.h" #include "../localisation/StringIds.h" #include "../management/Finance.h" #include "../ride/RideConstruction.h" diff --git a/src/openrct2/actions/LandSetRightsAction.cpp b/src/openrct2/actions/LandSetRightsAction.cpp index 9fbcf6211f..75988cdd8d 100644 --- a/src/openrct2/actions/LandSetRightsAction.cpp +++ b/src/openrct2/actions/LandSetRightsAction.cpp @@ -14,7 +14,7 @@ #include "../GameState.h" #include "../OpenRCT2.h" #include "../actions/LandSetHeightAction.h" -#include "../audio/audio.h" +#include "../audio/Audio.h" #include "../core/Numerics.hpp" #include "../localisation/StringIds.h" #include "../management/Finance.h" diff --git a/src/openrct2/actions/LandSmoothAction.cpp b/src/openrct2/actions/LandSmoothAction.cpp index d7c8f53a2b..b6eb21fc93 100644 --- a/src/openrct2/actions/LandSmoothAction.cpp +++ b/src/openrct2/actions/LandSmoothAction.cpp @@ -15,7 +15,7 @@ #include "../actions/LandLowerAction.h" #include "../actions/LandRaiseAction.h" #include "../actions/LandSetHeightAction.h" -#include "../audio/audio.h" +#include "../audio/Audio.h" #include "../localisation/StringIds.h" #include "../management/Finance.h" #include "../ride/RideData.h" diff --git a/src/openrct2/actions/WaterLowerAction.cpp b/src/openrct2/actions/WaterLowerAction.cpp index ccf98f312f..a25f4be1b3 100644 --- a/src/openrct2/actions/WaterLowerAction.cpp +++ b/src/openrct2/actions/WaterLowerAction.cpp @@ -11,7 +11,7 @@ #include "../GameState.h" #include "../OpenRCT2.h" -#include "../audio/audio.h" +#include "../audio/Audio.h" #include "../ride/RideConstruction.h" #include "../world/tile_element/SurfaceElement.h" #include "WaterSetHeightAction.h" diff --git a/src/openrct2/actions/WaterRaiseAction.cpp b/src/openrct2/actions/WaterRaiseAction.cpp index bed5a7535d..68b51702a8 100644 --- a/src/openrct2/actions/WaterRaiseAction.cpp +++ b/src/openrct2/actions/WaterRaiseAction.cpp @@ -11,7 +11,7 @@ #include "../GameState.h" #include "../OpenRCT2.h" -#include "../audio/audio.h" +#include "../audio/Audio.h" #include "../ride/RideConstruction.h" #include "../world/tile_element/SurfaceElement.h" #include "WaterSetHeightAction.h" diff --git a/src/openrct2/audio/Audio.cpp b/src/openrct2/audio/Audio.cpp index 599688ec14..f8691c7327 100644 --- a/src/openrct2/audio/Audio.cpp +++ b/src/openrct2/audio/Audio.cpp @@ -7,7 +7,7 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#include "audio.h" +#include "Audio.h" #include "../Context.h" #include "../OpenRCT2.h" diff --git a/src/openrct2/audio/audio.h b/src/openrct2/audio/Audio.h similarity index 100% rename from src/openrct2/audio/audio.h rename to src/openrct2/audio/Audio.h diff --git a/src/openrct2/entity/Balloon.cpp b/src/openrct2/entity/Balloon.cpp index 4b9d4e5d3f..1cb387f282 100644 --- a/src/openrct2/entity/Balloon.cpp +++ b/src/openrct2/entity/Balloon.cpp @@ -10,7 +10,7 @@ #include "Balloon.h" #include "../Game.h" -#include "../audio/audio.h" +#include "../audio/Audio.h" #include "../core/DataSerialiser.h" #include "../network/network.h" #include "../paint/Paint.h" diff --git a/src/openrct2/entity/Duck.cpp b/src/openrct2/entity/Duck.cpp index 499b86f746..7f230aa456 100644 --- a/src/openrct2/entity/Duck.cpp +++ b/src/openrct2/entity/Duck.cpp @@ -11,7 +11,7 @@ #include "../Game.h" #include "../GameState.h" #include "../SpriteIds.h" -#include "../audio/audio.h" +#include "../audio/Audio.h" #include "../core/DataSerialiser.h" #include "../paint/Paint.h" #include "../profiling/Profiling.h" diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp index 20ba6c92e6..a02d0484f1 100644 --- a/src/openrct2/entity/Guest.cpp +++ b/src/openrct2/entity/Guest.cpp @@ -15,7 +15,7 @@ #include "../GameState.h" #include "../OpenRCT2.h" #include "../SpriteIds.h" -#include "../audio/audio.h" +#include "../audio/Audio.h" #include "../config/Config.h" #include "../core/DataSerialiser.h" #include "../core/Guard.hpp" diff --git a/src/openrct2/entity/Particle.cpp b/src/openrct2/entity/Particle.cpp index 3e71e98323..443fb6044c 100644 --- a/src/openrct2/entity/Particle.cpp +++ b/src/openrct2/entity/Particle.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ #include "Particle.h" -#include "../audio/audio.h" +#include "../audio/Audio.h" #include "../core/DataSerialiser.h" #include "../paint/Paint.h" #include "../profiling/Profiling.h" diff --git a/src/openrct2/entity/Peep.cpp b/src/openrct2/entity/Peep.cpp index 6cfe439f99..b5760195d4 100644 --- a/src/openrct2/entity/Peep.cpp +++ b/src/openrct2/entity/Peep.cpp @@ -18,9 +18,9 @@ #include "../OpenRCT2.h" #include "../SpriteIds.h" #include "../actions/GameAction.h" +#include "../audio/Audio.h" #include "../audio/AudioChannel.h" #include "../audio/AudioMixer.h" -#include "../audio/audio.h" #include "../config/Config.h" #include "../core/EnumUtils.hpp" #include "../core/Guard.hpp" diff --git a/src/openrct2/entity/Staff.cpp b/src/openrct2/entity/Staff.cpp index 071bc8f21a..fb5bf73981 100644 --- a/src/openrct2/entity/Staff.cpp +++ b/src/openrct2/entity/Staff.cpp @@ -15,7 +15,7 @@ #include "../GameState.h" #include "../Input.h" #include "../actions/StaffSetOrdersAction.h" -#include "../audio/audio.h" +#include "../audio/Audio.h" #include "../core/DataSerialiser.h" #include "../core/EnumUtils.hpp" #include "../entity/EntityRegistry.h" diff --git a/src/openrct2/interface/Chat.cpp b/src/openrct2/interface/Chat.cpp index fc546d5e13..f182f3175a 100644 --- a/src/openrct2/interface/Chat.cpp +++ b/src/openrct2/interface/Chat.cpp @@ -10,8 +10,8 @@ #include "Chat.h" #include "../Context.h" +#include "../audio/Audio.h" #include "../audio/AudioMixer.h" -#include "../audio/audio.h" #include "../core/UTF8.h" #include "../drawing/Drawing.h" #include "../drawing/Text.h" diff --git a/src/openrct2/interface/Screenshot.cpp b/src/openrct2/interface/Screenshot.cpp index 8c1cc80880..9408b1bc65 100644 --- a/src/openrct2/interface/Screenshot.cpp +++ b/src/openrct2/interface/Screenshot.cpp @@ -16,7 +16,7 @@ #include "../OpenRCT2.h" #include "../PlatformEnvironment.h" #include "../actions/CheatSetAction.h" -#include "../audio/audio.h" +#include "../audio/Audio.h" #include "../config/Config.h" #include "../core/Console.hpp" #include "../core/EnumUtils.hpp" diff --git a/src/openrct2/interface/Window.cpp b/src/openrct2/interface/Window.cpp index 12952a1436..8c54ae978e 100644 --- a/src/openrct2/interface/Window.cpp +++ b/src/openrct2/interface/Window.cpp @@ -16,7 +16,7 @@ #include "../GameState.h" #include "../Input.h" #include "../OpenRCT2.h" -#include "../audio/audio.h" +#include "../audio/Audio.h" #include "../config/Config.h" #include "../drawing/Drawing.h" #include "../interface/Cursors.h" diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj index 3daf25c705..01237f8516 100644 --- a/src/openrct2/libopenrct2.vcxproj +++ b/src/openrct2/libopenrct2.vcxproj @@ -165,7 +165,7 @@ - + diff --git a/src/openrct2/management/NewsItem.cpp b/src/openrct2/management/NewsItem.cpp index 6d4b785605..a744a64d8e 100644 --- a/src/openrct2/management/NewsItem.cpp +++ b/src/openrct2/management/NewsItem.cpp @@ -14,7 +14,7 @@ #include "../GameState.h" #include "../Input.h" #include "../OpenRCT2.h" -#include "../audio/audio.h" +#include "../audio/Audio.h" #include "../entity/EntityRegistry.h" #include "../entity/Peep.h" #include "../localisation/Formatter.h" diff --git a/src/openrct2/object/ObjectFactory.cpp b/src/openrct2/object/ObjectFactory.cpp index f13aacef4f..33b625675f 100644 --- a/src/openrct2/object/ObjectFactory.cpp +++ b/src/openrct2/object/ObjectFactory.cpp @@ -13,7 +13,7 @@ #include "../Diagnostic.h" #include "../OpenRCT2.h" #include "../PlatformEnvironment.h" -#include "../audio/audio.h" +#include "../audio/Audio.h" #include "../core/Console.hpp" #include "../core/File.h" #include "../core/FileStream.h" diff --git a/src/openrct2/object/ObjectManager.cpp b/src/openrct2/object/ObjectManager.cpp index 52a8ae2c67..9004e87eb0 100644 --- a/src/openrct2/object/ObjectManager.cpp +++ b/src/openrct2/object/ObjectManager.cpp @@ -12,7 +12,7 @@ #include "../Context.h" #include "../Diagnostic.h" #include "../ParkImporter.h" -#include "../audio/audio.h" +#include "../audio/Audio.h" #include "../core/Console.hpp" #include "../core/EnumUtils.hpp" #include "../core/JobPool.h" diff --git a/src/openrct2/object/RideObject.cpp b/src/openrct2/object/RideObject.cpp index 84b09a0396..2d88bca0ca 100644 --- a/src/openrct2/object/RideObject.cpp +++ b/src/openrct2/object/RideObject.cpp @@ -12,7 +12,7 @@ #include "RideObject.h" #include "../OpenRCT2.h" -#include "../audio/audio.h" +#include "../audio/Audio.h" #include "../core/EnumMap.hpp" #include "../core/IStream.hpp" #include "../core/Json.hpp" diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 1719032c5b..651dd7d214 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -15,7 +15,7 @@ #include "../GameState.h" #include "../ParkImporter.h" #include "../actions/WallPlaceAction.h" -#include "../audio/audio.h" +#include "../audio/Audio.h" #include "../core/BitSet.hpp" #include "../core/Collections.hpp" #include "../core/Console.hpp" diff --git a/src/openrct2/ride/CableLift.cpp b/src/openrct2/ride/CableLift.cpp index 07772f9077..19fc2634aa 100644 --- a/src/openrct2/ride/CableLift.cpp +++ b/src/openrct2/ride/CableLift.cpp @@ -9,7 +9,7 @@ #include "CableLift.h" -#include "../audio/audio.h" +#include "../audio/Audio.h" #include "../entity/EntityList.h" #include "../rct12/RCT12.h" #include "../util/Util.h" diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index eb6d6576af..f57f113fae 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -21,8 +21,8 @@ #include "../actions/RideSetSettingAction.h" #include "../actions/RideSetStatusAction.h" #include "../actions/RideSetVehicleAction.h" +#include "../audio/Audio.h" #include "../audio/AudioMixer.h" -#include "../audio/audio.h" #include "../config/Config.h" #include "../core/BitSet.hpp" #include "../core/EnumUtils.hpp" diff --git a/src/openrct2/ride/RideAudio.cpp b/src/openrct2/ride/RideAudio.cpp index ccb0159d1c..0772df9842 100644 --- a/src/openrct2/ride/RideAudio.cpp +++ b/src/openrct2/ride/RideAudio.cpp @@ -11,10 +11,10 @@ #include "../Context.h" #include "../OpenRCT2.h" +#include "../audio/Audio.h" #include "../audio/AudioChannel.h" #include "../audio/AudioContext.h" #include "../audio/AudioMixer.h" -#include "../audio/audio.h" #include "../config/Config.h" #include "../interface/Viewport.h" #include "../object/AudioObject.h" diff --git a/src/openrct2/ride/RideData.cpp b/src/openrct2/ride/RideData.cpp index c8bf65991e..ebe08fc9f1 100644 --- a/src/openrct2/ride/RideData.cpp +++ b/src/openrct2/ride/RideData.cpp @@ -23,7 +23,7 @@ #include "../Diagnostic.h" #include "../GameState.h" #include "../SpriteIds.h" -#include "../audio/audio.h" +#include "../audio/Audio.h" #include "../interface/Colour.h" #include "../management/Research.h" #include "Ride.h" diff --git a/src/openrct2/ride/RideData.h b/src/openrct2/ride/RideData.h index a8abcc529b..121c02f79c 100644 --- a/src/openrct2/ride/RideData.h +++ b/src/openrct2/ride/RideData.h @@ -19,7 +19,7 @@ #define kDefaultFlatRideColourPreset TRACK_COLOUR_PRESETS({ COLOUR_BRIGHT_RED, COLOUR_LIGHT_BLUE, COLOUR_YELLOW }) #define kDefaultStallColourPreset TRACK_COLOUR_PRESETS({ COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED }) -#include "../audio/audio.h" +#include "../audio/Audio.h" #include "../core/BitSet.hpp" #include "../core/EnumUtils.hpp" #include "../drawing/ImageIndexType.h" diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp index baa640f621..a985ab0b3a 100644 --- a/src/openrct2/ride/Track.cpp +++ b/src/openrct2/ride/Track.cpp @@ -13,7 +13,7 @@ #include "../Diagnostic.h" #include "../Game.h" #include "../GameState.h" -#include "../audio/audio.h" +#include "../audio/Audio.h" #include "../config/Config.h" #include "../core/SawyerCoding.h" #include "../interface/Viewport.h" diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp index 36ac4f65a4..bbc5fba19a 100644 --- a/src/openrct2/ride/TrackDesign.cpp +++ b/src/openrct2/ride/TrackDesign.cpp @@ -30,7 +30,7 @@ #include "../actions/TrackRemoveAction.h" #include "../actions/WallPlaceAction.h" #include "../actions/WallRemoveAction.h" -#include "../audio/audio.h" +#include "../audio/Audio.h" #include "../core/DataSerialiser.h" #include "../core/File.h" #include "../core/Numerics.hpp" diff --git a/src/openrct2/ride/TrackDesignSave.cpp b/src/openrct2/ride/TrackDesignSave.cpp index 6a535566df..c537eb4dd0 100644 --- a/src/openrct2/ride/TrackDesignSave.cpp +++ b/src/openrct2/ride/TrackDesignSave.cpp @@ -10,7 +10,7 @@ #include "../Context.h" #include "../Diagnostic.h" #include "../Game.h" -#include "../audio/audio.h" +#include "../audio/Audio.h" #include "../core/SawyerCoding.h" #include "../interface/Viewport.h" #include "../localisation/StringIds.h" diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index 723683d27a..24f15441fa 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -16,9 +16,9 @@ #include "../GameState.h" #include "../OpenRCT2.h" #include "../actions/RideSetStatusAction.h" +#include "../audio/Audio.h" #include "../audio/AudioChannel.h" #include "../audio/AudioMixer.h" -#include "../audio/audio.h" #include "../config/Config.h" #include "../core/EnumUtils.hpp" #include "../core/FixedPoint.hpp" diff --git a/src/openrct2/ride/Vehicle.h b/src/openrct2/ride/Vehicle.h index 2b3ad2aaf5..bf5e5b835a 100644 --- a/src/openrct2/ride/Vehicle.h +++ b/src/openrct2/ride/Vehicle.h @@ -10,7 +10,7 @@ #pragma once #include "../Identifiers.h" -#include "../audio/audio.h" +#include "../audio/Audio.h" #include "../entity/EntityBase.h" #include "../ride/RideTypes.h" #include "../world/Location.hpp" diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp index b0aa085f59..cc7eb4d965 100644 --- a/src/openrct2/scenario/Scenario.cpp +++ b/src/openrct2/scenario/Scenario.cpp @@ -18,7 +18,7 @@ #include "../OpenRCT2.h" #include "../ParkImporter.h" #include "../PlatformEnvironment.h" -#include "../audio/audio.h" +#include "../audio/Audio.h" #include "../config/Config.h" #include "../core/BitSet.hpp" #include "../core/EnumUtils.hpp" diff --git a/src/openrct2/scenes/game/GameScene.cpp b/src/openrct2/scenes/game/GameScene.cpp index c3f48eec8e..ce944d5f30 100644 --- a/src/openrct2/scenes/game/GameScene.cpp +++ b/src/openrct2/scenes/game/GameScene.cpp @@ -14,7 +14,7 @@ #include "../../Game.h" #include "../../GameState.h" #include "../../OpenRCT2.h" -#include "../../audio/audio.h" +#include "../../audio/Audio.h" using namespace OpenRCT2; diff --git a/src/openrct2/scenes/intro/IntroScene.cpp b/src/openrct2/scenes/intro/IntroScene.cpp index 7e70145867..d902b3c93a 100644 --- a/src/openrct2/scenes/intro/IntroScene.cpp +++ b/src/openrct2/scenes/intro/IntroScene.cpp @@ -11,9 +11,9 @@ #include "../../Context.h" #include "../../SpriteIds.h" +#include "../../audio/Audio.h" #include "../../audio/AudioChannel.h" #include "../../audio/AudioMixer.h" -#include "../../audio/audio.h" #include "../../drawing/Drawing.h" #include diff --git a/src/openrct2/scenes/preloader/PreloaderScene.cpp b/src/openrct2/scenes/preloader/PreloaderScene.cpp index 4a3f218f79..b2e1d5cada 100644 --- a/src/openrct2/scenes/preloader/PreloaderScene.cpp +++ b/src/openrct2/scenes/preloader/PreloaderScene.cpp @@ -14,7 +14,7 @@ #include "../../Game.h" #include "../../GameState.h" #include "../../OpenRCT2.h" -#include "../../audio/audio.h" +#include "../../audio/Audio.h" #include "../../interface/Viewport.h" #include "../../localisation/StringIds.h" #include "../../ui/WindowManager.h" diff --git a/src/openrct2/scenes/title/TitleScene.cpp b/src/openrct2/scenes/title/TitleScene.cpp index b9935d7eb5..84551b731c 100644 --- a/src/openrct2/scenes/title/TitleScene.cpp +++ b/src/openrct2/scenes/title/TitleScene.cpp @@ -15,7 +15,7 @@ #include "../../GameState.h" #include "../../Input.h" #include "../../OpenRCT2.h" -#include "../../audio/audio.h" +#include "../../audio/Audio.h" #include "../../config/Config.h" #include "../../core/Console.hpp" #include "../../drawing/Text.h" diff --git a/src/openrct2/world/Climate.cpp b/src/openrct2/world/Climate.cpp index f367934241..638f51308e 100644 --- a/src/openrct2/world/Climate.cpp +++ b/src/openrct2/world/Climate.cpp @@ -15,9 +15,9 @@ #include "../GameState.h" #include "../OpenRCT2.h" #include "../SpriteIds.h" +#include "../audio/Audio.h" #include "../audio/AudioChannel.h" #include "../audio/AudioMixer.h" -#include "../audio/audio.h" #include "../config/Config.h" #include "../core/EnumUtils.hpp" #include "../drawing/Drawing.h" diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp index f538567d6e..edffdda012 100644 --- a/src/openrct2/world/Map.cpp +++ b/src/openrct2/world/Map.cpp @@ -20,7 +20,7 @@ #include "../actions/LargeSceneryRemoveAction.h" #include "../actions/ParkEntranceRemoveAction.h" #include "../actions/WallRemoveAction.h" -#include "../audio/audio.h" +#include "../audio/Audio.h" #include "../core/EnumUtils.hpp" #include "../core/Guard.hpp" #include "../entity/Duck.h"