mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 19:13:07 +01:00
Code Issues Releases Wiki Activity

Rework and refactor PathBitEntry (#14809)

Browse Source
This commit is contained in:
Duncan
2021-06-03 21:23:00 +01:00
committed by GitHub
parent 425f968a67
commit 6f81248084
18 changed files with 107 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/openrct2/object/FootpathItemObject.cpp
View File

@@ -23,11 +23,11 @@
void FootpathItemObject::ReadLegacy(IReadObjectContext* context, OpenRCT2::IStream* stream)
{
stream->Seek(6, OpenRCT2::STREAM_SEEK_CURRENT);
_legacyType.path_bit.flags = stream->ReadValue<uint16_t>();
_legacyType.path_bit.draw_type = stream->ReadValue<uint8_t>();
_legacyType.path_bit.tool_id = static_cast<CursorID>(stream->ReadValue<uint8_t>());
_legacyType.path_bit.price = stream->ReadValue<int16_t>();
_legacyType.path_bit.scenery_tab_id = OBJECT_ENTRY_INDEX_NULL;
_legacyType.flags = stream->ReadValue<uint16_t>();
_legacyType.draw_type = stream->ReadValue<uint8_t>();
_legacyType.tool_id = static_cast<CursorID>(stream->ReadValue<uint8_t>());
_legacyType.price = stream->ReadValue<int16_t>();
_legacyType.scenery_tab_id = OBJECT_ENTRY_INDEX_NULL;
stream->Seek(2, OpenRCT2::STREAM_SEEK_CURRENT);
GetStringTable().Read(context, stream, ObjectStringID::NAME);
@@ -38,7 +38,7 @@ void FootpathItemObject::ReadLegacy(IReadObjectContext* context, OpenRCT2::IStre
GetImageTable().Read(context, stream);
// Validate properties
if (_legacyType.large_scenery.price <= 0)
if (_legacyType.price <= 0)
{
context->LogError(ObjectError::InvalidProperty, "Price can not be free or negative.");
}
@@ -67,7 +67,7 @@ void FootpathItemObject::Load()
_legacyType.name = language_allocate_object_string(GetName());
_legacyType.image = gfx_object_allocate_images(GetImageTable().GetImages(), GetImageTable().GetCount());
_legacyType.path_bit.scenery_tab_id = OBJECT_ENTRY_INDEX_NULL;
_legacyType.scenery_tab_id = OBJECT_ENTRY_INDEX_NULL;
}
void FootpathItemObject::Unload()
@@ -106,14 +106,14 @@ void FootpathItemObject::ReadJson(IReadObjectContext* context, json_t& root)
if (properties.is_object())
{
_legacyType.path_bit.draw_type = ParseDrawType(Json::GetString(properties["renderAs"]));
_legacyType.path_bit.tool_id = Cursor::FromString(Json::GetString(properties["cursor"]), CursorID::LamppostDown);
_legacyType.path_bit.price = Json::GetNumber<int16_t>(properties["price"]);
_legacyType.draw_type = ParseDrawType(Json::GetString(properties["renderAs"]));
_legacyType.tool_id = Cursor::FromString(Json::GetString(properties["cursor"]), CursorID::LamppostDown);
_legacyType.price = Json::GetNumber<int16_t>(properties["price"]);
SetPrimarySceneryGroup(ObjectEntryDescriptor(Json::GetString(properties["sceneryGroup"])));
// clang-format off
_legacyType.path_bit.flags = Json::GetFlags<uint16_t>(
_legacyType.flags = Json::GetFlags<uint16_t>(
properties,
{
{ "isBin", PATH_BIT_FLAG_IS_BIN, Json::FlagType::Normal },