From 24a0405345bebd5266acc2ed6f1a2944bc014980 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Wed, 28 Dec 2016 14:16:15 +0100 Subject: [PATCH] Update testpaint --- CMakeLists.txt | 6 +++-- OpenRCT2.xcodeproj/project.pbxproj | 26 +++++++++++++-------- test/testpaint/FunctionCall.cpp | 2 +- test/testpaint/FunctionCall.hpp | 2 +- test/testpaint/GeneralSupportHeightCall.hpp | 2 +- test/testpaint/PaintIntercept.cpp | 10 ++++---- test/testpaint/PaintIntercept.hpp | 2 +- test/testpaint/Printer.cpp | 4 ++-- test/testpaint/SegmentSupportHeightCall.cpp | 2 +- test/testpaint/SegmentSupportHeightCall.hpp | 4 ++-- test/testpaint/SideTunnelCall.hpp | 4 ++-- test/testpaint/TestPaint.cpp | 10 ++++---- test/testpaint/TestPaint.hpp | 8 +++---- test/testpaint/TestTrack.cpp | 8 +++---- test/testpaint/TestTrack.hpp | 2 +- test/testpaint/Utils.cpp | 6 ++--- test/testpaint/Utils.hpp | 2 +- test/testpaint/VerticalTunnelCall.hpp | 2 +- test/testpaint/compat.c | 16 ++++++------- test/testpaint/data.c | 2 +- test/testpaint/data.h | 2 +- test/testpaint/generate.cpp | 12 +++++----- test/testpaint/main.cpp | 10 ++++---- 23 files changed, 76 insertions(+), 68 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ea167b3d9b..93f06c284e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -429,11 +429,13 @@ if (WITH_TESTS) endif () if (UNIX AND (NOT USE_MMAP) AND (NOT DISABLE_RCT2) AND (FORCE32)) - file(GLOB_RECURSE ORCT2_RIDE_SOURCES "src/ride/*/*.c") - file(GLOB_RECURSE ORCT2_RIDE_DEP_SOURCES "src/ride/ride_data.c" "src/ride/track_data.c" "src/ride/track_data_old.c" "src/ride/track_paint.c" "src/addresses.c" "src/diagnostic.c" "src/hook.c" "src/paint/map_element/map_element.c" "src/paint/paint_helpers.c") + set(OPENRCT2_SRCPATH "src/openrct2") + file(GLOB_RECURSE ORCT2_RIDE_SOURCES "${OPENRCT2_SRCPATH}/ride/*/*.c") + file(GLOB_RECURSE ORCT2_RIDE_DEP_SOURCES "${OPENRCT2_SRCPATH}/ride/ride_data.c" "${OPENRCT2_SRCPATH}/ride/track_data.c" "${OPENRCT2_SRCPATH}/ride/track_data_old.c" "${OPENRCT2_SRCPATH}/ride/track_paint.c" "${OPENRCT2_SRCPATH}/rct2/addresses.c" "${OPENRCT2_SRCPATH}/diagnostic.c" "${OPENRCT2_SRCPATH}/rct2/hook.c" "${OPENRCT2_SRCPATH}/paint/map_element/map_element.c" "${OPENRCT2_SRCPATH}/paint/paint_helpers.c") file(GLOB_RECURSE ORCT2_TESTPAINT_SOURCES "test/testpaint/*.c" "test/testpaint/*.cpp" "test/testpaint/*.h") add_executable(testpaint EXCLUDE_FROM_ALL ${ORCT2_RIDE_SOURCES} ${ORCT2_RIDE_DEP_SOURCES} ${ORCT2_TESTPAINT_SOURCES} ${RCT2_SECTIONS}) + target_include_directories(testpaint PRIVATE "src/") set_target_properties(testpaint PROPERTIES COMPILE_FLAGS "-DNO_VEHICLES -D__TESTPAINT__ -Wno-unused") add_dependencies(testpaint segfiles) endif () diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj index 378dd039d6..3f63db88d9 100644 --- a/OpenRCT2.xcodeproj/project.pbxproj +++ b/OpenRCT2.xcodeproj/project.pbxproj @@ -222,6 +222,8 @@ C6B5A7D41CDFE4CB00C9C006 /* S6Exporter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C6B5A7D01CDFE4CB00C9C006 /* S6Exporter.cpp */; }; C6B5A7D51CDFE4CB00C9C006 /* S6Importer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C6B5A7D21CDFE4CB00C9C006 /* S6Importer.cpp */; }; C6CABA821E1466D600D33A6B /* FileClassifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C6CABA801E1466D600D33A6B /* FileClassifier.cpp */; }; + C6CABA7E1E13F11C00D33A6B /* hook.c in Sources */ = {isa = PBXBuildFile; fileRef = C6E96E181E0406F00076A04F /* hook.c */; }; + C6CABA7F1E13F14F00D33A6B /* addresses.c in Sources */ = {isa = PBXBuildFile; fileRef = C6E96E161E0406F00076A04F /* addresses.c */; }; C6E96E121E04067A0076A04F /* File.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C6E96E101E04067A0076A04F /* File.cpp */; }; C6E96E151E04069A0076A04F /* Zip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C6E96E131E04069A0076A04F /* Zip.cpp */; }; C6E96E1A1E0406F00076A04F /* addresses.c in Sources */ = {isa = PBXBuildFile; fileRef = C6E96E161E0406F00076A04F /* addresses.c */; }; @@ -518,14 +520,14 @@ 791166FA1D7486EF005912EA /* NetworkServerAdvertiser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkServerAdvertiser.h; sourceTree = ""; }; 8594C05F1D885CF600235E93 /* track_data_old.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = track_data_old.c; sourceTree = ""; }; 85B468FB1D96822F000F1DB5 /* paint_helpers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = paint_helpers.c; sourceTree = ""; }; - C606CCAB1DB4054000FE4015 /* compat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = compat.c; sourceTree = ""; }; - C606CCAC1DB4054000FE4015 /* data.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = data.c; sourceTree = ""; }; - C606CCAD1DB4054000FE4015 /* data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = data.h; sourceTree = ""; }; - C606CCAE1DB4054000FE4015 /* FunctionCall.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FunctionCall.cpp; sourceTree = ""; }; - C606CCAF1DB4054000FE4015 /* FunctionCall.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = FunctionCall.hpp; sourceTree = ""; }; - C606CCB01DB4054000FE4015 /* generate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = generate.cpp; sourceTree = ""; }; - C606CCB41DB4054000FE4015 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = ""; }; - C606CCB51DB4054000FE4015 /* PaintIntercept.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PaintIntercept.cpp; sourceTree = ""; }; + C606CCAB1DB4054000FE4015 /* compat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 0; path = compat.c; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.c; }; + C606CCAC1DB4054000FE4015 /* data.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 0; path = data.c; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.c; }; + C606CCAD1DB4054000FE4015 /* data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = data.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; + C606CCAE1DB4054000FE4015 /* FunctionCall.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = FunctionCall.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; + C606CCAF1DB4054000FE4015 /* FunctionCall.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; lineEnding = 0; path = FunctionCall.hpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; + C606CCB01DB4054000FE4015 /* generate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = generate.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; + C606CCB41DB4054000FE4015 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = main.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; + C606CCB51DB4054000FE4015 /* PaintIntercept.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = PaintIntercept.cpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; C606CCB61DB4054000FE4015 /* Printer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Printer.cpp; sourceTree = ""; }; C606CCB71DB4054000FE4015 /* Printer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Printer.hpp; sourceTree = ""; }; C606CCB81DB4054000FE4015 /* String.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = String.cpp; sourceTree = ""; }; @@ -535,14 +537,14 @@ C606CCBC1DB4054000FE4015 /* Utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Utils.cpp; sourceTree = ""; }; C606CCBD1DB4054000FE4015 /* Utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Utils.hpp; sourceTree = ""; }; C606CCCA1DB427A000FE4015 /* GeneralSupportHeightCall.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GeneralSupportHeightCall.cpp; sourceTree = ""; }; - C606CCCB1DB427A000FE4015 /* GeneralSupportHeightCall.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = GeneralSupportHeightCall.hpp; sourceTree = ""; }; + C606CCCB1DB427A000FE4015 /* GeneralSupportHeightCall.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; lineEnding = 0; path = GeneralSupportHeightCall.hpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; C606CCCC1DB427A000FE4015 /* SegmentSupportHeightCall.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentSupportHeightCall.cpp; sourceTree = ""; }; C606CCCD1DB427A000FE4015 /* SegmentSupportHeightCall.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = SegmentSupportHeightCall.hpp; sourceTree = ""; }; C606CCD01DB4D7C800FE4015 /* SideTunnelCall.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SideTunnelCall.cpp; sourceTree = ""; }; C606CCD11DB4D7C800FE4015 /* SideTunnelCall.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = SideTunnelCall.hpp; sourceTree = ""; }; C606CCD31DB4DD6C00FE4015 /* VerticalTunnelCall.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VerticalTunnelCall.cpp; sourceTree = ""; }; C606CCD41DB4DD6C00FE4015 /* VerticalTunnelCall.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = VerticalTunnelCall.hpp; sourceTree = ""; }; - C606CCD61DB4E1CD00FE4015 /* PaintIntercept.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = PaintIntercept.hpp; sourceTree = ""; }; + C606CCD61DB4E1CD00FE4015 /* PaintIntercept.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; lineEnding = 0; path = PaintIntercept.hpp; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; C606CD231DB5120900FE4015 /* TestPaint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestPaint.cpp; sourceTree = ""; }; C606CD241DB5120900FE4015 /* TestPaint.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = TestPaint.hpp; sourceTree = ""; }; C612A8971D64825300B634CA /* vehicle_data.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vehicle_data.c; sourceTree = ""; }; @@ -2510,6 +2512,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + C6CABA7F1E13F14F00D33A6B /* addresses.c in Sources */, + C6CABA7E1E13F11C00D33A6B /* hook.c in Sources */, C64FDAC31D6DA41000F259B9 /* track_paint.c in Sources */, C64FDAC21D6DA0B800F259B9 /* diagnostic.c in Sources */, C64FDAC01D6D9E3B00F259B9 /* track_data.c in Sources */, @@ -2972,6 +2976,7 @@ HEADER_SEARCH_PATHS = ( "$(SRCROOT)/libxc/include", "$(SRCROOT)/libxc/include/SDL2", + "$(SRCROOT)/src", ); LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/libxc/lib"; OTHER_LDFLAGS = ( @@ -3020,6 +3025,7 @@ HEADER_SEARCH_PATHS = ( "$(SRCROOT)/libxc/include", "$(SRCROOT)/libxc/include/SDL2", + "$(SRCROOT)/src", ); LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/libxc/lib"; OTHER_LDFLAGS = ( diff --git a/test/testpaint/FunctionCall.cpp b/test/testpaint/FunctionCall.cpp index 75e14021f7..da06fdfd70 100644 --- a/test/testpaint/FunctionCall.cpp +++ b/test/testpaint/FunctionCall.cpp @@ -17,7 +17,7 @@ #include "FunctionCall.hpp" extern "C" { -#include "../../src/sprites.h" +#include } enum SpriteGroup { diff --git a/test/testpaint/FunctionCall.hpp b/test/testpaint/FunctionCall.hpp index 9c3d3a62b1..828d320334 100644 --- a/test/testpaint/FunctionCall.hpp +++ b/test/testpaint/FunctionCall.hpp @@ -16,7 +16,7 @@ #pragma once -#include "../../src/common.h" +#include #include "TestPaint.hpp" enum diff --git a/test/testpaint/GeneralSupportHeightCall.hpp b/test/testpaint/GeneralSupportHeightCall.hpp index 919c43529e..f497551c0e 100644 --- a/test/testpaint/GeneralSupportHeightCall.hpp +++ b/test/testpaint/GeneralSupportHeightCall.hpp @@ -16,7 +16,7 @@ #pragma once -#include "../../src/common.h" +#include struct SupportCall { sint32 height; diff --git a/test/testpaint/PaintIntercept.cpp b/test/testpaint/PaintIntercept.cpp index 4fcc159c0c..e8e7a77035 100644 --- a/test/testpaint/PaintIntercept.cpp +++ b/test/testpaint/PaintIntercept.cpp @@ -19,11 +19,11 @@ #include "FunctionCall.hpp" extern "C" { -#include "../../src/common.h" -#include "../../src/rct2/hook.h" -#include "../../src/interface/viewport.h" -#include "../../src/paint/supports.h" -#include "../../src/sprites.h" +#include +#include +#include +#include +#include } static bool _woodenSupports = false; diff --git a/test/testpaint/PaintIntercept.hpp b/test/testpaint/PaintIntercept.hpp index 32ee986583..921df4742b 100644 --- a/test/testpaint/PaintIntercept.hpp +++ b/test/testpaint/PaintIntercept.hpp @@ -16,7 +16,7 @@ #pragma once -#include "../../src/common.h" +#include #include "FunctionCall.hpp" namespace PaintIntercept { diff --git a/test/testpaint/Printer.cpp b/test/testpaint/Printer.cpp index 80b35ce1c6..190e235f14 100644 --- a/test/testpaint/Printer.cpp +++ b/test/testpaint/Printer.cpp @@ -16,11 +16,11 @@ #include "Printer.hpp" #include "String.hpp" -#include "../../src/core/Util.hpp" +#include #include "FunctionCall.hpp" extern "C" { -#include "../../src/sprites.h" +#include } namespace Printer { diff --git a/test/testpaint/SegmentSupportHeightCall.cpp b/test/testpaint/SegmentSupportHeightCall.cpp index a36fcd698a..b8b8952d97 100644 --- a/test/testpaint/SegmentSupportHeightCall.cpp +++ b/test/testpaint/SegmentSupportHeightCall.cpp @@ -20,7 +20,7 @@ #include "SegmentSupportHeightCall.hpp" extern "C" { -#include "../../src/paint/map_element/map_element.h" +#include } static bool SortSegmentSupportCalls(SegmentSupportCall lhs, SegmentSupportCall rhs) diff --git a/test/testpaint/SegmentSupportHeightCall.hpp b/test/testpaint/SegmentSupportHeightCall.hpp index 6b3c9728c2..d8a063be2f 100644 --- a/test/testpaint/SegmentSupportHeightCall.hpp +++ b/test/testpaint/SegmentSupportHeightCall.hpp @@ -18,10 +18,10 @@ #include -#include "../../src/common.h" +#include extern "C" { - #include "../../src/paint/paint.h" + #include } struct SegmentSupportCall diff --git a/test/testpaint/SideTunnelCall.hpp b/test/testpaint/SideTunnelCall.hpp index 0c585516e6..0aeedff5c3 100644 --- a/test/testpaint/SideTunnelCall.hpp +++ b/test/testpaint/SideTunnelCall.hpp @@ -16,10 +16,10 @@ #pragma once -#include "../../src/common.h" +#include extern "C" { -#include "../../src/paint/map_element/map_element.h" +#include } enum { diff --git a/test/testpaint/TestPaint.cpp b/test/testpaint/TestPaint.cpp index 5139d6220b..49acf9f4c4 100644 --- a/test/testpaint/TestPaint.cpp +++ b/test/testpaint/TestPaint.cpp @@ -24,11 +24,11 @@ #include "Utils.hpp" extern "C" { - #include "../../src/interface/viewport.h" - #include "../../src/paint/paint.h" - #include "../../src/paint/supports.h" - #include "../../src/rct2/hook.h" - #include "../../src/ride/track_data.h" + #include + #include + #include + #include + #include } namespace TestPaint diff --git a/test/testpaint/TestPaint.hpp b/test/testpaint/TestPaint.hpp index f5e4f3de89..eb39c60846 100644 --- a/test/testpaint/TestPaint.hpp +++ b/test/testpaint/TestPaint.hpp @@ -18,13 +18,13 @@ #include -#include "../../src/common.h" +#include extern "C" { - #include "../../src/interface/colour.h" - #include "../../src/paint/paint.h" - #include "../../src/paint/map_element/map_element.h" + #include + #include + #include } #define gRideEntries RCT2_ADDRESS(RCT2_ADDRESS_RIDE_ENTRIES, rct_ride_entry*) diff --git a/test/testpaint/TestTrack.cpp b/test/testpaint/TestTrack.cpp index 30ec423fcf..b77890c77e 100644 --- a/test/testpaint/TestTrack.cpp +++ b/test/testpaint/TestTrack.cpp @@ -30,10 +30,10 @@ #include "VerticalTunnelCall.hpp" extern "C" { -#include "../../src/paint/supports.h" -#include "../../src/ride/ride.h" -#include "../../src/ride/track.h" -#include "../../src/ride/track_data.h" +#include +#include +#include +#include } interface ITestTrackFilter { diff --git a/test/testpaint/TestTrack.hpp b/test/testpaint/TestTrack.hpp index 811cb2cfe3..7c8a821f73 100644 --- a/test/testpaint/TestTrack.hpp +++ b/test/testpaint/TestTrack.hpp @@ -18,7 +18,7 @@ #include -#include "../../src/common.h" +#include class TestTrack { public: diff --git a/test/testpaint/Utils.cpp b/test/testpaint/Utils.cpp index 344a408b3d..769bb81578 100644 --- a/test/testpaint/Utils.cpp +++ b/test/testpaint/Utils.cpp @@ -17,9 +17,9 @@ #include "Utils.hpp" extern "C" { - #include "../../src/ride/ride.h" - #include "../../src/ride/track.h" - #include "../../src/ride/track_data.h" + #include + #include + #include } namespace Utils { diff --git a/test/testpaint/Utils.hpp b/test/testpaint/Utils.hpp index 9ced7e4a2c..a103b63748 100644 --- a/test/testpaint/Utils.hpp +++ b/test/testpaint/Utils.hpp @@ -16,7 +16,7 @@ #pragma once -#include "../../src/common.h" +#include namespace Utils { int getTrackSequenceCount(uint8 rideType, uint8 trackType); diff --git a/test/testpaint/VerticalTunnelCall.hpp b/test/testpaint/VerticalTunnelCall.hpp index b72c4cd41d..c45f64ce46 100644 --- a/test/testpaint/VerticalTunnelCall.hpp +++ b/test/testpaint/VerticalTunnelCall.hpp @@ -16,7 +16,7 @@ #pragma once -#include "../../src/common.h" +#include namespace VerticalTunnelCall { bool HeightIsConsistent(uint8 heights[4]); diff --git a/test/testpaint/compat.c b/test/testpaint/compat.c index c186a02b11..1ca8ff1752 100644 --- a/test/testpaint/compat.c +++ b/test/testpaint/compat.c @@ -14,14 +14,14 @@ *****************************************************************************/ #pragma endregion -#include "../../src/config.h" -#include "../../src/object.h" -#include "../../src/interface/colour.h" -#include "../../src/interface/viewport.h" -#include "../../src/ride/ride.h" -#include "../../src/ride/track.h" -#include "../../src/world/sprite.h" -#include "../../src/paint/map_element/map_element.h" +#include +#include +#include +#include +#include +#include +#include +#include #define RCT2_ADDRESS_SPRITE_LIST 0x010E63BC diff --git a/test/testpaint/data.c b/test/testpaint/data.c index 139002ae43..675ff49d99 100644 --- a/test/testpaint/data.c +++ b/test/testpaint/data.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "../../src/common.h" +#include const utf8string RideNames[91] = { "SpiralRollerCoaster", diff --git a/test/testpaint/data.h b/test/testpaint/data.h index 27d918c955..73f995b182 100644 --- a/test/testpaint/data.h +++ b/test/testpaint/data.h @@ -17,7 +17,7 @@ #ifndef _TEST_PAINT_DATA_H_ #define _TEST_PAINT_DATA_H_ -#include "../../src/common.h" +#include extern const utf8string RideNames[91]; extern const utf8string TrackNames[256]; diff --git a/test/testpaint/generate.cpp b/test/testpaint/generate.cpp index e3be70c09d..2ca4495fe6 100644 --- a/test/testpaint/generate.cpp +++ b/test/testpaint/generate.cpp @@ -28,12 +28,12 @@ extern "C" { #include "data.h" - #include "../../src/interface/viewport.h" - #include "../../src/rct2.h" - #include "../../src/ride/ride.h" - #include "../../src/ride/ride_data.h" - #include "../../src/ride/track.h" - #include "../../src/ride/track_data.h" + #include + #include + #include + #include + #include + #include } class PaintCodeGenerator diff --git a/test/testpaint/main.cpp b/test/testpaint/main.cpp index 546a832835..85a4192c80 100644 --- a/test/testpaint/main.cpp +++ b/test/testpaint/main.cpp @@ -29,11 +29,11 @@ extern "C" { #include "data.h" -#include "../../src/rct2.h" -#include "../../src/ride/ride.h" -#include "../../src/ride/ride_data.h" -#include "../../src/ride/track.h" -#include "../../src/ride/track_data.h" +#include +#include +#include +#include +#include } typedef struct {