From a410872fece2d359d11d4ad32228902f1ba23f8a Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Sat, 6 Jan 2018 20:29:44 +0100 Subject: [PATCH] Move VirtualFloor.cpp to the paint folder and fix Xcode project --- OpenRCT2.xcodeproj/project.pbxproj | 4 ++++ .../paint/{tile_element => }/VirtualFloor.cpp | 12 ++++++------ src/openrct2/paint/{tile_element => }/VirtualFloor.h | 0 src/openrct2/paint/tile_element/TileElement.cpp | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) rename src/openrct2/paint/{tile_element => }/VirtualFloor.cpp (97%) rename src/openrct2/paint/{tile_element => }/VirtualFloor.h (100%) diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj index b59d87f60f..35a1ed76c8 100644 --- a/OpenRCT2.xcodeproj/project.pbxproj +++ b/OpenRCT2.xcodeproj/project.pbxproj @@ -88,6 +88,7 @@ 4C7B54082005736700A52E21 /* VehiclePaint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B54072005736700A52E21 /* VehiclePaint.cpp */; }; 4C7B540D20060D8100A52E21 /* TrackPaint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B540B20060D8100A52E21 /* TrackPaint.cpp */; }; 4C7B541C20060D8E00A52E21 /* RideData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B541420060D8E00A52E21 /* RideData.cpp */; }; + 4C7B540120015AC600A52E21 /* VirtualFloor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B540020015AC600A52E21 /* VirtualFloor.cpp */; }; 4C8667821EEFDCDF0024AAB8 /* RideGroupManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C8667801EEFDCDF0024AAB8 /* RideGroupManager.cpp */; }; 4C8B42701EEB1ABD00F015CA /* X8DrawingEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C8B426E1EEB1ABD00F015CA /* X8DrawingEngine.cpp */; }; 4C8B42721EEB1AE400F015CA /* HardwareDisplayDrawingEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C8B42711EEB1AE400F015CA /* HardwareDisplayDrawingEngine.cpp */; }; @@ -722,6 +723,7 @@ 4C7B540C20060D8100A52E21 /* TrackPaint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrackPaint.h; sourceTree = ""; }; 4C7B541420060D8E00A52E21 /* RideData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RideData.cpp; sourceTree = ""; }; 4C7B541520060D8E00A52E21 /* RideData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RideData.h; sourceTree = ""; }; + 4C7B540020015AC600A52E21 /* VirtualFloor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VirtualFloor.cpp; sourceTree = ""; }; 4C8667801EEFDCDF0024AAB8 /* RideGroupManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RideGroupManager.cpp; sourceTree = ""; }; 4C8667811EEFDCDF0024AAB8 /* RideGroupManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RideGroupManager.h; sourceTree = ""; }; 4C8B426E1EEB1ABD00F015CA /* X8DrawingEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = X8DrawingEngine.cpp; sourceTree = ""; }; @@ -2171,6 +2173,7 @@ 4C6A66B21FE278C900694CB6 /* PaintHelpers.cpp */, 4C6A66B31FE278C900694CB6 /* Supports.cpp */, 4C6A66B41FE278C900694CB6 /* Supports.h */, + 4C7B540020015AC600A52E21 /* VirtualFloor.cpp */, ); path = paint; sourceTree = ""; @@ -3292,6 +3295,7 @@ F7CB863F1EEDA0B50030C877 /* WindowManager.cpp in Sources */, 4C93F13F1F8B744400A9330D /* FlyingRollerCoaster.cpp in Sources */, 4C93F14F1F8B744400A9330D /* ReverserRollerCoaster.cpp in Sources */, + 4C7B540120015AC600A52E21 /* VirtualFloor.cpp in Sources */, F70839921FFC0AFF002DCEFA /* Scenario.cpp in Sources */, 4C8B42701EEB1ABD00F015CA /* X8DrawingEngine.cpp in Sources */, C654DF301F69C0430040F43D /* Finances.cpp in Sources */, diff --git a/src/openrct2/paint/tile_element/VirtualFloor.cpp b/src/openrct2/paint/VirtualFloor.cpp similarity index 97% rename from src/openrct2/paint/tile_element/VirtualFloor.cpp rename to src/openrct2/paint/VirtualFloor.cpp index 04b378ad8c..bc538086e5 100644 --- a/src/openrct2/paint/tile_element/VirtualFloor.cpp +++ b/src/openrct2/paint/VirtualFloor.cpp @@ -14,12 +14,12 @@ *****************************************************************************/ #pragma endregion -#include "../../Input.h" -#include "../../interface/Viewport.h" -#include "../../sprites.h" -#include "../../world/Map.h" -#include "../Paint.h" -#include "TileElement.h" +#include "../Input.h" +#include "../interface/Viewport.h" +#include "../sprites.h" +#include "../world/Map.h" +#include "Paint.h" +#include "tile_element/TileElement.h" #include "VirtualFloor.h" static const rct_xy_element offsets[4] = diff --git a/src/openrct2/paint/tile_element/VirtualFloor.h b/src/openrct2/paint/VirtualFloor.h similarity index 100% rename from src/openrct2/paint/tile_element/VirtualFloor.h rename to src/openrct2/paint/VirtualFloor.h diff --git a/src/openrct2/paint/tile_element/TileElement.cpp b/src/openrct2/paint/tile_element/TileElement.cpp index a5bced5e34..9812f34823 100644 --- a/src/openrct2/paint/tile_element/TileElement.cpp +++ b/src/openrct2/paint/tile_element/TileElement.cpp @@ -32,9 +32,9 @@ #include "../../sprites.h" #include "../Paint.h" #include "../Supports.h" +#include "../VirtualFloor.h" #include "Surface.h" #include "TileElement.h" -#include "VirtualFloor.h" #ifdef __TESTPAINT__ uint16 testPaintVerticalTunnelHeight;