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

Remove static initialization in looping_rc_track_station

This commit is contained in:
ζeh Matt 2021-08-26 23:22:00 +03:00
parent 3c106f7e0f
commit 2a087a7eef
No known key found for this signature in database
GPG Key ID: 18CE582C71A225B0
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/openrct2/ride/coaster/LoopingRollerCoaster.cpp
View File

@ -82,15 +82,19 @@ static void looping_rc_track_station(
paint_session* session, const Ride* ride, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
const TrackElement& trackElement)
{
const uint32_t stationTrackNESW = is_csg_loaded() ? LOOPING_RC_BOOSTER_NE_SW : 15016;
const uint32_t stationTrackNWSE = is_csg_loaded() ? LOOPING_RC_BOOSTER_NW_SE : 15017;
static const uint32_t imageIds[4][2] = {
{ stationTrackNESW, SPR_STATION_BASE_B_SW_NE },
{ stationTrackNWSE, SPR_STATION_BASE_B_NW_SE },
{ stationTrackNESW, SPR_STATION_BASE_B_SW_NE },
{ stationTrackNWSE, SPR_STATION_BASE_B_NW_SE },
static constexpr uint32_t imageIdsWithCsg[4][2] = {
{ LOOPING_RC_BOOSTER_NE_SW, SPR_STATION_BASE_B_SW_NE },
{ LOOPING_RC_BOOSTER_NW_SE, SPR_STATION_BASE_B_NW_SE },
{ LOOPING_RC_BOOSTER_NE_SW, SPR_STATION_BASE_B_SW_NE },
{ LOOPING_RC_BOOSTER_NW_SE, SPR_STATION_BASE_B_NW_SE },
};
static constexpr uint32_t imageIdWithoutCsg[4][2] = {
{ 15016, SPR_STATION_BASE_B_SW_NE },
{ 15017, SPR_STATION_BASE_B_NW_SE },
{ 15016, SPR_STATION_BASE_B_SW_NE },
{ 15017, SPR_STATION_BASE_B_NW_SE },
};
const auto imageIds = is_csg_loaded() ? imageIdsWithCsg : imageIdWithoutCsg;
PaintAddImageAsParentRotated(
session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6,