From a976a43708691076cdddd95cb299c377393bf080 Mon Sep 17 00:00:00 2001 From: 73 <94884086+733737@users.noreply.github.com> Date: Mon, 24 Feb 2025 04:43:06 -0500 Subject: [PATCH] Rename network.h to Network.h (#23882) --- src/openrct2-ui/ProvisionalElements.cpp | 2 +- src/openrct2-ui/input/Shortcuts.cpp | 2 +- src/openrct2-ui/windows/Cheats.cpp | 2 +- src/openrct2-ui/windows/Guest.cpp | 2 +- src/openrct2-ui/windows/LoadSave.cpp | 2 +- src/openrct2-ui/windows/Multiplayer.cpp | 2 +- src/openrct2-ui/windows/NetworkStatus.cpp | 2 +- src/openrct2-ui/windows/NewRide.cpp | 2 +- src/openrct2-ui/windows/Options.cpp | 2 +- src/openrct2-ui/windows/Player.cpp | 2 +- src/openrct2-ui/windows/Ride.cpp | 2 +- src/openrct2-ui/windows/RideConstruction.cpp | 2 +- src/openrct2-ui/windows/RideList.cpp | 2 +- src/openrct2-ui/windows/SavePrompt.cpp | 2 +- src/openrct2-ui/windows/Scenery.cpp | 2 +- src/openrct2-ui/windows/ServerList.cpp | 2 +- src/openrct2-ui/windows/ServerStart.cpp | 2 +- src/openrct2-ui/windows/Staff.cpp | 2 +- src/openrct2-ui/windows/TopToolbar.cpp | 2 +- src/openrct2-ui/windows/Transparency.cpp | 2 +- src/openrct2/Cheats.cpp | 2 +- src/openrct2/Context.cpp | 2 +- src/openrct2/Game.cpp | 2 +- src/openrct2/actions/CheatSetAction.cpp | 2 +- src/openrct2/actions/GameAction.cpp | 2 +- src/openrct2/actions/NetworkModifyGroupAction.cpp | 2 +- src/openrct2/actions/ParkSetNameAction.cpp | 2 +- src/openrct2/actions/PeepPickupAction.cpp | 2 +- src/openrct2/actions/PlayerKickAction.cpp | 2 +- src/openrct2/actions/PlayerSetGroupAction.cpp | 2 +- src/openrct2/command_line/RootCommands.cpp | 2 +- src/openrct2/command_line/SimulateCommands.cpp | 2 +- src/openrct2/command_line/UriHandler.cpp | 2 +- src/openrct2/config/Config.cpp | 2 +- src/openrct2/core/DataSerialiserTraits.h | 2 +- src/openrct2/entity/Balloon.cpp | 2 +- src/openrct2/entity/Guest.cpp | 2 +- src/openrct2/entity/MoneyEffect.cpp | 2 +- src/openrct2/entity/Peep.cpp | 2 +- src/openrct2/entity/Staff.cpp | 2 +- src/openrct2/interface/Chat.cpp | 2 +- src/openrct2/interface/InteractiveConsole.cpp | 2 +- src/openrct2/libopenrct2.vcxproj | 2 +- src/openrct2/network/DiscordService.cpp | 2 +- src/openrct2/network/{network.h => Network.h} | 0 src/openrct2/network/NetworkBase.cpp | 2 +- src/openrct2/network/NetworkConnection.cpp | 2 +- src/openrct2/network/NetworkServerAdvertiser.cpp | 2 +- src/openrct2/network/ServerList.cpp | 2 +- src/openrct2/rct2/S6Importer.cpp | 2 +- src/openrct2/ride/Ride.cpp | 2 +- src/openrct2/ride/RideConstruction.cpp | 2 +- src/openrct2/ride/Track.cpp | 2 +- src/openrct2/ride/TrackDesign.cpp | 2 +- src/openrct2/scenario/Scenario.cpp | 2 +- src/openrct2/scenes/title/TitleScene.cpp | 2 +- src/openrct2/scripting/bindings/network/ScNetwork.cpp | 2 +- src/openrct2/scripting/bindings/network/ScPlayer.cpp | 2 +- src/openrct2/scripting/bindings/network/ScPlayerGroup.cpp | 2 +- src/openrct2/world/Banner.cpp | 2 +- src/openrct2/world/Entrance.cpp | 2 +- src/openrct2/world/Map.cpp | 2 +- src/openrct2/world/Park.cpp | 2 +- src/openrct2/world/Scenery.cpp | 2 +- src/openrct2/world/tile_element/SmallSceneryElement.cpp | 2 +- test/tests/S6ImportExportTests.cpp | 2 +- 66 files changed, 65 insertions(+), 65 deletions(-) rename src/openrct2/network/{network.h => Network.h} (100%) diff --git a/src/openrct2-ui/ProvisionalElements.cpp b/src/openrct2-ui/ProvisionalElements.cpp index 14584c9174..2f29a94a89 100644 --- a/src/openrct2-ui/ProvisionalElements.cpp +++ b/src/openrct2-ui/ProvisionalElements.cpp @@ -13,7 +13,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 6337839534..39a79f40d6 100644 --- a/src/openrct2-ui/input/Shortcuts.cpp +++ b/src/openrct2-ui/input/Shortcuts.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Cheats.cpp b/src/openrct2-ui/windows/Cheats.cpp index 5c057b6d9d..3e7fdd6dd3 100644 --- a/src/openrct2-ui/windows/Cheats.cpp +++ b/src/openrct2-ui/windows/Cheats.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index 96c8e70674..e15894d990 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -30,7 +30,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 432ab300aa..ae59f01f06 100644 --- a/src/openrct2-ui/windows/LoadSave.cpp +++ b/src/openrct2-ui/windows/LoadSave.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Multiplayer.cpp b/src/openrct2-ui/windows/Multiplayer.cpp index 84c557f9c0..ff57fa3c82 100644 --- a/src/openrct2-ui/windows/Multiplayer.cpp +++ b/src/openrct2-ui/windows/Multiplayer.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include namespace OpenRCT2::Ui::Windows diff --git a/src/openrct2-ui/windows/NetworkStatus.cpp b/src/openrct2-ui/windows/NetworkStatus.cpp index f5ee64ef20..4e70fa5bf9 100644 --- a/src/openrct2-ui/windows/NetworkStatus.cpp +++ b/src/openrct2-ui/windows/NetworkStatus.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include namespace OpenRCT2::Ui::Windows diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp index f5263b5af8..840cbd3677 100644 --- a/src/openrct2-ui/windows/NewRide.cpp +++ b/src/openrct2-ui/windows/NewRide.cpp @@ -25,7 +25,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 f4f3717637..69f3895545 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Player.cpp b/src/openrct2-ui/windows/Player.cpp index 3a9a3c2458..14816a991e 100644 --- a/src/openrct2-ui/windows/Player.cpp +++ b/src/openrct2-ui/windows/Player.cpp @@ -18,8 +18,8 @@ #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 84d13e2bc8..1bf97c2b07 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -46,7 +46,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 cdc348df4a..5397dc4c25 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/RideList.cpp b/src/openrct2-ui/windows/RideList.cpp index c76357e768..6ba40441cc 100644 --- a/src/openrct2-ui/windows/RideList.cpp +++ b/src/openrct2-ui/windows/RideList.cpp @@ -23,7 +23,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 8d28e3d177..215c5b916c 100644 --- a/src/openrct2-ui/windows/SavePrompt.cpp +++ b/src/openrct2-ui/windows/SavePrompt.cpp @@ -17,7 +17,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 520bda1a03..03b43f8e3d 100644 --- a/src/openrct2-ui/windows/Scenery.cpp +++ b/src/openrct2-ui/windows/Scenery.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/ServerList.cpp b/src/openrct2-ui/windows/ServerList.cpp index 7bbf678a61..8fbe786e40 100644 --- a/src/openrct2-ui/windows/ServerList.cpp +++ b/src/openrct2-ui/windows/ServerList.cpp @@ -22,8 +22,8 @@ #include #include #include + #include #include - #include #include #include #include diff --git a/src/openrct2-ui/windows/ServerStart.cpp b/src/openrct2-ui/windows/ServerStart.cpp index 1cbccf0d18..4bd5750a35 100644 --- a/src/openrct2-ui/windows/ServerStart.cpp +++ b/src/openrct2-ui/windows/ServerStart.cpp @@ -18,7 +18,7 @@ #include #include #include - #include + #include #include #include diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp index 3fc9afe9f0..5e4220b3b4 100644 --- a/src/openrct2-ui/windows/Staff.cpp +++ b/src/openrct2-ui/windows/Staff.cpp @@ -29,7 +29,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 37b59c63e9..944c36729c 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2-ui/windows/Transparency.cpp b/src/openrct2-ui/windows/Transparency.cpp index 881c62e741..d2f25d899d 100644 --- a/src/openrct2-ui/windows/Transparency.cpp +++ b/src/openrct2-ui/windows/Transparency.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/openrct2/Cheats.cpp b/src/openrct2/Cheats.cpp index 9abbdacbb4..25ebf1c61a 100644 --- a/src/openrct2/Cheats.cpp +++ b/src/openrct2/Cheats.cpp @@ -13,7 +13,7 @@ #include "actions/CheatSetAction.h" #include "actions/ParkSetLoanAction.h" #include "core/DataSerialiser.h" -#include "network/network.h" +#include "network/Network.h" #include "ride/Ride.h" #include "scenario/Scenario.h" #include "world/Climate.h" diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index 57b926b786..f122e5c9ee 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -50,8 +50,8 @@ #include "localisation/Localisation.Date.h" #include "localisation/LocalisationService.h" #include "network/DiscordService.h" +#include "network/Network.h" #include "network/NetworkBase.h" -#include "network/network.h" #include "object/ObjectManager.h" #include "object/ObjectRepository.h" #include "paint/Painter.h" diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp index 7df0dcd5e2..9af209bc11 100644 --- a/src/openrct2/Game.cpp +++ b/src/openrct2/Game.cpp @@ -43,7 +43,7 @@ #include "management/Finance.h" #include "management/Marketing.h" #include "management/Research.h" -#include "network/network.h" +#include "network/Network.h" #include "object/Object.h" #include "object/ObjectEntryManager.h" #include "object/ObjectList.h" diff --git a/src/openrct2/actions/CheatSetAction.cpp b/src/openrct2/actions/CheatSetAction.cpp index ed8b6a07d2..a0681fb3d5 100644 --- a/src/openrct2/actions/CheatSetAction.cpp +++ b/src/openrct2/actions/CheatSetAction.cpp @@ -21,7 +21,7 @@ #include "../entity/EntityRegistry.h" #include "../entity/Staff.h" #include "../localisation/StringIds.h" -#include "../network/network.h" +#include "../network/Network.h" #include "../object/PathAdditionEntry.h" #include "../ride/Ride.h" #include "../ride/RideManager.hpp" diff --git a/src/openrct2/actions/GameAction.cpp b/src/openrct2/actions/GameAction.cpp index b81b37ff75..6a4c0cb79e 100644 --- a/src/openrct2/actions/GameAction.cpp +++ b/src/openrct2/actions/GameAction.cpp @@ -18,7 +18,7 @@ #include "../core/MemoryStream.h" #include "../entity/MoneyEffect.h" #include "../localisation/Formatter.h" -#include "../network/network.h" +#include "../network/Network.h" #include "../platform/Platform.h" #include "../profiling/Profiling.h" #include "../scenario/Scenario.h" diff --git a/src/openrct2/actions/NetworkModifyGroupAction.cpp b/src/openrct2/actions/NetworkModifyGroupAction.cpp index ccd4e331da..bda0261cb3 100644 --- a/src/openrct2/actions/NetworkModifyGroupAction.cpp +++ b/src/openrct2/actions/NetworkModifyGroupAction.cpp @@ -9,7 +9,7 @@ #include "NetworkModifyGroupAction.h" -#include "../network/network.h" +#include "../network/Network.h" using namespace OpenRCT2; diff --git a/src/openrct2/actions/ParkSetNameAction.cpp b/src/openrct2/actions/ParkSetNameAction.cpp index c7c3f8c2d8..801d1d5502 100644 --- a/src/openrct2/actions/ParkSetNameAction.cpp +++ b/src/openrct2/actions/ParkSetNameAction.cpp @@ -15,7 +15,7 @@ #include "../core/MemoryStream.h" #include "../drawing/Drawing.h" #include "../management/Finance.h" -#include "../network/network.h" +#include "../network/Network.h" #include "../ui/WindowManager.h" #include "../windows/Intent.h" #include "../world/Park.h" diff --git a/src/openrct2/actions/PeepPickupAction.cpp b/src/openrct2/actions/PeepPickupAction.cpp index 0814f35cda..6123a24692 100644 --- a/src/openrct2/actions/PeepPickupAction.cpp +++ b/src/openrct2/actions/PeepPickupAction.cpp @@ -13,7 +13,7 @@ #include "../Input.h" #include "../entity/EntityRegistry.h" #include "../entity/Peep.h" -#include "../network/network.h" +#include "../network/Network.h" using namespace OpenRCT2; diff --git a/src/openrct2/actions/PlayerKickAction.cpp b/src/openrct2/actions/PlayerKickAction.cpp index bdad5937c6..6973f8020e 100644 --- a/src/openrct2/actions/PlayerKickAction.cpp +++ b/src/openrct2/actions/PlayerKickAction.cpp @@ -9,7 +9,7 @@ #include "PlayerKickAction.h" -#include "../network/network.h" +#include "../network/Network.h" using namespace OpenRCT2; diff --git a/src/openrct2/actions/PlayerSetGroupAction.cpp b/src/openrct2/actions/PlayerSetGroupAction.cpp index 46c706f29a..03cec60c29 100644 --- a/src/openrct2/actions/PlayerSetGroupAction.cpp +++ b/src/openrct2/actions/PlayerSetGroupAction.cpp @@ -9,7 +9,7 @@ #include "PlayerSetGroupAction.h" -#include "../network/network.h" +#include "../network/Network.h" using namespace OpenRCT2; diff --git a/src/openrct2/command_line/RootCommands.cpp b/src/openrct2/command_line/RootCommands.cpp index d074408270..d9325ae468 100644 --- a/src/openrct2/command_line/RootCommands.cpp +++ b/src/openrct2/command_line/RootCommands.cpp @@ -19,7 +19,7 @@ #include "../core/Path.hpp" #include "../core/String.hpp" #include "../localisation/Language.h" -#include "../network/network.h" +#include "../network/Network.h" #include "../object/ObjectRepository.h" #include "../park/ParkFile.h" #include "../platform/Crash.h" diff --git a/src/openrct2/command_line/SimulateCommands.cpp b/src/openrct2/command_line/SimulateCommands.cpp index 86150b9969..cef7abef0c 100644 --- a/src/openrct2/command_line/SimulateCommands.cpp +++ b/src/openrct2/command_line/SimulateCommands.cpp @@ -14,7 +14,7 @@ #include "../config/ConfigTypes.h" #include "../core/Console.hpp" #include "../entity/EntityRegistry.h" -#include "../network/network.h" +#include "../network/Network.h" #include "../platform/Platform.h" #include "CommandLine.hpp" diff --git a/src/openrct2/command_line/UriHandler.cpp b/src/openrct2/command_line/UriHandler.cpp index 36f2e45141..9220449d58 100644 --- a/src/openrct2/command_line/UriHandler.cpp +++ b/src/openrct2/command_line/UriHandler.cpp @@ -10,7 +10,7 @@ #include "../OpenRCT2.h" #include "../core/Console.hpp" #include "../core/String.hpp" -#include "../network/network.h" +#include "../network/Network.h" #include "CommandLine.hpp" using namespace OpenRCT2; diff --git a/src/openrct2/config/Config.cpp b/src/openrct2/config/Config.cpp index 38d52cbe67..b6a03abf35 100644 --- a/src/openrct2/config/Config.cpp +++ b/src/openrct2/config/Config.cpp @@ -26,7 +26,7 @@ #include "../localisation/Formatting.h" #include "../localisation/Language.h" #include "../localisation/StringIds.h" -#include "../network/network.h" +#include "../network/Network.h" #include "../paint/VirtualFloor.h" #include "../platform/Platform.h" #include "../rct1/Csg.h" diff --git a/src/openrct2/core/DataSerialiserTraits.h b/src/openrct2/core/DataSerialiserTraits.h index 8c0a74cfe0..d66a2f4c04 100644 --- a/src/openrct2/core/DataSerialiserTraits.h +++ b/src/openrct2/core/DataSerialiserTraits.h @@ -11,8 +11,8 @@ #include "../Cheats.h" #include "../entity/Guest.h" +#include "../network/Network.h" #include "../network/NetworkTypes.h" -#include "../network/network.h" #include "../object/Object.h" #include "../ride/RideColour.h" #include "../ride/TrackDesign.h" diff --git a/src/openrct2/entity/Balloon.cpp b/src/openrct2/entity/Balloon.cpp index 1cb387f282..845a3b7076 100644 --- a/src/openrct2/entity/Balloon.cpp +++ b/src/openrct2/entity/Balloon.cpp @@ -12,7 +12,7 @@ #include "../Game.h" #include "../audio/Audio.h" #include "../core/DataSerialiser.h" -#include "../network/network.h" +#include "../network/Network.h" #include "../paint/Paint.h" #include "../profiling/Profiling.h" #include "../scenario/Scenario.h" diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp index a02d0484f1..37fe448d7b 100644 --- a/src/openrct2/entity/Guest.cpp +++ b/src/openrct2/entity/Guest.cpp @@ -31,7 +31,7 @@ #include "../management/Finance.h" #include "../management/Marketing.h" #include "../management/NewsItem.h" -#include "../network/network.h" +#include "../network/Network.h" #include "../object/LargeSceneryEntry.h" #include "../object/MusicObject.h" #include "../object/ObjectManager.h" diff --git a/src/openrct2/entity/MoneyEffect.cpp b/src/openrct2/entity/MoneyEffect.cpp index c47a56b101..4f26a79f84 100644 --- a/src/openrct2/entity/MoneyEffect.cpp +++ b/src/openrct2/entity/MoneyEffect.cpp @@ -17,7 +17,7 @@ #include "../interface/Viewport.h" #include "../interface/Window.h" #include "../localisation/Formatting.h" -#include "../network/network.h" +#include "../network/Network.h" #include "../paint/Paint.h" #include "../profiling/Profiling.h" #include "../world/Map.h" diff --git a/src/openrct2/entity/Peep.cpp b/src/openrct2/entity/Peep.cpp index 947b1316c0..8be6b22e5f 100644 --- a/src/openrct2/entity/Peep.cpp +++ b/src/openrct2/entity/Peep.cpp @@ -36,7 +36,7 @@ #include "../management/Finance.h" #include "../management/Marketing.h" #include "../management/NewsItem.h" -#include "../network/network.h" +#include "../network/Network.h" #include "../object/ObjectManager.h" #include "../object/PeepAnimationsObject.h" #include "../paint/Paint.h" diff --git a/src/openrct2/entity/Staff.cpp b/src/openrct2/entity/Staff.cpp index fb5bf73981..8d354f9976 100644 --- a/src/openrct2/entity/Staff.cpp +++ b/src/openrct2/entity/Staff.cpp @@ -22,7 +22,7 @@ #include "../interface/Viewport.h" #include "../localisation/StringIds.h" #include "../management/Finance.h" -#include "../network/network.h" +#include "../network/Network.h" #include "../object/ObjectEntryManager.h" #include "../object/ObjectLimits.h" #include "../object/ObjectList.h" diff --git a/src/openrct2/interface/Chat.cpp b/src/openrct2/interface/Chat.cpp index f182f3175a..2718a06e5e 100644 --- a/src/openrct2/interface/Chat.cpp +++ b/src/openrct2/interface/Chat.cpp @@ -17,7 +17,7 @@ #include "../drawing/Text.h" #include "../localisation/Formatter.h" #include "../localisation/Formatting.h" -#include "../network/network.h" +#include "../network/Network.h" #include "../platform/Platform.h" #include "../world/Location.hpp" diff --git a/src/openrct2/interface/InteractiveConsole.cpp b/src/openrct2/interface/InteractiveConsole.cpp index 2a66e9f5da..b7db3e31c3 100644 --- a/src/openrct2/interface/InteractiveConsole.cpp +++ b/src/openrct2/interface/InteractiveConsole.cpp @@ -50,7 +50,7 @@ #include "../management/Finance.h" #include "../management/NewsItem.h" #include "../management/Research.h" -#include "../network/network.h" +#include "../network/Network.h" #include "../object/Object.h" #include "../object/ObjectList.h" #include "../object/ObjectManager.h" diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj index 01237f8516..fab2e94f6d 100644 --- a/src/openrct2/libopenrct2.vcxproj +++ b/src/openrct2/libopenrct2.vcxproj @@ -308,7 +308,7 @@ - + diff --git a/src/openrct2/network/DiscordService.cpp b/src/openrct2/network/DiscordService.cpp index fcb149ac4c..f78f342081 100644 --- a/src/openrct2/network/DiscordService.cpp +++ b/src/openrct2/network/DiscordService.cpp @@ -19,7 +19,7 @@ #include "../core/UTF8.h" #include "../localisation/Formatting.h" #include "../world/Park.h" - #include "network.h" + #include "Network.h" #include #include diff --git a/src/openrct2/network/network.h b/src/openrct2/network/Network.h similarity index 100% rename from src/openrct2/network/network.h rename to src/openrct2/network/Network.h diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index 8865435bd2..6eee292519 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -37,7 +37,7 @@ #include "../ui/WindowManager.h" #include "../util/Util.h" #include "../world/Location.hpp" -#include "network.h" +#include "Network.h" #include #include diff --git a/src/openrct2/network/NetworkConnection.cpp b/src/openrct2/network/NetworkConnection.cpp index bfc53e2b53..1adc1689f5 100644 --- a/src/openrct2/network/NetworkConnection.cpp +++ b/src/openrct2/network/NetworkConnection.cpp @@ -14,8 +14,8 @@ #include "../core/String.hpp" #include "../localisation/Formatting.h" #include "../platform/Platform.h" + #include "Network.h" #include "Socket.h" - #include "network.h" #include diff --git a/src/openrct2/network/NetworkServerAdvertiser.cpp b/src/openrct2/network/NetworkServerAdvertiser.cpp index e5a8cbbb19..cf702f2be0 100644 --- a/src/openrct2/network/NetworkServerAdvertiser.cpp +++ b/src/openrct2/network/NetworkServerAdvertiser.cpp @@ -25,8 +25,8 @@ #include "../platform/Platform.h" #include "../world/Map.h" #include "../world/Park.h" + #include "Network.h" #include "Socket.h" - #include "network.h" #include #include diff --git a/src/openrct2/network/ServerList.cpp b/src/openrct2/network/ServerList.cpp index 166c6f63bd..d31d6b41f8 100644 --- a/src/openrct2/network/ServerList.cpp +++ b/src/openrct2/network/ServerList.cpp @@ -25,8 +25,8 @@ #include "../core/String.hpp" #include "../localisation/Language.h" #include "../platform/Platform.h" + #include "Network.h" #include "Socket.h" - #include "network.h" #include #include diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 8f06747f70..ef2c1b8ffd 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -43,7 +43,7 @@ #include "../management/Marketing.h" #include "../management/NewsItem.h" #include "../management/Research.h" -#include "../network/network.h" +#include "../network/Network.h" #include "../object/LargeSceneryEntry.h" #include "../object/ObjectLimits.h" #include "../object/ObjectList.h" diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 35d6d95abf..21af3a8caa 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -38,7 +38,7 @@ #include "../management/Finance.h" #include "../management/Marketing.h" #include "../management/NewsItem.h" -#include "../network/network.h" +#include "../network/Network.h" #include "../object/MusicObject.h" #include "../object/ObjectList.h" #include "../object/ObjectManager.h" diff --git a/src/openrct2/ride/RideConstruction.cpp b/src/openrct2/ride/RideConstruction.cpp index 8179c1c05e..ec02546580 100644 --- a/src/openrct2/ride/RideConstruction.cpp +++ b/src/openrct2/ride/RideConstruction.cpp @@ -23,7 +23,7 @@ #include "../entity/Staff.h" #include "../interface/Window_internal.h" #include "../localisation/Formatter.h" -#include "../network/network.h" +#include "../network/Network.h" #include "../ui/WindowManager.h" #include "../windows/Intent.h" #include "../world/Banner.h" diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp index 2dfe620097..8e41fe2f1f 100644 --- a/src/openrct2/ride/Track.cpp +++ b/src/openrct2/ride/Track.cpp @@ -18,7 +18,7 @@ #include "../core/SawyerCoding.h" #include "../interface/Viewport.h" #include "../management/Finance.h" -#include "../network/network.h" +#include "../network/Network.h" #include "../platform/Platform.h" #include "../rct1/RCT1.h" #include "../ride/RideColour.h" diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp index bbc5fba19a..046f452833 100644 --- a/src/openrct2/ride/TrackDesign.cpp +++ b/src/openrct2/ride/TrackDesign.cpp @@ -41,7 +41,7 @@ #include "../interface/Viewport.h" #include "../localisation/StringIds.h" #include "../management/Finance.h" -#include "../network/network.h" +#include "../network/Network.h" #include "../object/FootpathObject.h" #include "../object/FootpathSurfaceObject.h" #include "../object/LargeSceneryEntry.h" diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp index cc7eb4d965..2b49f70251 100644 --- a/src/openrct2/scenario/Scenario.cpp +++ b/src/openrct2/scenario/Scenario.cpp @@ -36,7 +36,7 @@ #include "../management/Marketing.h" #include "../management/NewsItem.h" #include "../management/Research.h" -#include "../network/network.h" +#include "../network/Network.h" #include "../object/Object.h" #include "../object/ObjectEntryManager.h" #include "../object/ObjectLimits.h" diff --git a/src/openrct2/scenes/title/TitleScene.cpp b/src/openrct2/scenes/title/TitleScene.cpp index 84551b731c..2d756dafbb 100644 --- a/src/openrct2/scenes/title/TitleScene.cpp +++ b/src/openrct2/scenes/title/TitleScene.cpp @@ -21,8 +21,8 @@ #include "../../drawing/Text.h" #include "../../interface/Screenshot.h" #include "../../interface/Viewport.h" +#include "../../network/Network.h" #include "../../network/NetworkBase.h" -#include "../../network/network.h" #include "../../scenario/Scenario.h" #include "../../scenario/ScenarioRepository.h" #include "../../ui/UiContext.h" diff --git a/src/openrct2/scripting/bindings/network/ScNetwork.cpp b/src/openrct2/scripting/bindings/network/ScNetwork.cpp index e96475d109..c1b68ef818 100644 --- a/src/openrct2/scripting/bindings/network/ScNetwork.cpp +++ b/src/openrct2/scripting/bindings/network/ScNetwork.cpp @@ -14,8 +14,8 @@ #include "../../../Context.h" #include "../../../actions/NetworkModifyGroupAction.h" #include "../../../actions/PlayerKickAction.h" + #include "../../../network/Network.h" #include "../../../network/NetworkAction.h" - #include "../../../network/network.h" namespace OpenRCT2::Scripting { diff --git a/src/openrct2/scripting/bindings/network/ScPlayer.cpp b/src/openrct2/scripting/bindings/network/ScPlayer.cpp index 905b11bbc0..6a6dd6ba4a 100644 --- a/src/openrct2/scripting/bindings/network/ScPlayer.cpp +++ b/src/openrct2/scripting/bindings/network/ScPlayer.cpp @@ -13,8 +13,8 @@ #include "../../../Context.h" #include "../../../actions/PlayerSetGroupAction.h" + #include "../../../network/Network.h" #include "../../../network/NetworkAction.h" - #include "../../../network/network.h" namespace OpenRCT2::Scripting { diff --git a/src/openrct2/scripting/bindings/network/ScPlayerGroup.cpp b/src/openrct2/scripting/bindings/network/ScPlayerGroup.cpp index 4f8bb37d2a..072d5a21cc 100644 --- a/src/openrct2/scripting/bindings/network/ScPlayerGroup.cpp +++ b/src/openrct2/scripting/bindings/network/ScPlayerGroup.cpp @@ -15,8 +15,8 @@ #include "../../../actions/NetworkModifyGroupAction.h" #include "../../../actions/PlayerSetGroupAction.h" #include "../../../core/String.hpp" + #include "../../../network/Network.h" #include "../../../network/NetworkAction.h" - #include "../../../network/network.h" #include "../../Duktape.hpp" namespace OpenRCT2::Scripting diff --git a/src/openrct2/world/Banner.cpp b/src/openrct2/world/Banner.cpp index d943adde3b..0667a7ad7f 100644 --- a/src/openrct2/world/Banner.cpp +++ b/src/openrct2/world/Banner.cpp @@ -18,7 +18,7 @@ #include "../localisation/Formatter.h" #include "../localisation/Formatting.h" #include "../management/Finance.h" -#include "../network/network.h" +#include "../network/Network.h" #include "../object/BannerSceneryEntry.h" #include "../object/ObjectEntryManager.h" #include "../object/WallSceneryEntry.h" diff --git a/src/openrct2/world/Entrance.cpp b/src/openrct2/world/Entrance.cpp index c4fbea6a45..1ec57fb7bb 100644 --- a/src/openrct2/world/Entrance.cpp +++ b/src/openrct2/world/Entrance.cpp @@ -19,7 +19,7 @@ #include "../actions/RideEntranceExitRemoveAction.h" #include "../localisation/StringIds.h" #include "../management/Finance.h" -#include "../network/network.h" +#include "../network/Network.h" #include "../object/FootpathObject.h" #include "../object/FootpathSurfaceObject.h" #include "../object/ObjectManager.h" diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp index edffdda012..160f10c93a 100644 --- a/src/openrct2/world/Map.cpp +++ b/src/openrct2/world/Map.cpp @@ -31,7 +31,7 @@ #include "../interface/Cursors.h" #include "../interface/Viewport.h" #include "../management/Finance.h" -#include "../network/network.h" +#include "../network/Network.h" #include "../object/LargeSceneryEntry.h" #include "../object/ObjectManager.h" #include "../object/SmallSceneryEntry.h" diff --git a/src/openrct2/world/Park.cpp b/src/openrct2/world/Park.cpp index ba0e99e58a..9b8fc31761 100644 --- a/src/openrct2/world/Park.cpp +++ b/src/openrct2/world/Park.cpp @@ -26,7 +26,7 @@ #include "../management/Finance.h" #include "../management/Marketing.h" #include "../management/Research.h" -#include "../network/network.h" +#include "../network/Network.h" #include "../profiling/Profiling.h" #include "../ride/Ride.h" #include "../ride/RideData.h" diff --git a/src/openrct2/world/Scenery.cpp b/src/openrct2/world/Scenery.cpp index 9e9c3a7397..1cbb9f3b47 100644 --- a/src/openrct2/world/Scenery.cpp +++ b/src/openrct2/world/Scenery.cpp @@ -21,7 +21,7 @@ #include "../actions/WallRemoveAction.h" #include "../core/CodepointView.hpp" #include "../entity/Fountain.h" -#include "../network/network.h" +#include "../network/Network.h" #include "../object/BannerSceneryEntry.h" #include "../object/LargeSceneryEntry.h" #include "../object/ObjectEntryManager.h" diff --git a/src/openrct2/world/tile_element/SmallSceneryElement.cpp b/src/openrct2/world/tile_element/SmallSceneryElement.cpp index 3e6b332c1a..10fb8376c1 100644 --- a/src/openrct2/world/tile_element/SmallSceneryElement.cpp +++ b/src/openrct2/world/tile_element/SmallSceneryElement.cpp @@ -14,7 +14,7 @@ #include "../../Game.h" #include "../../OpenRCT2.h" #include "../../management/Finance.h" -#include "../../network/network.h" +#include "../../network/Network.h" #include "../../object/ObjectEntryManager.h" #include "../../object/ObjectManager.h" #include "../../object/SmallSceneryEntry.h" diff --git a/test/tests/S6ImportExportTests.cpp b/test/tests/S6ImportExportTests.cpp index bf32066519..a7901aef60 100644 --- a/test/tests/S6ImportExportTests.cpp +++ b/test/tests/S6ImportExportTests.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include