diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj index 23a7d8e3f0..5f221925e4 100644 --- a/OpenRCT2.xcodeproj/project.pbxproj +++ b/OpenRCT2.xcodeproj/project.pbxproj @@ -25,7 +25,6 @@ C606CCBF1DB4054000FE4015 /* data.c in Sources */ = {isa = PBXBuildFile; fileRef = C606CCAC1DB4054000FE4015 /* data.c */; }; C606CCC01DB4054000FE4015 /* FunctionCall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C606CCAE1DB4054000FE4015 /* FunctionCall.cpp */; }; C606CCC11DB4054000FE4015 /* generate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C606CCB01DB4054000FE4015 /* generate.cpp */; }; - C606CCC21DB4054000FE4015 /* intercept_2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C606CCB11DB4054000FE4015 /* intercept_2.cpp */; }; C606CCC41DB4054000FE4015 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C606CCB41DB4054000FE4015 /* main.cpp */; }; C606CCC51DB4054000FE4015 /* PaintIntercept.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C606CCB51DB4054000FE4015 /* PaintIntercept.cpp */; }; C606CCC61DB4054000FE4015 /* Printer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C606CCB61DB4054000FE4015 /* Printer.cpp */; }; @@ -36,6 +35,7 @@ C606CCCF1DB427A000FE4015 /* SegmentSupportHeightCall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C606CCCC1DB427A000FE4015 /* SegmentSupportHeightCall.cpp */; }; C606CCD21DB4D7C800FE4015 /* SideTunnelCall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C606CCD01DB4D7C800FE4015 /* SideTunnelCall.cpp */; }; C606CCD51DB4DD6C00FE4015 /* VerticalTunnelCall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C606CCD31DB4DD6C00FE4015 /* VerticalTunnelCall.cpp */; }; + C606CD261DB5120C00FE4015 /* TestPaint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C606CD231DB5120900FE4015 /* TestPaint.cpp */; }; C612A8991D64825300B634CA /* vehicle_data.c in Sources */ = {isa = PBXBuildFile; fileRef = C612A8971D64825300B634CA /* vehicle_data.c */; }; C61FB7241CF86356004CE991 /* NetworkUser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C61FB7221CF86356004CE991 /* NetworkUser.cpp */; }; C64FDA641D6D9A2100F259B9 /* air_powered_vertical_coaster.c in Sources */ = {isa = PBXBuildFile; fileRef = C686F8BB1CDBC3B7009F9BFC /* air_powered_vertical_coaster.c */; }; @@ -402,8 +402,6 @@ D44272A51CC81B3200D84D28 /* particle.c in Sources */ = {isa = PBXBuildFile; fileRef = D44271EF1CC81B3200D84D28 /* particle.c */; }; D44272A61CC81B3200D84D28 /* scenery.c in Sources */ = {isa = PBXBuildFile; fileRef = D44271F01CC81B3200D84D28 /* scenery.c */; }; D44272A71CC81B3200D84D28 /* sprite.c in Sources */ = {isa = PBXBuildFile; fileRef = D44271F21CC81B3200D84D28 /* sprite.c */; }; - D452919B1DAA204200C11788 /* generate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D45291991DAA202C00C11788 /* generate.cpp */; }; - D45A38BB1CF3006400659A24 /* engines in Resources */ = {isa = PBXBuildFile; fileRef = D45A38B21CF3006400659A24 /* engines */; }; D45A38BC1CF3006400659A24 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D45A38B31CF3006400659A24 /* libcrypto.dylib */; }; D45A38BE1CF3006400659A24 /* libjansson.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D45A38B51CF3006400659A24 /* libjansson.dylib */; }; D45A38C01CF3006400659A24 /* libSDL2_ttf.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D45A38B71CF3006400659A24 /* libSDL2_ttf.dylib */; }; @@ -512,8 +510,6 @@ 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 = ""; }; - C606CCB11DB4054000FE4015 /* intercept_2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = intercept_2.cpp; sourceTree = ""; }; - C606CCB31DB4054000FE4015 /* intercept.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = intercept.h; 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 = ""; }; C606CCB61DB4054000FE4015 /* Printer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Printer.cpp; sourceTree = ""; }; @@ -533,6 +529,8 @@ 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 = ""; }; + 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 = ""; }; C612A8981D64825300B634CA /* vehicle_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vehicle_data.h; sourceTree = ""; }; C61FB7221CF86356004CE991 /* NetworkUser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkUser.cpp; sourceTree = ""; usesTabs = 0; }; @@ -939,8 +937,6 @@ D44271F21CC81B3200D84D28 /* sprite.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sprite.c; sourceTree = ""; }; D44271F31CC81B3200D84D28 /* sprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sprite.h; sourceTree = ""; }; D44271F41CC81B3200D84D28 /* water.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = water.h; sourceTree = ""; }; - D45291991DAA202C00C11788 /* generate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = generate.cpp; sourceTree = ""; }; - D45A38B21CF3006400659A24 /* engines */ = {isa = PBXFileReference; lastKnownFileType = folder; path = engines; sourceTree = ""; }; D45A38B31CF3006400659A24 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libcrypto.dylib; sourceTree = ""; }; D45A38B41CF3006400659A24 /* libfreetype.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libfreetype.dylib; sourceTree = ""; }; D45A38B51CF3006400659A24 /* libjansson.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; path = libjansson.dylib; sourceTree = ""; }; @@ -1207,8 +1203,6 @@ C606CCCA1DB427A000FE4015 /* GeneralSupportHeightCall.cpp */, C606CCCB1DB427A000FE4015 /* GeneralSupportHeightCall.hpp */, C606CCB01DB4054000FE4015 /* generate.cpp */, - C606CCB11DB4054000FE4015 /* intercept_2.cpp */, - C606CCB31DB4054000FE4015 /* intercept.h */, C606CCB41DB4054000FE4015 /* main.cpp */, C606CCB51DB4054000FE4015 /* PaintIntercept.cpp */, C606CCD61DB4E1CD00FE4015 /* PaintIntercept.hpp */, @@ -1220,6 +1214,8 @@ C606CCD11DB4D7C800FE4015 /* SideTunnelCall.hpp */, C606CCB81DB4054000FE4015 /* String.cpp */, C606CCB91DB4054000FE4015 /* String.hpp */, + C606CD231DB5120900FE4015 /* TestPaint.cpp */, + C606CD241DB5120900FE4015 /* TestPaint.hpp */, C606CCBA1DB4054000FE4015 /* TestTrack.cpp */, C606CCBB1DB4054000FE4015 /* TestTrack.hpp */, C606CCBC1DB4054000FE4015 /* Utils.cpp */, @@ -2439,7 +2435,6 @@ C64FDA781D6D9A2100F259B9 /* reverser_roller_coaster.c in Sources */, C64FDA791D6D9A2100F259B9 /* side_friction_roller_coaster.c in Sources */, C64FDA7A1D6D9A2100F259B9 /* spiral_roller_coaster.c in Sources */, - C606CCC21DB4054000FE4015 /* intercept_2.cpp in Sources */, C64FDA7B1D6D9A2100F259B9 /* stand_up_roller_coaster.c in Sources */, C606CCC61DB4054000FE4015 /* Printer.cpp in Sources */, C64FDA7C1D6D9A2100F259B9 /* steeplechase.c in Sources */, @@ -2488,6 +2483,7 @@ C64FDA9F1D6D9A2100F259B9 /* swinging_inverter_ship.c in Sources */, C64FDAA01D6D9A2100F259B9 /* top_spin.c in Sources */, C64FDAA11D6D9A2100F259B9 /* twist.c in Sources */, + C606CD261DB5120C00FE4015 /* TestPaint.cpp in Sources */, C64FDAA21D6D9A2100F259B9 /* chairlift.c in Sources */, C606CCC71DB4054000FE4015 /* String.cpp in Sources */, C64FDAA31D6D9A2100F259B9 /* lift.c in Sources */, diff --git a/test/testpaint/FunctionCall.hpp b/test/testpaint/FunctionCall.hpp index 52e9980665..10c1c4d18c 100644 --- a/test/testpaint/FunctionCall.hpp +++ b/test/testpaint/FunctionCall.hpp @@ -17,7 +17,7 @@ #pragma once #include "../../src/common.h" -#include "intercept.h" +#include "TestPaint.hpp" enum { diff --git a/test/testpaint/Printer.cpp b/test/testpaint/Printer.cpp index 87882dbbda..77915fc4b2 100644 --- a/test/testpaint/Printer.cpp +++ b/test/testpaint/Printer.cpp @@ -216,10 +216,10 @@ namespace Printer { uint32 palette = imageId & ~0x7FFFF; std::string paletteName; - if (palette == Intercept2::DEFAULT_SCHEME_TRACK) paletteName = "SCHEME_TRACK"; - else if (palette == Intercept2::DEFAULT_SCHEME_SUPPORTS) paletteName = "SCHEME_SUPPORTS"; - else if (palette == Intercept2::DEFAULT_SCHEME_MISC) paletteName = "SCHEME_MISC"; - else if (palette == Intercept2::DEFAULT_SCHEME_3) paletteName = "SCHEME_3"; + if (palette == TestPaint::DEFAULT_SCHEME_TRACK) paletteName = "SCHEME_TRACK"; + else if (palette == TestPaint::DEFAULT_SCHEME_SUPPORTS) paletteName = "SCHEME_SUPPORTS"; + else if (palette == TestPaint::DEFAULT_SCHEME_MISC) paletteName = "SCHEME_MISC"; + else if (palette == TestPaint::DEFAULT_SCHEME_3) paletteName = "SCHEME_3"; else { paletteName = String::Format("0x%08X", palette); } diff --git a/test/testpaint/intercept_2.cpp b/test/testpaint/TestPaint.cpp similarity index 88% rename from test/testpaint/intercept_2.cpp rename to test/testpaint/TestPaint.cpp index 8695423ea1..a5a74ce3b0 100644 --- a/test/testpaint/intercept_2.cpp +++ b/test/testpaint/TestPaint.cpp @@ -17,7 +17,7 @@ #include #include -#include "intercept.h" +#include "TestPaint.hpp" #include "GeneralSupportHeightCall.hpp" #include "Printer.hpp" #include "SegmentSupportHeightCall.hpp" @@ -31,7 +31,7 @@ extern "C" { #include "../../src/hook.h" } -namespace Intercept2 +namespace TestPaint { void ResetEnvironment() { gPaintInteractionType = VIEWPORT_INTERACTION_ITEM_RIDE; @@ -130,35 +130,22 @@ extern "C" { void testpaint_clear_ignore() { - Intercept2::testClearIgnore(); + TestPaint::testClearIgnore(); } void testpaint_ignore(uint8 direction, uint8 trackSequence) { - Intercept2::testIgnore(direction, trackSequence); + TestPaint::testIgnore(direction, trackSequence); } void testpaint_ignore_all() { - Intercept2::testIgnoreAll(); + TestPaint::testIgnoreAll(); } bool testpaint_is_ignored(uint8 direction, uint8 trackSequence) { - return Intercept2::testIsIgnored(direction, trackSequence); + return TestPaint::testIsIgnored(direction, trackSequence); } - void intercept_reset_environment() { - Intercept2::ResetEnvironment(); - } - - void intercept_reset_segment_heights() { - Intercept2::ResetSupportHeights(); - } - - void intercept_reset_tunnels() { - Intercept2::ResetTunnels(); - } - - } diff --git a/test/testpaint/intercept.h b/test/testpaint/TestPaint.hpp similarity index 75% rename from test/testpaint/intercept.h rename to test/testpaint/TestPaint.hpp index f0e75dd040..b0ff7d78de 100644 --- a/test/testpaint/intercept.h +++ b/test/testpaint/TestPaint.hpp @@ -14,65 +14,41 @@ *****************************************************************************/ #pragma endregion -#ifndef _TEST_PAINT_INTERCEPT_H_ -#define _TEST_PAINT_INTERCEPT_H_ +#pragma once + +#include #include "../../src/common.h" -#ifdef __cplusplus extern "C" { -#endif #include "../../src/interface/colour.h" #include "../../src/paint/paint.h" #include "../../src/paint/map_element/map_element.h" -#ifdef __cplusplus } -#endif -#define gRideEntries RCT2_ADDRESS(RCT2_ADDRESS_RIDE_ENTRIES, rct_ride_entry*) +#define gRideEntries RCT2_ADDRESS(RCT2_ADDRESS_RIDE_ENTRIES, rct_ride_entry*) #define gCurrentRotation RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_ROTATION, uint8) - - enum { TEST_SUCCESS, TEST_FAILED, TEST_SKIPPED, }; -#ifdef __cplusplus -extern "C" -{ -#endif - void intercept_reset_environment(); - void intercept_reset_segment_heights(); - void intercept_reset_tunnels(); - - int generatePaintCode(uint8 rideType); - -#ifdef __cplusplus -} -#endif - -#ifdef __cplusplus - -#include - -namespace Intercept2 +namespace TestPaint { static const uint32 DEFAULT_SCHEME_TRACK = COLOUR_GREY << 19 | COLOUR_WHITE << 24 | 0xA0000000; static const uint32 DEFAULT_SCHEME_SUPPORTS = COLOUR_LIGHT_BLUE << 19 | COLOUR_ICY_BLUE << 24 | 0xA0000000; static const uint32 DEFAULT_SCHEME_MISC = COLOUR_DARK_PURPLE << 19 | COLOUR_LIGHT_PURPLE << 24 | 0xA0000000; static const uint32 DEFAULT_SCHEME_3 = COLOUR_BRIGHT_PURPLE << 19 | COLOUR_DARK_BLUE << 24 | 0xA0000000; - - void ResetEnvironment(); void ResetTunnels(); void ResetSupportHeights(); } -#endif - -#endif // #endif _TEST_PAINT_INTERCEPT_H_ +extern "C" +{ +int generatePaintCode(uint8 rideType); +} diff --git a/test/testpaint/TestTrack.cpp b/test/testpaint/TestTrack.cpp index 5c1dd2b98f..498da4fc85 100644 --- a/test/testpaint/TestTrack.cpp +++ b/test/testpaint/TestTrack.cpp @@ -17,7 +17,7 @@ #include #include -#include "intercept.h" +#include "TestPaint.hpp" #include "FunctionCall.hpp" #include "GeneralSupportHeightCall.hpp" #include "PaintIntercept.hpp" @@ -141,8 +141,8 @@ static uint8 TestTrackElementPaintCalls(uint8 rideType, uint8 trackType, uint8 t gSurfaceElement = &surfaceElement; gDidPassSurface = true; - Intercept2::ResetEnvironment(); - Intercept2::ResetTunnels(); + TestPaint::ResetEnvironment(); + TestPaint::ResetTunnels(); function_call callBuffer[256] = {0}; int callCount = 0; @@ -167,7 +167,7 @@ static uint8 TestTrackElementPaintCalls(uint8 rideType, uint8 trackType, uint8 t ); PaintIntercept::ClearCalls(); - Intercept2::ResetSupportHeights(); + TestPaint::ResetSupportHeights(); CallOriginal(rideType, trackType, direction, trackSequence, height, &mapElement); @@ -177,7 +177,7 @@ static uint8 TestTrackElementPaintCalls(uint8 rideType, uint8 trackType, uint8 t PaintIntercept::ClearCalls(); testpaint_clear_ignore(); - Intercept2::ResetSupportHeights(); + TestPaint::ResetSupportHeights(); CallNew(rideType, trackType, direction, trackSequence, height, &mapElement); @@ -232,8 +232,8 @@ static uint8 TestTrackElementSegmentSupportHeight(uint8 rideType, uint8 trackTyp gSurfaceElement = &surfaceElement; gDidPassSurface = true; - Intercept2::ResetEnvironment(); - Intercept2::ResetTunnels(); + TestPaint::ResetEnvironment(); + TestPaint::ResetTunnels(); // TODO: Test Chainlift // TODO: Test Maze @@ -244,7 +244,7 @@ static uint8 TestTrackElementSegmentSupportHeight(uint8 rideType, uint8 trackTyp std::vector tileSegmentSupportCalls[4]; for (int direction = 0; direction < 4; direction++) { - Intercept2::ResetSupportHeights(); + TestPaint::ResetSupportHeights(); CallOriginal(rideType, trackType, direction, trackSequence, height, &mapElement); @@ -269,7 +269,7 @@ static uint8 TestTrackElementSegmentSupportHeight(uint8 rideType, uint8 trackTyp } for (int direction = 0; direction < 4; direction++) { - Intercept2::ResetSupportHeights(); + TestPaint::ResetSupportHeights(); testpaint_clear_ignore(); CallNew(rideType, trackType, direction, trackSequence, height, &mapElement); @@ -312,8 +312,8 @@ static uint8 TestTrackElementGeneralSupportHeight(uint8 rideType, uint8 trackTyp gSurfaceElement = &surfaceElement; gDidPassSurface = true; - Intercept2::ResetEnvironment(); - Intercept2::ResetTunnels(); + TestPaint::ResetEnvironment(); + TestPaint::ResetTunnels(); // TODO: Test Chainlift // TODO: Test Maze @@ -323,7 +323,7 @@ static uint8 TestTrackElementGeneralSupportHeight(uint8 rideType, uint8 trackTyp SupportCall tileGeneralSupportCalls[4]; for (int direction = 0; direction < 4; direction++) { - Intercept2::ResetSupportHeights(); + TestPaint::ResetSupportHeights(); CallOriginal(rideType, trackType, direction, trackSequence, height, &mapElement); @@ -352,7 +352,7 @@ static uint8 TestTrackElementGeneralSupportHeight(uint8 rideType, uint8 trackTyp } for (int direction = 0; direction < 4; direction++) { - Intercept2::ResetSupportHeights(); + TestPaint::ResetSupportHeights(); testpaint_clear_ignore(); CallNew(rideType, trackType, direction, trackSequence, height, &mapElement); @@ -406,13 +406,13 @@ static uint8 TestTrackElementSideTunnels(uint8 rideType, uint8 trackType, uint8 gSurfaceElement = &surfaceElement; gDidPassSurface = true; - Intercept2::ResetEnvironment(); - Intercept2::ResetTunnels(); + TestPaint::ResetEnvironment(); + TestPaint::ResetTunnels(); TunnelCall tileTunnelCalls[4][4]; for (int direction = 0; direction < 4; direction++) { - Intercept2::ResetTunnels(); + TestPaint::ResetTunnels(); for (sint8 offset = -8; offset <= 8; offset += 8) { CallOriginal(rideType, trackType, direction, trackSequence, height + offset, &mapElement); @@ -440,7 +440,7 @@ static uint8 TestTrackElementSideTunnels(uint8 rideType, uint8 trackType, uint8 TunnelCall newTileTunnelCalls[4][4]; for (int direction = 0; direction < 4; direction++) { - Intercept2::ResetTunnels(); + TestPaint::ResetTunnels(); testpaint_clear_ignore(); @@ -520,8 +520,8 @@ static uint8 TestTrackElementVerticalTunnels(uint8 rideType, uint8 trackType, ui gSurfaceElement = &surfaceElement; gDidPassSurface = true; - Intercept2::ResetEnvironment(); - Intercept2::ResetTunnels(); + TestPaint::ResetEnvironment(); + TestPaint::ResetTunnels(); uint8 verticalTunnelHeight[4]; diff --git a/test/testpaint/generate.cpp b/test/testpaint/generate.cpp index 4db4f30950..e3be70c09d 100644 --- a/test/testpaint/generate.cpp +++ b/test/testpaint/generate.cpp @@ -742,7 +742,7 @@ private: TunnelCall tileTunnelCalls[4][4], sint16 verticalTunnelHeights[4]) { - intercept_reset_tunnels(); + TestPaint::ResetTunnels(); for (int offset = -8; offset <= 8; offset += 8) { @@ -953,10 +953,10 @@ private: uint32 palette = imageId & ~0x7FFFF; std::string paletteName; - if (palette == Intercept2::DEFAULT_SCHEME_TRACK) paletteName = "gTrackColours[SCHEME_TRACK]"; - else if (palette == Intercept2::DEFAULT_SCHEME_SUPPORTS) paletteName = "gTrackColours[SCHEME_SUPPORTS]"; - else if (palette == Intercept2::DEFAULT_SCHEME_MISC) paletteName = "gTrackColours[SCHEME_MISC]"; - else if (palette == Intercept2::DEFAULT_SCHEME_3) paletteName = "gTrackColours[SCHEME_3]"; + if (palette == TestPaint::DEFAULT_SCHEME_TRACK) paletteName = "gTrackColours[SCHEME_TRACK]"; + else if (palette == TestPaint::DEFAULT_SCHEME_SUPPORTS) paletteName = "gTrackColours[SCHEME_SUPPORTS]"; + else if (palette == TestPaint::DEFAULT_SCHEME_MISC) paletteName = "gTrackColours[SCHEME_MISC]"; + else if (palette == TestPaint::DEFAULT_SCHEME_3) paletteName = "gTrackColours[SCHEME_3]"; else { paletteName = String::Format("0x%08X", palette); } @@ -1009,8 +1009,8 @@ private: void CallOriginal(int trackType, int direction, int trackSequence, int height, rct_map_element *mapElement) { - intercept_reset_environment(); - intercept_reset_segment_heights(); + TestPaint::ResetEnvironment(); + TestPaint::ResetSupportHeights(); uint32 *trackDirectionList = (uint32 *)RideTypeTrackPaintFunctionsOld[_rideType][trackType]; // Have to call from this point as it pushes esi and expects callee to pop it diff --git a/test/testpaint/testpaint.vcxproj b/test/testpaint/testpaint.vcxproj index c3d28cd492..09b27dffd4 100644 --- a/test/testpaint/testpaint.vcxproj +++ b/test/testpaint/testpaint.vcxproj @@ -98,13 +98,13 @@ - +