Update files missed in the great extern "C" cleanup of 2017

src/openrct2/core/FileScanner.cpp

@@ -27,10 +27,8 @@
     #include <sys/stat.h>
     #include <unistd.h>
 #elif defined(_WIN32)
-    extern "C" {
-        // Windows needs this for widechar <-> utf8 conversion utils
-        #include "../localisation/language.h"
-    }
+    // Windows needs this for widechar <-> utf8 conversion utils
+    #include "../localisation/language.h"
 #endif
 
 #include <stack>

src/openrct2/drawing/Sprite.cpp

@@ -28,13 +28,10 @@
 #include "../sprites.h"
 #include "../ui/UiContext.h"
 
-extern "C"
-{
-    #include "../platform/platform.h"
-    #include "../rct2/addresses.h"
-    #include "../util/util.h"
-    #include "drawing.h"
-}
+#include "../platform/platform.h"
+#include "../rct2/addresses.h"
+#include "../util/util.h"
+#include "drawing.h"
 
 using namespace OpenRCT2;
 using namespace OpenRCT2::Ui;

src/openrct2/network/Network.cpp

@@ -53,7 +53,6 @@ sint32 _pickup_peep_old_x = SPRITE_LOCATION_NULL;
 #include "../ParkImporter.h"
 #include "../rct2/S6Exporter.h"
 
-extern "C" {
 #include "../config/Config.h"
 #include "../game.h"
 #include "../interface/chat.h"
@@ -69,7 +68,6 @@ extern "C" {
 #include "NetworkAction.h"
 
 #include <openssl/evp.h> // just for OpenSSL_add_all_algorithms()
-}
 
 #pragma comment(lib, "Ws2_32.lib")
 

src/openrct2/paint/Painter.cpp

@@ -21,15 +21,12 @@
 #include "../ui/UiContext.h"
 #include "Painter.h"
 
-extern "C"
-{
-    #include "../drawing/drawing.h"
-    #include "../game.h"
-    #include "../interface/chat.h"
-    #include "../interface/console.h"
-    #include "../intro.h"
-    #include "../localisation/localisation.h"
-}
+#include "../drawing/drawing.h"
+#include "../game.h"
+#include "../interface/chat.h"
+#include "../interface/console.h"
+#include "../intro.h"
+#include "../localisation/localisation.h"
 
 using namespace OpenRCT2;
 using namespace OpenRCT2::Drawing;

src/openrct2/paint/supports.h

@@ -20,6 +20,10 @@
 #include "../common.h"
 #include "../world/footpath.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 bool wooden_a_supports_paint_setup(paint_session * session, sint32 supportType, sint32 special, sint32 height, uint32 imageColourFlags, bool* underground);
 bool wooden_b_supports_paint_setup(paint_session * session, sint32 supportType, sint32 special, sint32 height, uint32 imageColourFlags, bool* underground);
 bool metal_a_supports_paint_setup(paint_session * session, uint8 supportType, uint8 segment, sint32 special, sint32 height, uint32 imageColourFlags);
@@ -44,4 +48,8 @@ enum {
     METAL_SUPPORTS_BOXED_COATED         // Does not seem to be used in RCT2, but it was used in RCT1 for one of the path support types.
 };
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

src/openrct2/platform/Platform2.cpp

@@ -16,10 +16,7 @@
 
 #include "Platform2.h"
 
-extern "C"
-{
-    #include "platform.h"
-}
+#include "platform.h"
 
 namespace Platform
 {

src/openrct2/rct1/S4Importer.cpp

@@ -35,33 +35,30 @@
 #include "Tables.h"
 #include "../object_list.h"
 
-extern "C"
-{
-    #include "../audio/audio.h"
-    #include "../cheats.h"
-    #include "../Editor.h"
-    #include "../game.h"
-    #include "../interface/window.h"
-    #include "../localisation/date.h"
-    #include "../localisation/localisation.h"
-    #include "../management/finance.h"
-    #include "../management/marketing.h"
-    #include "../object.h"
-    #include "../object/ObjectManager.h"
-    #include "../peep/peep.h"
-    #include "../peep/staff.h"
-    #include "../rct1.h"
-    #include "../ride/ride_data.h"
-    #include "../ride/track.h"
-    #include "../util/sawyercoding.h"
-    #include "../util/util.h"
-    #include "../world/Climate.h"
-    #include "../world/footpath.h"
-    #include "../world/map_animation.h"
-    #include "../world/park.h"
-    #include "../world/entrance.h"
-    #include "../world/scenery.h"
-}
+#include "../audio/audio.h"
+#include "../cheats.h"
+#include "../Editor.h"
+#include "../game.h"
+#include "../interface/window.h"
+#include "../localisation/date.h"
+#include "../localisation/localisation.h"
+#include "../management/finance.h"
+#include "../management/marketing.h"
+#include "../object.h"
+#include "../object/ObjectManager.h"
+#include "../peep/peep.h"
+#include "../peep/staff.h"
+#include "../rct1.h"
+#include "../ride/ride_data.h"
+#include "../ride/track.h"
+#include "../util/sawyercoding.h"
+#include "../util/util.h"
+#include "../world/Climate.h"
+#include "../world/footpath.h"
+#include "../world/map_animation.h"
+#include "../world/park.h"
+#include "../world/entrance.h"
+#include "../world/scenery.h"
 
 class EntryList
 {

src/openrct2/rct1/Tables.cpp

@@ -19,12 +19,9 @@
 #include "../core/Util.hpp"
 #include "Tables.h"
 
-extern "C"
-{
-    #include "../interface/colour.h"
-    #include "../rct1.h"
-    #include "../ride/ride.h"
-}
+#include "../interface/colour.h"
+#include "../rct1.h"
+#include "../ride/ride.h"
 
 namespace RCT1
 {

src/openrct2/rct12/SawyerChunkReader.cpp

@@ -19,10 +19,7 @@
 #include "../core/Math.hpp"
 #include "SawyerChunkReader.h"
 
-extern "C"
-{
-    #include "../util/sawyercoding.h"
-}
+#include "../util/sawyercoding.h"
 
 // Allow chunks to be uncompressed to a maximum of 16 MiB
 constexpr size_t MAX_UNCOMPRESSED_CHUNK_SIZE = 16 * 1024 * 1024;

src/openrct2/rct12/SawyerChunkWriter.cpp

@@ -19,10 +19,7 @@
 #include "../core/Math.hpp"
 #include "SawyerChunkWriter.h"
 
-extern "C"
-{
-    #include "../util/sawyercoding.h"
-}
+#include "../util/sawyercoding.h"
 
 // Maximum buffer size to store compressed data, maximum of 16 MiB
 constexpr size_t MAX_COMPRESSED_CHUNK_SIZE = 16 * 1024 * 1024;

src/openrct2/rct2/S6Exporter.cpp

@@ -27,32 +27,29 @@
 #include "S6Exporter.h"
 #include <functional>
 
-extern "C"
-{
-    #include "../config/Config.h"
-    #include "../game.h"
-    #include "../interface/viewport.h"
-    #include "../interface/window.h"
-    #include "../localisation/date.h"
-    #include "../localisation/localisation.h"
-    #include "../management/finance.h"
-    #include "../management/marketing.h"
-    #include "../management/news_item.h"
-    #include "../management/research.h"
-    #include "../object.h"
-    #include "../OpenRCT2.h"
-    #include "../peep/staff.h"
-    #include "../ride/ride.h"
-    #include "../ride/ride_ratings.h"
-    #include "../ride/track_data.h"
-    #include "../scenario/scenario.h"
-    #include "../util/sawyercoding.h"
-    #include "../util/util.h"
-    #include "../world/Climate.h"
-    #include "../world/map_animation.h"
-    #include "../world/park.h"
-    #include "../world/sprite.h"
-}
+#include "../config/Config.h"
+#include "../game.h"
+#include "../interface/viewport.h"
+#include "../interface/window.h"
+#include "../localisation/date.h"
+#include "../localisation/localisation.h"
+#include "../management/finance.h"
+#include "../management/marketing.h"
+#include "../management/news_item.h"
+#include "../management/research.h"
+#include "../object.h"
+#include "../OpenRCT2.h"
+#include "../peep/staff.h"
+#include "../ride/ride.h"
+#include "../ride/ride_ratings.h"
+#include "../ride/track_data.h"
+#include "../scenario/scenario.h"
+#include "../util/sawyercoding.h"
+#include "../util/util.h"
+#include "../world/Climate.h"
+#include "../world/map_animation.h"
+#include "../world/park.h"
+#include "../world/sprite.h"
 
 S6Exporter::S6Exporter()
 {

src/openrct2/rct2/S6Importer.cpp

@@ -30,28 +30,25 @@
 #include "../rct12/SawyerEncoding.h"
 #include "../ride/station.h"
 
-extern "C"
-{
-    #include "../config/Config.h"
-    #include "../game.h"
-    #include "../interface/viewport.h"
-    #include "../localisation/date.h"
-    #include "../localisation/localisation.h"
-    #include "../management/finance.h"
-    #include "../management/marketing.h"
-    #include "../management/news_item.h"
-    #include "../management/research.h"
-    #include "../OpenRCT2.h"
-    #include "../peep/staff.h"
-    #include "../ride/ride.h"
-    #include "../ride/ride_ratings.h"
-    #include "../scenario/scenario.h"
-    #include "../util/sawyercoding.h"
-    #include "../world/Climate.h"
-    #include "../world/entrance.h"
-    #include "../world/map_animation.h"
-    #include "../world/park.h"
-}
+#include "../config/Config.h"
+#include "../game.h"
+#include "../interface/viewport.h"
+#include "../localisation/date.h"
+#include "../localisation/localisation.h"
+#include "../management/finance.h"
+#include "../management/marketing.h"
+#include "../management/news_item.h"
+#include "../management/research.h"
+#include "../OpenRCT2.h"
+#include "../peep/staff.h"
+#include "../ride/ride.h"
+#include "../ride/ride_ratings.h"
+#include "../scenario/scenario.h"
+#include "../util/sawyercoding.h"
+#include "../world/Climate.h"
+#include "../world/entrance.h"
+#include "../world/map_animation.h"
+#include "../world/park.h"
 
 class ObjectLoadException : public Exception
 {

src/openrct2/rct2/hook.h

@@ -33,8 +33,16 @@ enum {
 
 typedef uint8 (hook_function)(registers *regs);
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void addhook(uintptr_t address, hook_function *function);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 
 #endif

src/openrct2/ride/RideGroupManager.cpp

@@ -20,15 +20,12 @@
 #include "../config/Config.h"
 #include "../core/String.hpp"
 
-extern "C"
-{
-    #include "../localisation/string_ids.h"
-    #include "../management/research.h"
-    #include "ride.h"
-    #include "ride_data.h"
-    #include "track.h"
-    #include "track_data.h"
-}
+#include "../localisation/string_ids.h"
+#include "../management/research.h"
+#include "ride.h"
+#include "ride_data.h"
+#include "track.h"
+#include "track_data.h"
 
 class RideGroupManager final : public IRideGroupManager
 {

src/openrct2/ride/TrackDesign.cpp

@@ -23,25 +23,22 @@
 #include "../rct1/Tables.h"
 #include "TrackDesignRepository.h"
 
-extern "C"
-{
-    #include "../audio/audio.h"
-    #include "../cheats.h"
-    #include "../game.h"
-    #include "../localisation/localisation.h"
-    #include "../localisation/string_ids.h"
-    #include "../management/finance.h"
-    #include "../rct1.h"
-    #include "../util/sawyercoding.h"
-    #include "../util/util.h"
-    #include "../world/footpath.h"
-    #include "../world/scenery.h"
-    #include "ride.h"
-    #include "ride_data.h"
-    #include "track.h"
-    #include "track_data.h"
-    #include "TrackDesign.h"
-}
+#include "../audio/audio.h"
+#include "../cheats.h"
+#include "../game.h"
+#include "../localisation/localisation.h"
+#include "../localisation/string_ids.h"
+#include "../management/finance.h"
+#include "../rct1.h"
+#include "../util/sawyercoding.h"
+#include "../util/util.h"
+#include "../world/footpath.h"
+#include "../world/scenery.h"
+#include "ride.h"
+#include "ride_data.h"
+#include "track.h"
+#include "track_data.h"
+#include "TrackDesign.h"
 
 typedef struct map_backup
 {

test/testpaint/FunctionCall.cpp

@@ -16,9 +16,7 @@
 
 #include "FunctionCall.hpp"
 
-extern "C" {
 #include <openrct2/sprites.h>
-}
 
 enum SpriteGroup {
     SPRITEGROUP_NONE,

test/testpaint/PaintIntercept.cpp

@@ -18,13 +18,11 @@
 #include "PaintIntercept.hpp"
 #include "FunctionCall.hpp"
 
-extern "C" {
 #include <openrct2/common.h>
 #include <openrct2/rct2/hook.h>
 #include <openrct2/interface/viewport.h>
 #include <openrct2/paint/supports.h>
 #include <openrct2/sprites.h>
-}
 
 paint_session gPaintSession;
 

test/testpaint/Printer.cpp

@@ -19,9 +19,7 @@
 #include <openrct2/core/Util.hpp>
 #include "FunctionCall.hpp"
 
-extern "C" {
 #include <openrct2/sprites.h>
-}
 
 namespace Printer {
 

test/testpaint/SegmentSupportHeightCall.cpp

@@ -19,9 +19,7 @@
 
 #include "SegmentSupportHeightCall.hpp"
 
-extern "C" {
 #include <openrct2/paint/map_element/map_element.h>
-}
 
 static bool SortSegmentSupportCalls(SegmentSupportCall lhs, SegmentSupportCall rhs)
 {

test/testpaint/TestPaint.cpp

@@ -23,13 +23,11 @@
 #include "TestPaint.hpp"
 #include "Utils.hpp"
 
-extern "C" {
-    #include <openrct2/paint/paint.h>
-    #include <openrct2/paint/supports.h>
-    #include <openrct2/ride/track_data.h>
-    #include <openrct2/interface/viewport.h>
-    #include <openrct2/rct2/hook.h>
-}
+#include <openrct2/paint/paint.h>
+#include <openrct2/paint/supports.h>
+#include <openrct2/ride/track_data.h>
+#include <openrct2/interface/viewport.h>
+#include <openrct2/rct2/hook.h>
 
 namespace TestPaint
 {

test/testpaint/TestTrack.cpp

@@ -29,13 +29,11 @@
 #include "Utils.hpp"
 #include "VerticalTunnelCall.hpp"
 
-extern "C" {
 #include <openrct2/paint/map_element/map_element.h>
 #include <openrct2/paint/supports.h>
 #include <openrct2/ride/ride.h>
 #include <openrct2/ride/track.h>
 #include <openrct2/ride/track_data.h>
-}
 
 interface ITestTrackFilter {
 public:

test/testpaint/Utils.cpp

@@ -16,11 +16,9 @@
 
 #include "Utils.hpp"
 
-extern "C" {
-    #include <openrct2/ride/ride.h>
-    #include <openrct2/ride/track.h>
-    #include <openrct2/ride/track_data.h>
-}
+#include <openrct2/ride/ride.h>
+#include <openrct2/ride/track.h>
+#include <openrct2/ride/track_data.h>
 
 namespace Utils {
     int getTrackSequenceCount(uint8 rideType, uint8 trackType) {

test/testpaint/generate.cpp

@@ -26,16 +26,13 @@
 #include "String.hpp"
 #include "Utils.hpp"
 
-extern "C"
-{
-    #include "data.h"
-    #include <openrct2/interface/viewport.h>
-    #include <openrct2/rct2.h>
-    #include <openrct2/ride/ride.h>
-    #include <openrct2/ride/ride_data.h>
-    #include <openrct2/ride/track.h>
-    #include <openrct2/ride/track_data.h>
-}
+#include "data.h"
+#include <openrct2/interface/viewport.h>
+#include <openrct2/rct2.h>
+#include <openrct2/ride/ride.h>
+#include <openrct2/ride/ride_data.h>
+#include <openrct2/ride/track.h>
+#include <openrct2/ride/track_data.h>
 
 class PaintCodeGenerator
 {

test/testpaint/main.cpp

@@ -28,14 +28,12 @@
 #include "TestTrack.hpp"
 #include "Utils.hpp"
 
-extern "C" {
 #include "data.h"
 #include <openrct2/rct2.h>
 #include <openrct2/ride/ride.h>
 #include <openrct2/ride/ride_data.h>
 #include <openrct2/ride/track.h>
 #include <openrct2/ride/track_data.h>
-}
 
 typedef struct {
     uint8 rideType;

test/tests/IniWriterTest.cpp

@@ -4,10 +4,7 @@
 #include "openrct2/config/IniWriter.hpp"
 #include "openrct2/core/MemoryStream.h"
 
-extern "C"
-{
-    #include "openrct2/platform/platform.h"
-}
+#include "openrct2/platform/platform.h"
 
 class IniWriterTest : public testing::Test
 {

test/tests/MultiLaunch.cpp

@@ -9,11 +9,8 @@
 #include <openrct2/ParkImporter.h>
 #include "TestData.h"
 
-extern "C"
-{
-    #include <openrct2/platform/platform.h>
-    #include <openrct2/game.h>
-}
+#include <openrct2/platform/platform.h>
+#include <openrct2/game.h>
 
 using namespace OpenRCT2;
 

test/tests/RideRatings.cpp

@@ -8,11 +8,8 @@
 #include <openrct2/OpenRCT2.h>
 #include "TestData.h"
 
-extern "C"
-{
-    #include <openrct2/platform/platform.h>
-    #include <openrct2/game.h>
-}
+#include <openrct2/platform/platform.h>
+#include <openrct2/game.h>
 
 using namespace OpenRCT2;