mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add object selector icons for new tabs

This commit is contained in:
oli414 2021-12-03 20:36:46 +00:00
parent 5f9d03e9df
commit 2be6cb1408
8 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/g2/icons/legacy_path.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 475 B

BIN
resources/g2/icons/path_supports.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 387 B

BIN
resources/g2/icons/path_surface.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 399 B

BIN
resources/g2/icons/ride_station.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 449 B

BIN
resources/g2/icons/terrain_edge.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 564 B

25
resources/g2/sprites.json
View File

@ -479,8 +479,29 @@
"path": "icons/view.png"
},
{
"path": "icons/path_railings_tab.png",
"x_offset": 1
"path": "icons/path_supports.png",
"x_offset": 1,
"y_offset": 1
},
{
"path": "icons/legacy_path.png",
"x_offset": 1,
"y_offset": 1
},
{
"path": "icons/path_surface.png",
"x_offset": 1,
"y_offset": 1
},
{
"path": "icons/ride_station.png",
"x_offset": 5,
"y_offset": 1
},
{
"path": "icons/terrain_edge.png",
"x_offset": 1,
"y_offset": 1
},
{
"path": "font/latin/ae-uc-small.png",

8
src/openrct2-ui/windows/EditorObjectSelection.cpp
View File

@ -129,7 +129,7 @@ static constexpr const ObjectPageDesc ObjectSelectionPages[] = {
{ STR_OBJECT_SELECTION_LARGE_SCENERY, SPR_TAB_SCENERY_URBAN, true },
{ STR_OBJECT_SELECTION_WALLS_FENCES, SPR_TAB_SCENERY_WALLS, true },
{ STR_OBJECT_SELECTION_PATH_SIGNS, SPR_TAB_SCENERY_SIGNAGE, true },
{ STR_OBJECT_SELECTION_FOOTPATHS, SPR_TAB_SCENERY_PATHS, true },
{ STR_OBJECT_SELECTION_FOOTPATHS, SPR_G2_LEGACY_PATH_TAB, true },
{ STR_OBJECT_SELECTION_PATH_EXTRAS, SPR_TAB_SCENERY_PATH_ITEMS, false },
{ STR_OBJECT_SELECTION_SCENERY_GROUPS, SPR_TAB_SCENERY_STATUES, false },
{ STR_OBJECT_SELECTION_PARK_ENTRANCE, SPR_TAB_PARK, false },
@ -139,10 +139,10 @@ static constexpr const ObjectPageDesc ObjectSelectionPages[] = {
{ STR_NONE, static_cast<uint32_t>(SPR_NONE), false },
{ STR_OBJECT_SELECTION_TERRAIN_SURFACES, SPR_G2_TAB_LAND, true },
{ STR_OBJECT_SELECTION_TERRAIN_EDGES, SPR_G2_TAB_LAND, true },
{ STR_OBJECT_SELECTION_STATIONS, SPR_TAB_PARK, true },
{ STR_OBJECT_SELECTION_TERRAIN_EDGES, SPR_G2_TERRAIN_EDGE_TAB, true },
{ STR_OBJECT_SELECTION_STATIONS, SPR_G2_RIDE_STATION_TAB, true },
{ STR_OBJECT_SELECTION_MUSIC, SPR_TAB_MUSIC_0, false },
{ STR_OBJECT_SELECTION_FOOTPATH_SURFACES, SPR_TAB_SCENERY_PATHS, false },
{ STR_OBJECT_SELECTION_FOOTPATH_SURFACES, SPR_G2_PATH_SURFACE_TAB, false },
{ STR_OBJECT_SELECTION_FOOTPATH_RAILINGS, SPR_G2_PATH_RAILINGS_TAB, false },
};

6
src/openrct2/sprites.h
View File

@ -878,8 +878,12 @@ enum
SPR_G2_VIEW = SPR_G2_BEGIN + 137,
SPR_G2_PATH_RAILINGS_TAB = SPR_G2_BEGIN + 138,
SPR_G2_LEGACY_PATH_TAB = SPR_G2_BEGIN + 139,
SPR_G2_PATH_SURFACE_TAB = SPR_G2_BEGIN + 140,
SPR_G2_RIDE_STATION_TAB = SPR_G2_BEGIN + 141,
SPR_G2_TERRAIN_EDGE_TAB = SPR_G2_BEGIN + 142,
SPR_G2_CHAR_BEGIN = SPR_G2_BEGIN + 139,
SPR_G2_CHAR_BEGIN = SPR_G2_BEGIN + 143,
SPR_G2_AE_UPPER = SPR_G2_CHAR_BEGIN,
SPR_G2_AE_LOWER = SPR_G2_CHAR_BEGIN + 1,