mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-25 07:44:38 +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

20
src/openrct2-ui/windows/Scenery.cpp
View File

@@ -306,11 +306,11 @@ void window_scenery_init()
// path bits
for (ObjectEntryIndex sceneryId = 0; sceneryId < MAX_PATH_ADDITION_OBJECTS; sceneryId++)
{
rct_scenery_entry* sceneryEntry = get_footpath_item_entry(sceneryId);
if (sceneryEntry == nullptr)
auto* pathBitEntry = get_footpath_item_entry(sceneryId);
if (pathBitEntry == nullptr)
continue;
init_scenery_entry({ SCENERY_TYPE_PATH_ITEM, sceneryId }, sceneryEntry->path_bit.scenery_tab_id);
init_scenery_entry({ SCENERY_TYPE_PATH_ITEM, sceneryId }, pathBitEntry->scenery_tab_id);
}
for (rct_widgetindex widgetIndex = WIDX_SCENERY_TAB_1; widgetIndex < WIDX_SCENERY_LIST; widgetIndex++)
@@ -828,7 +828,7 @@ static void window_scenery_update(rct_window* w)
}
else if (tabSelectedScenery.SceneryType == SCENERY_TYPE_PATH_ITEM)
{ // path bit
gCurrentToolId = static_cast<Tool>(get_footpath_item_entry(tabSelectedScenery.EntryIndex)->path_bit.tool_id);
gCurrentToolId = static_cast<Tool>(get_footpath_item_entry(tabSelectedScenery.EntryIndex)->tool_id);
}
else
{ // small scenery
@@ -1143,10 +1143,12 @@ void window_scenery_paint(rct_window* w, rct_drawpixelinfo* dpi)
name = sceneryEntry->name;
break;
case SCENERY_TYPE_PATH_ITEM:
sceneryEntry = get_footpath_item_entry(selectedSceneryEntry.EntryIndex);
price = sceneryEntry->path_bit.price;
name = sceneryEntry->name;
{
auto* pathBitEntry = get_footpath_item_entry(selectedSceneryEntry.EntryIndex);
price = pathBitEntry->price;
name = pathBitEntry->name;
break;
}
case SCENERY_TYPE_WALL:
{
auto* wallEntry = get_wall_entry(selectedSceneryEntry.EntryIndex);
@@ -1299,8 +1301,8 @@ void window_scenery_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t s
}
else if (currentSceneryGlobal.SceneryType == SCENERY_TYPE_PATH_ITEM)
{
sceneryEntry = get_footpath_item_entry(currentSceneryGlobal.EntryIndex);
uint32_t imageId = sceneryEntry->image;
auto* pathBitEntry = get_footpath_item_entry(currentSceneryGlobal.EntryIndex);
uint32_t imageId = pathBitEntry->image;
gfx_draw_sprite(&clipdpi, imageId, { 0x0B, 0x10 }, w->colours[1]);
}