From 1de7cb433e496ef8ed25a6e9e5f2b6d3a85a710f Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Tue, 23 Jul 2024 13:28:59 +0200 Subject: [PATCH] Introduce sub-tabs for scenery-related object types --- src/openrct2-ui/windows/EditorObjectSelection.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp index b2eaeb92fa..292d89a7a1 100644 --- a/src/openrct2-ui/windows/EditorObjectSelection.cpp +++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp @@ -161,6 +161,13 @@ namespace OpenRCT2::Ui::Windows { STR_SHOPS_STALLS_TIP, ObjectType::Ride, FILTER_RIDE_STALL, SPR_TAB_RIDES_SHOP_0, 28, 4 }, }; + static ObjectSubTab kSceneryObjectSubTabs[] = { + { STR_OBJECT_SELECTION_SCENERY_GROUPS, ObjectType::SceneryGroup, FILTER_NONE, SPR_TAB_SCENERY_STATUES, 1, 1 }, + { STR_OBJECT_SELECTION_SMALL_SCENERY, ObjectType::SmallScenery, FILTER_NONE, SPR_TAB_SCENERY_TREES, 1, 1 }, + { STR_OBJECT_SELECTION_LARGE_SCENERY, ObjectType::LargeScenery, FILTER_NONE, SPR_TAB_SCENERY_URBAN, 1, 1 }, + { STR_OBJECT_SELECTION_WALLS_FENCES, ObjectType::Walls, FILTER_NONE, SPR_TAB_SCENERY_WALLS, 1, 1 }, + }; + static ObjectSubTab kPathObjectSubTabs[] = { { STR_OBJECT_SELECTION_FOOTPATH_SURFACES, ObjectType::FootpathSurface, FILTER_NONE, SPR_G2_PATH_SURFACE_TAB, 1, 1 }, { STR_OBJECT_SELECTION_FOOTPATH_RAILINGS, ObjectType::FootpathRailings, FILTER_NONE, SPR_G2_PATH_RAILINGS_TAB, 1, 1 }, @@ -173,10 +180,7 @@ namespace OpenRCT2::Ui::Windows { STR_OBJECT_SELECTION_RIDE_VEHICLES_ATTRACTIONS, ObjectType::Ride, SPR_TAB_RIDE_16, ObjectPageFlags::hasSubTabs, kRideObjectSubTabs }, { STR_OBJECT_SELECTION_STATIONS, ObjectType::Station, SPR_G2_RIDE_STATION_TAB, ObjectPageFlags::isAdvanced, {} }, { STR_OBJECT_SELECTION_MUSIC, ObjectType::Music, SPR_TAB_MUSIC_0, ObjectPageFlags::isAdvanced, {} }, - { STR_OBJECT_SELECTION_SCENERY_GROUPS, ObjectType::SceneryGroup, SPR_TAB_SCENERY_STATUES, ObjectPageFlags::none , {} }, - { STR_OBJECT_SELECTION_SMALL_SCENERY, ObjectType::SmallScenery, SPR_TAB_SCENERY_TREES, ObjectPageFlags::isAdvanced, {} }, - { STR_OBJECT_SELECTION_LARGE_SCENERY, ObjectType::LargeScenery, SPR_TAB_SCENERY_URBAN, ObjectPageFlags::isAdvanced, {} }, - { STR_OBJECT_SELECTION_WALLS_FENCES, ObjectType::Walls, SPR_TAB_SCENERY_WALLS, ObjectPageFlags::isAdvanced, {} }, + { STR_OBJECT_SELECTION_SCENERY_GROUPS, ObjectType::SceneryGroup, SPR_TAB_SCENERY_STATUES, ObjectPageFlags::hasSubTabs, kSceneryObjectSubTabs }, { STR_OBJECT_SELECTION_FOOTPATH_SURFACES, ObjectType::FootpathSurface, SPR_G2_LEGACY_PATH_TAB, ObjectPageFlags::hasSubTabs, kPathObjectSubTabs }, { STR_OBJECT_SELECTION_PARK_ENTRANCE, ObjectType::ParkEntrance, SPR_TAB_PARK, ObjectPageFlags::none , {} }, { STR_OBJECT_SELECTION_TERRAIN_SURFACES, ObjectType::TerrainSurface, SPR_G2_TAB_LAND, ObjectPageFlags::isAdvanced, {} },