mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-20 14:23:08 +01:00
Code Issues Releases Wiki Activity

Move VirtualFloor.cpp to the paint folder and fix Xcode project

Browse Source
This commit is contained in:
Michael Steenbeek
2018-01-06 20:29:44 +01:00
committed by Aaron van Geffen
parent c835832e79
commit a410872fec
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRCT2.xcodeproj/project.pbxproj
View File

@@ -88,6 +88,7 @@
4C7B54082005736700A52E21 /* VehiclePaint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B54072005736700A52E21 /* VehiclePaint.cpp */; }; 4C7B54082005736700A52E21 /* VehiclePaint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B54072005736700A52E21 /* VehiclePaint.cpp */; };
4C7B540D20060D8100A52E21 /* TrackPaint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B540B20060D8100A52E21 /* TrackPaint.cpp */; }; 4C7B540D20060D8100A52E21 /* TrackPaint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B540B20060D8100A52E21 /* TrackPaint.cpp */; };
4C7B541C20060D8E00A52E21 /* RideData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B541420060D8E00A52E21 /* RideData.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 */; }; 4C8667821EEFDCDF0024AAB8 /* RideGroupManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C8667801EEFDCDF0024AAB8 /* RideGroupManager.cpp */; };
4C8B42701EEB1ABD00F015CA /* X8DrawingEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C8B426E1EEB1ABD00F015CA /* X8DrawingEngine.cpp */; }; 4C8B42701EEB1ABD00F015CA /* X8DrawingEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C8B426E1EEB1ABD00F015CA /* X8DrawingEngine.cpp */; };
4C8B42721EEB1AE400F015CA /* HardwareDisplayDrawingEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C8B42711EEB1AE400F015CA /* HardwareDisplayDrawingEngine.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 = "<group>"; }; 4C7B540C20060D8100A52E21 /* TrackPaint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrackPaint.h; sourceTree = "<group>"; };
4C7B541420060D8E00A52E21 /* RideData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RideData.cpp; sourceTree = "<group>"; }; 4C7B541420060D8E00A52E21 /* RideData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RideData.cpp; sourceTree = "<group>"; };
4C7B541520060D8E00A52E21 /* RideData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RideData.h; sourceTree = "<group>"; }; 4C7B541520060D8E00A52E21 /* RideData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RideData.h; sourceTree = "<group>"; };
4C7B540020015AC600A52E21 /* VirtualFloor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VirtualFloor.cpp; sourceTree = "<group>"; };
4C8667801EEFDCDF0024AAB8 /* RideGroupManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RideGroupManager.cpp; sourceTree = "<group>"; }; 4C8667801EEFDCDF0024AAB8 /* RideGroupManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RideGroupManager.cpp; sourceTree = "<group>"; };
4C8667811EEFDCDF0024AAB8 /* RideGroupManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RideGroupManager.h; sourceTree = "<group>"; }; 4C8667811EEFDCDF0024AAB8 /* RideGroupManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RideGroupManager.h; sourceTree = "<group>"; };
4C8B426E1EEB1ABD00F015CA /* X8DrawingEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = X8DrawingEngine.cpp; sourceTree = "<group>"; }; 4C8B426E1EEB1ABD00F015CA /* X8DrawingEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = X8DrawingEngine.cpp; sourceTree = "<group>"; };
@@ -2171,6 +2173,7 @@
4C6A66B21FE278C900694CB6 /* PaintHelpers.cpp */, 4C6A66B21FE278C900694CB6 /* PaintHelpers.cpp */,
4C6A66B31FE278C900694CB6 /* Supports.cpp */, 4C6A66B31FE278C900694CB6 /* Supports.cpp */,
4C6A66B41FE278C900694CB6 /* Supports.h */, 4C6A66B41FE278C900694CB6 /* Supports.h */,
4C7B540020015AC600A52E21 /* VirtualFloor.cpp */,
); );
path = paint; path = paint;
sourceTree = "<group>"; sourceTree = "<group>";
@@ -3292,6 +3295,7 @@
F7CB863F1EEDA0B50030C877 /* WindowManager.cpp in Sources */, F7CB863F1EEDA0B50030C877 /* WindowManager.cpp in Sources */,
4C93F13F1F8B744400A9330D /* FlyingRollerCoaster.cpp in Sources */, 4C93F13F1F8B744400A9330D /* FlyingRollerCoaster.cpp in Sources */,
4C93F14F1F8B744400A9330D /* ReverserRollerCoaster.cpp in Sources */, 4C93F14F1F8B744400A9330D /* ReverserRollerCoaster.cpp in Sources */,
4C7B540120015AC600A52E21 /* VirtualFloor.cpp in Sources */,
F70839921FFC0AFF002DCEFA /* Scenario.cpp in Sources */, F70839921FFC0AFF002DCEFA /* Scenario.cpp in Sources */,
4C8B42701EEB1ABD00F015CA /* X8DrawingEngine.cpp in Sources */, 4C8B42701EEB1ABD00F015CA /* X8DrawingEngine.cpp in Sources */,
C654DF301F69C0430040F43D /* Finances.cpp in Sources */, C654DF301F69C0430040F43D /* Finances.cpp in Sources */,

12
src/openrct2/paint/tile_element/VirtualFloor.cpp → src/openrct2/paint/VirtualFloor.cpp
View File

@@ -14,12 +14,12 @@
*****************************************************************************/ *****************************************************************************/
#pragma endregion #pragma endregion
#include "../../Input.h" #include "../Input.h"
#include "../../interface/Viewport.h" #include "../interface/Viewport.h"
#include "../../sprites.h" #include "../sprites.h"
#include "../../world/Map.h" #include "../world/Map.h"
#include "../Paint.h" #include "Paint.h"
#include "TileElement.h" #include "tile_element/TileElement.h"
#include "VirtualFloor.h" #include "VirtualFloor.h"
static const rct_xy_element offsets[4] = static const rct_xy_element offsets[4] =

0
src/openrct2/paint/tile_element/VirtualFloor.h → src/openrct2/paint/VirtualFloor.h
View File

2
src/openrct2/paint/tile_element/TileElement.cpp
View File

@@ -32,9 +32,9 @@
#include "../../sprites.h" #include "../../sprites.h"
#include "../Paint.h" #include "../Paint.h"
#include "../Supports.h" #include "../Supports.h"
#include "../VirtualFloor.h"
#include "Surface.h" #include "Surface.h"
#include "TileElement.h" #include "TileElement.h"
#include "VirtualFloor.h"
#ifdef __TESTPAINT__ #ifdef __TESTPAINT__
uint16 testPaintVerticalTunnelHeight; uint16 testPaintVerticalTunnelHeight;