From 90075022b162ea439c1b62af95ed1612f9de6bf3 Mon Sep 17 00:00:00 2001 From: Peter Gaal Date: Mon, 7 Sep 2020 06:42:02 +0100 Subject: [PATCH] Titlecasev files openloco (#604) * renamed Company.h and Company.cpp * renamed CompanyManager.h and CompanyManager.cpp * renamed Config.h and Config.cpp * renamed Console.h and Console.cpp * renamed ConfigConvert.hpp * renamed Date.h and Date.cpp * renamed Environment.h and Environment.cpp * renamed GameCommands.h * renamed Gui.h and Gui.cpp * renamed Industry.h and Industry.cpp * renamed IndustryManager.h and IndustryManager.cpp * renamed Input.h and Input.cpp * renamed Intro.h and Intro.cpp * renamed Message.h * renamed MessageManager.h and MessageManager.cpp * renamed MultiPlayer.h and MultiPlayer.cpp * renamed OpenLoco.h and OpenLoco.cpp * renamed ProgressBar.h and ProgressBar.cpp * renamed Resource.h * renamed Scenario.h and Scenario.cpp * renamed ScenarioManager.h and ScenarioManager.cpp * renamed Station.h and Station.cpp * renamed StationManager.h and StationManager.cpp * renamed Town.h and Town.cpp * renamed TownManager.h and TownManager.cpp * renamed Tutorial.h and Tutorial.cpp * renamed Types.hpp * Removed Types.hpp from headers Removed Types.hpp from include section in CompanyManager.cpp which is already included in CompanyManager.h * renamed Ui.h and Ui.cpp * renamed Version.cpp * renamed Viewport.hpp and Viewport.cpp * renamed ViewportManager.h and ViewportManager.cpp * renamed Widget.h and Widget.cpp * renamed Win32.h * renamed Window.h and Window.cpp * Fix formatting * Fix formatting 2 * Fix formatting 3 * rename types.hpp to Types.hpp in TrackData.h --- resources/OpenLoco.rc | 4 +- resources/{resource.h => Resource.h} | 0 src/openloco/{company.cpp => Company.cpp} | 2 +- src/openloco/{company.h => Company.h} | 2 +- .../{companymgr.cpp => CompanyManager.cpp} | 9 +- .../{companymgr.h => CompanyManager.h} | 4 +- src/openloco/{config.cpp => Config.cpp} | 6 +- src/openloco/{config.h => Config.h} | 0 .../{config.convert.hpp => ConfigConvert.hpp} | 2 +- src/openloco/{console.cpp => Console.cpp} | 2 +- src/openloco/{console.h => Console.h} | 0 src/openloco/{date.cpp => Date.cpp} | 2 +- src/openloco/{date.h => Date.h} | 0 .../{environment.cpp => Environment.cpp} | 6 +- src/openloco/{environment.h => Environment.h} | 0 src/openloco/GameCommands.cpp | 8 +- .../{game_commands.h => GameCommands.h} | 0 src/openloco/{gui.cpp => Gui.cpp} | 12 +- src/openloco/{gui.h => Gui.h} | 0 src/openloco/{industry.cpp => Industry.cpp} | 2 +- src/openloco/{industry.h => Industry.h} | 2 +- .../{industrymgr.cpp => IndustryManager.cpp} | 6 +- .../{industrymgr.h => IndustryManager.h} | 2 +- src/openloco/{input.cpp => Input.cpp} | 6 +- src/openloco/{input.h => Input.h} | 2 +- src/openloco/{intro.cpp => Intro.cpp} | 2 +- src/openloco/{intro.h => Intro.h} | 0 src/openloco/{message.h => Message.h} | 0 .../{messagemgr.cpp => MessageManager.cpp} | 4 +- .../{messagemgr.h => MessageManager.h} | 4 +- .../{multiplayer.cpp => MultiPlayer.cpp} | 2 +- src/openloco/{multiplayer.h => MultiPlayer.h} | 0 src/openloco/{openloco.cpp => OpenLoco.cpp} | 34 ++--- src/openloco/{openloco.h => OpenLoco.h} | 0 .../{progressbar.cpp => ProgressBar.cpp} | 2 +- src/openloco/{progressbar.h => ProgressBar.h} | 0 src/openloco/{scenario.cpp => Scenario.cpp} | 2 +- src/openloco/{scenario.h => Scenario.h} | 0 .../{scenariomgr.cpp => ScenarioManager.cpp} | 2 +- .../{scenariomgr.h => ScenarioManager.h} | 0 src/openloco/{station.cpp => Station.cpp} | 12 +- src/openloco/{station.h => Station.h} | 4 +- .../{stationmgr.cpp => StationManager.cpp} | 10 +- .../{stationmgr.h => StationManager.h} | 2 +- src/openloco/Title.cpp | 6 +- src/openloco/{town.cpp => Town.cpp} | 2 +- src/openloco/{town.h => Town.h} | 2 +- src/openloco/{townmgr.cpp => TownManager.cpp} | 6 +- src/openloco/{townmgr.h => TownManager.h} | 2 +- src/openloco/TrackData.h | 2 +- src/openloco/{tutorial.cpp => Tutorial.cpp} | 12 +- src/openloco/{tutorial.h => Tutorial.h} | 2 +- src/openloco/{types.hpp => Types.hpp} | 0 src/openloco/{ui.cpp => Ui.cpp} | 24 ++-- src/openloco/{ui.h => Ui.h} | 0 src/openloco/{version.cpp => Version.cpp} | 2 +- src/openloco/{viewport.cpp => Viewport.cpp} | 4 +- src/openloco/{viewport.hpp => Viewport.hpp} | 2 +- .../{viewportmgr.cpp => ViewportManager.cpp} | 12 +- .../{viewportmgr.h => ViewportManager.h} | 6 +- src/openloco/{widget.cpp => Widget.cpp} | 6 +- src/openloco/{widget.h => Widget.h} | 2 +- src/openloco/{win32.h => Win32.h} | 0 src/openloco/{window.cpp => Window.cpp} | 12 +- src/openloco/{window.h => Window.h} | 8 +- src/openloco/audio/audio.cpp | 8 +- src/openloco/audio/audio.h | 4 +- src/openloco/audio/channel.cpp | 2 +- .../drawing/SoftwareDrawingEngine.cpp | 2 +- src/openloco/graphics/gfx.cpp | 8 +- src/openloco/graphics/gfx.h | 4 +- src/openloco/input/ShortcutManager.cpp | 8 +- src/openloco/input/ShortcutManager.h | 2 +- src/openloco/input/keyboard.cpp | 20 +-- src/openloco/input/mouse_input.cpp | 14 +- src/openloco/interop/hooks.cpp | 18 +-- src/openloco/interop/interop.cpp | 2 +- src/openloco/localisation/languagefiles.cpp | 6 +- src/openloco/localisation/languages.cpp | 2 +- src/openloco/localisation/stringmgr.cpp | 6 +- src/openloco/localisation/stringmgr.h | 2 +- src/openloco/management/Expenditures.h | 2 +- src/openloco/map/SurfaceTile.cpp | 4 +- src/openloco/map/tile.cpp | 2 +- src/openloco/map/tile.h | 4 +- src/openloco/map/tilemgr.cpp | 4 +- src/openloco/objects/airport_object.h | 2 +- src/openloco/objects/bridge_object.h | 2 +- src/openloco/objects/dock_object.h | 2 +- src/openloco/objects/road_extra_object.h | 2 +- src/openloco/objects/road_object.h | 2 +- src/openloco/objects/road_station_object.h | 2 +- src/openloco/objects/track_extra_object.h | 2 +- src/openloco/objects/track_object.h | 2 +- src/openloco/objects/train_signal_object.h | 2 +- src/openloco/objects/train_station_object.h | 2 +- src/openloco/objects/tree_object.h | 2 +- src/openloco/objects/wall_object.h | 2 +- src/openloco/openloco.vcxproj | 124 +++++++++--------- src/openloco/platform/platform.posix.cpp | 4 +- src/openloco/platform/platform.windows.cpp | 2 +- src/openloco/things/CreateVehicle.cpp | 8 +- src/openloco/things/thing.cpp | 4 +- src/openloco/things/thing.h | 2 +- src/openloco/things/thingmgr.cpp | 2 +- src/openloco/things/vehicle.cpp | 6 +- src/openloco/things/vehicle.h | 4 +- src/openloco/ui/Screenshot.cpp | 2 +- src/openloco/ui/WindowManager.cpp | 24 ++-- src/openloco/ui/WindowManager.h | 6 +- src/openloco/ui/dropdown.cpp | 8 +- src/openloco/ui/dropdown.h | 4 +- src/openloco/ui/scrollview.cpp | 4 +- src/openloco/ui/scrollview.h | 2 +- src/openloco/ui/viewport_interaction.cpp | 8 +- src/openloco/windows/BuildVehicle.cpp | 10 +- src/openloco/windows/CompanyFaceSelection.cpp | 8 +- src/openloco/windows/CompanyList.cpp | 12 +- src/openloco/windows/CompanyWindow.cpp | 18 +-- src/openloco/windows/EditKeyboardShortcut.cpp | 2 +- src/openloco/windows/IndustryList.cpp | 12 +- src/openloco/windows/IndustryWindow.cpp | 14 +- src/openloco/windows/KeyboardShortcuts.cpp | 2 +- src/openloco/windows/LandscapeGeneration.cpp | 8 +- .../windows/LandscapeGenerationConfirm.cpp | 4 +- src/openloco/windows/MessageWindow.cpp | 22 ++-- src/openloco/windows/MusicSelection.cpp | 4 +- src/openloco/windows/News/Common.cpp | 6 +- src/openloco/windows/News/News.cpp | 18 +-- src/openloco/windows/News/News.h | 2 +- src/openloco/windows/News/Ticker.cpp | 4 +- .../windows/ObjectSelectionWindow.cpp | 2 +- src/openloco/windows/PlayerInfoPanel.cpp | 16 +-- src/openloco/windows/ScenarioOptions.cpp | 6 +- src/openloco/windows/StationList.cpp | 12 +- src/openloco/windows/TimePanel.cpp | 14 +- src/openloco/windows/TitleExit.cpp | 8 +- src/openloco/windows/TitleLogo.cpp | 2 +- src/openloco/windows/TitleMenu.cpp | 16 +-- src/openloco/windows/TitleOptions.cpp | 8 +- src/openloco/windows/TitleVersion.cpp | 6 +- src/openloco/windows/ToolbarTop.cpp | 12 +- src/openloco/windows/ToolbarTopAlt.cpp | 12 +- src/openloco/windows/ToolbarTopCommon.cpp | 12 +- src/openloco/windows/TownList.cpp | 12 +- src/openloco/windows/VehicleList.cpp | 2 +- src/openloco/windows/construction/Common.cpp | 10 +- .../windows/construction/ConstructionTab.cpp | 4 +- .../windows/construction/OverheadTab.cpp | 4 +- .../windows/construction/SignalTab.cpp | 2 +- .../windows/construction/StationTab.cpp | 6 +- src/openloco/windows/error.cpp | 4 +- src/openloco/windows/map.cpp | 14 +- src/openloco/windows/options.cpp | 10 +- src/openloco/windows/promptbrowsewnd.cpp | 10 +- src/openloco/windows/promptokcancelwnd.cpp | 6 +- src/openloco/windows/stationwnd.cpp | 14 +- src/openloco/windows/terraform.cpp | 6 +- src/openloco/windows/textinputwnd.cpp | 4 +- src/openloco/windows/tooltip.cpp | 4 +- src/openloco/windows/townwnd.cpp | 18 +-- src/openloco/windows/vehicle.cpp | 6 +- 162 files changed, 520 insertions(+), 521 deletions(-) rename resources/{resource.h => Resource.h} (100%) rename src/openloco/{company.cpp => Company.cpp} (99%) rename src/openloco/{company.h => Company.h} (99%) rename src/openloco/{companymgr.cpp => CompanyManager.cpp} (98%) rename src/openloco/{companymgr.h => CompanyManager.h} (94%) rename src/openloco/{config.cpp => Config.cpp} (98%) rename src/openloco/{config.h => Config.h} (100%) rename src/openloco/{config.convert.hpp => ConfigConvert.hpp} (99%) rename src/openloco/{console.cpp => Console.cpp} (98%) rename src/openloco/{console.h => Console.h} (100%) rename src/openloco/{date.cpp => Date.cpp} (99%) rename src/openloco/{date.h => Date.h} (100%) rename src/openloco/{environment.cpp => Environment.cpp} (99%) rename src/openloco/{environment.h => Environment.h} (100%) rename src/openloco/{game_commands.h => GameCommands.h} (100%) rename src/openloco/{gui.cpp => Gui.cpp} (97%) rename src/openloco/{gui.h => Gui.h} (100%) rename src/openloco/{industry.cpp => Industry.cpp} (99%) rename src/openloco/{industry.h => Industry.h} (99%) rename src/openloco/{industrymgr.cpp => IndustryManager.cpp} (92%) rename src/openloco/{industrymgr.h => IndustryManager.h} (92%) rename src/openloco/{input.cpp => Input.cpp} (96%) rename src/openloco/{input.h => Input.h} (99%) rename src/openloco/{intro.cpp => Intro.cpp} (95%) rename src/openloco/{intro.h => Intro.h} (100%) rename src/openloco/{message.h => Message.h} (100%) rename src/openloco/{messagemgr.cpp => MessageManager.cpp} (93%) rename src/openloco/{messagemgr.h => MessageManager.h} (95%) rename src/openloco/{multiplayer.cpp => MultiPlayer.cpp} (95%) rename src/openloco/{multiplayer.h => MultiPlayer.h} (100%) rename src/openloco/{openloco.cpp => OpenLoco.cpp} (98%) rename src/openloco/{openloco.h => OpenLoco.h} (100%) rename src/openloco/{progressbar.cpp => ProgressBar.cpp} (95%) rename src/openloco/{progressbar.h => ProgressBar.h} (100%) rename src/openloco/{scenario.cpp => Scenario.cpp} (97%) rename src/openloco/{scenario.h => Scenario.h} (100%) rename src/openloco/{scenariomgr.cpp => ScenarioManager.cpp} (89%) rename src/openloco/{scenariomgr.h => ScenarioManager.h} (100%) rename src/openloco/{station.cpp => Station.cpp} (99%) rename src/openloco/{station.h => Station.h} (98%) rename src/openloco/{stationmgr.cpp => StationManager.cpp} (96%) rename src/openloco/{stationmgr.h => StationManager.h} (93%) rename src/openloco/{town.cpp => Town.cpp} (98%) rename src/openloco/{town.h => Town.h} (98%) rename src/openloco/{townmgr.cpp => TownManager.cpp} (98%) rename src/openloco/{townmgr.h => TownManager.h} (93%) rename src/openloco/{tutorial.cpp => Tutorial.cpp} (97%) rename src/openloco/{tutorial.h => Tutorial.h} (93%) rename src/openloco/{types.hpp => Types.hpp} (100%) rename src/openloco/{ui.cpp => Ui.cpp} (99%) rename src/openloco/{ui.h => Ui.h} (100%) rename src/openloco/{version.cpp => Version.cpp} (97%) rename src/openloco/{viewport.cpp => Viewport.cpp} (97%) rename src/openloco/{viewport.hpp => Viewport.hpp} (99%) rename src/openloco/{viewportmgr.cpp => ViewportManager.cpp} (99%) rename src/openloco/{viewportmgr.h => ViewportManager.h} (92%) rename src/openloco/{widget.cpp => Widget.cpp} (99%) rename src/openloco/{widget.h => Widget.h} (99%) rename src/openloco/{win32.h => Win32.h} (100%) rename src/openloco/{window.cpp => Window.cpp} (99%) rename src/openloco/{window.h => Window.h} (99%) diff --git a/resources/OpenLoco.rc b/resources/OpenLoco.rc index 9ffbd725..fc8fd40a 100644 --- a/resources/OpenLoco.rc +++ b/resources/OpenLoco.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script. // -#include "resource.h" +#include "Resource.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -26,7 +26,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK 1 TEXTINCLUDE BEGIN - "resource.h\0" + "Resource.h\0" END 2 TEXTINCLUDE diff --git a/resources/resource.h b/resources/Resource.h similarity index 100% rename from resources/resource.h rename to resources/Resource.h diff --git a/src/openloco/company.cpp b/src/openloco/Company.cpp similarity index 99% rename from src/openloco/company.cpp rename to src/openloco/Company.cpp index 2274faaf..aea08a82 100644 --- a/src/openloco/company.cpp +++ b/src/openloco/Company.cpp @@ -1,4 +1,4 @@ -#include "company.h" +#include "Company.h" #include "interop/interop.hpp" #include "localisation/FormatArguments.hpp" #include "localisation/string_ids.h" diff --git a/src/openloco/company.h b/src/openloco/Company.h similarity index 99% rename from src/openloco/company.h rename to src/openloco/Company.h index 0b038899..7f334ec3 100644 --- a/src/openloco/company.h +++ b/src/openloco/Company.h @@ -1,8 +1,8 @@ #pragma once +#include "Types.hpp" #include "localisation/stringmgr.h" #include "management/Expenditures.h" -#include "types.hpp" #include #include #include diff --git a/src/openloco/companymgr.cpp b/src/openloco/CompanyManager.cpp similarity index 98% rename from src/openloco/companymgr.cpp rename to src/openloco/CompanyManager.cpp index 9332ca65..9e92677d 100644 --- a/src/openloco/companymgr.cpp +++ b/src/openloco/CompanyManager.cpp @@ -1,13 +1,12 @@ -#include "companymgr.h" -#include "config.h" -#include "game_commands.h" +#include "CompanyManager.h" +#include "Config.h" +#include "GameCommands.h" +#include "OpenLoco.h" #include "interop/interop.hpp" #include "localisation/FormatArguments.hpp" #include "map/tile.h" -#include "openloco.h" #include "things/thingmgr.h" #include "things/vehicle.h" -#include "types.hpp" #include "ui/WindowManager.h" using namespace openloco::interop; diff --git a/src/openloco/companymgr.h b/src/openloco/CompanyManager.h similarity index 94% rename from src/openloco/companymgr.h rename to src/openloco/CompanyManager.h index 6c85faa8..2952f15a 100644 --- a/src/openloco/companymgr.h +++ b/src/openloco/CompanyManager.h @@ -1,7 +1,7 @@ #pragma once -#include "company.h" -#include "types.hpp" +#include "Company.h" +#include "Types.hpp" #include #include diff --git a/src/openloco/config.cpp b/src/openloco/Config.cpp similarity index 98% rename from src/openloco/config.cpp rename to src/openloco/Config.cpp index 2b741f97..9b20154e 100644 --- a/src/openloco/config.cpp +++ b/src/openloco/Config.cpp @@ -6,10 +6,10 @@ #include #endif -#include "config.convert.hpp" -#include "config.h" +#include "Config.h" +#include "ConfigConvert.hpp" +#include "Environment.h" #include "core/FileSystem.hpp" -#include "environment.h" #include "interop/interop.hpp" #include "utility/yaml.hpp" diff --git a/src/openloco/config.h b/src/openloco/Config.h similarity index 100% rename from src/openloco/config.h rename to src/openloco/Config.h diff --git a/src/openloco/config.convert.hpp b/src/openloco/ConfigConvert.hpp similarity index 99% rename from src/openloco/config.convert.hpp rename to src/openloco/ConfigConvert.hpp index a88e3bb9..fc9bcf3e 100644 --- a/src/openloco/config.convert.hpp +++ b/src/openloco/ConfigConvert.hpp @@ -1,6 +1,6 @@ #pragma once -#include "config.h" +#include "Config.h" #include "utility/yaml.hpp" #define enum_def(x, y) \ diff --git a/src/openloco/console.cpp b/src/openloco/Console.cpp similarity index 98% rename from src/openloco/console.cpp rename to src/openloco/Console.cpp index 617a4c76..e1e25fbc 100644 --- a/src/openloco/console.cpp +++ b/src/openloco/Console.cpp @@ -1,4 +1,4 @@ -#include "console.h" +#include "Console.h" #include "utility/string.hpp" #include diff --git a/src/openloco/console.h b/src/openloco/Console.h similarity index 100% rename from src/openloco/console.h rename to src/openloco/Console.h diff --git a/src/openloco/date.cpp b/src/openloco/Date.cpp similarity index 99% rename from src/openloco/date.cpp rename to src/openloco/Date.cpp index e92c96ee..ede4748c 100644 --- a/src/openloco/date.cpp +++ b/src/openloco/Date.cpp @@ -1,4 +1,4 @@ -#include "date.h" +#include "Date.h" #include "interop/interop.hpp" #include #include diff --git a/src/openloco/date.h b/src/openloco/Date.h similarity index 100% rename from src/openloco/date.h rename to src/openloco/Date.h diff --git a/src/openloco/environment.cpp b/src/openloco/Environment.cpp similarity index 99% rename from src/openloco/environment.cpp rename to src/openloco/Environment.cpp index f701ed88..c038899e 100644 --- a/src/openloco/environment.cpp +++ b/src/openloco/Environment.cpp @@ -1,8 +1,8 @@ -#include "environment.h" -#include "config.h" +#include "Environment.h" +#include "Config.h" +#include "Ui.h" #include "interop/interop.hpp" #include "platform/platform.h" -#include "ui.h" #include "utility/collection.hpp" #include "utility/string.hpp" #include diff --git a/src/openloco/environment.h b/src/openloco/Environment.h similarity index 100% rename from src/openloco/environment.h rename to src/openloco/Environment.h diff --git a/src/openloco/GameCommands.cpp b/src/openloco/GameCommands.cpp index ff5663c6..05db5698 100644 --- a/src/openloco/GameCommands.cpp +++ b/src/openloco/GameCommands.cpp @@ -1,12 +1,12 @@ +#include "GameCommands.h" +#include "Company.h" +#include "CompanyManager.h" +#include "StationManager.h" #include "audio/audio.h" -#include "company.h" -#include "companymgr.h" -#include "game_commands.h" #include "map/tile.h" #include "objects/objectmgr.h" #include "objects/road_object.h" #include "objects/track_object.h" -#include "stationmgr.h" #include "things/vehicle.h" #include "ui/WindowManager.h" #include diff --git a/src/openloco/game_commands.h b/src/openloco/GameCommands.h similarity index 100% rename from src/openloco/game_commands.h rename to src/openloco/GameCommands.h diff --git a/src/openloco/gui.cpp b/src/openloco/Gui.cpp similarity index 97% rename from src/openloco/gui.cpp rename to src/openloco/Gui.cpp index ccd88739..df3ef24f 100644 --- a/src/openloco/gui.cpp +++ b/src/openloco/Gui.cpp @@ -1,15 +1,15 @@ -#include "gui.h" +#include "Gui.h" +#include "OpenLoco.h" +#include "Tutorial.h" +#include "Ui.h" +#include "ViewportManager.h" +#include "Window.h" #include "graphics/colours.h" #include "interop/interop.hpp" #include "map/tile.h" #include "objects/interface_skin_object.h" #include "objects/objectmgr.h" -#include "openloco.h" -#include "tutorial.h" -#include "ui.h" #include "ui/WindowManager.h" -#include "viewportmgr.h" -#include "window.h" using namespace openloco::interop; using namespace openloco::ui; diff --git a/src/openloco/gui.h b/src/openloco/Gui.h similarity index 100% rename from src/openloco/gui.h rename to src/openloco/Gui.h diff --git a/src/openloco/industry.cpp b/src/openloco/Industry.cpp similarity index 99% rename from src/openloco/industry.cpp rename to src/openloco/Industry.cpp index 51c023b7..d7c6880c 100644 --- a/src/openloco/industry.cpp +++ b/src/openloco/Industry.cpp @@ -1,4 +1,4 @@ -#include "industry.h" +#include "Industry.h" #include "interop/interop.hpp" #include "localisation/string_ids.h" #include "map/tilemgr.h" diff --git a/src/openloco/industry.h b/src/openloco/Industry.h similarity index 99% rename from src/openloco/industry.h rename to src/openloco/Industry.h index 77990c56..fddb4e5c 100644 --- a/src/openloco/industry.h +++ b/src/openloco/Industry.h @@ -1,10 +1,10 @@ #pragma once +#include "Town.h" #include "localisation/stringmgr.h" #include "map/tile.h" #include "map/tile_loop.hpp" #include "objects/industry_object.h" -#include "town.h" #include "utility/prng.hpp" #include #include diff --git a/src/openloco/industrymgr.cpp b/src/openloco/IndustryManager.cpp similarity index 92% rename from src/openloco/industrymgr.cpp rename to src/openloco/IndustryManager.cpp index a6596442..9282c7d0 100644 --- a/src/openloco/industrymgr.cpp +++ b/src/openloco/IndustryManager.cpp @@ -1,7 +1,7 @@ -#include "industrymgr.h" -#include "companymgr.h" +#include "IndustryManager.h" +#include "CompanyManager.h" +#include "OpenLoco.h" #include "interop/interop.hpp" -#include "openloco.h" using namespace openloco::interop; diff --git a/src/openloco/industrymgr.h b/src/openloco/IndustryManager.h similarity index 92% rename from src/openloco/industrymgr.h rename to src/openloco/IndustryManager.h index 09dc10ba..b0f01cbc 100644 --- a/src/openloco/industrymgr.h +++ b/src/openloco/IndustryManager.h @@ -1,6 +1,6 @@ #pragma once -#include "industry.h" +#include "Industry.h" #include #include diff --git a/src/openloco/input.cpp b/src/openloco/Input.cpp similarity index 96% rename from src/openloco/input.cpp rename to src/openloco/Input.cpp index debb7976..3475e12f 100644 --- a/src/openloco/input.cpp +++ b/src/openloco/Input.cpp @@ -1,11 +1,11 @@ -#include "input.h" +#include "Input.h" +#include "Ui.h" +#include "Window.h" #include "audio/audio.h" #include "interop/interop.hpp" #include "localisation/string_ids.h" -#include "ui.h" #include "ui/WindowManager.h" #include "ui/scrollview.h" -#include "window.h" #include diff --git a/src/openloco/input.h b/src/openloco/Input.h similarity index 99% rename from src/openloco/input.h rename to src/openloco/Input.h index d8a25095..1b3d681d 100755 --- a/src/openloco/input.h +++ b/src/openloco/Input.h @@ -1,7 +1,7 @@ #pragma once +#include "Window.h" #include "ui/WindowManager.h" -#include "window.h" namespace openloco::input { diff --git a/src/openloco/intro.cpp b/src/openloco/Intro.cpp similarity index 95% rename from src/openloco/intro.cpp rename to src/openloco/Intro.cpp index c007f0ca..a1b9cc7a 100644 --- a/src/openloco/intro.cpp +++ b/src/openloco/Intro.cpp @@ -1,4 +1,4 @@ -#include "intro.h" +#include "Intro.h" #include "interop/interop.hpp" using namespace openloco::interop; diff --git a/src/openloco/intro.h b/src/openloco/Intro.h similarity index 100% rename from src/openloco/intro.h rename to src/openloco/Intro.h diff --git a/src/openloco/message.h b/src/openloco/Message.h similarity index 100% rename from src/openloco/message.h rename to src/openloco/Message.h diff --git a/src/openloco/messagemgr.cpp b/src/openloco/MessageManager.cpp similarity index 93% rename from src/openloco/messagemgr.cpp rename to src/openloco/MessageManager.cpp index f06c9483..92fc728e 100644 --- a/src/openloco/messagemgr.cpp +++ b/src/openloco/MessageManager.cpp @@ -1,6 +1,6 @@ -#include "messagemgr.h" +#include "MessageManager.h" +#include "OpenLoco.h" #include "interop/interop.hpp" -#include "openloco.h" using namespace openloco::interop; diff --git a/src/openloco/messagemgr.h b/src/openloco/MessageManager.h similarity index 95% rename from src/openloco/messagemgr.h rename to src/openloco/MessageManager.h index 23e19e41..b3b6ada4 100644 --- a/src/openloco/messagemgr.h +++ b/src/openloco/MessageManager.h @@ -1,7 +1,7 @@ #pragma once -#include "company.h" -#include "message.h" +#include "Company.h" +#include "Message.h" #include namespace openloco diff --git a/src/openloco/multiplayer.cpp b/src/openloco/MultiPlayer.cpp similarity index 95% rename from src/openloco/multiplayer.cpp rename to src/openloco/MultiPlayer.cpp index ae2f029a..4105fbb5 100644 --- a/src/openloco/multiplayer.cpp +++ b/src/openloco/MultiPlayer.cpp @@ -1,4 +1,4 @@ -#include "multiplayer.h" +#include "MultiPlayer.h" #include "interop/interop.hpp" using namespace openloco::interop; diff --git a/src/openloco/multiplayer.h b/src/openloco/MultiPlayer.h similarity index 100% rename from src/openloco/multiplayer.h rename to src/openloco/MultiPlayer.h diff --git a/src/openloco/openloco.cpp b/src/openloco/OpenLoco.cpp similarity index 98% rename from src/openloco/openloco.cpp rename to src/openloco/OpenLoco.cpp index 9f2b214a..27a4c976 100644 --- a/src/openloco/openloco.cpp +++ b/src/openloco/OpenLoco.cpp @@ -18,37 +18,37 @@ #undef small #endif +#include "CompanyManager.h" +#include "Config.h" +#include "Date.h" +#include "Environment.h" +#include "Gui.h" +#include "IndustryManager.h" +#include "Input.h" +#include "Intro.h" +#include "MultiPlayer.h" +#include "OpenLoco.h" +#include "ProgressBar.h" +#include "ScenarioManager.h" +#include "StationManager.h" #include "Title.h" +#include "TownManager.h" +#include "Tutorial.h" +#include "Ui.h" +#include "ViewportManager.h" #include "audio/audio.h" -#include "companymgr.h" -#include "config.h" -#include "date.h" -#include "environment.h" #include "graphics/colours.h" #include "graphics/gfx.h" -#include "gui.h" -#include "industrymgr.h" -#include "input.h" #include "interop/interop.hpp" -#include "intro.h" #include "localisation/languagefiles.h" #include "localisation/languages.h" #include "localisation/string_ids.h" -#include "multiplayer.h" #include "objects/objectmgr.h" -#include "openloco.h" #include "platform/platform.h" -#include "progressbar.h" #include "s5/s5.h" -#include "scenariomgr.h" -#include "stationmgr.h" #include "things/thingmgr.h" -#include "townmgr.h" -#include "tutorial.h" -#include "ui.h" #include "ui/WindowManager.h" #include "utility/numeric.hpp" -#include "viewportmgr.h" #pragma warning(disable : 4611) // interaction between '_setjmp' and C++ object destruction is non - portable diff --git a/src/openloco/openloco.h b/src/openloco/OpenLoco.h similarity index 100% rename from src/openloco/openloco.h rename to src/openloco/OpenLoco.h diff --git a/src/openloco/progressbar.cpp b/src/openloco/ProgressBar.cpp similarity index 95% rename from src/openloco/progressbar.cpp rename to src/openloco/ProgressBar.cpp index 760bebad..02bf3985 100644 --- a/src/openloco/progressbar.cpp +++ b/src/openloco/ProgressBar.cpp @@ -1,4 +1,4 @@ -#include "progressbar.h" +#include "ProgressBar.h" #include "interop/interop.hpp" using namespace openloco::interop; diff --git a/src/openloco/progressbar.h b/src/openloco/ProgressBar.h similarity index 100% rename from src/openloco/progressbar.h rename to src/openloco/ProgressBar.h diff --git a/src/openloco/scenario.cpp b/src/openloco/Scenario.cpp similarity index 97% rename from src/openloco/scenario.cpp rename to src/openloco/Scenario.cpp index b40e5987..7b3eb4fe 100644 --- a/src/openloco/scenario.cpp +++ b/src/openloco/Scenario.cpp @@ -1,4 +1,4 @@ -#include "scenario.h" +#include "Scenario.h" #include "graphics/gfx.h" #include "interop/interop.hpp" #include "s5/s5.h" diff --git a/src/openloco/scenario.h b/src/openloco/Scenario.h similarity index 100% rename from src/openloco/scenario.h rename to src/openloco/Scenario.h diff --git a/src/openloco/scenariomgr.cpp b/src/openloco/ScenarioManager.cpp similarity index 89% rename from src/openloco/scenariomgr.cpp rename to src/openloco/ScenarioManager.cpp index 336de2aa..6413da43 100644 --- a/src/openloco/scenariomgr.cpp +++ b/src/openloco/ScenarioManager.cpp @@ -1,4 +1,4 @@ -#include "scenariomgr.h" +#include "ScenarioManager.h" #include "interop/interop.hpp" using namespace openloco::interop; diff --git a/src/openloco/scenariomgr.h b/src/openloco/ScenarioManager.h similarity index 100% rename from src/openloco/scenariomgr.h rename to src/openloco/ScenarioManager.h diff --git a/src/openloco/station.cpp b/src/openloco/Station.cpp similarity index 99% rename from src/openloco/station.cpp rename to src/openloco/Station.cpp index c81eca20..81bc19e1 100644 --- a/src/openloco/station.cpp +++ b/src/openloco/Station.cpp @@ -1,19 +1,19 @@ -#include "station.h" -#include "companymgr.h" -#include "industrymgr.h" +#include "Station.h" +#include "CompanyManager.h" +#include "IndustryManager.h" +#include "MessageManager.h" +#include "OpenLoco.h" +#include "ViewportManager.h" #include "interop/interop.hpp" #include "localisation/string_ids.h" #include "map/tilemgr.h" -#include "messagemgr.h" #include "objects/airport_object.h" #include "objects/building_object.h" #include "objects/cargo_object.h" #include "objects/industry_object.h" #include "objects/objectmgr.h" #include "objects/road_station_object.h" -#include "openloco.h" #include "ui/WindowManager.h" -#include "viewportmgr.h" #include #include diff --git a/src/openloco/station.h b/src/openloco/Station.h similarity index 98% rename from src/openloco/station.h rename to src/openloco/Station.h index 19789211..06857466 100644 --- a/src/openloco/station.h +++ b/src/openloco/Station.h @@ -1,9 +1,9 @@ #pragma once +#include "Town.h" +#include "Types.hpp" #include "localisation/stringmgr.h" #include "map/tile.h" -#include "town.h" -#include "types.hpp" #include "utility/numeric.hpp" #include #include diff --git a/src/openloco/stationmgr.cpp b/src/openloco/StationManager.cpp similarity index 96% rename from src/openloco/stationmgr.cpp rename to src/openloco/StationManager.cpp index 4e9c0bf8..3a726034 100644 --- a/src/openloco/stationmgr.cpp +++ b/src/openloco/StationManager.cpp @@ -1,10 +1,10 @@ -#include "stationmgr.h" -#include "companymgr.h" +#include "StationManager.h" +#include "CompanyManager.h" +#include "OpenLoco.h" +#include "TownManager.h" +#include "Window.h" #include "interop/interop.hpp" -#include "openloco.h" -#include "townmgr.h" #include "ui/WindowManager.h" -#include "window.h" using namespace openloco::interop; using namespace openloco::ui; diff --git a/src/openloco/stationmgr.h b/src/openloco/StationManager.h similarity index 93% rename from src/openloco/stationmgr.h rename to src/openloco/StationManager.h index ab0f8ff0..869f1cc9 100644 --- a/src/openloco/stationmgr.h +++ b/src/openloco/StationManager.h @@ -1,6 +1,6 @@ #pragma once -#include "station.h" +#include "Station.h" #include #include diff --git a/src/openloco/Title.cpp b/src/openloco/Title.cpp index 5db31969..381a7b4d 100644 --- a/src/openloco/Title.cpp +++ b/src/openloco/Title.cpp @@ -1,9 +1,9 @@ #include "Title.h" +#include "CompanyManager.h" +#include "Gui.h" +#include "OpenLoco.h" #include "audio/audio.h" -#include "companymgr.h" -#include "gui.h" #include "interop/interop.hpp" -#include "openloco.h" #include "ui/WindowManager.h" using namespace openloco::interop; diff --git a/src/openloco/town.cpp b/src/openloco/Town.cpp similarity index 98% rename from src/openloco/town.cpp rename to src/openloco/Town.cpp index 539a6414..f7937828 100644 --- a/src/openloco/town.cpp +++ b/src/openloco/Town.cpp @@ -1,4 +1,4 @@ -#include "town.h" +#include "Town.h" #include "interop/interop.hpp" #include "localisation/string_ids.h" #include diff --git a/src/openloco/town.h b/src/openloco/Town.h similarity index 98% rename from src/openloco/town.h rename to src/openloco/Town.h index 111a90fc..a1474c96 100644 --- a/src/openloco/town.h +++ b/src/openloco/Town.h @@ -1,6 +1,6 @@ #pragma once -#include "company.h" +#include "Company.h" #include "localisation/stringmgr.h" #include "map/tile.h" #include diff --git a/src/openloco/townmgr.cpp b/src/openloco/TownManager.cpp similarity index 98% rename from src/openloco/townmgr.cpp rename to src/openloco/TownManager.cpp index a6572ba5..766e8852 100644 --- a/src/openloco/townmgr.cpp +++ b/src/openloco/TownManager.cpp @@ -1,7 +1,7 @@ -#include "townmgr.h" -#include "companymgr.h" +#include "TownManager.h" +#include "CompanyManager.h" +#include "OpenLoco.h" #include "interop/interop.hpp" -#include "openloco.h" #include "ui/WindowManager.h" #include "utility/numeric.hpp" diff --git a/src/openloco/townmgr.h b/src/openloco/TownManager.h similarity index 93% rename from src/openloco/townmgr.h rename to src/openloco/TownManager.h index 5d8fb5e6..d0002825 100644 --- a/src/openloco/townmgr.h +++ b/src/openloco/TownManager.h @@ -1,6 +1,6 @@ #pragma once -#include "town.h" +#include "Town.h" #include namespace openloco::townmgr diff --git a/src/openloco/TrackData.h b/src/openloco/TrackData.h index 43a89e77..db690639 100644 --- a/src/openloco/TrackData.h +++ b/src/openloco/TrackData.h @@ -1,6 +1,6 @@ #pragma once -#include "types.hpp" +#include "Types.hpp" #include namespace openloco::map::TrackData diff --git a/src/openloco/tutorial.cpp b/src/openloco/Tutorial.cpp similarity index 97% rename from src/openloco/tutorial.cpp rename to src/openloco/Tutorial.cpp index 960546a4..1a0a1132 100644 --- a/src/openloco/tutorial.cpp +++ b/src/openloco/Tutorial.cpp @@ -1,11 +1,11 @@ -#include "tutorial.h" -#include "config.h" -#include "environment.h" -#include "gui.h" +#include "Tutorial.h" +#include "Config.h" +#include "Environment.h" +#include "Gui.h" +#include "Scenario.h" +#include "Ui.h" #include "interop/interop.hpp" #include "localisation/string_ids.h" -#include "scenario.h" -#include "ui.h" #include #include diff --git a/src/openloco/tutorial.h b/src/openloco/Tutorial.h similarity index 93% rename from src/openloco/tutorial.h rename to src/openloco/Tutorial.h index 4cbca468..2c4d1779 100644 --- a/src/openloco/tutorial.h +++ b/src/openloco/Tutorial.h @@ -1,6 +1,6 @@ #pragma once -#include "types.hpp" +#include "Types.hpp" namespace openloco::tutorial { diff --git a/src/openloco/types.hpp b/src/openloco/Types.hpp similarity index 100% rename from src/openloco/types.hpp rename to src/openloco/Types.hpp diff --git a/src/openloco/ui.cpp b/src/openloco/Ui.cpp similarity index 99% rename from src/openloco/ui.cpp rename to src/openloco/Ui.cpp index 4672fe06..5aac5b7b 100755 --- a/src/openloco/ui.cpp +++ b/src/openloco/Ui.cpp @@ -1,4 +1,4 @@ -#include "win32.h" +#include "Win32.h" #include #include #include @@ -9,7 +9,7 @@ #include #ifdef _WIN32 -#include "../../resources/resource.h" +#include "../../resources/Resource.h" #ifndef NOMINMAX #define NOMINMAX @@ -29,18 +29,18 @@ #pragma warning(default : 4121) // alignment of a member was sensitive to packing #endif -#include "config.h" -#include "console.h" -#include "game_commands.h" +#include "Config.h" +#include "Console.h" +#include "GameCommands.h" +#include "Gui.h" +#include "Input.h" +#include "Intro.h" +#include "MultiPlayer.h" +#include "OpenLoco.h" +#include "Tutorial.h" +#include "Ui.h" #include "graphics/gfx.h" -#include "gui.h" -#include "input.h" #include "interop/interop.hpp" -#include "intro.h" -#include "multiplayer.h" -#include "openloco.h" -#include "tutorial.h" -#include "ui.h" #include "ui/WindowManager.h" #include "utility/string.hpp" diff --git a/src/openloco/ui.h b/src/openloco/Ui.h similarity index 100% rename from src/openloco/ui.h rename to src/openloco/Ui.h diff --git a/src/openloco/version.cpp b/src/openloco/Version.cpp similarity index 97% rename from src/openloco/version.cpp rename to src/openloco/Version.cpp index 999eb06a..3b98bb1d 100644 --- a/src/openloco/version.cpp +++ b/src/openloco/Version.cpp @@ -1,4 +1,4 @@ -#include "openloco.h" +#include "OpenLoco.h" #define NAME "OpenLoco" #define VERSION "20.07" diff --git a/src/openloco/viewport.cpp b/src/openloco/Viewport.cpp similarity index 97% rename from src/openloco/viewport.cpp rename to src/openloco/Viewport.cpp index 041910ee..99ad9f8b 100644 --- a/src/openloco/viewport.cpp +++ b/src/openloco/Viewport.cpp @@ -1,8 +1,8 @@ -#include "viewport.hpp" +#include "Viewport.hpp" +#include "Window.h" #include "graphics/gfx.h" #include "interop/interop.hpp" #include "map/tile.h" -#include "window.h" using namespace openloco::interop; diff --git a/src/openloco/viewport.hpp b/src/openloco/Viewport.hpp similarity index 99% rename from src/openloco/viewport.hpp rename to src/openloco/Viewport.hpp index c9250f42..6f0e995c 100644 --- a/src/openloco/viewport.hpp +++ b/src/openloco/Viewport.hpp @@ -1,8 +1,8 @@ #pragma once +#include "Types.hpp" #include "graphics/gfx.h" #include "interop/interop.hpp" -#include "types.hpp" #include namespace openloco::ui diff --git a/src/openloco/viewportmgr.cpp b/src/openloco/ViewportManager.cpp similarity index 99% rename from src/openloco/viewportmgr.cpp rename to src/openloco/ViewportManager.cpp index d6f367c2..bbff89f1 100644 --- a/src/openloco/viewportmgr.cpp +++ b/src/openloco/ViewportManager.cpp @@ -1,14 +1,14 @@ -#include "viewportmgr.h" -#include "config.h" -#include "console.h" +#include "ViewportManager.h" +#include "Config.h" +#include "Console.h" +#include "Station.h" +#include "Ui.h" +#include "Window.h" #include "interop/interop.hpp" #include "map/tile.h" #include "map/tilemgr.h" -#include "station.h" #include "things/thing.h" #include "things/thingmgr.h" -#include "ui.h" -#include "window.h" #include #include #include diff --git a/src/openloco/viewportmgr.h b/src/openloco/ViewportManager.h similarity index 92% rename from src/openloco/viewportmgr.h rename to src/openloco/ViewportManager.h index f6b38d8d..9fbb1542 100644 --- a/src/openloco/viewportmgr.h +++ b/src/openloco/ViewportManager.h @@ -1,10 +1,10 @@ #pragma once +#include "Station.h" +#include "Types.hpp" +#include "Window.h" #include "map/tile.h" -#include "station.h" #include "things/thing.h" -#include "types.hpp" -#include "window.h" #include namespace openloco::ui::viewportmgr diff --git a/src/openloco/widget.cpp b/src/openloco/Widget.cpp similarity index 99% rename from src/openloco/widget.cpp rename to src/openloco/Widget.cpp index 530220bb..0137ff98 100644 --- a/src/openloco/widget.cpp +++ b/src/openloco/Widget.cpp @@ -1,10 +1,10 @@ -#include "widget.h" +#include "Widget.h" +#include "Input.h" +#include "Window.h" #include "graphics/colours.h" #include "graphics/image_ids.h" -#include "input.h" #include "interop/interop.hpp" #include "ui/scrollview.h" -#include "window.h" #include using namespace openloco::interop; diff --git a/src/openloco/widget.h b/src/openloco/Widget.h similarity index 99% rename from src/openloco/widget.h rename to src/openloco/Widget.h index 401e0aff..a0c56000 100644 --- a/src/openloco/widget.h +++ b/src/openloco/Widget.h @@ -1,8 +1,8 @@ #pragma once +#include "Window.h" #include "graphics/gfx.h" #include "localisation/stringmgr.h" -#include "window.h" #include namespace openloco::ui::widget diff --git a/src/openloco/win32.h b/src/openloco/Win32.h similarity index 100% rename from src/openloco/win32.h rename to src/openloco/Win32.h diff --git a/src/openloco/window.cpp b/src/openloco/Window.cpp similarity index 99% rename from src/openloco/window.cpp rename to src/openloco/Window.cpp index 1d73c662..a41f4d15 100644 --- a/src/openloco/window.cpp +++ b/src/openloco/Window.cpp @@ -1,17 +1,17 @@ -#include "window.h" -#include "config.h" -#include "console.h" +#include "Window.h" +#include "Config.h" +#include "Console.h" +#include "Input.h" +#include "Ui.h" +#include "Widget.h" #include "graphics/colours.h" -#include "input.h" #include "interop/interop.hpp" #include "localisation/FormatArguments.hpp" #include "map/tile.h" #include "map/tilemgr.h" #include "things/thingmgr.h" -#include "ui.h" #include "ui/Rect.h" #include "ui/scrollview.h" -#include "widget.h" #include #include diff --git a/src/openloco/window.h b/src/openloco/Window.h similarity index 99% rename from src/openloco/window.h rename to src/openloco/Window.h index 0058d3e3..0f9cda94 100644 --- a/src/openloco/window.h +++ b/src/openloco/Window.h @@ -1,16 +1,16 @@ #pragma once -#include "company.h" +#include "Company.h" +#include "Types.hpp" +#include "Ui.h" +#include "Viewport.hpp" #include "core/Optional.hpp" #include "graphics/gfx.h" #include "interop/interop.hpp" #include "localisation/string_ids.h" #include "localisation/stringmgr.h" #include "map/tile.h" -#include "types.hpp" -#include "ui.h" #include "ui/WindowType.h" -#include "viewport.hpp" #include namespace openloco::ui diff --git a/src/openloco/audio/audio.cpp b/src/openloco/audio/audio.cpp index d30f6ef1..4eb5ee37 100644 --- a/src/openloco/audio/audio.cpp +++ b/src/openloco/audio/audio.cpp @@ -1,8 +1,8 @@ #include "audio.h" -#include "../config.h" -#include "../console.h" -#include "../date.h" -#include "../environment.h" +#include "../Config.h" +#include "../Console.h" +#include "../Date.h" +#include "../Environment.h" #include "../interop/interop.hpp" #include "../localisation/string_ids.h" #include "../map/tilemgr.h" diff --git a/src/openloco/audio/audio.h b/src/openloco/audio/audio.h index 828b72df..199bf97b 100644 --- a/src/openloco/audio/audio.h +++ b/src/openloco/audio/audio.h @@ -1,7 +1,7 @@ #pragma once -#include "../environment.h" -#include "../types.hpp" +#include "../Environment.h" +#include "../Types.hpp" #include #include #include diff --git a/src/openloco/audio/channel.cpp b/src/openloco/audio/channel.cpp index 414cac03..10e51781 100644 --- a/src/openloco/audio/channel.cpp +++ b/src/openloco/audio/channel.cpp @@ -1,5 +1,5 @@ #include "channel.h" -#include "../console.h" +#include "../Console.h" #include "audio.h" #include #include diff --git a/src/openloco/drawing/SoftwareDrawingEngine.cpp b/src/openloco/drawing/SoftwareDrawingEngine.cpp index c9140feb..adefd2e9 100644 --- a/src/openloco/drawing/SoftwareDrawingEngine.cpp +++ b/src/openloco/drawing/SoftwareDrawingEngine.cpp @@ -1,6 +1,6 @@ #include "SoftwareDrawingEngine.h" +#include "../Ui.h" #include "../interop/interop.hpp" -#include "../ui.h" #include "../ui/WindowManager.h" #include diff --git a/src/openloco/graphics/gfx.cpp b/src/openloco/graphics/gfx.cpp index 6726f571..4c5cc52a 100644 --- a/src/openloco/graphics/gfx.cpp +++ b/src/openloco/graphics/gfx.cpp @@ -1,11 +1,11 @@ #include "gfx.h" -#include "../console.h" +#include "../Console.h" +#include "../Environment.h" +#include "../Input.h" +#include "../Ui.h" #include "../drawing/SoftwareDrawingEngine.h" -#include "../environment.h" -#include "../input.h" #include "../interop/interop.hpp" #include "../localisation/languagefiles.h" -#include "../ui.h" #include "../ui/WindowManager.h" #include "../utility/stream.hpp" #include "colours.h" diff --git a/src/openloco/graphics/gfx.h b/src/openloco/graphics/gfx.h index 9af64842..cc5992fa 100644 --- a/src/openloco/graphics/gfx.h +++ b/src/openloco/graphics/gfx.h @@ -1,7 +1,7 @@ #pragma once -#include "../openloco.h" -#include "../types.hpp" +#include "../OpenLoco.h" +#include "../Types.hpp" #include "../ui/Rect.h" #include "types.h" #include diff --git a/src/openloco/input/ShortcutManager.cpp b/src/openloco/input/ShortcutManager.cpp index 75a7bee7..22165a80 100644 --- a/src/openloco/input/ShortcutManager.cpp +++ b/src/openloco/input/ShortcutManager.cpp @@ -1,11 +1,11 @@ #include "ShortcutManager.h" -#include "../companymgr.h" -#include "../game_commands.h" +#include "../CompanyManager.h" +#include "../GameCommands.h" +#include "../StationManager.h" +#include "../TownManager.h" #include "../interop/interop.hpp" #include "../localisation/string_ids.h" #include "../s5/s5.h" -#include "../stationmgr.h" -#include "../townmgr.h" #include "../ui/WindowManager.h" #include diff --git a/src/openloco/input/ShortcutManager.h b/src/openloco/input/ShortcutManager.h index e5dca5da..480938bf 100644 --- a/src/openloco/input/ShortcutManager.h +++ b/src/openloco/input/ShortcutManager.h @@ -1,4 +1,4 @@ -#include "../types.hpp" +#include "../Types.hpp" #include "Shortcut.h" #include diff --git a/src/openloco/input/keyboard.cpp b/src/openloco/input/keyboard.cpp index 63f71276..241792e5 100644 --- a/src/openloco/input/keyboard.cpp +++ b/src/openloco/input/keyboard.cpp @@ -1,18 +1,18 @@ +#include "../CompanyManager.h" +#include "../Config.h" +#include "../Console.h" +#include "../GameCommands.h" +#include "../Input.h" +#include "../Intro.h" +#include "../OpenLoco.h" +#include "../Tutorial.h" +#include "../Ui.h" +#include "../Win32.h" #include "../audio/audio.h" -#include "../companymgr.h" -#include "../config.h" -#include "../console.h" -#include "../game_commands.h" -#include "../input.h" #include "../interop/interop.hpp" -#include "../intro.h" #include "../localisation/string_ids.h" -#include "../openloco.h" #include "../things/thingmgr.h" -#include "../tutorial.h" -#include "../ui.h" #include "../ui/Screenshot.h" -#include "../win32.h" #include "ShortcutManager.h" #include #include diff --git a/src/openloco/input/mouse_input.cpp b/src/openloco/input/mouse_input.cpp index 6df4db2a..5a38d4e9 100755 --- a/src/openloco/input/mouse_input.cpp +++ b/src/openloco/input/mouse_input.cpp @@ -1,19 +1,19 @@ +#include "../CompanyManager.h" +#include "../Console.h" +#include "../Input.h" +#include "../StationManager.h" +#include "../TownManager.h" +#include "../Tutorial.h" +#include "../Window.h" #include "../audio/audio.h" -#include "../companymgr.h" -#include "../console.h" -#include "../input.h" #include "../interop/interop.hpp" #include "../localisation/string_ids.h" #include "../map/tilemgr.h" #include "../objects/objectmgr.h" #include "../objects/road_object.h" -#include "../stationmgr.h" #include "../things/thingmgr.h" -#include "../townmgr.h" -#include "../tutorial.h" #include "../ui/WindowManager.h" #include "../ui/scrollview.h" -#include "../window.h" #include using namespace openloco::interop; diff --git a/src/openloco/interop/hooks.cpp b/src/openloco/interop/hooks.cpp index 75428215..8193443d 100755 --- a/src/openloco/interop/hooks.cpp +++ b/src/openloco/interop/hooks.cpp @@ -6,25 +6,25 @@ #include #include #endif +#include "../Console.h" +#include "../Environment.h" +#include "../GameCommands.h" +#include "../Gui.h" +#include "../Input.h" +#include "../Station.h" #include "../Title.h" +#include "../Tutorial.h" +#include "../Ui.h" +#include "../ViewportManager.h" #include "../audio/audio.h" -#include "../console.h" #include "../core/FileSystem.hpp" -#include "../environment.h" -#include "../game_commands.h" #include "../graphics/colours.h" #include "../graphics/gfx.h" -#include "../gui.h" -#include "../input.h" #include "../map/tile.h" #include "../platform/platform.h" -#include "../station.h" #include "../things/vehicle.h" -#include "../tutorial.h" -#include "../ui.h" #include "../ui/WindowManager.h" #include "../utility/string.hpp" -#include "../viewportmgr.h" #include "interop.hpp" using namespace openloco; diff --git a/src/openloco/interop/interop.cpp b/src/openloco/interop/interop.cpp index 40b5e32a..da14ec75 100644 --- a/src/openloco/interop/interop.cpp +++ b/src/openloco/interop/interop.cpp @@ -11,7 +11,7 @@ #include #endif // _WIN32 -#include "../console.h" +#include "../Console.h" #include "interop.hpp" #pragma warning(disable : 4731) // frame pointer register 'ebp' modified by inline assembly code diff --git a/src/openloco/localisation/languagefiles.cpp b/src/openloco/localisation/languagefiles.cpp index 4fad8101..08beffd0 100644 --- a/src/openloco/localisation/languagefiles.cpp +++ b/src/openloco/localisation/languagefiles.cpp @@ -1,7 +1,7 @@ #include "languagefiles.h" -#include "../config.h" -#include "../console.h" -#include "../environment.h" +#include "../Config.h" +#include "../Console.h" +#include "../Environment.h" #include "../interop/interop.hpp" #include "../platform/platform.h" #include "../utility/yaml.hpp" diff --git a/src/openloco/localisation/languages.cpp b/src/openloco/localisation/languages.cpp index c9f9be34..ef1614f7 100644 --- a/src/openloco/localisation/languages.cpp +++ b/src/openloco/localisation/languages.cpp @@ -1,6 +1,6 @@ #include "languages.h" +#include "../Environment.h" #include "../core/FileSystem.hpp" -#include "../environment.h" #include "../platform/platform.h" #include "../utility/yaml.hpp" #include "conversion.h" diff --git a/src/openloco/localisation/stringmgr.cpp b/src/openloco/localisation/stringmgr.cpp index 6b6e3a55..251f9da9 100644 --- a/src/openloco/localisation/stringmgr.cpp +++ b/src/openloco/localisation/stringmgr.cpp @@ -1,10 +1,10 @@ #include "stringmgr.h" -#include "../config.h" -#include "../date.h" +#include "../Config.h" +#include "../Date.h" +#include "../TownManager.h" #include "../interop/interop.hpp" #include "../objects/currency_object.h" #include "../objects/objectmgr.h" -#include "../townmgr.h" #include "argswrapper.hpp" #include "string_ids.h" diff --git a/src/openloco/localisation/stringmgr.h b/src/openloco/localisation/stringmgr.h index e0fcb004..4dc1e65e 100644 --- a/src/openloco/localisation/stringmgr.h +++ b/src/openloco/localisation/stringmgr.h @@ -1,6 +1,6 @@ #pragma once -#include "../types.hpp" +#include "../Types.hpp" #include #ifdef small diff --git a/src/openloco/management/Expenditures.h b/src/openloco/management/Expenditures.h index 358d43e6..8a65723a 100644 --- a/src/openloco/management/Expenditures.h +++ b/src/openloco/management/Expenditures.h @@ -1,6 +1,6 @@ #pragma once -#include "../types.hpp" +#include "../Types.hpp" enum ExpenditureType : uint8_t { diff --git a/src/openloco/map/SurfaceTile.cpp b/src/openloco/map/SurfaceTile.cpp index 8cec520b..c87299bb 100644 --- a/src/openloco/map/SurfaceTile.cpp +++ b/src/openloco/map/SurfaceTile.cpp @@ -1,7 +1,7 @@ -#include "../industrymgr.h" +#include "../IndustryManager.h" +#include "../ViewportManager.h" #include "../interop/interop.hpp" #include "../ui/WindowManager.h" -#include "../viewportmgr.h" #include "tile.h" #include "tilemgr.h" diff --git a/src/openloco/map/tile.cpp b/src/openloco/map/tile.cpp index ecfe6073..dd879103 100644 --- a/src/openloco/map/tile.cpp +++ b/src/openloco/map/tile.cpp @@ -1,5 +1,5 @@ #include "tile.h" -#include "../industrymgr.h" +#include "../IndustryManager.h" #include "../interop/interop.hpp" #include "../objects/objectmgr.h" #include "../ui/WindowManager.h" diff --git a/src/openloco/map/tile.h b/src/openloco/map/tile.h index de6d11ee..1f998a67 100644 --- a/src/openloco/map/tile.h +++ b/src/openloco/map/tile.h @@ -1,7 +1,7 @@ #pragma once -#include "../types.hpp" -#include "../viewport.hpp" +#include "../Types.hpp" +#include "../Viewport.hpp" #include #include #include diff --git a/src/openloco/map/tilemgr.cpp b/src/openloco/map/tilemgr.cpp index 6d86fed3..24df9536 100644 --- a/src/openloco/map/tilemgr.cpp +++ b/src/openloco/map/tilemgr.cpp @@ -1,7 +1,7 @@ #include "tilemgr.h" -#include "../input.h" +#include "../Input.h" +#include "../ViewportManager.h" #include "../interop/interop.hpp" -#include "../viewportmgr.h" using namespace openloco::interop; diff --git a/src/openloco/objects/airport_object.h b/src/openloco/objects/airport_object.h index 7d14132e..1dcfad81 100644 --- a/src/openloco/objects/airport_object.h +++ b/src/openloco/objects/airport_object.h @@ -1,6 +1,6 @@ #pragma once -#include "../types.hpp" +#include "../Types.hpp" namespace openloco { diff --git a/src/openloco/objects/bridge_object.h b/src/openloco/objects/bridge_object.h index 57ed6a8c..b789c9da 100644 --- a/src/openloco/objects/bridge_object.h +++ b/src/openloco/objects/bridge_object.h @@ -1,6 +1,6 @@ #pragma once -#include "../types.hpp" +#include "../Types.hpp" namespace openloco { diff --git a/src/openloco/objects/dock_object.h b/src/openloco/objects/dock_object.h index ea0c6598..5651f4bf 100644 --- a/src/openloco/objects/dock_object.h +++ b/src/openloco/objects/dock_object.h @@ -1,6 +1,6 @@ #pragma once -#include "../types.hpp" +#include "../Types.hpp" namespace openloco { diff --git a/src/openloco/objects/road_extra_object.h b/src/openloco/objects/road_extra_object.h index 8d0627bb..55f1f62c 100644 --- a/src/openloco/objects/road_extra_object.h +++ b/src/openloco/objects/road_extra_object.h @@ -1,6 +1,6 @@ #pragma once -#include "../types.hpp" +#include "../Types.hpp" namespace openloco { diff --git a/src/openloco/objects/road_object.h b/src/openloco/objects/road_object.h index a54cbcdc..55d76375 100644 --- a/src/openloco/objects/road_object.h +++ b/src/openloco/objects/road_object.h @@ -1,6 +1,6 @@ #pragma once -#include "../types.hpp" +#include "../Types.hpp" namespace openloco { diff --git a/src/openloco/objects/road_station_object.h b/src/openloco/objects/road_station_object.h index 94846b36..abb454e4 100644 --- a/src/openloco/objects/road_station_object.h +++ b/src/openloco/objects/road_station_object.h @@ -1,6 +1,6 @@ #pragma once -#include "../types.hpp" +#include "../Types.hpp" namespace openloco { diff --git a/src/openloco/objects/track_extra_object.h b/src/openloco/objects/track_extra_object.h index 1196d6be..491a41bf 100644 --- a/src/openloco/objects/track_extra_object.h +++ b/src/openloco/objects/track_extra_object.h @@ -1,6 +1,6 @@ #pragma once -#include "../types.hpp" +#include "../Types.hpp" namespace openloco { diff --git a/src/openloco/objects/track_object.h b/src/openloco/objects/track_object.h index 1344b5f4..a4273fdc 100644 --- a/src/openloco/objects/track_object.h +++ b/src/openloco/objects/track_object.h @@ -1,6 +1,6 @@ #pragma once -#include "../types.hpp" +#include "../Types.hpp" namespace openloco { diff --git a/src/openloco/objects/train_signal_object.h b/src/openloco/objects/train_signal_object.h index 54047178..261a6515 100644 --- a/src/openloco/objects/train_signal_object.h +++ b/src/openloco/objects/train_signal_object.h @@ -1,6 +1,6 @@ #pragma once -#include "../types.hpp" +#include "../Types.hpp" namespace openloco { diff --git a/src/openloco/objects/train_station_object.h b/src/openloco/objects/train_station_object.h index a46620cb..da276ed0 100644 --- a/src/openloco/objects/train_station_object.h +++ b/src/openloco/objects/train_station_object.h @@ -1,6 +1,6 @@ #pragma once -#include "../types.hpp" +#include "../Types.hpp" namespace openloco { diff --git a/src/openloco/objects/tree_object.h b/src/openloco/objects/tree_object.h index 08150320..c1647ba5 100644 --- a/src/openloco/objects/tree_object.h +++ b/src/openloco/objects/tree_object.h @@ -1,6 +1,6 @@ #pragma once -#include "../types.hpp" +#include "../Types.hpp" namespace openloco { diff --git a/src/openloco/objects/wall_object.h b/src/openloco/objects/wall_object.h index 28df616d..a6b47ce4 100644 --- a/src/openloco/objects/wall_object.h +++ b/src/openloco/objects/wall_object.h @@ -1,6 +1,6 @@ #pragma once -#include "../types.hpp" +#include "../Types.hpp" namespace openloco { diff --git a/src/openloco/openloco.vcxproj b/src/openloco/openloco.vcxproj index 2da42ca2..26700f85 100644 --- a/src/openloco/openloco.vcxproj +++ b/src/openloco/openloco.vcxproj @@ -19,27 +19,27 @@ - - - - - + + + + + - + - - - - + + + + - + @@ -48,30 +48,30 @@ - - + + - + - + - - - - + + + + - - + + - - + + @@ -79,16 +79,16 @@ - + OPENLOCO_BRANCH="$(OPENLOCO_BRANCH)";%(PreprocessorDefinitions) OPENLOCO_COMMIT_SHA1_SHORT="$(OPENLOCO_SHA1_SHORT)";%(PreprocessorDefinitions) OPENLOCO_VERSION_TAG="$(GIT_DESCRIBE)";%(PreprocessorDefinitions) - - - - + + + + @@ -140,34 +140,34 @@ - + - - - - - + + + + + - + - - + + - - - - + + + + - + @@ -180,8 +180,8 @@ - - + + @@ -207,26 +207,26 @@ - + - + - - - - + + + + - - + + - - - + + + @@ -239,13 +239,13 @@ - - - - - + + + + + - + @@ -288,4 +288,4 @@ <_NuGetTargetFallbackMoniker>$(_NuGetTargetFallbackMoniker);native,Version=v0.0 - \ No newline at end of file + diff --git a/src/openloco/platform/platform.posix.cpp b/src/openloco/platform/platform.posix.cpp index b70fffbd..6d1670bc 100644 --- a/src/openloco/platform/platform.posix.cpp +++ b/src/openloco/platform/platform.posix.cpp @@ -1,8 +1,8 @@ #ifndef _WIN32 -#include "../console.h" +#include "../Console.h" +#include "../OpenLoco.h" #include "../interop/interop.hpp" -#include "../openloco.h" #include "platform.h" #include #include diff --git a/src/openloco/platform/platform.windows.cpp b/src/openloco/platform/platform.windows.cpp index bba1bd0f..f87b18fa 100644 --- a/src/openloco/platform/platform.windows.cpp +++ b/src/openloco/platform/platform.windows.cpp @@ -10,7 +10,7 @@ #include #include -#include "../ui.h" +#include "../Ui.h" #include "../utility/string.hpp" #include "platform.h" diff --git a/src/openloco/things/CreateVehicle.cpp b/src/openloco/things/CreateVehicle.cpp index fe61a611..9d1d6831 100644 --- a/src/openloco/things/CreateVehicle.cpp +++ b/src/openloco/things/CreateVehicle.cpp @@ -1,9 +1,9 @@ +#include "../Company.h" +#include "../CompanyManager.h" +#include "../Date.h" +#include "../GameCommands.h" #include "../audio/audio.h" -#include "../company.h" -#include "../companymgr.h" #include "../core/Optional.hpp" -#include "../date.h" -#include "../game_commands.h" #include "../management/Expenditures.h" #include "../map/tile.h" #include "../objects/objectmgr.h" diff --git a/src/openloco/things/thing.cpp b/src/openloco/things/thing.cpp index a51d706a..f666bd74 100644 --- a/src/openloco/things/thing.cpp +++ b/src/openloco/things/thing.cpp @@ -1,8 +1,8 @@ #include "thing.h" -#include "../config.h" +#include "../Config.h" +#include "../ViewportManager.h" #include "../graphics/gfx.h" #include "../interop/interop.hpp" -#include "../viewportmgr.h" #include using namespace openloco; diff --git a/src/openloco/things/thing.h b/src/openloco/things/thing.h index 44149cab..0210b6d4 100644 --- a/src/openloco/things/thing.h +++ b/src/openloco/things/thing.h @@ -1,6 +1,6 @@ #pragma once -#include "../types.hpp" +#include "../Types.hpp" #include #include diff --git a/src/openloco/things/thingmgr.cpp b/src/openloco/things/thingmgr.cpp index 2cb0ea62..d7c12dde 100644 --- a/src/openloco/things/thingmgr.cpp +++ b/src/openloco/things/thingmgr.cpp @@ -1,6 +1,6 @@ #include "thingmgr.h" +#include "../OpenLoco.h" #include "../interop/interop.hpp" -#include "../openloco.h" using namespace openloco::interop; diff --git a/src/openloco/things/vehicle.cpp b/src/openloco/things/vehicle.cpp index 7451ac24..d859a7bc 100644 --- a/src/openloco/things/vehicle.cpp +++ b/src/openloco/things/vehicle.cpp @@ -1,14 +1,14 @@ #include "vehicle.h" +#include "../Config.h" +#include "../OpenLoco.h" +#include "../ViewportManager.h" #include "../audio/audio.h" -#include "../config.h" #include "../graphics/gfx.h" #include "../interop/interop.hpp" #include "../map/tilemgr.h" #include "../objects/objectmgr.h" #include "../objects/vehicle_object.h" -#include "../openloco.h" #include "../utility/numeric.hpp" -#include "../viewportmgr.h" #include "misc.h" #include "thingmgr.h" #include diff --git a/src/openloco/things/vehicle.h b/src/openloco/things/vehicle.h index 8b424e4b..ef41d051 100644 --- a/src/openloco/things/vehicle.h +++ b/src/openloco/things/vehicle.h @@ -1,10 +1,10 @@ #pragma once +#include "../Company.h" +#include "../Window.h" #include "../audio/audio.h" -#include "../company.h" #include "../objects/vehicle_object.h" #include "../ui/WindowType.h" -#include "../window.h" #include "thing.h" namespace openloco diff --git a/src/openloco/ui/Screenshot.cpp b/src/openloco/ui/Screenshot.cpp index bbe5eda5..73dcf079 100644 --- a/src/openloco/ui/Screenshot.cpp +++ b/src/openloco/ui/Screenshot.cpp @@ -1,10 +1,10 @@ #include "Screenshot.h" +#include "../Ui.h" #include "../graphics/gfx.h" #include "../interop/interop.hpp" #include "../localisation/string_ids.h" #include "../platform/platform.h" #include "../s5/s5.h" -#include "../ui.h" #include #include #include diff --git a/src/openloco/ui/WindowManager.cpp b/src/openloco/ui/WindowManager.cpp index 1808eca7..155b10aa 100644 --- a/src/openloco/ui/WindowManager.cpp +++ b/src/openloco/ui/WindowManager.cpp @@ -1,23 +1,23 @@ #include "WindowManager.h" +#include "../CompanyManager.h" +#include "../Config.h" +#include "../Console.h" +#include "../GameCommands.h" +#include "../Input.h" +#include "../Intro.h" +#include "../MultiPlayer.h" +#include "../StationManager.h" +#include "../TownManager.h" +#include "../Tutorial.h" +#include "../Ui.h" +#include "../ViewportManager.h" #include "../audio/audio.h" -#include "../companymgr.h" -#include "../config.h" -#include "../console.h" -#include "../game_commands.h" #include "../graphics/colours.h" -#include "../input.h" #include "../interop/interop.hpp" -#include "../intro.h" #include "../map/tile.h" #include "../map/tilemgr.h" -#include "../multiplayer.h" -#include "../stationmgr.h" #include "../things/thingmgr.h" #include "../things/vehicle.h" -#include "../townmgr.h" -#include "../tutorial.h" -#include "../ui.h" -#include "../viewportmgr.h" #include "scrollview.h" #include #include diff --git a/src/openloco/ui/WindowManager.h b/src/openloco/ui/WindowManager.h index a910cdb4..2eead516 100644 --- a/src/openloco/ui/WindowManager.h +++ b/src/openloco/ui/WindowManager.h @@ -1,11 +1,11 @@ #pragma once -#include "../company.h" +#include "../Company.h" +#include "../Viewport.hpp" +#include "../Window.h" #include "../graphics/gfx.h" #include "../localisation/stringmgr.h" #include "../map/tile.h" -#include "../viewport.hpp" -#include "../window.h" #include namespace openloco diff --git a/src/openloco/ui/dropdown.cpp b/src/openloco/ui/dropdown.cpp index 2a9bfd71..24ea90d4 100644 --- a/src/openloco/ui/dropdown.cpp +++ b/src/openloco/ui/dropdown.cpp @@ -1,12 +1,12 @@ #include "dropdown.h" -#include "../companymgr.h" -#include "../console.h" -#include "../input.h" +#include "../CompanyManager.h" +#include "../Console.h" +#include "../Input.h" +#include "../Window.h" #include "../interop/interop.hpp" #include "../localisation/FormatArguments.hpp" #include "../objects/competitor_object.h" #include "../objects/objectmgr.h" -#include "../window.h" #include #include diff --git a/src/openloco/ui/dropdown.h b/src/openloco/ui/dropdown.h index 7bfb1bd2..44f3c0de 100644 --- a/src/openloco/ui/dropdown.h +++ b/src/openloco/ui/dropdown.h @@ -1,7 +1,7 @@ -#include "../company.h" +#include "../Company.h" +#include "../Window.h" #include "../graphics/colours.h" #include "../localisation/stringmgr.h" -#include "../window.h" #include #include diff --git a/src/openloco/ui/scrollview.cpp b/src/openloco/ui/scrollview.cpp index 9cfe5e03..5818841f 100644 --- a/src/openloco/ui/scrollview.cpp +++ b/src/openloco/ui/scrollview.cpp @@ -1,7 +1,7 @@ #include "scrollview.h" -#include "../input.h" +#include "../Input.h" +#include "../Ui.h" #include "../interop/interop.hpp" -#include "../ui.h" #include "WindowManager.h" #include diff --git a/src/openloco/ui/scrollview.h b/src/openloco/ui/scrollview.h index 7fe0fd4c..f9b8fba1 100644 --- a/src/openloco/ui/scrollview.h +++ b/src/openloco/ui/scrollview.h @@ -1,5 +1,5 @@ +#include "../Window.h" #include "../interop/interop.hpp" -#include "../window.h" using namespace openloco::interop; diff --git a/src/openloco/ui/viewport_interaction.cpp b/src/openloco/ui/viewport_interaction.cpp index 9bcf0ea7..014c7e81 100644 --- a/src/openloco/ui/viewport_interaction.cpp +++ b/src/openloco/ui/viewport_interaction.cpp @@ -1,10 +1,10 @@ -#include "../input.h" +#include "../Input.h" +#include "../StationManager.h" +#include "../Ui.h" +#include "../Window.h" #include "../interop/interop.hpp" #include "../localisation/stringmgr.h" -#include "../stationmgr.h" -#include "../ui.h" #include "../ui/scrollview.h" -#include "../window.h" #include "WindowManager.h" using namespace openloco::interop; diff --git a/src/openloco/windows/BuildVehicle.cpp b/src/openloco/windows/BuildVehicle.cpp index 1421bbdb..f55c592e 100644 --- a/src/openloco/windows/BuildVehicle.cpp +++ b/src/openloco/windows/BuildVehicle.cpp @@ -1,8 +1,10 @@ -#include "../companymgr.h" -#include "../game_commands.h" +#include "../CompanyManager.h" +#include "../GameCommands.h" +#include "../Input.h" +#include "../OpenLoco.h" +#include "../Widget.h" #include "../graphics/colours.h" #include "../graphics/image_ids.h" -#include "../input.h" #include "../interop/interop.hpp" #include "../localisation/FormatArguments.hpp" #include "../objects/cargo_object.h" @@ -13,11 +15,9 @@ #include "../objects/track_extra_object.h" #include "../objects/track_object.h" #include "../objects/vehicle_object.h" -#include "../openloco.h" #include "../things/thingmgr.h" #include "../ui/WindowManager.h" #include "../ui/scrollview.h" -#include "../widget.h" using namespace openloco::interop; diff --git a/src/openloco/windows/CompanyFaceSelection.cpp b/src/openloco/windows/CompanyFaceSelection.cpp index 78f172d8..3af8e38d 100644 --- a/src/openloco/windows/CompanyFaceSelection.cpp +++ b/src/openloco/windows/CompanyFaceSelection.cpp @@ -1,16 +1,16 @@ +#include "../CompanyManager.h" +#include "../GameCommands.h" +#include "../Input.h" +#include "../OpenLoco.h" #include "../audio/audio.h" -#include "../companymgr.h" #include "../core/Optional.hpp" -#include "../game_commands.h" #include "../graphics/colours.h" #include "../graphics/image_ids.h" -#include "../input.h" #include "../interop/interop.hpp" #include "../localisation/FormatArguments.hpp" #include "../objects/competitor_object.h" #include "../objects/interface_skin_object.h" #include "../objects/objectmgr.h" -#include "../openloco.h" #include "../ui/WindowManager.h" using namespace openloco::interop; diff --git a/src/openloco/windows/CompanyList.cpp b/src/openloco/windows/CompanyList.cpp index 5e11d883..60348420 100644 --- a/src/openloco/windows/CompanyList.cpp +++ b/src/openloco/windows/CompanyList.cpp @@ -1,19 +1,19 @@ -#include "../company.h" -#include "../companymgr.h" -#include "../date.h" +#include "../Company.h" +#include "../CompanyManager.h" +#include "../Date.h" +#include "../Input.h" +#include "../OpenLoco.h" +#include "../Widget.h" #include "../graphics/colours.h" #include "../graphics/image_ids.h" -#include "../input.h" #include "../interop/interop.hpp" #include "../localisation/FormatArguments.hpp" #include "../objects/cargo_object.h" #include "../objects/competitor_object.h" #include "../objects/interface_skin_object.h" #include "../objects/objectmgr.h" -#include "../openloco.h" #include "../ui/WindowManager.h" #include "../utility/numeric.hpp" -#include "../widget.h" using namespace openloco::interop; diff --git a/src/openloco/windows/CompanyWindow.cpp b/src/openloco/windows/CompanyWindow.cpp index 3687a1a7..fc07e6d9 100644 --- a/src/openloco/windows/CompanyWindow.cpp +++ b/src/openloco/windows/CompanyWindow.cpp @@ -1,10 +1,13 @@ -#include "../company.h" -#include "../companymgr.h" -#include "../config.h" -#include "../date.h" -#include "../game_commands.h" +#include "../Company.h" +#include "../CompanyManager.h" +#include "../Config.h" +#include "../Date.h" +#include "../GameCommands.h" +#include "../Input.h" +#include "../OpenLoco.h" +#include "../ViewportManager.h" +#include "../Widget.h" #include "../graphics/image_ids.h" -#include "../input.h" #include "../interop/interop.hpp" #include "../localisation/FormatArguments.hpp" #include "../localisation/string_ids.h" @@ -13,13 +16,10 @@ #include "../objects/competitor_object.h" #include "../objects/interface_skin_object.h" #include "../objects/objectmgr.h" -#include "../openloco.h" #include "../things/thingmgr.h" #include "../things/vehicle.h" #include "../ui/WindowManager.h" #include "../ui/dropdown.h" -#include "../viewportmgr.h" -#include "../widget.h" using namespace openloco::interop; diff --git a/src/openloco/windows/EditKeyboardShortcut.cpp b/src/openloco/windows/EditKeyboardShortcut.cpp index 67e7c453..4b9690f6 100644 --- a/src/openloco/windows/EditKeyboardShortcut.cpp +++ b/src/openloco/windows/EditKeyboardShortcut.cpp @@ -1,4 +1,4 @@ -#include "../config.h" +#include "../Config.h" #include "../graphics/colours.h" #include "../graphics/image_ids.h" #include "../input/Shortcut.h" diff --git a/src/openloco/windows/IndustryList.cpp b/src/openloco/windows/IndustryList.cpp index 29e960f9..d3ccc00d 100644 --- a/src/openloco/windows/IndustryList.cpp +++ b/src/openloco/windows/IndustryList.cpp @@ -1,19 +1,19 @@ +#include "../Config.h" +#include "../Date.h" +#include "../IndustryManager.h" +#include "../Input.h" +#include "../OpenLoco.h" +#include "../Widget.h" #include "../audio/audio.h" -#include "../config.h" -#include "../date.h" #include "../graphics/colours.h" #include "../graphics/image_ids.h" -#include "../industrymgr.h" -#include "../input.h" #include "../interop/interop.hpp" #include "../localisation/FormatArguments.hpp" #include "../objects/cargo_object.h" #include "../objects/interface_skin_object.h" #include "../objects/objectmgr.h" -#include "../openloco.h" #include "../ui/WindowManager.h" #include "../ui/scrollview.h" -#include "../widget.h" using namespace openloco::interop; diff --git a/src/openloco/windows/IndustryWindow.cpp b/src/openloco/windows/IndustryWindow.cpp index 8e5aaeb1..40074efc 100644 --- a/src/openloco/windows/IndustryWindow.cpp +++ b/src/openloco/windows/IndustryWindow.cpp @@ -1,13 +1,15 @@ +#include "../Config.h" +#include "../Date.h" +#include "../GameCommands.h" +#include "../IndustryManager.h" +#include "../Input.h" +#include "../ViewportManager.h" +#include "../Widget.h" #include "../audio/audio.h" -#include "../config.h" -#include "../date.h" -#include "../game_commands.h" #include "../graphics/colours.h" #include "../graphics/gfx.h" #include "../graphics/image_ids.h" #include "../graphics/types.h" -#include "../industrymgr.h" -#include "../input.h" #include "../interop/interop.hpp" #include "../localisation/FormatArguments.hpp" #include "../localisation/string_ids.h" @@ -16,8 +18,6 @@ #include "../objects/interface_skin_object.h" #include "../objects/objectmgr.h" #include "../ui/WindowManager.h" -#include "../viewportmgr.h" -#include "../widget.h" using namespace openloco::interop; using namespace openloco::game_commands; diff --git a/src/openloco/windows/KeyboardShortcuts.cpp b/src/openloco/windows/KeyboardShortcuts.cpp index 3ccb29e8..e2ba346c 100644 --- a/src/openloco/windows/KeyboardShortcuts.cpp +++ b/src/openloco/windows/KeyboardShortcuts.cpp @@ -1,4 +1,4 @@ -#include "../config.h" +#include "../Config.h" #include "../graphics/colours.h" #include "../graphics/image_ids.h" #include "../input/ShortcutManager.h" diff --git a/src/openloco/windows/LandscapeGeneration.cpp b/src/openloco/windows/LandscapeGeneration.cpp index a82d2122..e34b2dbc 100644 --- a/src/openloco/windows/LandscapeGeneration.cpp +++ b/src/openloco/windows/LandscapeGeneration.cpp @@ -1,7 +1,10 @@ +#include "../Input.h" +#include "../Scenario.h" +#include "../TownManager.h" +#include "../Widget.h" #include "../audio/audio.h" #include "../graphics/colours.h" #include "../graphics/image_ids.h" -#include "../input.h" #include "../interop/interop.hpp" #include "../localisation/FormatArguments.hpp" #include "../localisation/string_ids.h" @@ -9,11 +12,8 @@ #include "../objects/land_object.h" #include "../objects/objectmgr.h" #include "../s5/s5.h" -#include "../scenario.h" -#include "../townmgr.h" #include "../ui/WindowManager.h" #include "../ui/dropdown.h" -#include "../widget.h" using namespace openloco::interop; diff --git a/src/openloco/windows/LandscapeGenerationConfirm.cpp b/src/openloco/windows/LandscapeGenerationConfirm.cpp index 0ef5ed5e..683e8ecc 100644 --- a/src/openloco/windows/LandscapeGenerationConfirm.cpp +++ b/src/openloco/windows/LandscapeGenerationConfirm.cpp @@ -1,11 +1,11 @@ +#include "../Input.h" +#include "../Scenario.h" #include "../graphics/colours.h" #include "../graphics/gfx.h" -#include "../input.h" #include "../interop/interop.hpp" #include "../localisation/string_ids.h" #include "../objects/interface_skin_object.h" #include "../objects/objectmgr.h" -#include "../scenario.h" #include "../ui/WindowManager.h" using namespace openloco::interop; diff --git a/src/openloco/windows/MessageWindow.cpp b/src/openloco/windows/MessageWindow.cpp index 8b32a7b1..a25cd6bc 100644 --- a/src/openloco/windows/MessageWindow.cpp +++ b/src/openloco/windows/MessageWindow.cpp @@ -1,26 +1,26 @@ +#include "../CompanyManager.h" +#include "../Config.h" +#include "../Date.h" +#include "../GameCommands.h" +#include "../Input.h" +#include "../Intro.h" +#include "../Message.h" +#include "../MessageManager.h" +#include "../OpenLoco.h" +#include "../Ui.h" +#include "../Widget.h" #include "../audio/audio.h" -#include "../companymgr.h" -#include "../config.h" -#include "../date.h" -#include "../game_commands.h" #include "../graphics/colours.h" #include "../graphics/gfx.h" #include "../graphics/image_ids.h" -#include "../input.h" #include "../interop/interop.hpp" -#include "../intro.h" #include "../localisation/FormatArguments.hpp" #include "../localisation/string_ids.h" -#include "../message.h" -#include "../messagemgr.h" #include "../objects/interface_skin_object.h" #include "../objects/objectmgr.h" -#include "../openloco.h" -#include "../ui.h" #include "../ui/WindowManager.h" #include "../ui/dropdown.h" #include "../ui/scrollview.h" -#include "../widget.h" using namespace openloco::interop; diff --git a/src/openloco/windows/MusicSelection.cpp b/src/openloco/windows/MusicSelection.cpp index 070865e6..98bb4cf8 100644 --- a/src/openloco/windows/MusicSelection.cpp +++ b/src/openloco/windows/MusicSelection.cpp @@ -1,5 +1,6 @@ +#include "../Config.h" +#include "../OpenLoco.h" #include "../audio/audio.h" -#include "../config.h" #include "../graphics/colours.h" #include "../graphics/image_ids.h" #include "../interop/interop.hpp" @@ -7,7 +8,6 @@ #include "../localisation/string_ids.h" #include "../objects/interface_skin_object.h" #include "../objects/objectmgr.h" -#include "../openloco.h" #include "../ui/WindowManager.h" using namespace openloco::interop; diff --git a/src/openloco/windows/News/Common.cpp b/src/openloco/windows/News/Common.cpp index 0c6e2739..14c95ab1 100644 --- a/src/openloco/windows/News/Common.cpp +++ b/src/openloco/windows/News/Common.cpp @@ -1,9 +1,9 @@ +#include "../../Config.h" +#include "../../Message.h" +#include "../../MessageManager.h" #include "../../audio/audio.h" -#include "../../config.h" #include "../../graphics/colours.h" #include "../../interop/interop.hpp" -#include "../../message.h" -#include "../../messagemgr.h" #include "../../objects/interface_skin_object.h" #include "../../objects/objectmgr.h" #include "News.h" diff --git a/src/openloco/windows/News/News.cpp b/src/openloco/windows/News/News.cpp index d7f9298e..744bfdd0 100644 --- a/src/openloco/windows/News/News.cpp +++ b/src/openloco/windows/News/News.cpp @@ -1,21 +1,21 @@ #include "News.h" -#include "../../companymgr.h" -#include "../../date.h" +#include "../../CompanyManager.h" +#include "../../Date.h" +#include "../../IndustryManager.h" +#include "../../Message.h" +#include "../../MessageManager.h" +#include "../../StationManager.h" +#include "../../TownManager.h" +#include "../../ViewportManager.h" +#include "../../Window.h" #include "../../graphics/colours.h" #include "../../graphics/image_ids.h" -#include "../../industrymgr.h" #include "../../interop/interop.hpp" #include "../../localisation/FormatArguments.hpp" #include "../../localisation/string_ids.h" -#include "../../message.h" -#include "../../messagemgr.h" #include "../../objects/objectmgr.h" #include "../../objects/vehicle_object.h" -#include "../../stationmgr.h" #include "../../things/thingmgr.h" -#include "../../townmgr.h" -#include "../../viewportmgr.h" -#include "../../window.h" using namespace openloco::interop; diff --git a/src/openloco/windows/News/News.h b/src/openloco/windows/News/News.h index 345b938e..1718205f 100644 --- a/src/openloco/windows/News/News.h +++ b/src/openloco/windows/News/News.h @@ -1,5 +1,5 @@ #pragma once -#include "../../company.h" +#include "../../Company.h" #include "../../graphics/gfx.h" #include "../../interop/interop.hpp" #include "../../ui/WindowManager.h" diff --git a/src/openloco/windows/News/Ticker.cpp b/src/openloco/windows/News/Ticker.cpp index a949c002..1ee08037 100644 --- a/src/openloco/windows/News/Ticker.cpp +++ b/src/openloco/windows/News/Ticker.cpp @@ -1,8 +1,8 @@ +#include "../../Message.h" +#include "../../MessageManager.h" #include "../../audio/audio.h" #include "../../graphics/colours.h" #include "../../interop/interop.hpp" -#include "../../message.h" -#include "../../messagemgr.h" #include "News.h" using namespace openloco::interop; diff --git a/src/openloco/windows/ObjectSelectionWindow.cpp b/src/openloco/windows/ObjectSelectionWindow.cpp index c2e9ed24..5af3199f 100644 --- a/src/openloco/windows/ObjectSelectionWindow.cpp +++ b/src/openloco/windows/ObjectSelectionWindow.cpp @@ -1,6 +1,6 @@ +#include "../Window.h" #include "../interop/interop.hpp" #include "../ui/WindowManager.h" -#include "../window.h" using namespace openloco::interop; diff --git a/src/openloco/windows/PlayerInfoPanel.cpp b/src/openloco/windows/PlayerInfoPanel.cpp index 076e0f52..a5eecdf8 100644 --- a/src/openloco/windows/PlayerInfoPanel.cpp +++ b/src/openloco/windows/PlayerInfoPanel.cpp @@ -1,20 +1,20 @@ -#include "../company.h" -#include "../companymgr.h" -#include "../date.h" -#include "../game_commands.h" +#include "../Company.h" +#include "../CompanyManager.h" +#include "../Date.h" +#include "../GameCommands.h" +#include "../Input.h" +#include "../Intro.h" +#include "../OpenLoco.h" +#include "../Ui.h" #include "../graphics/colours.h" #include "../graphics/gfx.h" #include "../graphics/image_ids.h" -#include "../input.h" #include "../interop/interop.hpp" -#include "../intro.h" #include "../localisation/FormatArguments.hpp" #include "../localisation/string_ids.h" #include "../objects/competitor_object.h" #include "../objects/interface_skin_object.h" #include "../objects/objectmgr.h" -#include "../openloco.h" -#include "../ui.h" #include "../ui/WindowManager.h" #include "../ui/dropdown.h" #include diff --git a/src/openloco/windows/ScenarioOptions.cpp b/src/openloco/windows/ScenarioOptions.cpp index 7329b01e..5a4843b5 100644 --- a/src/openloco/windows/ScenarioOptions.cpp +++ b/src/openloco/windows/ScenarioOptions.cpp @@ -1,6 +1,8 @@ +#include "../Input.h" +#include "../Scenario.h" +#include "../Widget.h" #include "../graphics/colours.h" #include "../graphics/image_ids.h" -#include "../input.h" #include "../interop/interop.hpp" #include "../localisation/string_ids.h" #include "../objects/cargo_object.h" @@ -8,10 +10,8 @@ #include "../objects/objectmgr.h" #include "../objects/scenario_text_object.h" #include "../s5/s5.h" -#include "../scenario.h" #include "../ui/WindowManager.h" #include "../ui/dropdown.h" -#include "../widget.h" using namespace openloco::interop; diff --git a/src/openloco/windows/StationList.cpp b/src/openloco/windows/StationList.cpp index 98b8db4d..0d3f80dc 100644 --- a/src/openloco/windows/StationList.cpp +++ b/src/openloco/windows/StationList.cpp @@ -1,8 +1,12 @@ -#include "../companymgr.h" +#include "../CompanyManager.h" +#include "../Input.h" +#include "../OpenLoco.h" +#include "../StationManager.h" +#include "../TownManager.h" +#include "../Widget.h" #include "../graphics/colours.h" #include "../graphics/gfx.h" #include "../graphics/image_ids.h" -#include "../input.h" #include "../interop/interop.hpp" #include "../localisation/FormatArguments.hpp" #include "../localisation/string_ids.h" @@ -10,12 +14,8 @@ #include "../objects/competitor_object.h" #include "../objects/interface_skin_object.h" #include "../objects/objectmgr.h" -#include "../openloco.h" -#include "../stationmgr.h" -#include "../townmgr.h" #include "../ui/WindowManager.h" #include "../ui/dropdown.h" -#include "../widget.h" using namespace openloco::interop; diff --git a/src/openloco/windows/TimePanel.cpp b/src/openloco/windows/TimePanel.cpp index c01405b9..19670540 100644 --- a/src/openloco/windows/TimePanel.cpp +++ b/src/openloco/windows/TimePanel.cpp @@ -1,18 +1,18 @@ -#include "../companymgr.h" -#include "../date.h" -#include "../game_commands.h" +#include "../CompanyManager.h" +#include "../Date.h" +#include "../GameCommands.h" +#include "../Input.h" +#include "../Intro.h" +#include "../OpenLoco.h" +#include "../Ui.h" #include "../graphics/colours.h" #include "../graphics/gfx.h" #include "../graphics/image_ids.h" -#include "../input.h" #include "../interop/interop.hpp" -#include "../intro.h" #include "../localisation/FormatArguments.hpp" #include "../localisation/string_ids.h" #include "../objects/interface_skin_object.h" #include "../objects/objectmgr.h" -#include "../openloco.h" -#include "../ui.h" #include "../ui/WindowManager.h" #include "../ui/dropdown.h" diff --git a/src/openloco/windows/TitleExit.cpp b/src/openloco/windows/TitleExit.cpp index 19b9084e..4ed2300d 100644 --- a/src/openloco/windows/TitleExit.cpp +++ b/src/openloco/windows/TitleExit.cpp @@ -1,11 +1,11 @@ -#include "../game_commands.h" +#include "../GameCommands.h" +#include "../Intro.h" +#include "../OpenLoco.h" +#include "../Ui.h" #include "../graphics/colours.h" #include "../graphics/gfx.h" #include "../interop/interop.hpp" -#include "../intro.h" #include "../localisation/string_ids.h" -#include "../openloco.h" -#include "../ui.h" #include "../ui/WindowManager.h" using namespace openloco::interop; diff --git a/src/openloco/windows/TitleLogo.cpp b/src/openloco/windows/TitleLogo.cpp index 1003e76e..d62b6d26 100644 --- a/src/openloco/windows/TitleLogo.cpp +++ b/src/openloco/windows/TitleLogo.cpp @@ -1,7 +1,7 @@ +#include "../OpenLoco.h" #include "../graphics/colours.h" #include "../graphics/image_ids.h" #include "../interop/interop.hpp" -#include "../openloco.h" #include "../ui/WindowManager.h" using namespace openloco::interop; diff --git a/src/openloco/windows/TitleMenu.cpp b/src/openloco/windows/TitleMenu.cpp index 6a681d65..ef667556 100644 --- a/src/openloco/windows/TitleMenu.cpp +++ b/src/openloco/windows/TitleMenu.cpp @@ -1,21 +1,21 @@ -#include "../game_commands.h" +#include "../GameCommands.h" +#include "../Input.h" +#include "../Intro.h" +#include "../MultiPlayer.h" +#include "../OpenLoco.h" +#include "../Tutorial.h" +#include "../Ui.h" +#include "../ViewportManager.h" #include "../graphics/colours.h" #include "../graphics/gfx.h" #include "../graphics/image_ids.h" -#include "../input.h" #include "../interop/interop.hpp" -#include "../intro.h" #include "../localisation/string_ids.h" #include "../map/tile.h" -#include "../multiplayer.h" #include "../objects/interface_skin_object.h" #include "../objects/objectmgr.h" -#include "../openloco.h" -#include "../tutorial.h" -#include "../ui.h" #include "../ui/WindowManager.h" #include "../ui/dropdown.h" -#include "../viewportmgr.h" using namespace openloco::interop; diff --git a/src/openloco/windows/TitleOptions.cpp b/src/openloco/windows/TitleOptions.cpp index 67b8dbfc..34e0581b 100644 --- a/src/openloco/windows/TitleOptions.cpp +++ b/src/openloco/windows/TitleOptions.cpp @@ -1,11 +1,11 @@ -#include "../game_commands.h" +#include "../GameCommands.h" +#include "../Intro.h" +#include "../OpenLoco.h" +#include "../Ui.h" #include "../graphics/colours.h" #include "../graphics/gfx.h" #include "../interop/interop.hpp" -#include "../intro.h" #include "../localisation/string_ids.h" -#include "../openloco.h" -#include "../ui.h" #include "../ui/WindowManager.h" using namespace openloco::interop; diff --git a/src/openloco/windows/TitleVersion.cpp b/src/openloco/windows/TitleVersion.cpp index 50876a1e..a1b21633 100644 --- a/src/openloco/windows/TitleVersion.cpp +++ b/src/openloco/windows/TitleVersion.cpp @@ -1,9 +1,9 @@ +#include "../OpenLoco.h" +#include "../Ui.h" +#include "../Window.h" #include "../graphics/colours.h" #include "../interop/interop.hpp" -#include "../openloco.h" -#include "../ui.h" #include "../ui/WindowManager.h" -#include "../window.h" using namespace openloco::interop; diff --git a/src/openloco/windows/ToolbarTop.cpp b/src/openloco/windows/ToolbarTop.cpp index bfe2c117..582d0be0 100644 --- a/src/openloco/windows/ToolbarTop.cpp +++ b/src/openloco/windows/ToolbarTop.cpp @@ -1,11 +1,13 @@ +#include "../CompanyManager.h" +#include "../Config.h" +#include "../GameCommands.h" +#include "../Input.h" +#include "../StationManager.h" +#include "../TownManager.h" #include "../audio/audio.h" -#include "../companymgr.h" -#include "../config.h" -#include "../game_commands.h" #include "../graphics/colours.h" #include "../graphics/gfx.h" #include "../graphics/image_ids.h" -#include "../input.h" #include "../interop/interop.hpp" #include "../localisation/string_ids.h" #include "../objects/interface_skin_object.h" @@ -14,10 +16,8 @@ #include "../objects/road_object.h" #include "../objects/track_object.h" #include "../objects/water_object.h" -#include "../stationmgr.h" #include "../things/thingmgr.h" #include "../things/vehicle.h" -#include "../townmgr.h" #include "../ui/WindowManager.h" #include "../ui/dropdown.h" #include "ToolbarTopCommon.h" diff --git a/src/openloco/windows/ToolbarTopAlt.cpp b/src/openloco/windows/ToolbarTopAlt.cpp index 8b6caf57..836f101e 100644 --- a/src/openloco/windows/ToolbarTopAlt.cpp +++ b/src/openloco/windows/ToolbarTopAlt.cpp @@ -1,11 +1,13 @@ +#include "../CompanyManager.h" +#include "../Config.h" +#include "../GameCommands.h" +#include "../Input.h" +#include "../StationManager.h" +#include "../TownManager.h" #include "../audio/audio.h" -#include "../companymgr.h" -#include "../config.h" -#include "../game_commands.h" #include "../graphics/colours.h" #include "../graphics/gfx.h" #include "../graphics/image_ids.h" -#include "../input.h" #include "../interop/interop.hpp" #include "../localisation/string_ids.h" #include "../objects/interface_skin_object.h" @@ -15,10 +17,8 @@ #include "../objects/track_object.h" #include "../objects/water_object.h" #include "../s5/s5.h" -#include "../stationmgr.h" #include "../things/thingmgr.h" #include "../things/vehicle.h" -#include "../townmgr.h" #include "../ui/WindowManager.h" #include "../ui/dropdown.h" #include "ToolbarTopCommon.h" diff --git a/src/openloco/windows/ToolbarTopCommon.cpp b/src/openloco/windows/ToolbarTopCommon.cpp index 0e2b5afe..76ef9d95 100644 --- a/src/openloco/windows/ToolbarTopCommon.cpp +++ b/src/openloco/windows/ToolbarTopCommon.cpp @@ -1,12 +1,14 @@ #include "ToolbarTopCommon.h" +#include "../CompanyManager.h" +#include "../Config.h" +#include "../GameCommands.h" +#include "../Input.h" +#include "../StationManager.h" +#include "../TownManager.h" #include "../audio/audio.h" -#include "../companymgr.h" -#include "../config.h" -#include "../game_commands.h" #include "../graphics/colours.h" #include "../graphics/gfx.h" #include "../graphics/image_ids.h" -#include "../input.h" #include "../interop/interop.hpp" #include "../localisation/string_ids.h" #include "../objects/interface_skin_object.h" @@ -15,10 +17,8 @@ #include "../objects/road_object.h" #include "../objects/track_object.h" #include "../objects/water_object.h" -#include "../stationmgr.h" #include "../things/thingmgr.h" #include "../things/vehicle.h" -#include "../townmgr.h" #include "../ui/WindowManager.h" #include "../ui/dropdown.h" #include diff --git a/src/openloco/windows/TownList.cpp b/src/openloco/windows/TownList.cpp index 67893e74..4f0f6be1 100644 --- a/src/openloco/windows/TownList.cpp +++ b/src/openloco/windows/TownList.cpp @@ -1,21 +1,21 @@ +#include "../Config.h" +#include "../Input.h" +#include "../OpenLoco.h" +#include "../Town.h" +#include "../TownManager.h" +#include "../Widget.h" #include "../audio/audio.h" -#include "../config.h" #include "../graphics/colours.h" #include "../graphics/image_ids.h" -#include "../input.h" #include "../interop/interop.hpp" #include "../localisation/FormatArguments.hpp" #include "../objects/building_object.h" #include "../objects/interface_skin_object.h" #include "../objects/objectmgr.h" -#include "../openloco.h" -#include "../town.h" -#include "../townmgr.h" #include "../ui/WindowManager.h" #include "../ui/dropdown.h" #include "../ui/scrollview.h" #include "../utility/numeric.hpp" -#include "../widget.h" using namespace openloco::interop; diff --git a/src/openloco/windows/VehicleList.cpp b/src/openloco/windows/VehicleList.cpp index 441327aa..57f288c8 100644 --- a/src/openloco/windows/VehicleList.cpp +++ b/src/openloco/windows/VehicleList.cpp @@ -1,5 +1,5 @@ +#include "../OpenLoco.h" #include "../interop/interop.hpp" -#include "../openloco.h" #include "../ui/WindowManager.h" #include diff --git a/src/openloco/windows/construction/Common.cpp b/src/openloco/windows/construction/Common.cpp index cd82e5ff..4cff607c 100644 --- a/src/openloco/windows/construction/Common.cpp +++ b/src/openloco/windows/construction/Common.cpp @@ -1,7 +1,9 @@ -#include "../../companymgr.h" -#include "../../date.h" +#include "../../CompanyManager.h" +#include "../../Date.h" +#include "../../Input.h" +#include "../../StationManager.h" +#include "../../Widget.h" #include "../../graphics/image_ids.h" -#include "../../input.h" #include "../../objects/airport_object.h" #include "../../objects/bridge_object.h" #include "../../objects/dock_object.h" @@ -14,8 +16,6 @@ #include "../../objects/track_object.h" #include "../../objects/train_signal_object.h" #include "../../objects/train_station_object.h" -#include "../../stationmgr.h" -#include "../../widget.h" #include "Construction.h" using namespace openloco::interop; diff --git a/src/openloco/windows/construction/ConstructionTab.cpp b/src/openloco/windows/construction/ConstructionTab.cpp index c6156996..fbf1fec5 100644 --- a/src/openloco/windows/construction/ConstructionTab.cpp +++ b/src/openloco/windows/construction/ConstructionTab.cpp @@ -1,8 +1,8 @@ +#include "../../CompanyManager.h" +#include "../../Input.h" #include "../../TrackData.h" #include "../../audio/audio.h" -#include "../../companymgr.h" #include "../../graphics/image_ids.h" -#include "../../input.h" #include "../../localisation/FormatArguments.hpp" #include "../../objects/bridge_object.h" #include "../../objects/objectmgr.h" diff --git a/src/openloco/windows/construction/OverheadTab.cpp b/src/openloco/windows/construction/OverheadTab.cpp index 8430ffb1..e814d3ca 100644 --- a/src/openloco/windows/construction/OverheadTab.cpp +++ b/src/openloco/windows/construction/OverheadTab.cpp @@ -1,6 +1,6 @@ -#include "../../companymgr.h" +#include "../../CompanyManager.h" +#include "../../Input.h" #include "../../graphics/image_ids.h" -#include "../../input.h" #include "../../localisation/FormatArguments.hpp" #include "../../objects/objectmgr.h" #include "../../objects/road_extra_object.h" diff --git a/src/openloco/windows/construction/SignalTab.cpp b/src/openloco/windows/construction/SignalTab.cpp index 3bff72e4..d27b81c0 100644 --- a/src/openloco/windows/construction/SignalTab.cpp +++ b/src/openloco/windows/construction/SignalTab.cpp @@ -1,5 +1,5 @@ +#include "../../Input.h" #include "../../graphics/image_ids.h" -#include "../../input.h" #include "../../localisation/FormatArguments.hpp" #include "../../objects/objectmgr.h" #include "../../objects/track_object.h" diff --git a/src/openloco/windows/construction/StationTab.cpp b/src/openloco/windows/construction/StationTab.cpp index 094899f2..30b23e95 100644 --- a/src/openloco/windows/construction/StationTab.cpp +++ b/src/openloco/windows/construction/StationTab.cpp @@ -1,6 +1,7 @@ -#include "../../companymgr.h" +#include "../../CompanyManager.h" +#include "../../Input.h" +#include "../../StationManager.h" #include "../../graphics/image_ids.h" -#include "../../input.h" #include "../../localisation/FormatArguments.hpp" #include "../../objects/airport_object.h" #include "../../objects/cargo_object.h" @@ -10,7 +11,6 @@ #include "../../objects/road_station_object.h" #include "../../objects/track_object.h" #include "../../objects/train_station_object.h" -#include "../../stationmgr.h" #include "../../ui/dropdown.h" #include "Construction.h" diff --git a/src/openloco/windows/error.cpp b/src/openloco/windows/error.cpp index 03b4064b..b6cdf38f 100644 --- a/src/openloco/windows/error.cpp +++ b/src/openloco/windows/error.cpp @@ -1,5 +1,6 @@ +#include "../CompanyManager.h" +#include "../OpenLoco.h" #include "../audio/audio.h" -#include "../companymgr.h" #include "../graphics/colours.h" #include "../graphics/image_ids.h" #include "../interop/interop.hpp" @@ -8,7 +9,6 @@ #include "../objects/competitor_object.h" #include "../objects/interface_skin_object.h" #include "../objects/objectmgr.h" -#include "../openloco.h" #include "../ui/WindowManager.h" using namespace openloco::interop; diff --git a/src/openloco/windows/map.cpp b/src/openloco/windows/map.cpp index b5805ec0..6e406bd4 100644 --- a/src/openloco/windows/map.cpp +++ b/src/openloco/windows/map.cpp @@ -1,9 +1,13 @@ -#include "../companymgr.h" +#include "../CompanyManager.h" +#include "../IndustryManager.h" +#include "../Input.h" +#include "../StationManager.h" +#include "../TownManager.h" +#include "../Types.hpp" +#include "../Widget.h" #include "../graphics/colours.h" #include "../graphics/gfx.h" #include "../graphics/image_ids.h" -#include "../industrymgr.h" -#include "../input.h" #include "../interop/interop.hpp" #include "../localisation/FormatArguments.hpp" #include "../objects/industry_object.h" @@ -11,14 +15,10 @@ #include "../objects/objectmgr.h" #include "../objects/road_object.h" #include "../objects/track_object.h" -#include "../stationmgr.h" #include "../things/thing.h" #include "../things/thingmgr.h" -#include "../townmgr.h" -#include "../types.hpp" #include "../ui/WindowManager.h" #include "../ui/scrollview.h" -#include "../widget.h" using namespace openloco::interop; using namespace openloco::ui::WindowManager; diff --git a/src/openloco/windows/options.cpp b/src/openloco/windows/options.cpp index 1d57d3ae..44481f88 100644 --- a/src/openloco/windows/options.cpp +++ b/src/openloco/windows/options.cpp @@ -1,9 +1,11 @@ +#include "../Config.h" +#include "../Date.h" +#include "../Input.h" +#include "../Ui.h" +#include "../Widget.h" #include "../audio/audio.h" -#include "../config.h" -#include "../date.h" #include "../graphics/colours.h" #include "../graphics/image_ids.h" -#include "../input.h" #include "../interop/interop.hpp" #include "../localisation/FormatArguments.hpp" #include "../localisation/languagefiles.h" @@ -13,10 +15,8 @@ #include "../objects/interface_skin_object.h" #include "../objects/objectmgr.h" #include "../s5/s5.h" -#include "../ui.h" #include "../ui/WindowManager.h" #include "../ui/dropdown.h" -#include "../widget.h" #include using namespace openloco::interop; diff --git a/src/openloco/windows/promptbrowsewnd.cpp b/src/openloco/windows/promptbrowsewnd.cpp index 9ec6d294..588376e7 100644 --- a/src/openloco/windows/promptbrowsewnd.cpp +++ b/src/openloco/windows/promptbrowsewnd.cpp @@ -1,17 +1,17 @@ +#include "../Console.h" +#include "../Input.h" +#include "../OpenLoco.h" +#include "../Scenario.h" +#include "../Ui.h" #include "../audio/audio.h" -#include "../console.h" #include "../core/FileSystem.hpp" #include "../graphics/colours.h" #include "../graphics/image_ids.h" -#include "../input.h" #include "../interop/interop.hpp" #include "../localisation/FormatArguments.hpp" #include "../localisation/string_ids.h" -#include "../openloco.h" #include "../platform/platform.h" #include "../s5/s5.h" -#include "../scenario.h" -#include "../ui.h" #include "../ui/WindowManager.h" #include "../utility/string.hpp" #include diff --git a/src/openloco/windows/promptokcancelwnd.cpp b/src/openloco/windows/promptokcancelwnd.cpp index 61fee911..daaf085b 100644 --- a/src/openloco/windows/promptokcancelwnd.cpp +++ b/src/openloco/windows/promptokcancelwnd.cpp @@ -1,9 +1,9 @@ +#include "../Input.h" +#include "../OpenLoco.h" +#include "../Ui.h" #include "../audio/audio.h" #include "../graphics/colours.h" -#include "../input.h" #include "../interop/interop.hpp" -#include "../openloco.h" -#include "../ui.h" #include "../ui/WindowManager.h" #include diff --git a/src/openloco/windows/stationwnd.cpp b/src/openloco/windows/stationwnd.cpp index fbb36b5e..a05b4299 100644 --- a/src/openloco/windows/stationwnd.cpp +++ b/src/openloco/windows/stationwnd.cpp @@ -1,10 +1,13 @@ -#include "../companymgr.h" -#include "../config.h" -#include "../game_commands.h" +#include "../CompanyManager.h" +#include "../Config.h" +#include "../GameCommands.h" +#include "../Input.h" +#include "../StationManager.h" +#include "../ViewportManager.h" +#include "../Widget.h" #include "../graphics/colours.h" #include "../graphics/gfx.h" #include "../graphics/image_ids.h" -#include "../input.h" #include "../interop/interop.hpp" #include "../localisation/FormatArguments.hpp" #include "../localisation/string_ids.h" @@ -13,11 +16,8 @@ #include "../objects/cargo_object.h" #include "../objects/interface_skin_object.h" #include "../objects/objectmgr.h" -#include "../stationmgr.h" #include "../things/thingmgr.h" #include "../ui/WindowManager.h" -#include "../viewportmgr.h" -#include "../widget.h" using namespace openloco::interop; using namespace openloco::map; diff --git a/src/openloco/windows/terraform.cpp b/src/openloco/windows/terraform.cpp index 4b57bb47..80a4f066 100644 --- a/src/openloco/windows/terraform.cpp +++ b/src/openloco/windows/terraform.cpp @@ -1,8 +1,9 @@ +#include "../GameCommands.h" +#include "../Input.h" +#include "../Widget.h" #include "../audio/audio.h" -#include "../game_commands.h" #include "../graphics/colours.h" #include "../graphics/image_ids.h" -#include "../input.h" #include "../interop/interop.hpp" #include "../localisation/FormatArguments.hpp" #include "../map/tile.h" @@ -17,7 +18,6 @@ #include "../ui/dropdown.h" #include "../ui/scrollview.h" #include "../utility/numeric.hpp" -#include "../widget.h" using namespace openloco::interop; using namespace openloco::map; diff --git a/src/openloco/windows/textinputwnd.cpp b/src/openloco/windows/textinputwnd.cpp index b355c2d9..ea2633e4 100644 --- a/src/openloco/windows/textinputwnd.cpp +++ b/src/openloco/windows/textinputwnd.cpp @@ -1,4 +1,5 @@ -#include "../companymgr.h" +#include "../CompanyManager.h" +#include "../Win32.h" #include "../graphics/colours.h" #include "../graphics/image_ids.h" #include "../interop/interop.hpp" @@ -6,7 +7,6 @@ #include "../objects/interface_skin_object.h" #include "../objects/objectmgr.h" #include "../ui/WindowManager.h" -#include "../win32.h" #include #ifdef _WIN32 diff --git a/src/openloco/windows/tooltip.cpp b/src/openloco/windows/tooltip.cpp index cbe42d7b..dbf03328 100644 --- a/src/openloco/windows/tooltip.cpp +++ b/src/openloco/windows/tooltip.cpp @@ -1,10 +1,10 @@ +#include "../Input.h" +#include "../Ui.h" #include "../graphics/colours.h" #include "../graphics/gfx.h" -#include "../input.h" #include "../interop/interop.hpp" #include "../objects/interface_skin_object.h" #include "../objects/objectmgr.h" -#include "../ui.h" #include "../ui/WindowManager.h" #include #include diff --git a/src/openloco/windows/townwnd.cpp b/src/openloco/windows/townwnd.cpp index d4068ea7..7e515b4d 100644 --- a/src/openloco/windows/townwnd.cpp +++ b/src/openloco/windows/townwnd.cpp @@ -1,23 +1,23 @@ +#include "../CompanyManager.h" +#include "../Config.h" +#include "../Date.h" +#include "../GameCommands.h" +#include "../Input.h" +#include "../OpenLoco.h" +#include "../TownManager.h" +#include "../ViewportManager.h" +#include "../Widget.h" #include "../audio/audio.h" -#include "../companymgr.h" -#include "../config.h" -#include "../date.h" -#include "../game_commands.h" #include "../graphics/colours.h" #include "../graphics/image_ids.h" -#include "../input.h" #include "../interop/interop.hpp" #include "../localisation/FormatArguments.hpp" #include "../localisation/string_ids.h" #include "../map/tile.h" #include "../objects/interface_skin_object.h" #include "../objects/objectmgr.h" -#include "../openloco.h" #include "../things/thingmgr.h" -#include "../townmgr.h" #include "../ui/WindowManager.h" -#include "../viewportmgr.h" -#include "../widget.h" using namespace openloco::interop; using namespace openloco::game_commands; diff --git a/src/openloco/windows/vehicle.cpp b/src/openloco/windows/vehicle.cpp index f44cca01..70d43dc4 100644 --- a/src/openloco/windows/vehicle.cpp +++ b/src/openloco/windows/vehicle.cpp @@ -1,7 +1,7 @@ -#include "../companymgr.h" -#include "../input.h" +#include "../CompanyManager.h" +#include "../Input.h" +#include "../OpenLoco.h" #include "../interop/interop.hpp" -#include "../openloco.h" #include "../things/thingmgr.h" #include "../ui/WindowManager.h"