mirrors
/
OpenLoco
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename things (#618) 

* rename Things folder

* rename Misc.h and Misc.cpp

* rename Thing.h and Thing.cpp

* rename ThingManager.h and ThingManager.cpp

* rename Vehicle.h and Vehicle.cpp
This commit is contained in:
Peter Gaal 2020-09-10 07:35:31 +01:00 committed by GitHub
parent 7512227cfc
commit 6988223e06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
36 changed files with 57 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/openloco/Audio/Audio.cpp
View File

@ -8,8 +8,8 @@
#include "../Map/TileManager.h"
#include "../Objects/ObjectManager.h"
#include "../Objects/SoundObject.h"
#include "../things/thingmgr.h"
#include "../things/vehicle.h"
#include "../Things/ThingManager.h"
#include "../Things/Vehicle.h"
#include "../ui/WindowManager.h"
#include "../utility/stream.hpp"
#include "Channel.h"

2
src/openloco/Audio/MusicChannel.h
View File

@ -1,7 +1,7 @@
#pragma once
#include "../Core/FileSystem.hpp"
#include "../things/thing.h"
#include "../Things/Thing.h"
#include "Audio.h"
#include "Channel.h"

4
src/openloco/Audio/VehicleChannel.cpp
View File

@ -1,7 +1,7 @@
#include "VehicleChannel.h"
#include "../Interop/Interop.hpp"
#include "../things/thingmgr.h"
#include "../things/vehicle.h"
#include "../Things/ThingManager.h"
#include "../Things/Vehicle.h"
using namespace openloco;
using namespace openloco::audio;

2
src/openloco/Audio/VehicleChannel.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "../things/thing.h"
#include "../Things/Thing.h"
#include "Audio.h"
#include "Channel.h"

2
src/openloco/Company.cpp
View File

@ -2,7 +2,7 @@
#include "Interop/Interop.hpp"
#include "Localisation/FormatArguments.hpp"
#include "Localisation/StringIds.h"
#include "things/thingmgr.h"
#include "Things/ThingManager.h"
#include "ui/WindowManager.h"
#include <algorithm>
#include <array>

4
src/openloco/CompanyManager.cpp
View File

@ -5,8 +5,8 @@
#include "Localisation/FormatArguments.hpp"
#include "Map/Tile.h"
#include "OpenLoco.h"
#include "things/thingmgr.h"
#include "things/vehicle.h"
#include "Things/ThingManager.h"
#include "Things/Vehicle.h"
#include "ui/WindowManager.h"
using namespace openloco::interop;

2
src/openloco/GameCommands.cpp
View File

@ -7,7 +7,7 @@
#include "Objects/RoadObject.h"
#include "Objects/TrackObject.h"
#include "StationManager.h"
#include "things/vehicle.h"
#include "Things/Vehicle.h"
#include "ui/WindowManager.h"
#include <cassert>

2
src/openloco/GameCommands.h
View File

@ -3,7 +3,7 @@
#include "Interop/Interop.hpp"
#include "Map/Tile.h"
#include "Objects/ObjectManager.h"
#include "things/thing.h"
#include "Things/Thing.h"
using namespace openloco::interop;

2
src/openloco/Input/Keyboard.cpp
View File

@ -8,10 +8,10 @@
#include "../Intro.h"
#include "../Localisation/StringIds.h"
#include "../OpenLoco.h"
#include "../Things/ThingManager.h"
#include "../Tutorial.h"
#include "../Ui.h"
#include "../Win32.h"
#include "../things/thingmgr.h"
#include "../ui/Screenshot.h"
#include "ShortcutManager.h"
#include <cstdint>

2
src/openloco/Input/MouseInput.cpp
View File

@ -8,10 +8,10 @@
#include "../Objects/ObjectManager.h"
#include "../Objects/RoadObject.h"
#include "../StationManager.h"
#include "../Things/ThingManager.h"
#include "../TownManager.h"
#include "../Tutorial.h"
#include "../Window.h"
#include "../things/thingmgr.h"
#include "../ui/WindowManager.h"
#include "../ui/scrollview.h"
#include <map>

2
src/openloco/Interop/Hooks.cpp
View File

@ -18,11 +18,11 @@
#include "../Map/Tile.h"
#include "../Platform/Platform.h"
#include "../Station.h"
#include "../Things/Vehicle.h"
#include "../Title.h"
#include "../Tutorial.h"
#include "../Ui.h"
#include "../ViewportManager.h"
#include "../things/vehicle.h"
#include "../ui/WindowManager.h"
#include "../utility/string.hpp"
#include "Interop.hpp"

2
src/openloco/OpenLoco.cpp
View File

@ -41,12 +41,12 @@
#include "S5/S5.h"
#include "ScenarioManager.h"
#include "StationManager.h"
#include "Things/ThingManager.h"
#include "Title.h"
#include "TownManager.h"
#include "Tutorial.h"
#include "Ui.h"
#include "ViewportManager.h"
#include "things/thingmgr.h"
#include "ui/WindowManager.h"
#include "utility/numeric.hpp"

4
src/openloco/things/CreateVehicle.cpp → src/openloco/Things/CreateVehicle.cpp
View File

@ -12,8 +12,8 @@
#include "../Objects/TrackObject.h"
#include "../Objects/VehicleObject.h"
#include "../ui/WindowManager.h"
#include "thingmgr.h"
#include "vehicle.h"
#include "ThingManager.h"
#include "Vehicle.h"
#include <numeric>
#include <utility>

4
src/openloco/things/misc.cpp → src/openloco/Things/Misc.cpp
View File

@ -1,7 +1,7 @@
#include "misc.h"
#include "Misc.h"
#include "../Map/TileManager.h"
#include "../Objects/ObjectManager.h"
#include "thingmgr.h"
#include "ThingManager.h"
using namespace openloco;
using namespace openloco::objectmgr;

2
src/openloco/things/misc.h → src/openloco/Things/Misc.h
View File

@ -1,7 +1,7 @@
#pragma once
#include "../Objects/SteamObject.h"
#include "thing.h"
#include "Thing.h"
namespace openloco
{

2
src/openloco/things/thing.cpp → src/openloco/Things/Thing.cpp
View File

@ -1,4 +1,4 @@
#include "thing.h"
#include "Thing.h"
#include "../Config.h"
#include "../Graphics/Gfx.h"
#include "../Interop/Interop.hpp"

0
src/openloco/things/thing.h → src/openloco/Things/Thing.h
View File

2
src/openloco/things/thingmgr.cpp → src/openloco/Things/ThingManager.cpp
View File

@ -1,4 +1,4 @@
#include "thingmgr.h"
#include "ThingManager.h"
#include "../Interop/Interop.hpp"
#include "../OpenLoco.h"

4
src/openloco/things/thingmgr.h → src/openloco/Things/ThingManager.h
View File

@ -1,7 +1,7 @@
#pragma once
#include "thing.h"
#include "vehicle.h"
#include "Thing.h"
#include "Vehicle.h"
#include <cstdio>
namespace openloco::thingmgr

6
src/openloco/things/vehicle.cpp → src/openloco/Things/Vehicle.cpp
View File

@ -1,4 +1,4 @@
#include "vehicle.h"
#include "Vehicle.h"
#include "../Audio/Audio.h"
#include "../Config.h"
#include "../Graphics/Gfx.h"
@ -9,8 +9,8 @@
#include "../OpenLoco.h"
#include "../ViewportManager.h"
#include "../utility/numeric.hpp"
#include "misc.h"
#include "thingmgr.h"
#include "Misc.h"
#include "ThingManager.h"
#include <algorithm>
#include <cassert>

2
src/openloco/things/vehicle.h → src/openloco/Things/Vehicle.h
View File

@ -5,7 +5,7 @@
#include "../Objects/VehicleObject.h"
#include "../Window.h"
#include "../ui/WindowType.h"
#include "thing.h"
#include "Thing.h"
namespace openloco
{

3
src/openloco/ViewportManager.cpp
View File

@ -5,10 +5,9 @@
#include "Map/Tile.h"
#include "Map/TileManager.h"
#include "Station.h"
#include "Things/ThingManager.h"
#include "Ui.h"
#include "Window.h"
#include "things/thing.h"
#include "things/thingmgr.h"
#include <algorithm>
#include <cassert>
#include <memory>

2
src/openloco/ViewportManager.h
View File

@ -2,9 +2,9 @@
#include "Map/Tile.h"
#include "Station.h"
#include "Things/Thing.h"
#include "Types.hpp"
#include "Window.h"
#include "things/thing.h"
#include <array>
namespace openloco::ui::viewportmgr

2
src/openloco/Window.cpp
View File

@ -7,9 +7,9 @@
#include "Localisation/FormatArguments.hpp"
#include "Map/Tile.h"
#include "Map/TileManager.h"
#include "Things/ThingManager.h"
#include "Ui.h"
#include "Widget.h"
#include "things/thingmgr.h"
#include "ui/Rect.h"
#include "ui/scrollview.h"
#include <cassert>

18
src/openloco/openloco.vcxproj
View File

@ -61,11 +61,11 @@
<ClCompile Include="ScenarioManager.cpp" />
<ClCompile Include="Station.cpp" />
<ClCompile Include="StationManager.cpp" />
<ClCompile Include="things\CreateVehicle.cpp" />
<ClCompile Include="things\misc.cpp" />
<ClCompile Include="things\thing.cpp" />
<ClCompile Include="things\thingmgr.cpp" />
<ClCompile Include="things\vehicle.cpp" />
<ClCompile Include="Things\CreateVehicle.cpp" />
<ClCompile Include="Things\Misc.cpp" />
<ClCompile Include="Things\Thing.cpp" />
<ClCompile Include="Things\ThingManager.cpp" />
<ClCompile Include="Things\Vehicle.cpp" />
<ClCompile Include="Title.cpp" />
<ClCompile Include="Town.cpp" />
<ClCompile Include="TownManager.cpp" />
@ -215,10 +215,10 @@
<ClInclude Include="ScenarioManager.h" />
<ClInclude Include="Station.h" />
<ClInclude Include="StationManager.h" />
<ClInclude Include="things\misc.h" />
<ClInclude Include="things\thing.h" />
<ClInclude Include="things\thingmgr.h" />
<ClInclude Include="things\vehicle.h" />
<ClInclude Include="Things\Misc.h" />
<ClInclude Include="Things\Thing.h" />
<ClInclude Include="Things\ThingManager.h" />
<ClInclude Include="Things\Vehicle.h" />
<ClInclude Include="thirdparty\filesystem.hpp" />
<ClInclude Include="Title.h" />
<ClInclude Include="Town.h" />

4
src/openloco/ui/WindowManager.cpp
View File

@ -12,12 +12,12 @@
#include "../Map/TileManager.h"
#include "../MultiPlayer.h"
#include "../StationManager.h"
#include "../Things/ThingManager.h"
#include "../Things/Vehicle.h"
#include "../TownManager.h"
#include "../Tutorial.h"
#include "../Ui.h"
#include "../ViewportManager.h"
#include "../things/thingmgr.h"
#include "../things/vehicle.h"
#include "scrollview.h"
#include <algorithm>
#include <cinttypes>

2
src/openloco/windows/BuildVehicle.cpp
View File

@ -14,8 +14,8 @@
#include "../Objects/TrackObject.h"
#include "../Objects/VehicleObject.h"
#include "../OpenLoco.h"
#include "../Things/ThingManager.h"
#include "../Widget.h"
#include "../things/thingmgr.h"
#include "../ui/WindowManager.h"
#include "../ui/scrollview.h"

4
src/openloco/windows/CompanyWindow.cpp
View File

@ -14,10 +14,10 @@
#include "../Objects/InterfaceSkinObject.h"
#include "../Objects/ObjectManager.h"
#include "../OpenLoco.h"
#include "../Things/ThingManager.h"
#include "../Things/Vehicle.h"
#include "../ViewportManager.h"
#include "../Widget.h"
#include "../things/thingmgr.h"
#include "../things/vehicle.h"
#include "../ui/WindowManager.h"
#include "../ui/dropdown.h"

2
src/openloco/windows/News/News.cpp
View File

@ -12,10 +12,10 @@
#include "../../Objects/ObjectManager.h"
#include "../../Objects/VehicleObject.h"
#include "../../StationManager.h"
#include "../../Things/ThingManager.h"
#include "../../TownManager.h"
#include "../../ViewportManager.h"
#include "../../Window.h"
#include "../../things/thingmgr.h"
using namespace openloco::interop;

4
src/openloco/windows/ToolbarTop.cpp
View File

@ -15,9 +15,9 @@
#include "../Objects/TrackObject.h"
#include "../Objects/WaterObject.h"
#include "../StationManager.h"
#include "../Things/ThingManager.h"
#include "../Things/Vehicle.h"
#include "../TownManager.h"
#include "../things/thingmgr.h"
#include "../things/vehicle.h"
#include "../ui/WindowManager.h"
#include "../ui/dropdown.h"
#include "ToolbarTopCommon.h"

4
src/openloco/windows/ToolbarTopAlt.cpp
View File

@ -16,9 +16,9 @@
#include "../Objects/WaterObject.h"
#include "../S5/S5.h"
#include "../StationManager.h"
#include "../Things/ThingManager.h"
#include "../Things/Vehicle.h"
#include "../TownManager.h"
#include "../things/thingmgr.h"
#include "../things/vehicle.h"
#include "../ui/WindowManager.h"
#include "../ui/dropdown.h"
#include "ToolbarTopCommon.h"

4
src/openloco/windows/ToolbarTopCommon.cpp
View File

@ -16,9 +16,9 @@
#include "../Objects/TrackObject.h"
#include "../Objects/WaterObject.h"
#include "../StationManager.h"
#include "../Things/ThingManager.h"
#include "../Things/Vehicle.h"
#include "../TownManager.h"
#include "../things/thingmgr.h"
#include "../things/vehicle.h"
#include "../ui/WindowManager.h"
#include "../ui/dropdown.h"
#include <map>

4
src/openloco/windows/map.cpp
View File

@ -12,11 +12,11 @@
#include "../Objects/RoadObject.h"
#include "../Objects/TrackObject.h"
#include "../StationManager.h"
#include "../Things/Thing.h"
#include "../Things/ThingManager.h"
#include "../TownManager.h"
#include "../Types.hpp"
#include "../Widget.h"
#include "../things/thing.h"
#include "../things/thingmgr.h"
#include "../ui/WindowManager.h"
#include "../ui/scrollview.h"

2
src/openloco/windows/stationwnd.cpp
View File

@ -14,9 +14,9 @@
#include "../Objects/InterfaceSkinObject.h"
#include "../Objects/ObjectManager.h"
#include "../StationManager.h"
#include "../Things/ThingManager.h"
#include "../ViewportManager.h"
#include "../Widget.h"
#include "../things/thingmgr.h"
#include "../ui/WindowManager.h"
using namespace openloco::interop;

2
src/openloco/windows/townwnd.cpp
View File

@ -13,10 +13,10 @@
#include "../Objects/InterfaceSkinObject.h"
#include "../Objects/ObjectManager.h"
#include "../OpenLoco.h"
#include "../Things/ThingManager.h"
#include "../TownManager.h"
#include "../ViewportManager.h"
#include "../Widget.h"
#include "../things/thingmgr.h"
#include "../ui/WindowManager.h"
using namespace openloco::interop;

2
src/openloco/windows/vehicle.cpp
View File

@ -2,7 +2,7 @@
#include "../Input.h"
#include "../Interop/Interop.hpp"
#include "../OpenLoco.h"
#include "../things/thingmgr.h"
#include "../Things/ThingManager.h"
#include "../ui/WindowManager.h"
using namespace openloco::interop;