mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-10 09:32:29 +01:00
Code Issues Releases Wiki Activity

Fix rebase errors

Browse Source
This commit is contained in:
Gymnasiast
2018-01-22 15:36:16 +01:00
parent 81a2c28e1b
commit b207797ad2
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/object/ObjectFactory.cpp
View File

@@ -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());

2
src/openrct2/object/ObjectJsonHelpers.cpp
View File

@@ -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"

4
src/openrct2/object/ObjectJsonHelpers.h
View File

@@ -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"

2
src/openrct2/object/RideObject.cpp
View File

@@ -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");

2
src/openrct2/sprites.h
View File

@@ -17,7 +17,7 @@
#ifndef _SPRITES_H_
#define _SPRITES_H_
#include <openrct2/rct1/RCT1.h>
#include "rct1/RCT1.h"
enum {
SPR_NONE = -1,