mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 22:34:33 +01:00
Code Issues Releases Wiki Activity

Create constant for SCROLLING_MODE_NONE

Browse Source
This commit is contained in:
Michael Steenbeek
2019-02-14 22:41:48 +01:00
committed by GitHub
parent d143c7b7c6
commit 2a4215a30f
14 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/openrct2/object/WallObject.cpp
View File

@@ -13,6 +13,7 @@
#include "../drawing/Drawing.h"
#include "../interface/Cursors.h"
#include "../localisation/Language.h"
#include "../world/Banner.h"
#include "ObjectJsonHelpers.h"
void WallObject::ReadLegacy(IReadObjectContext* context, IStream* stream)
@@ -94,7 +95,7 @@ void WallObject::ReadJson(IReadObjectContext* context, const json_t* root)
_legacyType.wall.price = json_integer_value(json_object_get(properties, "price"));
auto jScrollingMode = json_object_get(properties, "scrollingMode");
_legacyType.wall.scrolling_mode = jScrollingMode != nullptr ? json_integer_value(jScrollingMode) : -1;
_legacyType.wall.scrolling_mode = jScrollingMode != nullptr ? json_integer_value(jScrollingMode) : SCROLLING_MODE_NONE;
SetPrimarySceneryGroup(ObjectJsonHelpers::GetString(json_object_get(properties, "sceneryGroup")));