From d456d86f69e05473514a1336edb222ebc70d5398 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Mon, 5 Sep 2016 19:16:46 +0200 Subject: [PATCH] Add header for data.h --- OpenRCT2.xcodeproj/project.pbxproj | 2 ++ PaintTest/data.h | 26 ++++++++++++++++++++++++++ PaintTest/main.cpp | 5 +---- 3 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 PaintTest/data.h diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj index 766e06fb45..fe50264b7b 100644 --- a/OpenRCT2.xcodeproj/project.pbxproj +++ b/OpenRCT2.xcodeproj/project.pbxproj @@ -494,6 +494,7 @@ 8594C05F1D885CF600235E93 /* track_data_old.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = track_data_old.c; sourceTree = ""; }; 85AFA20F1D7DB83E00221B42 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = ""; }; 85AFA2101D7DB83E00221B42 /* intercept.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = intercept.h; sourceTree = ""; }; + 85AFA2141D7DDFA100221B42 /* data.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = data.h; 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; }; @@ -1155,6 +1156,7 @@ children = ( C64FDAC41D6DA55E00F259B9 /* compat.c */, C64FDAC91D6DA92D00F259B9 /* data.c */, + 85AFA2141D7DDFA100221B42 /* data.h */, C64FDAC71D6DA72400F259B9 /* intercept.c */, 85AFA2101D7DB83E00221B42 /* intercept.h */, 85AFA20F1D7DB83E00221B42 /* main.cpp */, diff --git a/PaintTest/data.h b/PaintTest/data.h new file mode 100644 index 0000000000..6e6b55dd58 --- /dev/null +++ b/PaintTest/data.h @@ -0,0 +1,26 @@ +#pragma region Copyright (c) 2014-2016 OpenRCT2 Developers +/***************************************************************************** + * OpenRCT2, an open source clone of Roller Coaster Tycoon 2. + * + * OpenRCT2 is the work of many authors, a full list can be found in contributors.md + * For more information, visit https://github.com/OpenRCT2/OpenRCT2 + * + * OpenRCT2 is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * A full copy of the GNU General Public License can be found in licence.txt + *****************************************************************************/ +#pragma endregion + +#ifndef _TEST_PAINT_DATA_H_ +#define _TEST_PAINT_DATA_H_ + +#include "../src/common.h" + +extern const utf8string RideNames[91]; +extern const utf8string TrackNames[256]; +extern const utf8string FlatTrackNames[256]; + +#endif // #endif _TEST_PAINT_DATA_H_ diff --git a/PaintTest/main.cpp b/PaintTest/main.cpp index 71d362521b..775db022bd 100644 --- a/PaintTest/main.cpp +++ b/PaintTest/main.cpp @@ -19,6 +19,7 @@ #include extern "C" { +#include "data.h" #include "intercept.h" #include "../src/rct2.h" #include "../src/ride/ride.h" @@ -32,10 +33,6 @@ typedef struct { std::vector trackTypes; } TestCase; -extern const utf8string RideNames[91]; -extern const utf8string TrackNames[256]; -extern const utf8string FlatTrackNames[256]; - enum CLIColour { RED, GREEN,