From a7be24b2b4ce4a972a63934411a87a200d7a167f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= <janisozaur+signed@gmail.com>
Date: Thu, 12 Oct 2017 00:08:40 +0200
Subject: [PATCH] MSVC fixes

---
 src/openrct2/ride/Vehicle.cpp    | 4 ++--
 src/openrct2/ride/vehicle_data.h | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp
index 7632d7516f..516c2be92e 100644
--- a/src/openrct2/ride/Vehicle.cpp
+++ b/src/openrct2/ride/Vehicle.cpp
@@ -5369,7 +5369,7 @@ static void vehicle_crash_on_water(rct_vehicle * vehicle)
     sprite_move(vehicle->x, vehicle->y, vehicle->z, (rct_sprite *)vehicle);
     vehicle_invalidate(vehicle);
 
-    vehicle->var_4E = 0xFFFF;
+    vehicle->var_4E = 0xFFFFu;
 }
 
 /**
@@ -6317,7 +6317,7 @@ static sint32 vehicle_update_motion_dodgems(rct_vehicle * vehicle)
         uint8 oldC4     = vehicle->var_C4 & 0x1E;
         vehicle->var_C4 = 0;
 
-        LocationXYZ16 location = { .x = vehicle->x, .y = vehicle->y, .z = vehicle->z };
+        LocationXYZ16 location = { vehicle->x, vehicle->y, vehicle->z };
 
         location.x += Unk9A36C4[oldC4].x;
         location.y += Unk9A36C4[oldC4].y;
diff --git a/src/openrct2/ride/vehicle_data.h b/src/openrct2/ride/vehicle_data.h
index 9782803dff..ff3c92e29f 100644
--- a/src/openrct2/ride/vehicle_data.h
+++ b/src/openrct2/ride/vehicle_data.h
@@ -19,6 +19,10 @@
 
 #include "../common.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern const uint8 * Rotation1TimeToSpriteMaps[];
 extern const uint8 * Rotation2TimeToSpriteMaps[];
 extern const uint8 * Rotation3TimeToSpriteMaps[];
@@ -38,4 +42,8 @@ extern const sint32 dword_9A2970[];
 
 extern const sint32 word_9A3684[];
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif