From b207797ad27d4c06c4d26b98f278904e857618af Mon Sep 17 00:00:00 2001
From: Gymnasiast <m.o.steenbeek@gmail.com>
Date: Mon, 22 Jan 2018 15:36:16 +0100
Subject: [PATCH] Fix rebase errors

---
 src/openrct2/object/ObjectFactory.cpp     | 4 ++--
 src/openrct2/object/ObjectJsonHelpers.cpp | 2 +-
 src/openrct2/object/ObjectJsonHelpers.h   | 4 ++--
 src/openrct2/object/RideObject.cpp        | 2 +-
 src/openrct2/sprites.h                    | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/openrct2/object/ObjectFactory.cpp b/src/openrct2/object/ObjectFactory.cpp
index a399fe5b1b..1f18245ffb 100644
--- a/src/openrct2/object/ObjectFactory.cpp
+++ b/src/openrct2/object/ObjectFactory.cpp
@@ -253,13 +253,13 @@ namespace ObjectFactory
                     result->ReadJson(&readContext, jRoot);
                     if (readContext.WasError())
                     {
-                        throw Exception("Object has errors");
+                        throw std::runtime_error("Object has errors");
                     }
                 }
             }
             json_decref(jRoot);
         }
-        catch (Exception)
+        catch (std::runtime_error)
         {
             Console::Error::WriteLine("Unable to open or read '%s'", path.c_str());
 
diff --git a/src/openrct2/object/ObjectJsonHelpers.cpp b/src/openrct2/object/ObjectJsonHelpers.cpp
index c3e3a4148e..20325f724e 100644
--- a/src/openrct2/object/ObjectJsonHelpers.cpp
+++ b/src/openrct2/object/ObjectJsonHelpers.cpp
@@ -23,7 +23,7 @@
 #include "../core/Path.hpp"
 #include "../core/String.hpp"
 #include "../interface/Cursors.h"
-#include "../localisation/language.h"
+#include "../localisation/Language.h"
 #include "../PlatformEnvironment.h"
 #include "../sprites.h"
 #include "Object.h"
diff --git a/src/openrct2/object/ObjectJsonHelpers.h b/src/openrct2/object/ObjectJsonHelpers.h
index ae13934ba0..4a0761db89 100644
--- a/src/openrct2/object/ObjectJsonHelpers.h
+++ b/src/openrct2/object/ObjectJsonHelpers.h
@@ -22,8 +22,8 @@
 #include <vector>
 #include "../common.h"
 #include "../core/Json.hpp"
-#include "../drawing/drawing.h"
-#include "../object.h"
+#include "../drawing/Drawing.h"
+#include "../object/Object.h"
 #include "ImageTable.h"
 #include "StringTable.h"
 
diff --git a/src/openrct2/object/RideObject.cpp b/src/openrct2/object/RideObject.cpp
index a2f0c2ebc5..27a4abfc88 100644
--- a/src/openrct2/object/RideObject.cpp
+++ b/src/openrct2/object/RideObject.cpp
@@ -757,7 +757,7 @@ rct_ride_entry_vehicle RideObject::ReadJsonCar(const json_t * jCar)
     car.friction_sound_id = ObjectJsonHelpers::GetInteger(jCar, "frictionSoundId", 255);
     car.var_58 = ObjectJsonHelpers::GetInteger(jCar, "var58");
     car.sound_range = ObjectJsonHelpers::GetInteger(jCar, "soundRange", 255);
-    car.var_5A = ObjectJsonHelpers::GetInteger(jCar, "var5A");
+    car.double_sound_frequency = ObjectJsonHelpers::GetInteger(jCar, "var5A");
     car.powered_acceleration = ObjectJsonHelpers::GetInteger(jCar, "poweredAcceleration");
     car.powered_max_speed = ObjectJsonHelpers::GetInteger(jCar, "poweredMaxSpeed");
     car.car_visual = ObjectJsonHelpers::GetInteger(jCar, "carVisual");
diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h
index e0d1001b91..f681a87f4e 100644
--- a/src/openrct2/sprites.h
+++ b/src/openrct2/sprites.h
@@ -17,7 +17,7 @@
 #ifndef _SPRITES_H_
 #define _SPRITES_H_
 
-#include <openrct2/rct1/RCT1.h>
+#include "rct1/RCT1.h"
 
 enum {
     SPR_NONE = -1,