mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 06:44:38 +01:00
Code Issues Releases Wiki Activity

Rearrange WallSceneryEntry to enforce types (#14808)

Browse Source 
* Rearrange WallSceneryEntry to enforce types

* Clang format

Correct inverted nullptr check
This commit is contained in:
Duncan
2021-06-03 13:26:00 +01:00
committed by GitHub
parent 97002cae5d
commit 425f968a67
25 changed files with 204 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,14 +20,14 @@
void WallObject::ReadLegacy(IReadObjectContext* context, OpenRCT2::IStream* stream)
{
stream->Seek(6, OpenRCT2::STREAM_SEEK_CURRENT);
_legacyType.wall.tool_id = static_cast<CursorID>(stream->ReadValue<uint8_t>());
_legacyType.wall.flags = stream->ReadValue<uint8_t>();
_legacyType.wall.height = stream->ReadValue<uint8_t>();
_legacyType.wall.flags2 = stream->ReadValue<uint8_t>();
_legacyType.wall.price = stream->ReadValue<uint16_t>();
_legacyType.wall.scenery_tab_id = OBJECT_ENTRY_INDEX_NULL;
_legacyType.tool_id = static_cast<CursorID>(stream->ReadValue<uint8_t>());
_legacyType.flags = stream->ReadValue<uint8_t>();
_legacyType.height = stream->ReadValue<uint8_t>();
_legacyType.flags2 = stream->ReadValue<uint8_t>();
_legacyType.price = stream->ReadValue<uint16_t>();
_legacyType.scenery_tab_id = OBJECT_ENTRY_INDEX_NULL;
stream->Seek(1, OpenRCT2::STREAM_SEEK_CURRENT);
_legacyType.wall.scrolling_mode = stream->ReadValue<uint8_t>();
_legacyType.scrolling_mode = stream->ReadValue<uint8_t>();
GetStringTable().Read(context, stream, ObjectStringID::NAME);
@@ -37,7 +37,7 @@ void WallObject::ReadLegacy(IReadObjectContext* context, OpenRCT2::IStream* stre
GetImageTable().Read(context, stream);
// Validate properties
if (_legacyType.wall.price <= 0)
if (_legacyType.price <= 0)
{
context->LogError(ObjectError::InvalidProperty, "Price can not be free or negative.");
}
@@ -46,8 +46,8 @@ void WallObject::ReadLegacy(IReadObjectContext* context, OpenRCT2::IStream* stre
auto identifier = GetLegacyIdentifier();
if (identifier == "XXWLBR03")
{
_legacyType.wall.flags2 &= ~WALL_SCENERY_2_DOOR_SOUND_MASK;
_legacyType.wall.flags2 |= (1u << WALL_SCENERY_2_DOOR_SOUND_SHIFT) & WALL_SCENERY_2_DOOR_SOUND_MASK;
_legacyType.flags2 &= ~WALL_SCENERY_2_DOOR_SOUND_MASK;
_legacyType.flags2 |= (1u << WALL_SCENERY_2_DOOR_SOUND_SHIFT) & WALL_SCENERY_2_DOOR_SOUND_MASK;
}
}
@@ -72,22 +72,22 @@ void WallObject::DrawPreview(rct_drawpixelinfo* dpi, int32_t width, int32_t heig
auto screenCoords = ScreenCoordsXY{ width / 2, height / 2 };
screenCoords.x += 14;
screenCoords.y += (_legacyType.wall.height * 2) + 16;
screenCoords.y += (_legacyType.height * 2) + 16;
uint32_t imageId = 0x20D00000 | _legacyType.image;
if (_legacyType.wall.flags & WALL_SCENERY_HAS_SECONDARY_COLOUR)
if (_legacyType.flags & WALL_SCENERY_HAS_SECONDARY_COLOUR)
{
imageId |= 0x92000000;
}
gfx_draw_sprite(dpi, imageId, screenCoords, 0);
if (_legacyType.wall.flags & WALL_SCENERY_HAS_GLASS)
if (_legacyType.flags & WALL_SCENERY_HAS_GLASS)
{
imageId = _legacyType.image + 0x44500006;
gfx_draw_sprite(dpi, imageId, screenCoords, 0);
}
else if (_legacyType.wall.flags & WALL_SCENERY_IS_DOOR)
else if (_legacyType.flags & WALL_SCENERY_IS_DOOR)
{
imageId++;
gfx_draw_sprite(dpi, imageId, screenCoords, 0);
@@ -102,16 +102,16 @@ void WallObject::ReadJson(IReadObjectContext* context, json_t& root)
if (properties.is_object())
{
_legacyType.wall.tool_id = Cursor::FromString(Json::GetString(properties["cursor"]), CursorID::FenceDown);
_legacyType.wall.height = Json::GetNumber<uint8_t>(properties["height"]);
_legacyType.wall.price = Json::GetNumber<int16_t>(properties["price"]);
_legacyType.tool_id = Cursor::FromString(Json::GetString(properties["cursor"]), CursorID::FenceDown);
_legacyType.height = Json::GetNumber<uint8_t>(properties["height"]);
_legacyType.price = Json::GetNumber<int16_t>(properties["price"]);
_legacyType.wall.scrolling_mode = Json::GetNumber<uint8_t>(properties["scrollingMode"], SCROLLING_MODE_NONE);
_legacyType.scrolling_mode = Json::GetNumber<uint8_t>(properties["scrollingMode"], SCROLLING_MODE_NONE);
SetPrimarySceneryGroup(ObjectEntryDescriptor(Json::GetString(properties["sceneryGroup"])));
// clang-format off
_legacyType.wall.flags = Json::GetFlags<uint8_t>(
_legacyType.flags = Json::GetFlags<uint8_t>(
properties,
{
{ "hasPrimaryColour", WALL_SCENERY_HAS_PRIMARY_COLOUR, Json::FlagType::Normal },
@@ -126,7 +126,7 @@ void WallObject::ReadJson(IReadObjectContext* context, json_t& root)
});
// clang-format on
_legacyType.wall.flags2 = Json::GetFlags<uint8_t>(
_legacyType.flags2 = Json::GetFlags<uint8_t>(
properties,
{
{ "isOpaque", WALL_SCENERY_2_IS_OPAQUE },
@@ -135,12 +135,12 @@ void WallObject::ReadJson(IReadObjectContext* context, json_t& root)
// HACK WALL_SCENERY_HAS_PRIMARY_COLOUR actually means, has any colour but we simplify the
// JSON and handle this on load. We should change code base in future to reflect the JSON.
if (!(_legacyType.wall.flags & WALL_SCENERY_HAS_PRIMARY_COLOUR))
if (!(_legacyType.flags & WALL_SCENERY_HAS_PRIMARY_COLOUR))
{
if (_legacyType.wall.flags & (WALL_SCENERY_HAS_SECONDARY_COLOUR | WALL_SCENERY_HAS_TERNARY_COLOUR))
if (_legacyType.flags & (WALL_SCENERY_HAS_SECONDARY_COLOUR | WALL_SCENERY_HAS_TERNARY_COLOUR))
{
_legacyType.wall.flags |= WALL_SCENERY_HAS_PRIMARY_COLOUR;
_legacyType.wall.flags2 |= WALL_SCENERY_2_NO_SELECT_PRIMARY_COLOUR;
_legacyType.flags |= WALL_SCENERY_HAS_PRIMARY_COLOUR;
_legacyType.flags2 |= WALL_SCENERY_2_NO_SELECT_PRIMARY_COLOUR;
}
}
@@ -149,7 +149,7 @@ void WallObject::ReadJson(IReadObjectContext* context, json_t& root)
if (jDoorSound.is_number())
{
auto doorSound = Json::GetNumber<uint8_t>(jDoorSound);
_legacyType.wall.flags2 |= (doorSound << WALL_SCENERY_2_DOOR_SOUND_SHIFT) & WALL_SCENERY_2_DOOR_SOUND_MASK;
_legacyType.flags2 |= (doorSound << WALL_SCENERY_2_DOOR_SOUND_SHIFT) & WALL_SCENERY_2_DOOR_SOUND_MASK;
}
}