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

Refactor PATH_BIT_DRAW_TYPE_LIGHTS to use strong enum (#14837)

Browse Source 
* Refactor PATH_BIT_DRAW_TYPE to use strong enum

* Rename PathBitDrawType members to be singular

* Remove whitespace and add trailing comma
This commit is contained in:
Jamie Quigley
2021-06-07 13:40:27 +01:00
committed by GitHub
parent cf7b277d89
commit 1d84bdca88
3 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,7 @@ void FootpathItemObject::ReadLegacy(IReadObjectContext* context, OpenRCT2::IStre
{
stream->Seek(6, OpenRCT2::STREAM_SEEK_CURRENT);
_legacyType.flags = stream->ReadValue<uint16_t>();
_legacyType.draw_type = stream->ReadValue<uint8_t>();
_legacyType.draw_type = static_cast<PathBitDrawType>(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;
@@ -85,17 +85,17 @@ void FootpathItemObject::DrawPreview(rct_drawpixelinfo* dpi, int32_t width, int3
gfx_draw_sprite(dpi, _legacyType.image, screenCoords - ScreenCoordsXY{ 22, 24 }, 0);
}
static uint8_t ParseDrawType(const std::string& s)
static PathBitDrawType ParseDrawType(const std::string& s)
{
if (s == "lamp")
return PATH_BIT_DRAW_TYPE_LIGHTS;
return PathBitDrawType::Light;
if (s == "bin")
return PATH_BIT_DRAW_TYPE_BINS;
return PathBitDrawType::Bin;
if (s == "bench")
return PATH_BIT_DRAW_TYPE_BENCHES;
return PathBitDrawType::Bench;
if (s == "fountain")
return PATH_BIT_DRAW_TYPE_JUMPING_FOUNTAINS;
return PATH_BIT_DRAW_TYPE_LIGHTS;
return PathBitDrawType::JumpingFountain;
return PathBitDrawType::Light;
}
void FootpathItemObject::ReadJson(IReadObjectContext* context, json_t& root)