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

Use constexpr where applicable in HybridCoaster.cpp

This commit is contained in:
ζeh Matt 2021-08-26 22:54:35 +03:00
parent de747919c9
commit 5dd277fc0d
No known key found for this signature in database
GPG Key ID: 18CE582C71A225B0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/openrct2/ride/coaster/HybridCoaster.cpp
View File

@ -447,13 +447,13 @@ namespace HybridRC
{ 24, 6, height + 8 },
{ 4, 6, height + 8 },
};
static const CoordsXYZ boundBoxLengths[4] = {
static constexpr CoordsXYZ boundBoxLengths[4] = {
{ 2, 20, 31 },
{ 2, 20, 31 },
{ 2, 20, 31 },
{ 2, 20, 31 },
};
static const uint32_t imageIds[4] = {
static constexpr uint32_t imageIds[4] = {
SPR_G2_HYBRID_TRACK_VERTICAL + 8,
SPR_G2_HYBRID_TRACK_VERTICAL + 9,
SPR_G2_HYBRID_TRACK_VERTICAL + 10,
@ -492,13 +492,13 @@ namespace HybridRC
{ 24, 6, height },
{ 0, 6, height },
};
static const CoordsXYZ boundBoxLengths[4] = {
static constexpr CoordsXYZ boundBoxLengths[4] = {
{ 32, 20, 3 },
{ 2, 20, 55 },
{ 2, 20, 55 },
{ 32, 20, 3 },
};
static const uint32_t imageIds[4] = {
static constexpr uint32_t imageIds[4] = {
SPR_G2_HYBRID_TRACK_VERTICAL + 0,
SPR_G2_HYBRID_TRACK_VERTICAL + 1,
SPR_G2_HYBRID_TRACK_VERTICAL + 2,
@ -543,13 +543,13 @@ namespace HybridRC
{ 24, 6, height + 8 },
{ 0, 6, height + 8 },
};
static const CoordsXYZ boundBoxLengths[4] = {
static constexpr CoordsXYZ boundBoxLengths[4] = {
{ 32, 20, 3 },
{ 2, 20, 31 },
{ 2, 20, 31 },
{ 32, 20, 3 },
};
static const uint32_t imageIds[4] = {
static constexpr uint32_t imageIds[4] = {
SPR_G2_HYBRID_TRACK_VERTICAL + 4,
SPR_G2_HYBRID_TRACK_VERTICAL + 5,
SPR_G2_HYBRID_TRACK_VERTICAL + 6,