From 263dc9f189a686ce888d20d78a93028be5f8a728 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Sun, 16 Oct 2016 19:25:41 +0200 Subject: [PATCH] Remove unneeded declarations from intercept --- test/testpaint/intercept.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/test/testpaint/intercept.c b/test/testpaint/intercept.c index f912573e7b..1a8ea16387 100644 --- a/test/testpaint/intercept.c +++ b/test/testpaint/intercept.c @@ -15,17 +15,13 @@ #pragma endregion #include "intercept.h" +#include "data.h" #include "../../src/paint/paint.h" #include "../../src/paint/supports.h" #include "../../src/ride/track_data.h" #include "../../src/interface/viewport.h" #include "../../src/hook.h" -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; - #define BLANK_SUPPORT {.height = 0, .slope = 0xFF} const support_height DefaultSegmentHeight[9] = { BLANK_SUPPORT, BLANK_SUPPORT, BLANK_SUPPORT, @@ -33,12 +29,6 @@ const support_height DefaultSegmentHeight[9] = { BLANK_SUPPORT, BLANK_SUPPORT, BLANK_SUPPORT }; -extern const utf8string RideNames[91]; -extern const utf8string TrackNames[256]; -extern const utf8string FlatTrackNames[256]; - - - static bool assertFunctionCallArrayEquals(function_call expected[], uint8 expectedCount, function_call actual[], uint8 actualCount) { if (expectedCount != actualCount) { return false; @@ -71,7 +61,6 @@ extern bool testSupportSegments(uint8 rideType, uint8 trackType); extern bool testTunnels(uint8 rideType, uint8 trackType); extern bool testVerticalTunnels(uint8 rideType, uint8 trackType); - static uint8 testTrackElement(uint8 rideType, uint8 trackType, utf8string error, size_t len) { if (rideType == RIDE_TYPE_CHAIRLIFT) { if (trackType == TRACK_ELEM_BEGIN_STATION || trackType == TRACK_ELEM_MIDDLE_STATION || trackType == TRACK_ELEM_END_STATION) {