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

Rename long flat to steep wooden support sprite ids

Browse Source
This commit is contained in:
mix
2025-10-11 18:03:11 +01:00
parent 5dffda6dba
commit ba1f5ffa2f
2 changed files with 54 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/openrct2/SpriteIds.h
View File

@@ -1640,9 +1640,12 @@ enum : ImageIndex
// G2 Supports
SPR_TRACKS_SUPPORT_WOODEN_TRUSS = SPR_TRACKS_GO_KARTS_END,
SPR_TRACKS_SUPPORT_WOODEN_MINE = SPR_TRACKS_SUPPORT_WOODEN_TRUSS + 32,
SPR_TRACKS_SUPPORT_END = SPR_TRACKS_SUPPORT_WOODEN_MINE + 32,
SPR_TRACKS_SUPPORT_BEGIN = SPR_TRACKS_GO_KARTS_END,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_FLAT_TO_STEEP = SPR_TRACKS_SUPPORT_BEGIN,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_STEEP_TO_FLAT = SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_FLAT_TO_STEEP + 16,
SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_FLAT_TO_STEEP = SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_STEEP_TO_FLAT + 16,
SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_STEEP_TO_FLAT = SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_FLAT_TO_STEEP + 16,
SPR_TRACKS_SUPPORT_END = SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_STEEP_TO_FLAT + 16,
// G2 New track types

80
src/openrct2/paint/support/WoodenSupports.cpp
View File

@@ -77,22 +77,30 @@ static constexpr ImagesByTransitionTypeArray WoodenCurveSupportImageIds0 = { {
{ 3505, 3506, 3507, 3508 }, // ?
{ 3509, 3510, 3511, 3512 }, // ?
{ 3513, 3513, 3513, 3513 }, // Large scenery
{ SPR_TRACKS_SUPPORT_WOODEN_TRUSS, SPR_TRACKS_SUPPORT_WOODEN_TRUSS + 1, SPR_TRACKS_SUPPORT_WOODEN_TRUSS + 2,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS + 3 }, // Flat to steep large 1
{ SPR_TRACKS_SUPPORT_WOODEN_TRUSS + 4, SPR_TRACKS_SUPPORT_WOODEN_TRUSS + 5, SPR_TRACKS_SUPPORT_WOODEN_TRUSS + 6,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS + 7 }, // Flat to steep large 2
{ SPR_TRACKS_SUPPORT_WOODEN_TRUSS + 8, SPR_TRACKS_SUPPORT_WOODEN_TRUSS + 9, SPR_TRACKS_SUPPORT_WOODEN_TRUSS + 10,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS + 11 }, // Flat to steep large 3
{ SPR_TRACKS_SUPPORT_WOODEN_TRUSS + 12, SPR_TRACKS_SUPPORT_WOODEN_TRUSS + 13, SPR_TRACKS_SUPPORT_WOODEN_TRUSS + 14,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS + 15 }, // Flat to steep large 4
{ SPR_TRACKS_SUPPORT_WOODEN_TRUSS + 16, SPR_TRACKS_SUPPORT_WOODEN_TRUSS + 17, SPR_TRACKS_SUPPORT_WOODEN_TRUSS + 18,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS + 19 }, // Steep to flat large 1
{ SPR_TRACKS_SUPPORT_WOODEN_TRUSS + 20, SPR_TRACKS_SUPPORT_WOODEN_TRUSS + 21, SPR_TRACKS_SUPPORT_WOODEN_TRUSS + 22,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS + 23 }, // Steep to flat large 2
{ SPR_TRACKS_SUPPORT_WOODEN_TRUSS + 24, SPR_TRACKS_SUPPORT_WOODEN_TRUSS + 25, SPR_TRACKS_SUPPORT_WOODEN_TRUSS + 26,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS + 27 }, // Steep to flat large 3
{ SPR_TRACKS_SUPPORT_WOODEN_TRUSS + 28, SPR_TRACKS_SUPPORT_WOODEN_TRUSS + 29, SPR_TRACKS_SUPPORT_WOODEN_TRUSS + 30,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS + 31 }, // Steep to flat large 4
{ SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_FLAT_TO_STEEP, SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_FLAT_TO_STEEP + 1,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_FLAT_TO_STEEP + 2,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_FLAT_TO_STEEP + 3 }, // flatToUp60DegLongBaseSeq0
{ SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_FLAT_TO_STEEP + 4, SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_FLAT_TO_STEEP + 5,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_FLAT_TO_STEEP + 6,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_FLAT_TO_STEEP + 7 }, // flatToUp60DegLongBaseSeq1
{ SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_FLAT_TO_STEEP + 8, SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_FLAT_TO_STEEP + 9,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_FLAT_TO_STEEP + 10,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_FLAT_TO_STEEP + 11 }, // flatToUp60DegLongBaseSeq2
{ SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_FLAT_TO_STEEP + 12, SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_FLAT_TO_STEEP + 13,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_FLAT_TO_STEEP + 14,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_FLAT_TO_STEEP + 15 }, // flatToUp60DegLongBaseSeq3
{ SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_STEEP_TO_FLAT, SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_STEEP_TO_FLAT + 1,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_STEEP_TO_FLAT + 2,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_STEEP_TO_FLAT + 3 }, // up60DegToFlatLongBaseSeq0
{ SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_STEEP_TO_FLAT + 4, SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_STEEP_TO_FLAT + 5,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_STEEP_TO_FLAT + 6,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_STEEP_TO_FLAT + 7 }, // up60DegToFlatLongBaseSeq1
{ SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_STEEP_TO_FLAT + 8, SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_STEEP_TO_FLAT + 9,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_STEEP_TO_FLAT + 10,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_STEEP_TO_FLAT + 11 }, // up60DegToFlatLongBaseSeq2
{ SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_STEEP_TO_FLAT + 12, SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_STEEP_TO_FLAT + 13,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_STEEP_TO_FLAT + 14,
SPR_TRACKS_SUPPORT_WOODEN_TRUSS_LONG_STEEP_TO_FLAT + 15 }, // up60DegToFlatLongBaseSeq3
} };
static constexpr ImagesByTransitionTypeArray WoodenCurveSupportImageIds1 = { {
@@ -109,22 +117,30 @@ static constexpr ImagesByTransitionTypeArray WoodenCurveSupportImageIds1 = { {
{ 3721, 3722, 3723, 3724 }, // ?
{ 3725, 3726, 3727, 3728 }, // ?
{ 3729, 3729, 3729, 3729 }, // Large scenery
{ SPR_TRACKS_SUPPORT_WOODEN_MINE, SPR_TRACKS_SUPPORT_WOODEN_MINE + 1, SPR_TRACKS_SUPPORT_WOODEN_MINE + 2,
SPR_TRACKS_SUPPORT_WOODEN_MINE + 3 }, // Flat to steep large 1
{ SPR_TRACKS_SUPPORT_WOODEN_MINE + 4, SPR_TRACKS_SUPPORT_WOODEN_MINE + 5, SPR_TRACKS_SUPPORT_WOODEN_MINE + 6,
SPR_TRACKS_SUPPORT_WOODEN_MINE + 7 }, // Flat to steep large 2
{ SPR_TRACKS_SUPPORT_WOODEN_MINE + 8, SPR_TRACKS_SUPPORT_WOODEN_MINE + 9, SPR_TRACKS_SUPPORT_WOODEN_MINE + 10,
SPR_TRACKS_SUPPORT_WOODEN_MINE + 11 }, // Flat to steep large 3
{ SPR_TRACKS_SUPPORT_WOODEN_MINE + 12, SPR_TRACKS_SUPPORT_WOODEN_MINE + 13, SPR_TRACKS_SUPPORT_WOODEN_MINE + 14,
SPR_TRACKS_SUPPORT_WOODEN_MINE + 15 }, // Flat to steep large 4
{ SPR_TRACKS_SUPPORT_WOODEN_MINE + 16, SPR_TRACKS_SUPPORT_WOODEN_MINE + 17, SPR_TRACKS_SUPPORT_WOODEN_MINE + 18,
SPR_TRACKS_SUPPORT_WOODEN_MINE + 19 }, // Steep to flat large 1
{ SPR_TRACKS_SUPPORT_WOODEN_MINE + 20, SPR_TRACKS_SUPPORT_WOODEN_MINE + 21, SPR_TRACKS_SUPPORT_WOODEN_MINE + 22,
SPR_TRACKS_SUPPORT_WOODEN_MINE + 23 }, // Steep to flat large 2
{ SPR_TRACKS_SUPPORT_WOODEN_MINE + 24, SPR_TRACKS_SUPPORT_WOODEN_MINE + 25, SPR_TRACKS_SUPPORT_WOODEN_MINE + 26,
SPR_TRACKS_SUPPORT_WOODEN_MINE + 27 }, // Steep to flat large 3
{ SPR_TRACKS_SUPPORT_WOODEN_MINE + 28, SPR_TRACKS_SUPPORT_WOODEN_MINE + 29, SPR_TRACKS_SUPPORT_WOODEN_MINE + 30,
SPR_TRACKS_SUPPORT_WOODEN_MINE + 31 }, // Steep to flat large 4
{ SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_FLAT_TO_STEEP, SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_FLAT_TO_STEEP + 1,
SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_FLAT_TO_STEEP + 2,
SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_FLAT_TO_STEEP + 3 }, // flatToUp60DegLongBaseSeq0
{ SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_FLAT_TO_STEEP + 4, SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_FLAT_TO_STEEP + 5,
SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_FLAT_TO_STEEP + 6,
SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_FLAT_TO_STEEP + 7 }, // flatToUp60DegLongBaseSeq1
{ SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_FLAT_TO_STEEP + 8, SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_FLAT_TO_STEEP + 9,
SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_FLAT_TO_STEEP + 10,
SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_FLAT_TO_STEEP + 11 }, // flatToUp60DegLongBaseSeq2
{ SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_FLAT_TO_STEEP + 12, SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_FLAT_TO_STEEP + 13,
SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_FLAT_TO_STEEP + 14,
SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_FLAT_TO_STEEP + 15 }, // flatToUp60DegLongBaseSeq3
{ SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_STEEP_TO_FLAT, SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_STEEP_TO_FLAT + 1,
SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_STEEP_TO_FLAT + 2,
SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_STEEP_TO_FLAT + 3 }, // up60DegToFlatLongBaseSeq0
{ SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_STEEP_TO_FLAT + 4, SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_STEEP_TO_FLAT + 5,
SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_STEEP_TO_FLAT + 6,
SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_STEEP_TO_FLAT + 7 }, // up60DegToFlatLongBaseSeq1
{ SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_STEEP_TO_FLAT + 8, SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_STEEP_TO_FLAT + 9,
SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_STEEP_TO_FLAT + 10,
SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_STEEP_TO_FLAT + 11 }, // up60DegToFlatLongBaseSeq2
{ SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_STEEP_TO_FLAT + 12, SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_STEEP_TO_FLAT + 13,
SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_STEEP_TO_FLAT + 14,
SPR_TRACKS_SUPPORT_WOODEN_MINE_LONG_STEEP_TO_FLAT + 15 }, // up60DegToFlatLongBaseSeq3
} };
// clang-format off