From 987bfa409a738f4ab6cd2f1a4e379ca3fa1fd5cd Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Fri, 16 Sep 2016 14:30:20 +0200 Subject: [PATCH] Improve track type support check --- test/testpaint/intercept.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/test/testpaint/intercept.c b/test/testpaint/intercept.c index 1f1035b84f..d40824116a 100644 --- a/test/testpaint/intercept.c +++ b/test/testpaint/intercept.c @@ -465,16 +465,23 @@ int getTrackSequenceCount(uint8 rideType, uint8 trackType) { return sequenceCount; } -bool rideSupportsTrackType(int rideType, int trackType) { +bool rideSupportsTrackType(int rideType, int trackType) +{ TRACK_PAINT_FUNCTION_GETTER newPaintGetter = RideTypeTrackPaintFunctions[rideType]; if (newPaintGetter == NULL) { return false; } - bool supportsTrackType = (newPaintGetter(trackType, 0) != NULL); + if (newPaintGetter(trackType, 0) == NULL) { + return false; + } - return supportsTrackType; + if (RideTypeTrackPaintFunctionsOld[rideType][trackType] == 0) { + return false; + } + + return true; }