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

Use const and constexpr whenever possible.

This commit is contained in:
ZehMatt 2018-01-11 14:50:31 +01:00 committed by Michał Janiszewski
parent 81398d9225
commit 84f2917f59
129 changed files with 2719 additions and 2719 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/openrct2-ui/CursorData.cpp
View File

@ -19,12 +19,12 @@
namespace OpenRCT2 { namespace Ui namespace OpenRCT2 { namespace Ui
{ {
static const CursorData BlankCursorData = static constexpr const CursorData BlankCursorData =
{ {
{ 0, 0 }, { 0 }, { 0 } { 0, 0 }, { 0 }, { 0 }
}; };
static const CursorData UpArrowCursorData = static constexpr const CursorData UpArrowCursorData =
{ {
{ 15, 0 }, { 15, 0 },
{ {
@ -49,7 +49,7 @@ namespace OpenRCT2 { namespace Ui
} }
}; };
static const CursorData UpDownArrowCursorData = static constexpr const CursorData UpDownArrowCursorData =
{ {
{ 7, 31 }, { 7, 31 },
{ {
@ -74,7 +74,7 @@ namespace OpenRCT2 { namespace Ui
} }
}; };
static const CursorData ZZZCursorData = static constexpr const CursorData ZZZCursorData =
{ {
{ 0, 0 }, { 0, 0 },
{ {
@ -99,7 +99,7 @@ namespace OpenRCT2 { namespace Ui
} }
}; };
static const CursorData DiagonalArrowCursorData = static constexpr const CursorData DiagonalArrowCursorData =
{ {
{ 0, 0 }, { 0, 0 },
{ {
@ -124,7 +124,7 @@ namespace OpenRCT2 { namespace Ui
} }
}; };
static const CursorData PickerArrowCursorData = static constexpr const CursorData PickerArrowCursorData =
{ {
{ 15, 31 }, { 15, 31 },
{ {
@ -149,7 +149,7 @@ namespace OpenRCT2 { namespace Ui
} }
}; };
static const CursorData TreeDownCursorData = static constexpr const CursorData TreeDownCursorData =
{ {
{ 7, 31 }, { 7, 31 },
{ {
@ -174,7 +174,7 @@ namespace OpenRCT2 { namespace Ui
} }
}; };
static const CursorData FountainDownCursorData = static constexpr const CursorData FountainDownCursorData =
{ {
{ 7, 31 }, { 7, 31 },
{ {
@ -199,7 +199,7 @@ namespace OpenRCT2 { namespace Ui
} }
}; };
static const CursorData StatueDownCursorData = static constexpr const CursorData StatueDownCursorData =
{ {
{ 7, 31 }, { 7, 31 },
{ {
@ -224,7 +224,7 @@ namespace OpenRCT2 { namespace Ui
} }
}; };
static const CursorData BenchDownCursorData = static constexpr const CursorData BenchDownCursorData =
{ {
{ 7, 31 }, { 7, 31 },
{ {
@ -249,7 +249,7 @@ namespace OpenRCT2 { namespace Ui
} }
}; };
static const CursorData CrossHairCursorData = static constexpr const CursorData CrossHairCursorData =
{ {
{ 15, 15 }, { 15, 15 },
{ {
@ -274,7 +274,7 @@ namespace OpenRCT2 { namespace Ui
} }
}; };
static const CursorData BinDownCursorData = static constexpr const CursorData BinDownCursorData =
{ {
{ 7, 31 }, { 7, 31 },
{ {
@ -299,7 +299,7 @@ namespace OpenRCT2 { namespace Ui
} }
}; };
static const CursorData LampPostDownCursorData = static constexpr const CursorData LampPostDownCursorData =
{ {
{ 7, 31 }, { 7, 31 },
{ {
@ -324,7 +324,7 @@ namespace OpenRCT2 { namespace Ui
} }
}; };
static const CursorData FenceDownCursorData = static constexpr const CursorData FenceDownCursorData =
{ {
{ 7, 31 }, { 7, 31 },
{ {
@ -349,7 +349,7 @@ namespace OpenRCT2 { namespace Ui
} }
}; };
static const CursorData FlowerDownCursorData = static constexpr const CursorData FlowerDownCursorData =
{ {
{ 7, 31 }, { 7, 31 },
{ {
@ -374,7 +374,7 @@ namespace OpenRCT2 { namespace Ui
} }
}; };
static const CursorData FootpathDownCursorData = static constexpr const CursorData FootpathDownCursorData =
{ {
{ 7, 31 }, { 7, 31 },
{ {
@ -399,7 +399,7 @@ namespace OpenRCT2 { namespace Ui
} }
}; };
static const CursorData DigDownCursorData = static constexpr const CursorData DigDownCursorData =
{ {
{ 7, 31 }, { 7, 31 },
{ {
@ -424,7 +424,7 @@ namespace OpenRCT2 { namespace Ui
} }
}; };
static const CursorData WaterDownCursorData = static constexpr const CursorData WaterDownCursorData =
{ {
{ 7, 31 }, { 7, 31 },
{ {
@ -449,7 +449,7 @@ namespace OpenRCT2 { namespace Ui
} }
}; };
static const CursorData HouseDownCursorData = static constexpr const CursorData HouseDownCursorData =
{ {
{ 7, 31 }, { 7, 31 },
{ {
@ -474,7 +474,7 @@ namespace OpenRCT2 { namespace Ui
} }
}; };
static const CursorData VolcanoDownCursorData = static constexpr const CursorData VolcanoDownCursorData =
{ {
{ 7, 31 }, { 7, 31 },
{ {
@ -499,7 +499,7 @@ namespace OpenRCT2 { namespace Ui
} }
}; };
static const CursorData WalkDownCursorData = static constexpr const CursorData WalkDownCursorData =
{ {
{ 7, 31 }, { 7, 31 },
{ {
@ -524,7 +524,7 @@ namespace OpenRCT2 { namespace Ui
} }
}; };
static const CursorData PaintDownCursorData = static constexpr const CursorData PaintDownCursorData =
{ {
{ 8, 30 }, { 8, 30 },
{ {
@ -549,7 +549,7 @@ namespace OpenRCT2 { namespace Ui
} }
}; };
static const CursorData EntranceDownCursorData = static constexpr const CursorData EntranceDownCursorData =
{ {
{ 7, 31 }, { 7, 31 },
{ {
@ -574,7 +574,7 @@ namespace OpenRCT2 { namespace Ui
} }
}; };
static const CursorData HandOpenDownCursorData = static constexpr const CursorData HandOpenDownCursorData =
{ {
{ 5, 1 }, { 5, 1 },
{ {
@ -599,7 +599,7 @@ namespace OpenRCT2 { namespace Ui
} }
}; };
static const CursorData HandClosedDownCursorData = static constexpr const CursorData HandClosedDownCursorData =
{ {
{ 5, 1 }, { 5, 1 },
{ {
@ -624,7 +624,7 @@ namespace OpenRCT2 { namespace Ui
} }
}; };
static const CursorData * RawCursorData[] = static constexpr const CursorData * RawCursorData[] =
{ {
nullptr, // CURSOR_ARROW nullptr, // CURSOR_ARROW
&BlankCursorData, // CURSOR_BLANK &BlankCursorData, // CURSOR_BLANK

2
src/openrct2-ui/UiContext.cpp
View File

@ -132,7 +132,7 @@ public:
void SetFullscreenMode(FULLSCREEN_MODE mode) override void SetFullscreenMode(FULLSCREEN_MODE mode) override
{ {
static const sint32 SDLFSFlags[] = { 0, SDL_WINDOW_FULLSCREEN, SDL_WINDOW_FULLSCREEN_DESKTOP }; static constexpr const sint32 SDLFSFlags[] = { 0, SDL_WINDOW_FULLSCREEN, SDL_WINDOW_FULLSCREEN_DESKTOP };
uint32 windowFlags = SDLFSFlags[(sint32)mode]; uint32 windowFlags = SDLFSFlags[(sint32)mode];
// HACK Changing window size when in fullscreen usually has no effect // HACK Changing window size when in fullscreen usually has no effect

2
src/openrct2-ui/input/MouseInput.cpp
View File

@ -1389,7 +1389,7 @@ void input_state_widget_pressed(sint32 x, sint32 y, sint32 state, rct_widgetinde
gDropdownLastColourHover = dropdown_index; gDropdownLastColourHover = dropdown_index;
window_tooltip_close(); window_tooltip_close();
static const rct_string_id colourTooltips[] = { static constexpr const rct_string_id colourTooltips[] = {
STR_COLOUR_BLACK_TIP, STR_COLOUR_BLACK_TIP,
STR_COLOUR_GREY_TIP, STR_COLOUR_GREY_TIP,
STR_COLOUR_WHITE_TIP, STR_COLOUR_WHITE_TIP,

2
src/openrct2-ui/windows/Banner.cpp
View File

@ -41,7 +41,7 @@ enum WINDOW_BANNER_WIDGET_IDX {
WIDX_TEXT_COLOUR_DROPDOWN_BUTTON WIDX_TEXT_COLOUR_DROPDOWN_BUTTON
}; };
static const rct_string_id BannerColouredTextFormats[] = { static constexpr const rct_string_id BannerColouredTextFormats[] = {
STR_TEXT_COLOR_BLACK, STR_TEXT_COLOR_BLACK,
STR_TEXT_COLOR_GREY, STR_TEXT_COLOR_GREY,
STR_TEXT_COLOR_WHITE, STR_TEXT_COLOR_WHITE,

2
src/openrct2-ui/windows/Cheats.cpp
View File

@ -40,7 +40,7 @@ enum {
WINDOW_CHEATS_PAGE_RIDES, WINDOW_CHEATS_PAGE_RIDES,
}; };
static const rct_string_id WeatherTypes[] = { static constexpr const rct_string_id WeatherTypes[] = {
STR_SUNNY, STR_SUNNY,
STR_PARTIALLY_CLOUDY, STR_PARTIALLY_CLOUDY,
STR_CLOUDY, STR_CLOUDY,

2
src/openrct2-ui/windows/EditorBottomToolbar.cpp
View File

@ -114,7 +114,7 @@ static EMPTY_ARGS_VOID_POINTER *next_button_mouseup_events[] = {
nullptr nullptr
}; };
static const rct_string_id EditorStepNames[] = { static constexpr const rct_string_id EditorStepNames[] = {
STR_EDITOR_STEP_OBJECT_SELECTION, STR_EDITOR_STEP_OBJECT_SELECTION,
STR_EDITOR_STEP_LANDSCAPE_EDITOR, STR_EDITOR_STEP_LANDSCAPE_EDITOR,
STR_EDITOR_STEP_INVENTIONS_LIST_SET_UP, STR_EDITOR_STEP_INVENTIONS_LIST_SET_UP,

2
src/openrct2-ui/windows/EditorInventionsList.cpp
View File

@ -155,7 +155,7 @@ static rct_window_event_list window_editor_inventions_list_drag_events = {
static rct_research_item *_editorInventionsListDraggedItem; static rct_research_item *_editorInventionsListDraggedItem;
static const rct_string_id EditorInventionsResearchCategories[] = { static constexpr const rct_string_id EditorInventionsResearchCategories[] = {
STR_RESEARCH_NEW_TRANSPORT_RIDES, STR_RESEARCH_NEW_TRANSPORT_RIDES,
STR_RESEARCH_NEW_GENTLE_RIDES, STR_RESEARCH_NEW_GENTLE_RIDES,
STR_RESEARCH_NEW_ROLLER_COASTERS, STR_RESEARCH_NEW_ROLLER_COASTERS,

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

@ -89,7 +89,7 @@ enum {
WINDOW_OBJECT_SELECTION_PAGE_COUNT WINDOW_OBJECT_SELECTION_PAGE_COUNT
}; };
static const rct_string_id ObjectSelectionPageNames[WINDOW_OBJECT_SELECTION_PAGE_COUNT] = { static constexpr const rct_string_id ObjectSelectionPageNames[WINDOW_OBJECT_SELECTION_PAGE_COUNT] = {
STR_OBJECT_SELECTION_RIDE_VEHICLES_ATTRACTIONS, STR_OBJECT_SELECTION_RIDE_VEHICLES_ATTRACTIONS,
STR_OBJECT_SELECTION_SMALL_SCENERY, STR_OBJECT_SELECTION_SMALL_SCENERY,
STR_OBJECT_SELECTION_LARGE_SCENERY, STR_OBJECT_SELECTION_LARGE_SCENERY,
@ -230,8 +230,8 @@ static rct_window_event_list window_editor_object_selection_events = {
#pragma endregion #pragma endregion
const sint32 window_editor_object_selection_animation_loops[] = { 20, 32, 10, 72, 24, 28, 16 }; static constexpr const sint32 window_editor_object_selection_animation_loops[] = { 20, 32, 10, 72, 24, 28, 16 };
const sint32 window_editor_object_selection_animation_divisor[] = { 4, 8, 2, 4, 4, 4, 2 }; static constexpr const sint32 window_editor_object_selection_animation_divisor[] = { 4, 8, 2, 4, 4, 4, 2 };
static void window_editor_object_set_page(rct_window *w, sint32 page); static void window_editor_object_set_page(rct_window *w, sint32 page);
static void window_editor_object_selection_set_pressed_tab(rct_window *w); static void window_editor_object_selection_set_pressed_tab(rct_window *w);

4
src/openrct2-ui/windows/EditorObjectiveOptions.cpp
View File

@ -36,14 +36,14 @@ enum {
WINDOW_EDITOR_OBJECTIVE_OPTIONS_PAGE_COUNT WINDOW_EDITOR_OBJECTIVE_OPTIONS_PAGE_COUNT
}; };
static const rct_string_id ClimateNames[] = { static constexpr const rct_string_id ClimateNames[] = {
STR_CLIMATE_COOL_AND_WET, STR_CLIMATE_COOL_AND_WET,
STR_CLIMATE_WARM, STR_CLIMATE_WARM,
STR_CLIMATE_HOT_AND_DRY, STR_CLIMATE_HOT_AND_DRY,
STR_CLIMATE_COLD, STR_CLIMATE_COLD,
}; };
static const rct_string_id ObjectiveDropdownOptionNames[] = { static constexpr const rct_string_id ObjectiveDropdownOptionNames[] = {
STR_OBJECTIVE_DROPDOWN_NONE, STR_OBJECTIVE_DROPDOWN_NONE,
STR_OBJECTIVE_DROPDOWN_NUMBER_OF_GUESTS_AT_A_GIVEN_DATE, STR_OBJECTIVE_DROPDOWN_NUMBER_OF_GUESTS_AT_A_GIVEN_DATE,
STR_OBJECTIVE_DROPDOWN_PARK_VALUE_AT_A_GIVEN_DATE, STR_OBJECTIVE_DROPDOWN_PARK_VALUE_AT_A_GIVEN_DATE,

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

@ -435,7 +435,7 @@ static rct_window_event_list *const _windowFinancesPageEvents[] =
(1ULL << WIDX_TAB_5) | \ (1ULL << WIDX_TAB_5) | \
(1ULL << WIDX_TAB_6)) (1ULL << WIDX_TAB_6))
static const uint32 WindowFinancesPageEnabledWidgets[] = static constexpr const uint32 WindowFinancesPageEnabledWidgets[] =
{ {
ALWAYS_ENABLED_WIDGETS | ALWAYS_ENABLED_WIDGETS |
(1ULL << WIDX_LOAN_INCREASE) | (1ULL << WIDX_LOAN_INCREASE) |
@ -467,7 +467,7 @@ static const uint32 WindowFinancesPageEnabledWidgets[] =
(1ULL << WIDX_SCENERY_AND_THEMING) (1ULL << WIDX_SCENERY_AND_THEMING)
}; };
static const uint32 WindowFinancesPageHoldDownWidgets[] = static constexpr const uint32 WindowFinancesPageHoldDownWidgets[] =
{ {
(1ULL << WIDX_LOAN_INCREASE) | (1ULL << WIDX_LOAN_INCREASE) |
(1ULL << WIDX_LOAN_DECREASE), (1ULL << WIDX_LOAN_DECREASE),
@ -481,12 +481,12 @@ static const uint32 WindowFinancesPageHoldDownWidgets[] =
#pragma endregion #pragma endregion
static const sint32 WindowFinancesTabAnimationLoops[] = static constexpr const sint32 WindowFinancesTabAnimationLoops[] =
{ {
16, 32, 32, 32, 38, 16 16, 32, 32, 32, 38, 16
}; };
static const rct_string_id window_finances_summary_row_labels[RCT_EXPENDITURE_TYPE_COUNT] = { static constexpr const rct_string_id window_finances_summary_row_labels[RCT_EXPENDITURE_TYPE_COUNT] = {
STR_FINANCES_SUMMARY_RIDE_CONSTRUCTION, STR_FINANCES_SUMMARY_RIDE_CONSTRUCTION,
STR_FINANCES_SUMMARY_RIDE_RUNNING_COSTS, STR_FINANCES_SUMMARY_RIDE_RUNNING_COSTS,
STR_FINANCES_SUMMARY_LAND_PURCHASE, STR_FINANCES_SUMMARY_LAND_PURCHASE,

4
src/openrct2-ui/windows/Footpath.cpp
View File

@ -160,7 +160,7 @@ static uint8 _lastUpdatedCameraRotation = UINT8_MAX;
static bool _footpathErrorOccured; static bool _footpathErrorOccured;
/** rct2: 0x0098D8B4 */ /** rct2: 0x0098D8B4 */
static const uint8 DefaultPathSlope[] = { static constexpr const uint8 DefaultPathSlope[] = {
0, 0,
SLOPE_IS_IRREGULAR_FLAG, SLOPE_IS_IRREGULAR_FLAG,
SLOPE_IS_IRREGULAR_FLAG, SLOPE_IS_IRREGULAR_FLAG,
@ -180,7 +180,7 @@ static const uint8 DefaultPathSlope[] = {
}; };
/** rct2: 0x0098D7E0 */ /** rct2: 0x0098D7E0 */
static const uint8 ConstructionPreviewImages[][4] = { static constexpr const uint8 ConstructionPreviewImages[][4] = {
{5, 10, 5, 10}, // Flat {5, 10, 5, 10}, // Flat
{16, 17, 18, 19}, // Upwards {16, 17, 18, 19}, // Upwards
{18, 19, 16, 17}, // Downwards {18, 19, 16, 17}, // Downwards

4
src/openrct2-ui/windows/GameBottomToolbar.cpp
View File

@ -464,14 +464,14 @@ static void window_game_bottom_toolbar_draw_left_panel(rct_drawpixelinfo *dpi, r
); );
} }
static const rct_string_id guestCountFormats[] = static constexpr const rct_string_id guestCountFormats[] =
{ {
STR_BOTTOM_TOOLBAR_NUM_GUESTS_STABLE, STR_BOTTOM_TOOLBAR_NUM_GUESTS_STABLE,
STR_BOTTOM_TOOLBAR_NUM_GUESTS_DECREASE, STR_BOTTOM_TOOLBAR_NUM_GUESTS_DECREASE,
STR_BOTTOM_TOOLBAR_NUM_GUESTS_INCREASE, STR_BOTTOM_TOOLBAR_NUM_GUESTS_INCREASE,
}; };
static const rct_string_id guestCountFormatsSingular[] = static constexpr const rct_string_id guestCountFormatsSingular[] =
{ {
STR_BOTTOM_TOOLBAR_NUM_GUESTS_STABLE_SINGULAR, STR_BOTTOM_TOOLBAR_NUM_GUESTS_STABLE_SINGULAR,
STR_BOTTOM_TOOLBAR_NUM_GUESTS_DECREASE_SINGULAR, STR_BOTTOM_TOOLBAR_NUM_GUESTS_DECREASE_SINGULAR,

4
src/openrct2-ui/windows/Guest.cpp
View File

@ -418,7 +418,7 @@ static rct_window_event_list *window_guest_page_events[] = {
void window_guest_set_colours(); void window_guest_set_colours();
// 0x981D3C // 0x981D3C
static const uint32 window_guest_page_enabled_widgets[] = { static constexpr const uint32 window_guest_page_enabled_widgets[] = {
(1 << WIDX_CLOSE) | (1 << WIDX_CLOSE) |
(1 << WIDX_TAB_1) | (1 << WIDX_TAB_1) |
(1 << WIDX_TAB_2) | (1 << WIDX_TAB_2) |
@ -1480,7 +1480,7 @@ void window_guest_stats_paint(rct_window *w, rct_drawpixelinfo *dpi)
gfx_draw_string_left(dpi, string_id, gCommonFormatArgs, COLOUR_BLACK, x + 4, y); gfx_draw_string_left(dpi, string_id, gCommonFormatArgs, COLOUR_BLACK, x + 4, y);
// Nausea tolerance // Nausea tolerance
static const rct_string_id nauseaTolerances[] = { static constexpr const rct_string_id nauseaTolerances[] = {
STR_PEEP_STAT_NAUSEA_TOLERANCE_NONE, STR_PEEP_STAT_NAUSEA_TOLERANCE_NONE,
STR_PEEP_STAT_NAUSEA_TOLERANCE_LOW, STR_PEEP_STAT_NAUSEA_TOLERANCE_LOW,
STR_PEEP_STAT_NAUSEA_TOLERANCE_AVERAGE, STR_PEEP_STAT_NAUSEA_TOLERANCE_AVERAGE,

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

@ -53,7 +53,7 @@ enum {
VIEW_COUNT VIEW_COUNT
}; };
static const rct_string_id pageNames[] = { static constexpr const rct_string_id pageNames[] = {
STR_PAGE_1, STR_PAGE_1,
STR_PAGE_2, STR_PAGE_2,
STR_PAGE_3, STR_PAGE_3,
@ -61,13 +61,13 @@ static const rct_string_id pageNames[] = {
STR_PAGE_5, STR_PAGE_5,
}; };
static const rct_string_id filterNames[] = { static constexpr const rct_string_id filterNames[] = {
STR_GUESTS_FILTER, STR_GUESTS_FILTER,
STR_GUESTS_FILTER_THINKING, STR_GUESTS_FILTER_THINKING,
STR_GUESTS_FILTER_THINKING_ABOUT, STR_GUESTS_FILTER_THINKING_ABOUT,
}; };
static const rct_string_id viewNames[VIEW_COUNT] = { static constexpr const rct_string_id viewNames[VIEW_COUNT] = {
STR_ACTIONS, STR_ACTIONS,
STR_THOUGHTS, STR_THOUGHTS,
}; };
@ -90,7 +90,7 @@ static rct_widget window_guest_list_widgets[] = {
{ WIDGETS_END }, { WIDGETS_END },
}; };
static const uint8 SUMMARISED_GUEST_ROW_HEIGHT = SCROLLABLE_ROW_HEIGHT + 11; static constexpr const uint8 SUMMARISED_GUEST_ROW_HEIGHT = SCROLLABLE_ROW_HEIGHT + 11;
static void window_guest_list_mouseup(rct_window *w, rct_widgetindex widgetIndex); static void window_guest_list_mouseup(rct_window *w, rct_widgetindex widgetIndex);
static void window_guest_list_resize(rct_window *w); static void window_guest_list_resize(rct_window *w);

14
src/openrct2-ui/windows/Map.cpp
View File

@ -101,7 +101,7 @@ static rct_widget window_map_widgets[] = {
// used in transforming viewport view coordinates to minimap coordinates // used in transforming viewport view coordinates to minimap coordinates
// rct2: 0x00981BBC // rct2: 0x00981BBC
const LocationXY16 MiniMapOffsets[] = { static constexpr const LocationXY16 MiniMapOffsets[] = {
{ 256 - 8, 0 }, { 256 - 8, 0 },
{ 512 - 8, 256 }, { 512 - 8, 256 },
{ 256 - 8, 512 }, { 256 - 8, 512 },
@ -109,7 +109,7 @@ const LocationXY16 MiniMapOffsets[] = {
}; };
/** rct2: 0x00981BCC */ /** rct2: 0x00981BCC */
static const uint16 RideKeyColours[] = { static constexpr const uint16 RideKeyColours[] = {
MAP_COLOUR(PALETTE_INDEX_61), // COLOUR_KEY_RIDE MAP_COLOUR(PALETTE_INDEX_61), // COLOUR_KEY_RIDE
MAP_COLOUR(PALETTE_INDEX_42), // COLOUR_KEY_FOOD MAP_COLOUR(PALETTE_INDEX_42), // COLOUR_KEY_FOOD
MAP_COLOUR(PALETTE_INDEX_20), // COLOUR_KEY_DRINK MAP_COLOUR(PALETTE_INDEX_20), // COLOUR_KEY_DRINK
@ -1434,8 +1434,8 @@ static void map_window_decrease_map_size()
gfx_invalidate_screen(); gfx_invalidate_screen();
} }
static const uint16 WaterColour = MAP_COLOUR(PALETTE_INDEX_195); static constexpr const uint16 WaterColour = MAP_COLOUR(PALETTE_INDEX_195);
static const uint16 TerrainColour[] = { static constexpr const uint16 TerrainColour[] = {
MAP_COLOUR(PALETTE_INDEX_73), // TERRAIN_GRASS MAP_COLOUR(PALETTE_INDEX_73), // TERRAIN_GRASS
MAP_COLOUR(PALETTE_INDEX_40), // TERRAIN_SAND MAP_COLOUR(PALETTE_INDEX_40), // TERRAIN_SAND
MAP_COLOUR(PALETTE_INDEX_108), // TERRAIN_DIRT MAP_COLOUR(PALETTE_INDEX_108), // TERRAIN_DIRT
@ -1452,7 +1452,7 @@ static const uint16 TerrainColour[] = {
MAP_COLOUR(PALETTE_INDEX_222), // TERRAIN_SAND_LIGHT MAP_COLOUR(PALETTE_INDEX_222), // TERRAIN_SAND_LIGHT
}; };
static const uint16 ElementTypeMaskColour[] = { static constexpr const uint16 ElementTypeMaskColour[] = {
0xFFFF, // TILE_ELEMENT_TYPE_SURFACE 0xFFFF, // TILE_ELEMENT_TYPE_SURFACE
0x0000, // TILE_ELEMENT_TYPE_PATH 0x0000, // TILE_ELEMENT_TYPE_PATH
0x00FF, // TILE_ELEMENT_TYPE_TRACK 0x00FF, // TILE_ELEMENT_TYPE_TRACK
@ -1464,7 +1464,7 @@ static const uint16 ElementTypeMaskColour[] = {
0x0000, // TILE_ELEMENT_TYPE_CORRUPT 0x0000, // TILE_ELEMENT_TYPE_CORRUPT
}; };
static const uint16 ElementTypeAddColour[] = { static constexpr const uint16 ElementTypeAddColour[] = {
MAP_COLOUR(PALETTE_INDEX_0), // TILE_ELEMENT_TYPE_SURFACE MAP_COLOUR(PALETTE_INDEX_0), // TILE_ELEMENT_TYPE_SURFACE
MAP_COLOUR(PALETTE_INDEX_17), // TILE_ELEMENT_TYPE_PATH MAP_COLOUR(PALETTE_INDEX_17), // TILE_ELEMENT_TYPE_PATH
MAP_COLOUR_2(PALETTE_INDEX_183, PALETTE_INDEX_0), // TILE_ELEMENT_TYPE_TRACK MAP_COLOUR_2(PALETTE_INDEX_183, PALETTE_INDEX_0), // TILE_ELEMENT_TYPE_TRACK
@ -1487,7 +1487,7 @@ enum {
COLOUR_KEY_TOILETS COLOUR_KEY_TOILETS
}; };
static const uint8 RideColourKey[] = { static constexpr const uint8 RideColourKey[] = {
COLOUR_KEY_RIDE, // RIDE_TYPE_SPIRAL_ROLLER_COASTER COLOUR_KEY_RIDE, // RIDE_TYPE_SPIRAL_ROLLER_COASTER
COLOUR_KEY_RIDE, // RIDE_TYPE_STAND_UP_ROLLER_COASTER COLOUR_KEY_RIDE, // RIDE_TYPE_STAND_UP_ROLLER_COASTER
COLOUR_KEY_RIDE, // RIDE_TYPE_SUSPENDED_SWINGING_COASTER COLOUR_KEY_RIDE, // RIDE_TYPE_SUSPENDED_SWINGING_COASTER

6
src/openrct2-ui/windows/MapGen.cpp
View File

@ -528,13 +528,13 @@ static uint64 PressedWidgets[WINDOW_MAPGEN_PAGE_COUNT] = {
#pragma endregion #pragma endregion
static const sint32 TabAnimationDivisor[WINDOW_MAPGEN_PAGE_COUNT] = { static constexpr const sint32 TabAnimationDivisor[WINDOW_MAPGEN_PAGE_COUNT] = {
1, 1, 1, 1 1, 1, 1, 1
}; };
static const sint32 TabAnimationFrames[WINDOW_MAPGEN_PAGE_COUNT] = { static constexpr const sint32 TabAnimationFrames[WINDOW_MAPGEN_PAGE_COUNT] = {
1, 1, 1, 1 1, 1, 1, 1
}; };
static const sint32 TabAnimationLoops[WINDOW_MAPGEN_PAGE_COUNT] = { static constexpr const sint32 TabAnimationLoops[WINDOW_MAPGEN_PAGE_COUNT] = {
16, 16, 16, 0 16, 16, 16, 0
}; };

6
src/openrct2-ui/windows/Multiplayer.cpp
View File

@ -106,7 +106,7 @@ static rct_widget *window_multiplayer_page_widgets[] = {
window_multiplayer_options_widgets window_multiplayer_options_widgets
}; };
const uint64 window_multiplayer_page_enabled_widgets[] = { static constexpr const uint64 window_multiplayer_page_enabled_widgets[] = {
(1 << WIDX_CLOSE) | (1 << WIDX_TAB1) | (1 << WIDX_TAB2) | (1 << WIDX_TAB3) | (1 << WIDX_TAB4), (1 << WIDX_CLOSE) | (1 << WIDX_TAB1) | (1 << WIDX_TAB2) | (1 << WIDX_TAB3) | (1 << WIDX_TAB4),
(1 << WIDX_CLOSE) | (1 << WIDX_TAB1) | (1 << WIDX_TAB2) | (1 << WIDX_TAB3) | (1 << WIDX_TAB4), (1 << WIDX_CLOSE) | (1 << WIDX_TAB1) | (1 << WIDX_TAB2) | (1 << WIDX_TAB3) | (1 << WIDX_TAB4),
(1 << WIDX_CLOSE) | (1 << WIDX_TAB1) | (1 << WIDX_TAB2) | (1 << WIDX_TAB3) | (1 << WIDX_TAB4) | (1 << WIDX_DEFAULT_GROUP) | (1 << WIDX_DEFAULT_GROUP_DROPDOWN) | (1 << WIDX_ADD_GROUP) | (1 << WIDX_REMOVE_GROUP) | (1 << WIDX_RENAME_GROUP) | (1 << WIDX_SELECTED_GROUP) | (1 << WIDX_SELECTED_GROUP_DROPDOWN), (1 << WIDX_CLOSE) | (1 << WIDX_TAB1) | (1 << WIDX_TAB2) | (1 << WIDX_TAB3) | (1 << WIDX_TAB4) | (1 << WIDX_DEFAULT_GROUP) | (1 << WIDX_DEFAULT_GROUP_DROPDOWN) | (1 << WIDX_ADD_GROUP) | (1 << WIDX_REMOVE_GROUP) | (1 << WIDX_RENAME_GROUP) | (1 << WIDX_SELECTED_GROUP) | (1 << WIDX_SELECTED_GROUP_DROPDOWN),
@ -281,8 +281,8 @@ static rct_window_event_list *window_multiplayer_page_events[] = {
&window_multiplayer_options_events &window_multiplayer_options_events
}; };
static const sint32 window_multiplayer_animation_divisor[] = { 4, 4, 2, 2 }; static constexpr const sint32 window_multiplayer_animation_divisor[] = { 4, 4, 2, 2 };
static const sint32 window_multiplayer_animation_frames[] = { 8, 8, 7, 4 }; static constexpr const sint32 window_multiplayer_animation_frames[] = { 8, 8, 7, 4 };
static void window_multiplayer_draw_tab_images(rct_window *w, rct_drawpixelinfo *dpi); static void window_multiplayer_draw_tab_images(rct_window *w, rct_drawpixelinfo *dpi);
static void window_multiplayer_set_page(rct_window* w, sint32 page); static void window_multiplayer_set_page(rct_window* w, sint32 page);

4
src/openrct2-ui/windows/MusicCredits.cpp
View File

@ -35,7 +35,7 @@ static rct_widget window_music_credits_widgets[] = {
{ WIDGETS_END }, { WIDGETS_END },
}; };
static const rct_string_id music_credits[] = { static constexpr const rct_string_id music_credits[] = {
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_MARCH_CHILDREN_OF_THE_REGIMENT, STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_MARCH_CHILDREN_OF_THE_REGIMENT,
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_HEYKENS_SERENADE, STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_HEYKENS_SERENADE,
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_IN_CONTINENTAL_MOOD, STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_IN_CONTINENTAL_MOOD,
@ -49,7 +49,7 @@ static const rct_string_id music_credits[] = {
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_BELLA_BELLA_BIMBA, STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_BELLA_BELLA_BIMBA,
}; };
static const rct_string_id music_credits_rct2[] = { static constexpr const rct_string_id music_credits_rct2[] = {
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_RCT2_TITLE_MUSIC, STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_RCT2_TITLE_MUSIC,
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_DODGEMS_BEAT, STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_DODGEMS_BEAT,
STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_MIS_SUMMERS_HEAT, STR_MUSIC_ACKNOWLEDGEMENTS_TRACK_MIS_SUMMERS_HEAT,

10
src/openrct2-ui/windows/NewRide.cpp
View File

@ -53,7 +53,7 @@ static ride_list_item _windowNewRideListItems[384];
* The order of ride types shown in the new ride window so that the order stays consistent across games and rides of the same * The order of ride types shown in the new ride window so that the order stays consistent across games and rides of the same
* type are kept together. * type are kept together.
*/ */
const char RideTypeViewOrder[] = { static constexpr const char RideTypeViewOrder[] = {
// Transport rides // Transport rides
RIDE_TYPE_MINIATURE_RAILWAY, RIDE_TYPE_MINIATURE_RAILWAY,
RIDE_TYPE_MONORAIL, RIDE_TYPE_MONORAIL,
@ -254,7 +254,7 @@ static rct_window_event_list window_new_ride_events = {
#pragma endregion #pragma endregion
static const rct_string_id window_new_ride_titles[WINDOW_NEW_RIDE_PAGE_COUNT] = { static constexpr const rct_string_id window_new_ride_titles[WINDOW_NEW_RIDE_PAGE_COUNT] = {
STR_NEW_TRANSPORT_RIDES, STR_NEW_TRANSPORT_RIDES,
STR_NEW_GENTLE_RIDES, STR_NEW_GENTLE_RIDES,
STR_NEW_ROLLER_COASTERS, STR_NEW_ROLLER_COASTERS,
@ -264,8 +264,8 @@ static const rct_string_id window_new_ride_titles[WINDOW_NEW_RIDE_PAGE_COUNT] =
STR_RESEARCH_AND_DEVELOPMENT, STR_RESEARCH_AND_DEVELOPMENT,
}; };
const sint32 window_new_ride_tab_animation_loops[] = { 20, 32, 10, 72, 24, 28, 16 }; static constexpr const sint32 window_new_ride_tab_animation_loops[] = { 20, 32, 10, 72, 24, 28, 16 };
const sint32 window_new_ride_tab_animation_divisor[] = { 4, 8, 2, 4, 4, 4, 2 }; static constexpr const sint32 window_new_ride_tab_animation_divisor[] = { 4, 8, 2, 4, 4, 4, 2 };
static void window_new_ride_set_page(rct_window *w, sint32 page); static void window_new_ride_set_page(rct_window *w, sint32 page);
static void window_new_ride_refresh_widget_sizing(rct_window *w); static void window_new_ride_refresh_widget_sizing(rct_window *w);
@ -642,7 +642,7 @@ static void window_new_ride_set_pressed_tab(rct_window *w)
w->pressed_widgets |= 1LL << (WIDX_TAB_1 + _windowNewRideCurrentTab); w->pressed_widgets |= 1LL << (WIDX_TAB_1 + _windowNewRideCurrentTab);
} }
const sint32 ThrillRidesTabAnimationSequence[] = { static constexpr const sint32 ThrillRidesTabAnimationSequence[] = {
5, 6, 5, 4, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 0, 0, 0 5, 6, 5, 4, 3, 2, 1, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 0, 0, 0
}; };

2
src/openrct2-ui/windows/NewsOptions.cpp
View File

@ -34,7 +34,7 @@ typedef struct notification_def {
size_t config_offset; size_t config_offset;
} notification_def; } notification_def;
static const notification_def NewsItemOptionDefinitions[] = { static constexpr const notification_def NewsItemOptionDefinitions[] = {
{ NOTIFICATION_CATEGORY_PARK, STR_NOTIFICATION_PARK_AWARD, offsetof(NotificationConfiguration, park_award) }, { NOTIFICATION_CATEGORY_PARK, STR_NOTIFICATION_PARK_AWARD, offsetof(NotificationConfiguration, park_award) },
{ NOTIFICATION_CATEGORY_PARK, STR_NOTIFICATION_PARK_MARKETING_CAMPAIGN_FINISHED, offsetof(NotificationConfiguration, park_marketing_campaign_finished) }, { NOTIFICATION_CATEGORY_PARK, STR_NOTIFICATION_PARK_MARKETING_CAMPAIGN_FINISHED, offsetof(NotificationConfiguration, park_marketing_campaign_finished) },
{ NOTIFICATION_CATEGORY_PARK, STR_NOTIFICATION_PARK_WARNINGS, offsetof(NotificationConfiguration, park_warnings) }, { NOTIFICATION_CATEGORY_PARK, STR_NOTIFICATION_PARK_WARNINGS, offsetof(NotificationConfiguration, park_warnings) },

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

@ -384,7 +384,7 @@ static rct_widget *window_options_page_widgets[] = {
#pragma endregion #pragma endregion
static const rct_string_id window_options_autosave_names[6] = { static constexpr const rct_string_id window_options_autosave_names[6] = {
STR_SAVE_EVERY_MINUTE, STR_SAVE_EVERY_MINUTE,
STR_SAVE_EVERY_5MINUTES, STR_SAVE_EVERY_5MINUTES,
STR_SAVE_EVERY_15MINUTES, STR_SAVE_EVERY_15MINUTES,
@ -393,19 +393,19 @@ static const rct_string_id window_options_autosave_names[6] = {
STR_SAVE_NEVER, STR_SAVE_NEVER,
}; };
static const rct_string_id window_options_title_music_names[] = { static constexpr const rct_string_id window_options_title_music_names[] = {
STR_OPTIONS_MUSIC_VALUE_NONE , STR_OPTIONS_MUSIC_VALUE_NONE ,
STR_ROLLERCOASTER_TYCOON_1_DROPDOWN , STR_ROLLERCOASTER_TYCOON_1_DROPDOWN ,
STR_ROLLERCOASTER_TYCOON_2_DROPDOWN , STR_ROLLERCOASTER_TYCOON_2_DROPDOWN ,
STR_OPTIONS_MUSIC_VALUE_RANDOM, STR_OPTIONS_MUSIC_VALUE_RANDOM,
}; };
static const rct_string_id window_options_scale_quality_names[] = { static constexpr const rct_string_id window_options_scale_quality_names[] = {
STR_SCALING_QUALITY_LINEAR, STR_SCALING_QUALITY_LINEAR,
STR_SCALING_QUALITY_SMOOTH_NN STR_SCALING_QUALITY_SMOOTH_NN
}; };
static const rct_string_id window_options_fullscreen_mode_names[] = { static constexpr const rct_string_id window_options_fullscreen_mode_names[] = {
STR_OPTIONS_DISPLAY_WINDOWED, STR_OPTIONS_DISPLAY_WINDOWED,
STR_OPTIONS_DISPLAY_FULLSCREEN, STR_OPTIONS_DISPLAY_FULLSCREEN,
STR_OPTIONS_DISPLAY_FULLSCREEN_BORDERLESS, STR_OPTIONS_DISPLAY_FULLSCREEN_BORDERLESS,

2
src/openrct2-ui/windows/Park.cpp
View File

@ -523,7 +523,7 @@ typedef struct window_park_award {
uint32 sprite; uint32 sprite;
} window_park_award; } window_park_award;
static const window_park_award ParkAwards[] = { static constexpr const window_park_award ParkAwards[] = {
{ STR_AWARD_MOST_UNTIDY, SPR_AWARD_MOST_UNTIDY }, { STR_AWARD_MOST_UNTIDY, SPR_AWARD_MOST_UNTIDY },
{ STR_AWARD_MOST_TIDY, SPR_AWARD_MOST_TIDY }, { STR_AWARD_MOST_TIDY, SPR_AWARD_MOST_TIDY },
{ STR_AWARD_BEST_ROLLERCOASTERS, SPR_AWARD_BEST_ROLLERCOASTERS }, { STR_AWARD_BEST_ROLLERCOASTERS, SPR_AWARD_BEST_ROLLERCOASTERS },

4
src/openrct2-ui/windows/Research.cpp
View File

@ -210,7 +210,7 @@ static uint32 window_research_page_enabled_widgets[] = {
const sint32 window_research_tab_animation_loops[] = { 16, 16 }; const sint32 window_research_tab_animation_loops[] = { 16, 16 };
static const rct_string_id ResearchCategoryNames[] = { static constexpr const rct_string_id ResearchCategoryNames[] = {
STR_RESEARCH_CATEGORY_TRANSPORT, STR_RESEARCH_CATEGORY_TRANSPORT,
STR_RESEARCH_CATEGORY_GENTLE, STR_RESEARCH_CATEGORY_GENTLE,
STR_RESEARCH_CATEGORY_ROLLERCOASTER, STR_RESEARCH_CATEGORY_ROLLERCOASTER,
@ -220,7 +220,7 @@ static const rct_string_id ResearchCategoryNames[] = {
STR_RESEARCH_CATEGORY_SCENERYSET, STR_RESEARCH_CATEGORY_SCENERYSET,
}; };
static const rct_string_id ResearchStageNames[] = { static constexpr const rct_string_id ResearchStageNames[] = {
STR_RESEARCH_STAGE_INITIAL_RESEARCH, STR_RESEARCH_STAGE_INITIAL_RESEARCH,
STR_RESEARCH_STAGE_DESIGNING, STR_RESEARCH_STAGE_DESIGNING,
STR_RESEARCH_STAGE_COMPLETING_DESIGN, STR_RESEARCH_STAGE_COMPLETING_DESIGN,

34
src/openrct2-ui/windows/Ride.cpp
View File

@ -399,7 +399,7 @@ static rct_widget *window_ride_page_widgets[] = {
(1ULL << WIDX_TAB_9) | \ (1ULL << WIDX_TAB_9) | \
(1ULL << WIDX_TAB_10) (1ULL << WIDX_TAB_10)
const uint64 window_ride_page_enabled_widgets[] = { static constexpr const uint64 window_ride_page_enabled_widgets[] = {
MAIN_RIDE_ENABLED_WIDGETS | MAIN_RIDE_ENABLED_WIDGETS |
(1ULL << WIDX_VIEW) | (1ULL << WIDX_VIEW) |
(1ULL << WIDX_VIEW_DROPDOWN) | (1ULL << WIDX_VIEW_DROPDOWN) |
@ -493,7 +493,7 @@ const uint64 window_ride_page_enabled_widgets[] = {
(1ULL << WIDX_SHOW_GUESTS_QUEUING), (1ULL << WIDX_SHOW_GUESTS_QUEUING),
}; };
const uint64 window_ride_page_hold_down_widgets[] = { static constexpr const uint64 window_ride_page_hold_down_widgets[] = {
(1ULL << WIDX_RIDE_TYPE_INCREASE) | (1ULL << WIDX_RIDE_TYPE_INCREASE) |
(1ULL << WIDX_RIDE_TYPE_DECREASE), (1ULL << WIDX_RIDE_TYPE_DECREASE),
(1ULL << WIDX_VEHICLE_TRAINS_INCREASE) | (1ULL << WIDX_VEHICLE_TRAINS_INCREASE) |
@ -971,10 +971,10 @@ typedef struct ride_overall_view_t {
static ride_overall_view ride_overall_views[MAX_RIDES] = {0}; static ride_overall_view ride_overall_views[MAX_RIDES] = {0};
const sint32 window_ride_tab_animation_divisor[] = { 0, 0, 2, 2, 4, 2, 8, 8, 2, 0 }; static constexpr const sint32 window_ride_tab_animation_divisor[] = { 0, 0, 2, 2, 4, 2, 8, 8, 2, 0 };
const sint32 window_ride_tab_animation_frames[] = { 0, 0, 4, 16, 8, 16, 8, 8, 8, 0 }; static constexpr const sint32 window_ride_tab_animation_frames[] = { 0, 0, 4, 16, 8, 16, 8, 8, 8, 0 };
static const rct_string_id RatingNames[] = { static constexpr const rct_string_id RatingNames[] = {
STR_RATING_LOW, STR_RATING_LOW,
STR_RATING_MEDIUM, STR_RATING_MEDIUM,
STR_RATING_HIGH, STR_RATING_HIGH,
@ -983,7 +983,7 @@ static const rct_string_id RatingNames[] = {
STR_RATING_ULTRA_EXTREME, STR_RATING_ULTRA_EXTREME,
}; };
static const rct_string_id RideBreakdownReasonNames[] = { static constexpr const rct_string_id RideBreakdownReasonNames[] = {
STR_RIDE_BREAKDOWN_SAFETY_CUT_OUT , STR_RIDE_BREAKDOWN_SAFETY_CUT_OUT ,
STR_RIDE_BREAKDOWN_RESTRAINTS_STUCK_CLOSED, STR_RIDE_BREAKDOWN_RESTRAINTS_STUCK_CLOSED,
STR_RIDE_BREAKDOWN_RESTRAINTS_STUCK_OPEN, STR_RIDE_BREAKDOWN_RESTRAINTS_STUCK_OPEN,
@ -994,14 +994,14 @@ static const rct_string_id RideBreakdownReasonNames[] = {
STR_RIDE_BREAKDOWN_CONTROL_FAILURE STR_RIDE_BREAKDOWN_CONTROL_FAILURE
}; };
static const rct_string_id ColourSchemeNames[] = { static constexpr const rct_string_id ColourSchemeNames[] = {
STR_MAIN_COLOUR_SCHEME, STR_MAIN_COLOUR_SCHEME,
STR_ALTERNATIVE_COLOUR_SCHEME_1, STR_ALTERNATIVE_COLOUR_SCHEME_1,
STR_ALTERNATIVE_COLOUR_SCHEME_2, STR_ALTERNATIVE_COLOUR_SCHEME_2,
STR_ALTERNATIVE_COLOUR_SCHEME_3, STR_ALTERNATIVE_COLOUR_SCHEME_3,
}; };
static const rct_string_id VehicleLoadNames[] = { static constexpr const rct_string_id VehicleLoadNames[] = {
STR_QUARTER_LOAD, STR_QUARTER_LOAD,
STR_HALF_LOAD, STR_HALF_LOAD,
STR_THREE_QUARTER_LOAD, STR_THREE_QUARTER_LOAD,
@ -1009,13 +1009,13 @@ static const rct_string_id VehicleLoadNames[] = {
STR_ANY_LOAD, STR_ANY_LOAD,
}; };
static const rct_string_id VehicleColourSchemeNames[] = { static constexpr const rct_string_id VehicleColourSchemeNames[] = {
STR_ALL_VEHICLES_IN_SAME_COLOURS , STR_ALL_VEHICLES_IN_SAME_COLOURS ,
STR_DIFFERENT_COLOURS_PER , STR_DIFFERENT_COLOURS_PER ,
STR_DIFFERENT_COLOURS_PER_VEHICLE , STR_DIFFERENT_COLOURS_PER_VEHICLE ,
}; };
static const rct_string_id VehicleStatusNames[] = { static constexpr const rct_string_id VehicleStatusNames[] = {
STR_MOVING_TO_END_OF, // VEHICLE_STATUS_MOVING_TO_END_OF_STATION STR_MOVING_TO_END_OF, // VEHICLE_STATUS_MOVING_TO_END_OF_STATION
STR_WAITING_FOR_PASSENGERS_AT, // VEHICLE_STATUS_WAITING_FOR_PASSENGERS STR_WAITING_FOR_PASSENGERS_AT, // VEHICLE_STATUS_WAITING_FOR_PASSENGERS
STR_WAITING_TO_DEPART, // VEHICLE_STATUS_WAITING_TO_DEPART STR_WAITING_TO_DEPART, // VEHICLE_STATUS_WAITING_TO_DEPART
@ -1049,7 +1049,7 @@ static const rct_string_id VehicleStatusNames[] = {
STR_STOPPED_BY_BLOCK_BRAKES, // VEHICLE_STATUS_STOPPED_BY_BLOCK_BRAKES STR_STOPPED_BY_BLOCK_BRAKES, // VEHICLE_STATUS_STOPPED_BY_BLOCK_BRAKES
}; };
static const rct_string_id SingleSessionVehicleStatusNames[] = { static constexpr const rct_string_id SingleSessionVehicleStatusNames[] = {
STR_STOPPING_0, // VEHICLE_STATUS_MOVING_TO_END_OF_STATION STR_STOPPING_0, // VEHICLE_STATUS_MOVING_TO_END_OF_STATION
STR_WAITING_FOR_PASSENGERS, // VEHICLE_STATUS_WAITING_FOR_PASSENGERS STR_WAITING_FOR_PASSENGERS, // VEHICLE_STATUS_WAITING_FOR_PASSENGERS
STR_WAITING_TO_START, // VEHICLE_STATUS_WAITING_TO_DEPART STR_WAITING_TO_START, // VEHICLE_STATUS_WAITING_TO_DEPART
@ -1059,7 +1059,7 @@ static const rct_string_id SingleSessionVehicleStatusNames[] = {
STR_UNLOADING_PASSENGERS, // VEHICLE_STATUS_UNLOADING_PASSENGERS STR_UNLOADING_PASSENGERS, // VEHICLE_STATUS_UNLOADING_PASSENGERS
}; };
static const rct_string_id MusicStyleNames[] = { static constexpr const rct_string_id MusicStyleNames[] = {
STR_MUSIC_STYLE_DODGEMS_BEAT, STR_MUSIC_STYLE_DODGEMS_BEAT,
STR_MUSIC_STYLE_FAIRGROUND_ORGAN, STR_MUSIC_STYLE_FAIRGROUND_ORGAN,
STR_MUSIC_STYLE_ROMAN_FANFARE, STR_MUSIC_STYLE_ROMAN_FANFARE,
@ -1100,7 +1100,7 @@ typedef struct window_ride_maze_design_option {
uint32 sprite; uint32 sprite;
} window_ride_maze_design_option; } window_ride_maze_design_option;
static const window_ride_maze_design_option MazeOptions[] = { static constexpr const window_ride_maze_design_option MazeOptions[] = {
{ STR_RIDE_DESIGN_MAZE_BRICK_WALLS, SPR_RIDE_DESIGN_PREVIEW_MAZE_BRICK_WALLS }, { STR_RIDE_DESIGN_MAZE_BRICK_WALLS, SPR_RIDE_DESIGN_PREVIEW_MAZE_BRICK_WALLS },
{ STR_RIDE_DESIGN_MAZE_HEDGES, SPR_RIDE_DESIGN_PREVIEW_MAZE_HEDGES }, { STR_RIDE_DESIGN_MAZE_HEDGES, SPR_RIDE_DESIGN_PREVIEW_MAZE_HEDGES },
{ STR_RIDE_DESIGN_MAZE_ICE_BLOCKS, SPR_RIDE_DESIGN_PREVIEW_MAZE_ICE_BLOCKS }, { STR_RIDE_DESIGN_MAZE_ICE_BLOCKS, SPR_RIDE_DESIGN_PREVIEW_MAZE_ICE_BLOCKS },
@ -1113,7 +1113,7 @@ typedef struct window_ride_colour_preview
uint32 supports; uint32 supports;
} window_ride_colour_preview; } window_ride_colour_preview;
static const window_ride_colour_preview TrackColourPreviews[] = { static constexpr const window_ride_colour_preview TrackColourPreviews[] = {
{ SPR_RIDE_DESIGN_PREVIEW_SPIRAL_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_SPIRAL_ROLLER_COASTER_SUPPORTS}, { SPR_RIDE_DESIGN_PREVIEW_SPIRAL_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_SPIRAL_ROLLER_COASTER_SUPPORTS},
{ SPR_RIDE_DESIGN_PREVIEW_STAND_UP_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_STAND_UP_ROLLER_COASTER_SUPPORTS}, { SPR_RIDE_DESIGN_PREVIEW_STAND_UP_ROLLER_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_STAND_UP_ROLLER_COASTER_SUPPORTS},
{ SPR_RIDE_DESIGN_PREVIEW_SUSPENDED_SWINGING_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_SUSPENDED_SWINGING_COASTER_SUPPORTS}, { SPR_RIDE_DESIGN_PREVIEW_SUSPENDED_SWINGING_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_SUSPENDED_SWINGING_COASTER_SUPPORTS},
@ -1215,7 +1215,7 @@ typedef struct rct_window_graphs_y_axis {
} rct_window_graphs_y_axis; } rct_window_graphs_y_axis;
/** rct2: 0x0098DD98 */ /** rct2: 0x0098DD98 */
static const rct_window_graphs_y_axis window_graphs_y_axi[] = { static constexpr const rct_window_graphs_y_axis window_graphs_y_axi[] = {
{11, 0, 10, STR_RIDE_STATS_VELOCITY_FORMAT}, // GRAPH_VELOCITY {11, 0, 10, STR_RIDE_STATS_VELOCITY_FORMAT}, // GRAPH_VELOCITY
{10, 0, 15, STR_RIDE_STATS_ALTITUDE_FORMAT}, // GRAPH_ALTITUDE {10, 0, 15, STR_RIDE_STATS_ALTITUDE_FORMAT}, // GRAPH_ALTITUDE
{13, -3, 1, STR_RIDE_STATS_G_FORCE_FORMAT}, // GRAPH_VERTICAL {13, -3, 1, STR_RIDE_STATS_G_FORCE_FORMAT}, // GRAPH_VERTICAL
@ -4039,7 +4039,7 @@ static void window_ride_maintenance_paint(rct_window *w, rct_drawpixelinfo *dpi)
#pragma region Colour #pragma region Colour
const uint8 window_ride_entrance_style_list[] = { static constexpr const uint8 window_ride_entrance_style_list[] = {
RIDE_ENTRANCE_STYLE_PLAIN, RIDE_ENTRANCE_STYLE_PLAIN,
RIDE_ENTRANCE_STYLE_CANVAS_TENT, RIDE_ENTRANCE_STYLE_CANVAS_TENT,
RIDE_ENTRANCE_STYLE_WOODEN, RIDE_ENTRANCE_STYLE_WOODEN,
@ -4705,7 +4705,7 @@ static void window_ride_colour_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi
#pragma region Music #pragma region Music
const uint8 MusicStyleOrder[] = { static constexpr const uint8 MusicStyleOrder[] = {
MUSIC_STYLE_GENTLE, MUSIC_STYLE_GENTLE,
MUSIC_STYLE_SUMMER, MUSIC_STYLE_SUMMER,
MUSIC_STYLE_WATER, MUSIC_STYLE_WATER,

4
src/openrct2-ui/windows/RideConstruction.cpp
View File

@ -183,7 +183,7 @@ static rct_window_event_list window_ride_construction_events = {
#pragma region RideConfigurationStringIds #pragma region RideConfigurationStringIds
// rct2: 0x00999492 // rct2: 0x00999492
static const rct_string_id RideConfigurationStringIds[] = { static constexpr const rct_string_id RideConfigurationStringIds[] = {
0, // 0 0, // 0
STR_STATION_PLATFORM, // 1 STR_STATION_PLATFORM, // 1
0, // 2 0, // 2
@ -486,7 +486,7 @@ static void ride_construction_tooldown_entrance_exit(sint32 screenX, sint32 scre
static uint8 _currentPossibleRideConfigurations[32]; static uint8 _currentPossibleRideConfigurations[32];
static const rct_string_id RideConstructionSeatAngleRotationStrings[] = { static constexpr const rct_string_id RideConstructionSeatAngleRotationStrings[] = {
STR_RIDE_CONSTRUCTION_SEAT_ROTATION_ANGLE_NEG_180, STR_RIDE_CONSTRUCTION_SEAT_ROTATION_ANGLE_NEG_180,
STR_RIDE_CONSTRUCTION_SEAT_ROTATION_ANGLE_NEG_135, STR_RIDE_CONSTRUCTION_SEAT_ROTATION_ANGLE_NEG_135,
STR_RIDE_CONSTRUCTION_SEAT_ROTATION_ANGLE_NEG_90, STR_RIDE_CONSTRUCTION_SEAT_ROTATION_ANGLE_NEG_90,

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

@ -137,7 +137,7 @@ enum {
DROPDOWN_LIST_COUNT DROPDOWN_LIST_COUNT
}; };
static const rct_string_id ride_info_type_string_mapping[DROPDOWN_LIST_COUNT] = { static constexpr const rct_string_id ride_info_type_string_mapping[DROPDOWN_LIST_COUNT] = {
STR_STATUS, STR_STATUS,
STR_POPULARITY, STR_POPULARITY,
STR_SATISFACTION, STR_SATISFACTION,
@ -155,13 +155,13 @@ static const rct_string_id ride_info_type_string_mapping[DROPDOWN_LIST_COUNT] =
STR_GUESTS_FAVOURITE STR_GUESTS_FAVOURITE
}; };
static const rct_string_id ride_list_statusbar_count_strings[PAGE_COUNT] = { static constexpr const rct_string_id ride_list_statusbar_count_strings[PAGE_COUNT] = {
STR_NUMBER_RIDES, STR_NUMBER_RIDES,
STR_NUMBER_SHOPS_AND_STALLS, STR_NUMBER_SHOPS_AND_STALLS,
STR_NUMBER_RESTROOMS_AND_INFORMATION_KIOSKS, STR_NUMBER_RESTROOMS_AND_INFORMATION_KIOSKS,
}; };
static const bool ride_info_type_money_mapping[DROPDOWN_LIST_COUNT] = { static constexpr const bool ride_info_type_money_mapping[DROPDOWN_LIST_COUNT] = {
false, false,
false, false,
false, false,
@ -179,7 +179,7 @@ static const bool ride_info_type_money_mapping[DROPDOWN_LIST_COUNT] = {
false false
}; };
static const rct_string_id page_names[] = { static constexpr const rct_string_id page_names[] = {
STR_RIDES, STR_RIDES,
STR_SHOPS_AND_STALLS, STR_SHOPS_AND_STALLS,
STR_RESTROOMS_AND_INFORMATION_KIOSKS, STR_RESTROOMS_AND_INFORMATION_KIOSKS,

2
src/openrct2-ui/windows/SavePrompt.cpp
View File

@ -64,7 +64,7 @@ static rct_widget window_quit_prompt_widgets[] = {
{ WIDGETS_END }, { WIDGETS_END },
}; };
static const rct_string_id window_save_prompt_labels[][2] = { static constexpr const rct_string_id window_save_prompt_labels[][2] = {
{ STR_LOAD_GAME_PROMPT_TITLE, STR_SAVE_BEFORE_LOADING }, { STR_LOAD_GAME_PROMPT_TITLE, STR_SAVE_BEFORE_LOADING },
{ STR_QUIT_GAME_PROMPT_TITLE, STR_SAVE_BEFORE_QUITTING }, { STR_QUIT_GAME_PROMPT_TITLE, STR_SAVE_BEFORE_QUITTING },
{ STR_QUIT_GAME_2_PROMPT_TITLE, STR_SAVE_BEFORE_QUITTING_2 }, { STR_QUIT_GAME_2_PROMPT_TITLE, STR_SAVE_BEFORE_QUITTING_2 },

2
src/openrct2-ui/windows/Staff.cpp
View File

@ -264,7 +264,7 @@ static rct_window_event_list *window_staff_page_events[] = {
&window_staff_stats_events &window_staff_stats_events
}; };
static const uint32 window_staff_page_enabled_widgets[] = { static constexpr const uint32 window_staff_page_enabled_widgets[] = {
(1 << WIDX_CLOSE) | (1 << WIDX_CLOSE) |
(1 << WIDX_TAB_1) | (1 << WIDX_TAB_1) |
(1 << WIDX_TAB_2) | (1 << WIDX_TAB_2) |

6
src/openrct2-ui/windows/StaffList.cpp
View File

@ -141,7 +141,7 @@ typedef struct staff_naming_convention
rct_string_id action_hire; rct_string_id action_hire;
} staff_naming_convention; } staff_naming_convention;
static const staff_naming_convention StaffNamingConvention[] = { static constexpr const staff_naming_convention StaffNamingConvention[] = {
{ STR_HANDYMAN_PLURAL, STR_HANDYMAN_SINGULAR, STR_HIRE_HANDYMAN }, { STR_HANDYMAN_PLURAL, STR_HANDYMAN_SINGULAR, STR_HIRE_HANDYMAN },
{ STR_MECHANIC_PLURAL, STR_MECHANIC_SINGULAR, STR_HIRE_MECHANIC }, { STR_MECHANIC_PLURAL, STR_MECHANIC_SINGULAR, STR_HIRE_MECHANIC },
{ STR_SECURITY_GUARD_PLURAL, STR_SECURITY_GUARD_SINGULAR, STR_HIRE_SECURITY_GUARD }, { STR_SECURITY_GUARD_PLURAL, STR_SECURITY_GUARD_SINGULAR, STR_HIRE_SECURITY_GUARD },
@ -616,14 +616,14 @@ void window_staff_list_paint(rct_window *w, rct_drawpixelinfo *dpi)
} }
/** rct2: 0x00992A08 */ /** rct2: 0x00992A08 */
static const uint32 staffOrderBaseSprites[] = { static constexpr const uint32 staffOrderBaseSprites[] = {
SPR_STAFF_ORDERS_SWEEPING, SPR_STAFF_ORDERS_SWEEPING,
SPR_STAFF_ORDERS_INSPECT_RIDES, SPR_STAFF_ORDERS_INSPECT_RIDES,
0, 0,
0, 0,
}; };
static const uint32 staffCostumeSprites[] = { static constexpr const uint32 staffCostumeSprites[] = {
SPR_STAFF_COSTUME_PANDA, SPR_STAFF_COSTUME_PANDA,
SPR_STAFF_COSTUME_TIGER, SPR_STAFF_COSTUME_TIGER,
SPR_STAFF_COSTUME_ELEPHANT, SPR_STAFF_COSTUME_ELEPHANT,

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

@ -270,10 +270,10 @@ static rct_windowclass *window_themes_tab_classes[] = {
static uint8 _selected_tab = 0; static uint8 _selected_tab = 0;
static sint16 _colour_index_1 = -1; static sint16 _colour_index_1 = -1;
static sint8 _colour_index_2 = -1; static sint8 _colour_index_2 = -1;
static const uint8 _row_height = 32; static constexpr const uint8 _row_height = 32;
static const uint8 _button_offset_x = 220; static constexpr const uint8 _button_offset_x = 220;
static const uint8 _button_offset_y = 3; static constexpr const uint8 _button_offset_y = 3;
static const uint8 _check_offset_y = 3 + 12 + 2; static constexpr const uint8 _check_offset_y = 3 + 12 + 2;
static void window_themes_init_vars() static void window_themes_init_vars()
{ {

10
src/openrct2-ui/windows/TileInspector.cpp
View File

@ -36,7 +36,7 @@
#include <openrct2/world/SmallScenery.h> #include <openrct2/world/SmallScenery.h>
#include <openrct2/world/TileInspector.h> #include <openrct2/world/TileInspector.h>
static const rct_string_id TerrainTypeStringIds[] = { static constexpr const rct_string_id TerrainTypeStringIds[] = {
STR_TILE_INSPECTOR_TERRAIN_GRASS, STR_TILE_INSPECTOR_TERRAIN_GRASS,
STR_TILE_INSPECTOR_TERRAIN_SAND, STR_TILE_INSPECTOR_TERRAIN_SAND,
STR_TILE_INSPECTOR_TERRAIN_DIRT, STR_TILE_INSPECTOR_TERRAIN_DIRT,
@ -55,7 +55,7 @@ static const rct_string_id TerrainTypeStringIds[] = {
STR_TILE_INSPECTOR_TERRAIN_UNDERGROUND_VIEW, STR_TILE_INSPECTOR_TERRAIN_UNDERGROUND_VIEW,
}; };
static const rct_string_id TerrainEdgeTypeStringIds[] = { static constexpr const rct_string_id TerrainEdgeTypeStringIds[] = {
STR_TILE_INSPECTOR_TERRAIN_EDGE_ROCK, STR_TILE_INSPECTOR_TERRAIN_EDGE_ROCK,
STR_TILE_INSPECTOR_TERRAIN_EDGE_WOOD_RED, STR_TILE_INSPECTOR_TERRAIN_EDGE_WOOD_RED,
STR_TILE_INSPECTOR_TERRAIN_EDGE_WOOD_BLACK, STR_TILE_INSPECTOR_TERRAIN_EDGE_WOOD_BLACK,
@ -63,19 +63,19 @@ static const rct_string_id TerrainEdgeTypeStringIds[] = {
}; };
static const rct_string_id EntranceTypeStringIds[] = { static constexpr const rct_string_id EntranceTypeStringIds[] = {
STR_TILE_INSPECTOR_ENTRANCE_TYPE_RIDE_ENTRANCE, STR_TILE_INSPECTOR_ENTRANCE_TYPE_RIDE_ENTRANCE,
STR_TILE_INSPECTOR_ENTRANCE_TYPE_RIDE_EXIT, STR_TILE_INSPECTOR_ENTRANCE_TYPE_RIDE_EXIT,
STR_TILE_INSPECTOR_ENTRANCE_TYPE_PARK_ENTRANC, STR_TILE_INSPECTOR_ENTRANCE_TYPE_PARK_ENTRANC,
}; };
static const rct_string_id ParkEntrancePartStringIds[] = { static constexpr const rct_string_id ParkEntrancePartStringIds[] = {
STR_TILE_INSPECTOR_ENTRANCE_MIDDLE, STR_TILE_INSPECTOR_ENTRANCE_MIDDLE,
STR_TILE_INSPECTOR_ENTRANCE_LEFT, STR_TILE_INSPECTOR_ENTRANCE_LEFT,
STR_TILE_INSPECTOR_ENTRANCE_RIGHT STR_TILE_INSPECTOR_ENTRANCE_RIGHT
}; };
static const rct_string_id WallSlopeStringIds[] = { static constexpr const rct_string_id WallSlopeStringIds[] = {
STR_TILE_INSPECTOR_WALL_FLAT, STR_TILE_INSPECTOR_WALL_FLAT,
STR_TILE_INSPECTOR_WALL_SLOPED_LEFT, STR_TILE_INSPECTOR_WALL_SLOPED_LEFT,
STR_TILE_INSPECTOR_WALL_SLOPED_RIGHT STR_TILE_INSPECTOR_WALL_SLOPED_RIGHT

4
src/openrct2-ui/windows/TitleScenarioSelect.cpp
View File

@ -84,7 +84,7 @@ static rct_widget window_scenarioselect_widgets[] = {
{ WIDGETS_END }, { WIDGETS_END },
}; };
static const rct_string_id ScenarioOriginStringIds[] = { static constexpr const rct_string_id ScenarioOriginStringIds[] = {
STR_SCENARIO_CATEGORY_RCT1, STR_SCENARIO_CATEGORY_RCT1,
STR_SCENARIO_CATEGORY_RCT1_AA, STR_SCENARIO_CATEGORY_RCT1_AA,
STR_SCENARIO_CATEGORY_RCT1_LL, STR_SCENARIO_CATEGORY_RCT1_LL,
@ -721,6 +721,6 @@ static bool is_locking_enabled(rct_window *w)
return false; return false;
if (_titleEditor) if (_titleEditor)
return false; return false;
return true; return true;
} }

4
src/openrct2-ui/windows/TopToolbar.cpp
View File

@ -153,7 +153,7 @@ enum {
#pragma region Toolbar_widget_ordering #pragma region Toolbar_widget_ordering
// from left to right // from left to right
static const sint32 left_aligned_widgets_order[] = { static constexpr const sint32 left_aligned_widgets_order[] = {
WIDX_PAUSE, WIDX_PAUSE,
WIDX_FASTFORWARD, WIDX_FASTFORWARD,
WIDX_FILE_MENU, WIDX_FILE_MENU,
@ -173,7 +173,7 @@ static const sint32 left_aligned_widgets_order[] = {
}; };
// from right to left // from right to left
static const sint32 right_aligned_widgets_order[] = { static constexpr const sint32 right_aligned_widgets_order[] = {
WIDX_NEWS, WIDX_NEWS,
WIDX_GUESTS, WIDX_GUESTS,
WIDX_STAFF, WIDX_STAFF,

2
src/openrct2/Context.cpp
View File

@ -187,7 +187,7 @@ namespace OpenRCT2
std::string GetPathLegacy(sint32 pathId) override std::string GetPathLegacy(sint32 pathId) override
{ {
static const char * const LegacyFileNames[PATH_ID_END] = static constexpr const char * const LegacyFileNames[PATH_ID_END] =
{ {
nullptr, nullptr,
nullptr, nullptr,

2
src/openrct2/Diagnostic.cpp
View File

@ -71,7 +71,7 @@ void diagnostic_log_with_location(DiagnosticLevel diagnosticLevel, const char *f
#else #else
static const char * _level_strings[] = { static constexpr const char * _level_strings[] = {
"FATAL", "FATAL",
"ERROR", "ERROR",
"WARNING", "WARNING",

18
src/openrct2/config/Config.cpp
View File

@ -45,14 +45,14 @@ namespace Config
{ {
#pragma region Enums #pragma region Enums
static auto Enum_MeasurementFormat = ConfigEnum<sint32>( static const auto Enum_MeasurementFormat = ConfigEnum<sint32>(
{ {
ConfigEnumEntry<sint32>("IMPERIAL", MEASUREMENT_FORMAT_IMPERIAL), ConfigEnumEntry<sint32>("IMPERIAL", MEASUREMENT_FORMAT_IMPERIAL),
ConfigEnumEntry<sint32>("METRIC", MEASUREMENT_FORMAT_METRIC), ConfigEnumEntry<sint32>("METRIC", MEASUREMENT_FORMAT_METRIC),
ConfigEnumEntry<sint32>("SI", MEASUREMENT_FORMAT_SI), ConfigEnumEntry<sint32>("SI", MEASUREMENT_FORMAT_SI),
}); });
static auto Enum_Currency = ConfigEnum<sint32>( static const auto Enum_Currency = ConfigEnum<sint32>(
{ {
ConfigEnumEntry<sint32>("GBP", CURRENCY_POUNDS), ConfigEnumEntry<sint32>("GBP", CURRENCY_POUNDS),
ConfigEnumEntry<sint32>("USD", CURRENCY_DOLLARS), ConfigEnumEntry<sint32>("USD", CURRENCY_DOLLARS),
@ -73,13 +73,13 @@ namespace Config
ConfigEnumEntry<sint32>("CUSTOM", CURRENCY_CUSTOM), ConfigEnumEntry<sint32>("CUSTOM", CURRENCY_CUSTOM),
}); });
static auto Enum_CurrencySymbolAffix = ConfigEnum<sint32>( static const auto Enum_CurrencySymbolAffix = ConfigEnum<sint32>(
{ {
ConfigEnumEntry<sint32>("PREFIX", CURRENCY_PREFIX), ConfigEnumEntry<sint32>("PREFIX", CURRENCY_PREFIX),
ConfigEnumEntry<sint32>("SUFFIX", CURRENCY_SUFFIX), ConfigEnumEntry<sint32>("SUFFIX", CURRENCY_SUFFIX),
}); });
static auto Enum_DateFormat = ConfigEnum<sint32>( static const auto Enum_DateFormat = ConfigEnum<sint32>(
{ {
ConfigEnumEntry<sint32>("DD/MM/YY", DATE_FORMAT_DAY_MONTH_YEAR), ConfigEnumEntry<sint32>("DD/MM/YY", DATE_FORMAT_DAY_MONTH_YEAR),
ConfigEnumEntry<sint32>("MM/DD/YY", DATE_FORMAT_MONTH_DAY_YEAR), ConfigEnumEntry<sint32>("MM/DD/YY", DATE_FORMAT_MONTH_DAY_YEAR),
@ -87,20 +87,20 @@ namespace Config
ConfigEnumEntry<sint32>("YY/DD/MM", DATE_FORMAT_YEAR_DAY_MONTH), ConfigEnumEntry<sint32>("YY/DD/MM", DATE_FORMAT_YEAR_DAY_MONTH),
}); });
static auto Enum_DrawingEngine = ConfigEnum<sint32>( static const auto Enum_DrawingEngine = ConfigEnum<sint32>(
{ {
ConfigEnumEntry<sint32>("SOFTWARE", DRAWING_ENGINE_SOFTWARE), ConfigEnumEntry<sint32>("SOFTWARE", DRAWING_ENGINE_SOFTWARE),
ConfigEnumEntry<sint32>("SOFTWARE_HWD", DRAWING_ENGINE_SOFTWARE_WITH_HARDWARE_DISPLAY), ConfigEnumEntry<sint32>("SOFTWARE_HWD", DRAWING_ENGINE_SOFTWARE_WITH_HARDWARE_DISPLAY),
ConfigEnumEntry<sint32>("OPENGL", DRAWING_ENGINE_OPENGL), ConfigEnumEntry<sint32>("OPENGL", DRAWING_ENGINE_OPENGL),
}); });
static auto Enum_Temperature = ConfigEnum<sint32>( static const auto Enum_Temperature = ConfigEnum<sint32>(
{ {
ConfigEnumEntry<sint32>("CELSIUS", TEMPERATURE_FORMAT_C), ConfigEnumEntry<sint32>("CELSIUS", TEMPERATURE_FORMAT_C),
ConfigEnumEntry<sint32>("FAHRENHEIT", TEMPERATURE_FORMAT_F), ConfigEnumEntry<sint32>("FAHRENHEIT", TEMPERATURE_FORMAT_F),
}); });
static auto Enum_ScaleQuality = ConfigEnum<sint32>( static const auto Enum_ScaleQuality = ConfigEnum<sint32>(
{ {
ConfigEnumEntry<sint32>("NEAREST_NEIGHBOUR", SCALE_QUALITY_NN), ConfigEnumEntry<sint32>("NEAREST_NEIGHBOUR", SCALE_QUALITY_NN),
ConfigEnumEntry<sint32>("LINEAR", SCALE_QUALITY_LINEAR), ConfigEnumEntry<sint32>("LINEAR", SCALE_QUALITY_LINEAR),
@ -599,7 +599,7 @@ namespace Config
{ {
log_verbose("config_find_rct2_path(...)"); log_verbose("config_find_rct2_path(...)");
static const utf8 * searchLocations[] = static constexpr const utf8 * searchLocations[] =
{ {
R"(C:\GOG Games\RollerCoaster Tycoon 2 Triple Thrill Pack)", R"(C:\GOG Games\RollerCoaster Tycoon 2 Triple Thrill Pack)",
R"(C:\Program Files\Atari\RollerCoaster Tycoon 2)", R"(C:\Program Files\Atari\RollerCoaster Tycoon 2)",

6
src/openrct2/config/ConfigEnum.hpp
View File

@ -46,12 +46,12 @@ template<typename T>
class ConfigEnum final : public IConfigEnum<T> class ConfigEnum final : public IConfigEnum<T>
{ {
private: private:
std::vector<ConfigEnumEntry<T>> _entries; const std::vector<ConfigEnumEntry<T>> _entries;
public: public:
ConfigEnum(std::initializer_list<ConfigEnumEntry<T>> entries) ConfigEnum(const std::initializer_list<ConfigEnumEntry<T>>& entries)
: _entries(entries)
{ {
_entries = entries;
} }
std::string GetName(T value) const override std::string GetName(T value) const override

8
src/openrct2/drawing/X8DrawingEngine.cpp
View File

@ -54,7 +54,7 @@ void X8RainDrawer::SetDPI(rct_drawpixelinfo * dpi)
void X8RainDrawer::Draw(sint32 x, sint32 y, sint32 width, sint32 height, sint32 xStart, sint32 yStart) void X8RainDrawer::Draw(sint32 x, sint32 y, sint32 width, sint32 height, sint32 xStart, sint32 yStart)
{ {
static const uint8 RainPattern[] = static constexpr const uint8 RainPattern[] =
{ {
32, 32, 0, 12, 0, 14, 0, 16, 255, 0, 255, 0, 255, 0, 255, 0, 255, 32, 32, 0, 12, 0, 14, 0, 16, 255, 0, 255, 0, 255, 0, 255, 0, 255,
0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0, 255, 0,
@ -497,7 +497,7 @@ void X8DrawingContext::Clear(uint8 paletteIndex)
/** rct2: 0x0097FF04 */ /** rct2: 0x0097FF04 */
// clang-format off // clang-format off
static const uint16 Pattern[] = { static constexpr const uint16 Pattern[] = {
0b0111111110000000, 0b0111111110000000,
0b0011111111000000, 0b0011111111000000,
0b0001111111100000, 0b0001111111100000,
@ -517,7 +517,7 @@ static const uint16 Pattern[] = {
}; };
/** rct2: 0x0097FF14 */ /** rct2: 0x0097FF14 */
static const uint16 PatternInverse[] = { static constexpr const uint16 PatternInverse[] = {
0b1000000001111111, 0b1000000001111111,
0b1100000000111111, 0b1100000000111111,
0b1110000000011111, 0b1110000000011111,
@ -537,7 +537,7 @@ static const uint16 PatternInverse[] = {
}; };
/** rct2: 0x0097FEFC */ /** rct2: 0x0097FEFC */
static const uint16 * Patterns[] = { static constexpr const uint16 * Patterns[] = {
Pattern, Pattern,
PatternInverse PatternInverse
}; };

8
src/openrct2/interface/Theme.cpp
View File

@ -113,7 +113,7 @@ struct WindowThemeDesc
#define THEME_WC(wc) wc, #wc #define THEME_WC(wc) wc, #wc
static const WindowThemeDesc WindowThemeDescriptors[] = static constexpr const WindowThemeDesc WindowThemeDescriptors[] =
{ {
// WindowClass, WindowClassSZ WindowName NumColours, DefaultTheme // WindowClass, WindowClassSZ WindowName NumColours, DefaultTheme
{ THEME_WC(WC_TOP_TOOLBAR), STR_THEMES_WINDOW_TOP_TOOLBAR, COLOURS_4(COLOUR_LIGHT_BLUE, COLOUR_DARK_GREEN, COLOUR_DARK_BROWN, COLOUR_GREY ) }, { THEME_WC(WC_TOP_TOOLBAR), STR_THEMES_WINDOW_TOP_TOOLBAR, COLOURS_4(COLOUR_LIGHT_BLUE, COLOUR_DARK_GREEN, COLOUR_DARK_BROWN, COLOUR_GREY ) },
@ -184,7 +184,7 @@ static const WindowThemeDesc WindowThemeDescriptors[] =
#define COLOURS_RCT1(c0, c1, c2, c3, c4, c5) { { (c0), (c1), (c2), (c3), (c4), (c5) } } #define COLOURS_RCT1(c0, c1, c2, c3, c4, c5) { { (c0), (c1), (c2), (c3), (c4), (c5) } }
static const UIThemeWindowEntry PredefinedThemeRCT1_Entries[] = static constexpr const UIThemeWindowEntry PredefinedThemeRCT1_Entries[] =
{ {
{ WC_TOP_TOOLBAR, COLOURS_RCT1(COLOUR_GREY, COLOUR_GREY, COLOUR_GREY, COLOUR_GREY, COLOUR_BLACK, COLOUR_BLACK) }, { WC_TOP_TOOLBAR, COLOURS_RCT1(COLOUR_GREY, COLOUR_GREY, COLOUR_GREY, COLOUR_GREY, COLOUR_BLACK, COLOUR_BLACK) },
{ WC_BOTTOM_TOOLBAR, COLOURS_RCT1(TRANSLUCENT(COLOUR_GREY), TRANSLUCENT(COLOUR_GREY), COLOUR_BLACK, COLOUR_YELLOW, COLOUR_BLACK, COLOUR_BLACK) }, { WC_BOTTOM_TOOLBAR, COLOURS_RCT1(TRANSLUCENT(COLOUR_GREY), TRANSLUCENT(COLOUR_GREY), COLOUR_BLACK, COLOUR_YELLOW, COLOUR_BLACK, COLOUR_BLACK) },
@ -207,7 +207,7 @@ static const UIThemeWindowEntry PredefinedThemeRCT1_Entries[] =
THEME_DEF_END THEME_DEF_END
}; };
static const UIThemeWindowEntry PredefinedThemeRCT2_Entries[] = static constexpr const UIThemeWindowEntry PredefinedThemeRCT2_Entries[] =
{ {
THEME_DEF_END THEME_DEF_END
}; };
@ -227,7 +227,7 @@ struct PredefinedTheme
rct_string_id Name; rct_string_id Name;
}; };
static const PredefinedTheme PredefinedThemes[] = { static constexpr const PredefinedTheme PredefinedThemes[] = {
{ &PredefinedThemeRCT1, STR_TITLE_SEQUENCE_RCT1 }, { &PredefinedThemeRCT1, STR_TITLE_SEQUENCE_RCT1 },
{ &PredefinedThemeRCT2, STR_TITLE_SEQUENCE_RCT2 } { &PredefinedThemeRCT2, STR_TITLE_SEQUENCE_RCT2 }
}; };

8
src/openrct2/management/Award.cpp
View File

@ -27,7 +27,7 @@
#define NEGATIVE 0 #define NEGATIVE 0
#define POSITIVE 1 #define POSITIVE 1
static const uint8 AwardPositiveMap[] = static constexpr const uint8 AwardPositiveMap[] =
{ {
NEGATIVE, // PARK_AWARD_MOST_UNTIDY NEGATIVE, // PARK_AWARD_MOST_UNTIDY
POSITIVE, // PARK_AWARD_MOST_TIDY POSITIVE, // PARK_AWARD_MOST_TIDY
@ -48,7 +48,7 @@ static const uint8 AwardPositiveMap[] =
POSITIVE, // PARK_AWARD_BEST_GENTLE_RIDES POSITIVE, // PARK_AWARD_BEST_GENTLE_RIDES
}; };
static const rct_string_id AwardNewsStrings[] = static constexpr const rct_string_id AwardNewsStrings[] =
{ {
STR_NEWS_ITEM_AWARD_MOST_UNTIDY, STR_NEWS_ITEM_AWARD_MOST_UNTIDY,
STR_NEWS_ITEM_MOST_TIDY, STR_NEWS_ITEM_MOST_TIDY,
@ -552,7 +552,7 @@ static bool award_is_deserved_best_custom_designed_rides(sint32 awardType, sint3
} }
/** At least 5 colourful rides and more than half of the rides are colourful. */ /** At least 5 colourful rides and more than half of the rides are colourful. */
static const uint8 dazzling_ride_colours[] = {5, 14, 20, 30}; static constexpr const uint8 dazzling_ride_colours[] = {5, 14, 20, 30};
static bool award_is_deserved_most_dazzling_ride_colours(sint32 awardType, sint32 activeAwardTypes) static bool award_is_deserved_most_dazzling_ride_colours(sint32 awardType, sint32 activeAwardTypes)
{ {
@ -642,7 +642,7 @@ static bool award_is_deserved_best_gentle_rides(sint32 awardType, sint32 activeA
typedef bool (* award_deserved_check)(sint32, sint32); typedef bool (* award_deserved_check)(sint32, sint32);
static const award_deserved_check _awardChecks[] = static constexpr const award_deserved_check _awardChecks[] =
{ {
award_is_deserved_most_untidy, award_is_deserved_most_untidy,
award_is_deserved_most_tidy, award_is_deserved_most_tidy,

2
src/openrct2/management/Finance.cpp
View File

@ -48,7 +48,7 @@ const money32 research_cost_table[RESEARCH_FUNDING_COUNT] =
MONEY(400, 00) // Maximum funding MONEY(400, 00) // Maximum funding
}; };
static const sint32 dword_988E60[RCT_EXPENDITURE_TYPE_COUNT] = {1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0}; static constexpr const sint32 dword_988E60[RCT_EXPENDITURE_TYPE_COUNT] = {1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0};
money32 gInitialCash; money32 gInitialCash;
money32 gCash; money32 gCash;

2
src/openrct2/management/Marketing.cpp
View File

@ -36,7 +36,7 @@ const money16 AdvertisingCampaignPricePerWeek[] =
MONEY(200, 00) // RIDE MONEY(200, 00) // RIDE
}; };
static const sint32 AdvertisingCampaignGuestGenerationProbabilities[] = {400, 300, 200, 200, 250, 200}; static constexpr const sint32 AdvertisingCampaignGuestGenerationProbabilities[] = {400, 300, 200, 200, 250, 200};
uint8 gMarketingCampaignDaysLeft[20]; uint8 gMarketingCampaignDaysLeft[20];
uint8 gMarketingCampaignRideIndex[22]; uint8 gMarketingCampaignRideIndex[22];

2
src/openrct2/management/Research.cpp
View File

@ -37,7 +37,7 @@
#include "../core/Memory.hpp" #include "../core/Memory.hpp"
#include "../util/Util.h" #include "../util/Util.h"
const sint32 _researchRate[] = {0, 160, 250, 400}; static constexpr const sint32 _researchRate[] = {0, 160, 250, 400};
uint8 gResearchFundingLevel; uint8 gResearchFundingLevel;
uint8 gResearchPriorities; uint8 gResearchPriorities;

2
src/openrct2/network/NetworkServerAdvertiser.cpp
View File

@ -229,7 +229,7 @@ private:
static std::string GenerateAdvertiseKey() static std::string GenerateAdvertiseKey()
{ {
// Generate a string of 16 random hex characters (64-integer key as a hex formatted string) // Generate a string of 16 random hex characters (64-integer key as a hex formatted string)
static const char hexChars[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' }; static constexpr const char hexChars[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
char key[17]; char key[17];
for (sint32 i = 0; i < 16; i++) for (sint32 i = 0; i < 16; i++)
{ {

2
src/openrct2/object/StringTable.cpp
View File

@ -22,7 +22,7 @@
#include "Object.h" #include "Object.h"
#include "StringTable.h" #include "StringTable.h"
static const uint8 RCT2ToOpenRCT2LanguageId[] = static constexpr const uint8 RCT2ToOpenRCT2LanguageId[] =
{ {
LANGUAGE_ENGLISH_UK, LANGUAGE_ENGLISH_UK,
LANGUAGE_ENGLISH_US, LANGUAGE_ENGLISH_US,

2
src/openrct2/paint/Paint.cpp
View File

@ -30,7 +30,7 @@ uint8 gClipHeight = 128; // Default to middle value
paint_session gPaintSession; paint_session gPaintSession;
static bool _paintSessionInUse; static bool _paintSessionInUse;
static const uint8 BoundBoxDebugColours[] = static constexpr const uint8 BoundBoxDebugColours[] =
{ {
0, // NONE 0, // NONE
102, // TERRAIN 102, // TERRAIN

80
src/openrct2/paint/Supports.cpp
View File

@ -21,7 +21,7 @@
/** rct2: 0x0097AF20, 0x0097AF21 */ /** rct2: 0x0097AF20, 0x0097AF21 */
// clang-format off // clang-format off
static const LocationXY8 loc_97AF20[] = { static constexpr const LocationXY8 loc_97AF20[] = {
{4, 4}, {4, 4},
{28, 4}, {28, 4},
{4, 28}, {4, 28},
@ -34,7 +34,7 @@ static const LocationXY8 loc_97AF20[] = {
}; };
/** rct2: 0x0097AF32 */ /** rct2: 0x0097AF32 */
static const uint8 _97AF32[] = { static constexpr const uint8 _97AF32[] = {
5, 2, 5, 2, 5, 2, 5, 2, 5, 2, 5, 2, 5, 2, 5, 2,
7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1,
6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3,
@ -77,7 +77,7 @@ static const uint8 _97AF32[] = {
}; };
/** rct2: 0x0097B052, 0x0097B053 */ /** rct2: 0x0097B052, 0x0097B053 */
static const LocationXY16 loc_97B052[] = { static constexpr const LocationXY16 loc_97B052[] = {
{-15, -1}, {-15, -1},
{0, -2}, {0, -2},
{-2, -1}, {-2, -1},
@ -89,7 +89,7 @@ static const LocationXY16 loc_97B052[] = {
}; };
/** rct2: 0x0097B062, 0x0097B063 */ /** rct2: 0x0097B062, 0x0097B063 */
static const LocationXY8 _97B062[] = { static constexpr const LocationXY8 _97B062[] = {
{ 18, 3 }, { 18, 3 },
{ 3, 18 }, { 3, 18 },
{ 18, 3 }, { 18, 3 },
@ -101,7 +101,7 @@ static const LocationXY8 _97B062[] = {
}; };
/** rct2: 0x0097B072 */ /** rct2: 0x0097B072 */
static const uint32 _metalSupportTypeToCrossbeamImages[][8] = { static constexpr const uint32 _metalSupportTypeToCrossbeamImages[][8] = {
{ 3370, 3371, 3370, 3371, 3372, 3373, 3372, 3373 }, // METAL_SUPPORTS_TUBES { 3370, 3371, 3370, 3371, 3372, 3373, 3372, 3373 }, // METAL_SUPPORTS_TUBES
{ 3374, 3375, 3374, 3375, 3376, 3377, 3376, 3377 }, // METAL_SUPPORTS_FORK { 3374, 3375, 3374, 3375, 3376, 3377, 3376, 3377 }, // METAL_SUPPORTS_FORK
{ 3374, 3375, 3374, 3375, 3376, 3377, 3376, 3377 }, // METAL_SUPPORTS_FORK_ALT { 3374, 3375, 3374, 3375, 3376, 3377, 3376, 3377 }, // METAL_SUPPORTS_FORK_ALT
@ -118,7 +118,7 @@ static const uint32 _metalSupportTypeToCrossbeamImages[][8] = {
}; };
/** rct2: 0x0097B142 */ /** rct2: 0x0097B142 */
static const uint8 supportTypeToHeight[] = { static constexpr const uint8 supportTypeToHeight[] = {
6, 6,
3, 3,
3, 3,
@ -140,7 +140,7 @@ typedef struct metal_supports_images {
} metal_supports_images; } metal_supports_images;
/** rct2: 0x0097B15C */ /** rct2: 0x0097B15C */
static const metal_supports_images _97B15C[] = { static constexpr const metal_supports_images _97B15C[] = {
{ 3243, 3209 }, { 3243, 3209 },
{ 3279, 3262 }, { 3279, 3262 },
{ 3298, 3262 }, { 3298, 3262 },
@ -157,7 +157,7 @@ static const metal_supports_images _97B15C[] = {
}; };
/** rct2: 0x0097B190 */ /** rct2: 0x0097B190 */
static const metal_supports_images _97B190[] = { static constexpr const metal_supports_images _97B190[] = {
{ 3243, 3226 }, // 3209 { 3243, 3226 }, // 3209
{ 3279, 3262 }, { 3279, 3262 },
{ 3298, 3262 }, { 3298, 3262 },
@ -174,7 +174,7 @@ static const metal_supports_images _97B190[] = {
}; };
/** rct2: 0x0097B404 */ /** rct2: 0x0097B404 */
static const uint8 metal_supports_slope_image_map[] = { static constexpr const uint8 metal_supports_slope_image_map[] = {
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 0,
0, 0, 0, 0, 0, 0, 0, 15, 0, 0, 0, 16, 0, 17, 18, 0, 0, 0, 0, 0, 0, 0, 0, 15, 0, 0, 0, 16, 0, 17, 18, 0,
}; };
@ -187,7 +187,7 @@ typedef struct supports_id_desc {
} supports_id_desc; } supports_id_desc;
/* 0x0097B1C4 */ /* 0x0097B1C4 */
static const supports_id_desc WoodenSupportImageIds[] = { static constexpr const supports_id_desc WoodenSupportImageIds[] = {
{ 3392, 3393, 3394, 3536 }, { 3392, 3393, 3394, 3536 },
{ 3390, 3391, 3394, 3514 }, { 3390, 3391, 3394, 3514 },
{ 3558, 3559, 3560, 3570 }, { 3558, 3559, 3560, 3570 },
@ -203,7 +203,7 @@ static const supports_id_desc WoodenSupportImageIds[] = {
}; };
/* 0x0097B224 */ /* 0x0097B224 */
static const uint16 WoodenCurveSupportImageIds[] = { static constexpr const uint16 WoodenCurveSupportImageIds[] = {
3465, 3465,
3465, 3465,
0, 0,
@ -234,7 +234,7 @@ typedef struct unk_supports_desc {
} unk_supports_desc; } unk_supports_desc;
/* 0x0097B23C */ /* 0x0097B23C */
static const unk_supports_desc byte_97B23C[] = { static constexpr const unk_supports_desc byte_97B23C[] = {
{{{0, 0, 0}, {1, 1, 8}}, 0, 1}, {{{0, 0, 0}, {1, 1, 8}}, 0, 1},
{{{0, 0, 0}, {1, 1, 8}}, 0, 1}, {{{0, 0, 0}, {1, 1, 8}}, 0, 1},
{{{0, 0, 0}, {1, 1, 8}}, 0, 1}, {{{0, 0, 0}, {1, 1, 8}}, 0, 1},
@ -287,7 +287,7 @@ static const unk_supports_desc byte_97B23C[] = {
}; };
/* 0x0098D8D4 */ /* 0x0098D8D4 */
static const unk_supports_desc byte_98D8D4[] = { static constexpr const unk_supports_desc byte_98D8D4[] = {
{{{0, 0, 0}, {1, 1, 4}}, 0, 1}, {{{0, 0, 0}, {1, 1, 4}}, 0, 1},
{{{0, 0, 0}, {1, 1, 4}}, 0, 1}, {{{0, 0, 0}, {1, 1, 4}}, 0, 1},
{{{0, 0, 0}, {1, 1, 4}}, 0, 1}, {{{0, 0, 0}, {1, 1, 4}}, 0, 1},
@ -295,7 +295,7 @@ static const unk_supports_desc byte_98D8D4[] = {
}; };
/* 0x0097B3C4 */ /* 0x0097B3C4 */
static const uint16 word_97B3C4[] = { static constexpr const uint16 word_97B3C4[] = {
0, 0,
0, 0,
1, 1,
@ -532,7 +532,7 @@ bool wooden_b_supports_paint_setup(paint_session * session, sint32 supportType,
} else { } else {
imageId += word_97B3C4[session->Support.slope & TILE_ELEMENT_SURFACE_SLOPE_MASK]; imageId += word_97B3C4[session->Support.slope & TILE_ELEMENT_SURFACE_SLOPE_MASK];
sub_98197C(session, sub_98197C(session,
imageId | imageColourFlags, imageId | imageColourFlags,
0, 0, 0, 0,
32, 32, 11, 32, 32, 11,
@ -542,7 +542,7 @@ bool wooden_b_supports_paint_setup(paint_session * session, sint32 supportType,
); );
baseHeight += 16; baseHeight += 16;
sub_98197C(session, sub_98197C(session,
(imageId + 4) | imageColourFlags, (imageId + 4) | imageColourFlags,
0, 0, 0, 0,
32, 32, 3, 32, 32, 3,
@ -568,7 +568,7 @@ bool wooden_b_supports_paint_setup(paint_session * session, sint32 supportType,
} else { } else {
imageId += word_97B3C4[session->Support.slope & TILE_ELEMENT_SURFACE_SLOPE_MASK]; imageId += word_97B3C4[session->Support.slope & TILE_ELEMENT_SURFACE_SLOPE_MASK];
sub_98197C(session, sub_98197C(session,
imageId | imageColourFlags, imageId | imageColourFlags,
0, 0, 0, 0,
32, 32, 3, 32, 32, 3,
@ -587,7 +587,7 @@ bool wooden_b_supports_paint_setup(paint_session * session, sint32 supportType,
if (heightSteps == 0) { if (heightSteps == 0) {
skipTo663004 = true; skipTo663004 = true;
} else { } else {
sub_98196C(session, sub_98196C(session,
WoodenSupportImageIds[supportType].flat | imageColourFlags, WoodenSupportImageIds[supportType].flat | imageColourFlags,
0, 0, 0, 0,
32, 32, 0, 32, 32, 0,
@ -601,7 +601,7 @@ bool wooden_b_supports_paint_setup(paint_session * session, sint32 supportType,
if (!skipTo663004) { if (!skipTo663004) {
while (heightSteps > 0) { while (heightSteps > 0) {
if (baseHeight & 0x10 || heightSteps == 1 || baseHeight + 16 == session->Unk141E9DC) { if (baseHeight & 0x10 || heightSteps == 1 || baseHeight + 16 == session->Unk141E9DC) {
sub_98196C(session, sub_98196C(session,
WoodenSupportImageIds[supportType].half | imageColourFlags, WoodenSupportImageIds[supportType].half | imageColourFlags,
0, 0, 0, 0,
32, 32, ((heightSteps == 1) ? 7 : 12), 32, 32, ((heightSteps == 1) ? 7 : 12),
@ -612,7 +612,7 @@ bool wooden_b_supports_paint_setup(paint_session * session, sint32 supportType,
baseHeight += 16; baseHeight += 16;
_9E32B1 = true; _9E32B1 = true;
} else { } else {
sub_98196C(session, sub_98196C(session,
WoodenSupportImageIds[supportType].full | imageColourFlags, WoodenSupportImageIds[supportType].full | imageColourFlags,
0, 0, 0, 0,
32, 32, ((heightSteps == 2) ? 23 : 28), 32, 32, ((heightSteps == 2) ? 23 : 28),
@ -638,7 +638,7 @@ bool wooden_b_supports_paint_setup(paint_session * session, sint32 supportType,
unk_supports_desc_bound_box boundBox = supportsDesc.bounding_box; unk_supports_desc_bound_box boundBox = supportsDesc.bounding_box;
if (supportsDesc.var_6 == 0 || session->WoodenSupportsPrependTo == nullptr) { if (supportsDesc.var_6 == 0 || session->WoodenSupportsPrependTo == nullptr) {
sub_98197C(session, sub_98197C(session,
imageId | imageColourFlags, imageId | imageColourFlags,
0, 0, 0, 0,
boundBox.length.x, boundBox.length.y, boundBox.length.z, boundBox.length.x, boundBox.length.y, boundBox.length.z,
@ -648,7 +648,7 @@ bool wooden_b_supports_paint_setup(paint_session * session, sint32 supportType,
); );
_9E32B1 = true; _9E32B1 = true;
} else { } else {
paint_struct * paintStruct = sub_98198C(session, paint_struct * paintStruct = sub_98198C(session,
imageId | imageColourFlags, imageId | imageColourFlags,
0, 0, 0, 0,
boundBox.length.x, boundBox.length.y, boundBox.length.z, boundBox.length.x, boundBox.length.y, boundBox.length.z,
@ -917,7 +917,7 @@ bool metal_b_supports_paint_setup(paint_session * session, uint8 supportType, ui
return true; // STC return true; // STC
} }
sub_98196C(session, sub_98196C(session,
_metalSupportTypeToCrossbeamImages[supportType][ebp] | imageColourFlags, _metalSupportTypeToCrossbeamImages[supportType][ebp] | imageColourFlags,
loc_97AF20[originalSegment].x + loc_97B052[ebp].x, loc_97AF20[originalSegment].y + loc_97B052[ebp].y, loc_97AF20[originalSegment].x + loc_97B052[ebp].x, loc_97AF20[originalSegment].y + loc_97B052[ebp].y,
_97B062[ebp].x, _97B062[ebp].y, 1, _97B062[ebp].x, _97B062[ebp].y, 1,
@ -936,7 +936,7 @@ bool metal_b_supports_paint_setup(paint_session * session, uint8 supportType, ui
uint32 imageOffset = metal_supports_slope_image_map[supportSegments[segment].slope & TILE_ELEMENT_SURFACE_SLOPE_MASK]; uint32 imageOffset = metal_supports_slope_image_map[supportSegments[segment].slope & TILE_ELEMENT_SURFACE_SLOPE_MASK];
uint32 imageId = _97B15C[supportType].base_id + imageOffset; uint32 imageId = _97B15C[supportType].base_id + imageOffset;
sub_98196C(session, sub_98196C(session,
imageId | imageColourFlags, imageId | imageColourFlags,
loc_97AF20[segment].x, loc_97AF20[segment].y, loc_97AF20[segment].x, loc_97AF20[segment].y,
0, 0, 5, 0, 0, 5,
@ -954,7 +954,7 @@ bool metal_b_supports_paint_setup(paint_session * session, uint8 supportType, ui
heightDiff -= baseHeight; heightDiff -= baseHeight;
if (heightDiff > 0) { if (heightDiff > 0) {
sub_98196C(session, sub_98196C(session,
(_97B15C[supportType].beam_id + (heightDiff - 1)) | imageColourFlags, (_97B15C[supportType].beam_id + (heightDiff - 1)) | imageColourFlags,
loc_97AF20[segment].x, loc_97AF20[segment].y, loc_97AF20[segment].x, loc_97AF20[segment].y,
0, 0, heightDiff - 1, 0, 0, heightDiff - 1,
@ -991,7 +991,7 @@ bool metal_b_supports_paint_setup(paint_session * session, uint8 supportType, ui
} }
} }
sub_98196C(session, sub_98196C(session,
imageId | imageColourFlags, imageId | imageColourFlags,
loc_97AF20[segment].x, loc_97AF20[segment].y, loc_97AF20[segment].x, loc_97AF20[segment].y,
0, 0, beamLength - 1, 0, 0, beamLength - 1,
@ -1021,7 +1021,7 @@ bool metal_b_supports_paint_setup(paint_session * session, uint8 supportType, ui
} }
uint32 imageId = _97B15C[supportType].beam_id + (beamLength - 1); uint32 imageId = _97B15C[supportType].beam_id + (beamLength - 1);
sub_98197C(session, sub_98197C(session,
imageId | imageColourFlags, imageId | imageColourFlags,
loc_97AF20[originalSegment].x, loc_97AF20[originalSegment].y, loc_97AF20[originalSegment].x, loc_97AF20[originalSegment].y,
0, 0, 0, 0, 0, 0,
@ -1076,7 +1076,7 @@ bool path_a_supports_paint_setup(paint_session * session, sint32 supportType, si
if (session->Support.slope & 0x20) { if (session->Support.slope & 0x20) {
//save dx2 //save dx2
sub_98196C(session, sub_98196C(session,
(pathEntry->bridge_image + 48) | imageColourFlags, (pathEntry->bridge_image + 48) | imageColourFlags,
0, 0, 0, 0,
32, 32, 0, 32, 32, 0,
@ -1093,7 +1093,7 @@ bool path_a_supports_paint_setup(paint_session * session, sint32 supportType, si
uint32 imageId = (supportType * 24) + word_97B3C4[session->Support.slope & TILE_ELEMENT_SURFACE_SLOPE_MASK] + pathEntry->bridge_image; uint32 imageId = (supportType * 24) + word_97B3C4[session->Support.slope & TILE_ELEMENT_SURFACE_SLOPE_MASK] + pathEntry->bridge_image;
sub_98197C(session, sub_98197C(session,
imageId | imageColourFlags, imageId | imageColourFlags,
0, 0, 0, 0,
32, 32, 11, 32, 32, 11,
@ -1103,7 +1103,7 @@ bool path_a_supports_paint_setup(paint_session * session, sint32 supportType, si
); );
baseHeight += 16; baseHeight += 16;
sub_98197C(session, sub_98197C(session,
(imageId + 4) | imageColourFlags, (imageId + 4) | imageColourFlags,
0, 0, 0, 0,
32, 32, 11, 32, 32, 11,
@ -1124,7 +1124,7 @@ bool path_a_supports_paint_setup(paint_session * session, sint32 supportType, si
uint32 ebx = (supportType * 24) + word_97B3C4[session->Support.slope & TILE_ELEMENT_SURFACE_SLOPE_MASK] + pathEntry->bridge_image; uint32 ebx = (supportType * 24) + word_97B3C4[session->Support.slope & TILE_ELEMENT_SURFACE_SLOPE_MASK] + pathEntry->bridge_image;
sub_98197C(session, sub_98197C(session,
ebx | imageColourFlags, ebx | imageColourFlags,
0, 0, 0, 0,
32, 32, 11, 32, 32, 11,
@ -1142,7 +1142,7 @@ bool path_a_supports_paint_setup(paint_session * session, sint32 supportType, si
uint32 imageId = (supportType * 24) + pathEntry->bridge_image + 23; uint32 imageId = (supportType * 24) + pathEntry->bridge_image + 23;
sub_98196C(session, sub_98196C(session,
imageId | imageColourFlags, imageId | imageColourFlags,
0, 0, 0, 0,
32, 32, ((heightSteps == 1) ? 7 : 12), 32, 32, ((heightSteps == 1) ? 7 : 12),
@ -1155,7 +1155,7 @@ bool path_a_supports_paint_setup(paint_session * session, sint32 supportType, si
} else { } else {
uint32 imageId = (supportType * 24) + pathEntry->bridge_image + 22; uint32 imageId = (supportType * 24) + pathEntry->bridge_image + 22;
sub_98196C(session, sub_98196C(session,
imageId | imageColourFlags, imageId | imageColourFlags,
0, 0, 0, 0,
32, 32, ((heightSteps == 2) ? 23 : 28), 32, 32, ((heightSteps == 2) ? 23 : 28),
@ -1177,7 +1177,7 @@ bool path_a_supports_paint_setup(paint_session * session, sint32 supportType, si
unk_supports_desc_bound_box boundBox = supportsDesc.bounding_box; unk_supports_desc_bound_box boundBox = supportsDesc.bounding_box;
if (supportsDesc.var_6 == 0 || session->WoodenSupportsPrependTo == nullptr) { if (supportsDesc.var_6 == 0 || session->WoodenSupportsPrependTo == nullptr) {
sub_98197C(session, sub_98197C(session,
imageId | imageColourFlags, imageId | imageColourFlags,
0, 0, 0, 0,
boundBox.length.y, boundBox.length.x, boundBox.length.z, boundBox.length.y, boundBox.length.x, boundBox.length.z,
@ -1187,7 +1187,7 @@ bool path_a_supports_paint_setup(paint_session * session, sint32 supportType, si
); );
hasSupports = true; hasSupports = true;
} else { } else {
paint_struct * paintStruct = sub_98198C(session, paint_struct * paintStruct = sub_98198C(session,
imageId | imageColourFlags, imageId | imageColourFlags,
0, 0, 0, 0,
boundBox.length.y, boundBox.length.x, boundBox.length.z, boundBox.length.y, boundBox.length.x, boundBox.length.z,
@ -1246,7 +1246,7 @@ bool path_b_supports_paint_setup(paint_session * session, sint32 segment, sint32
uint8 imageOffset = metal_supports_slope_image_map[supportSegments[segment].slope & TILE_ELEMENT_SURFACE_SLOPE_MASK]; uint8 imageOffset = metal_supports_slope_image_map[supportSegments[segment].slope & TILE_ELEMENT_SURFACE_SLOPE_MASK];
baseHeight = supportSegments[segment].height; baseHeight = supportSegments[segment].height;
sub_98196C(session, sub_98196C(session,
(pathEntry->bridge_image + 37 + imageOffset) | imageColourFlags, (pathEntry->bridge_image + 37 + imageOffset) | imageColourFlags,
loc_97AF20[segment].x, loc_97AF20[segment].y, loc_97AF20[segment].x, loc_97AF20[segment].y,
0, 0, 5, 0, 0, 5,
@ -1267,7 +1267,7 @@ bool path_b_supports_paint_setup(paint_session * session, sint32 segment, sint32
heightDiff -= baseHeight; heightDiff -= baseHeight;
if (heightDiff > 0) { if (heightDiff > 0) {
sub_98196C(session, sub_98196C(session,
(pathEntry->bridge_image + 20 + (heightDiff - 1)) | imageColourFlags, (pathEntry->bridge_image + 20 + (heightDiff - 1)) | imageColourFlags,
loc_97AF20[segment].x, loc_97AF20[segment].y, loc_97AF20[segment].x, loc_97AF20[segment].y,
0, 0, heightDiff - 1, 0, 0, heightDiff - 1,
@ -1299,7 +1299,7 @@ bool path_b_supports_paint_setup(paint_session * session, sint32 segment, sint32
break; break;
} }
sub_98196C(session, sub_98196C(session,
(pathEntry->bridge_image + 20 + (z - 1)) | imageColourFlags, (pathEntry->bridge_image + 20 + (z - 1)) | imageColourFlags,
loc_97AF20[segment].x, loc_97AF20[segment].y, loc_97AF20[segment].x, loc_97AF20[segment].y,
0, 0, (z - 1), 0, 0, (z - 1),
@ -1319,7 +1319,7 @@ bool path_b_supports_paint_setup(paint_session * session, sint32 segment, sint32
imageId += 1; imageId += 1;
} }
sub_98196C(session, sub_98196C(session,
imageId | imageColourFlags, imageId | imageColourFlags,
loc_97AF20[segment].x, loc_97AF20[segment].y, loc_97AF20[segment].x, loc_97AF20[segment].y,
0, 0, (z - 1), 0, 0, (z - 1),
@ -1349,7 +1349,7 @@ bool path_b_supports_paint_setup(paint_session * session, sint32 segment, sint32
} }
uint32 imageId = pathEntry->bridge_image + 20 + (z - 1); uint32 imageId = pathEntry->bridge_image + 20 + (z - 1);
sub_98197C(session, sub_98197C(session,
imageId | imageColourFlags, imageId | imageColourFlags,
loc_97AF20[segment].x, loc_97AF20[segment].y, loc_97AF20[segment].x, loc_97AF20[segment].y,
0, 0, 0, 0, 0, 0,

4
src/openrct2/paint/sprite/Litter.cpp
View File

@ -51,7 +51,7 @@ typedef struct litter_sprite {
} litter_sprite; } litter_sprite;
/** rct2: 0x0097EF6C */ /** rct2: 0x0097EF6C */
static const litter_sprite litter_sprites[] = { static constexpr const litter_sprite litter_sprites[] = {
{ SPR_LITTER_SICK, 0x1 }, { SPR_LITTER_SICK, 0x1 },
{ SPR_LITTER_SICK_ALT, 0x1 }, { SPR_LITTER_SICK_ALT, 0x1 },
{ SPR_LITTER_EMPTY_CAN, 0x1 }, { SPR_LITTER_EMPTY_CAN, 0x1 },
@ -84,7 +84,7 @@ void litter_paint(paint_session * session, rct_litter *litter, sint32 imageDirec
imageDirection &= litter_sprites[litter->type].direction_mask; imageDirection &= litter_sprites[litter->type].direction_mask;
uint32 image_id = imageDirection + litter_sprites[litter->type].base_id; uint32 image_id = imageDirection + litter_sprites[litter->type].base_id;
// In the following call to sub_98197C, we add 4 (instead of 2) to the // In the following call to sub_98197C, we add 4 (instead of 2) to the
// bound_box_offset_z to make sure litter is drawn on top of railways // bound_box_offset_z to make sure litter is drawn on top of railways
sub_98197C(session, image_id, 0, 0, 4, 4, -1, litter->z, -4, -4, litter->z + 4, get_current_rotation()); sub_98197C(session, image_id, 0, 0, 4, 4, -1, litter->z, -4, -4, litter->z + 4, get_current_rotation());

2
src/openrct2/paint/sprite/Misc.cpp
View File

@ -22,7 +22,7 @@
#include "../../localisation/StringIds.h" #include "../../localisation/StringIds.h"
/** rct2: 0x0097EDA4 */ /** rct2: 0x0097EDA4 */
static const sint8 money_wave[] = { static constexpr const sint8 money_wave[] = {
0, 1, 2, 2, 3, 3, 3, 3, 2, 2, 1, 0, -1, -2, -2, -3, -3, -3, -3, -2, -2, -1, 0, 1, 2, 2, 3, 3, 3, 3, 2, 2, 1, 0, -1, -2, -2, -3, -3, -3, -3, -2, -2, -1,
0, 1, 2, 2, 3, 3, 3, 3, 2, 2, 1, 0, -1, -2, -2, -3, -3, -3, -3, -2, -2, -1 0, 1, 2, 2, 3, 3, 3, 3, 2, 2, 1, 0, -1, -2, -2, -3, -3, -3, -3, -2, -2, -1
}; };

8
src/openrct2/paint/tile_element/Fence.cpp
View File

@ -28,22 +28,22 @@
#include "../Paint.h" #include "../Paint.h"
#include "TileElement.h" #include "TileElement.h"
static const uint8 byte_9A406C[] = { static constexpr const uint8 byte_9A406C[] = {
2, 2, 22, 26, 30, 34, 34, 34, 34, 34, 30, 26, 22, 2, 6, 2, 2, 2, 22, 26, 30, 34, 34, 34, 34, 34, 30, 26, 22, 2, 6, 2,
2, 2, 6, 10, 14, 18, 18, 18, 18, 18, 14, 10, 6, 2, 22, 2 2, 2, 6, 10, 14, 18, 18, 18, 18, 18, 14, 10, 6, 2, 22, 2
}; };
static const uint8 byte_9A408C[] = { static constexpr const uint8 byte_9A408C[] = {
0, 0, 4, 8, 12, 16, 16, 16, 16, 16, 12, 8, 4, 0, 20, 0, 0, 0, 4, 8, 12, 16, 16, 16, 16, 16, 12, 8, 4, 0, 20, 0,
0, 0, 20, 24, 28, 32, 32, 32, 32, 32, 28, 24, 20, 0, 4, 0 0, 0, 20, 24, 28, 32, 32, 32, 32, 32, 28, 24, 20, 0, 4, 0
}; };
static const uint8 byte_9A40AC[] = { static constexpr const uint8 byte_9A40AC[] = {
2, 2, 6, 10, 14, 18, 18, 18, 18, 18, 14, 10, 6, 2, 22, 2, 2, 2, 6, 10, 14, 18, 18, 18, 18, 18, 14, 10, 6, 2, 22, 2,
2, 2, 22, 26, 30, 34, 34, 34, 34, 34, 30, 26, 22, 2, 6, 2 2, 2, 22, 26, 30, 34, 34, 34, 34, 34, 30, 26, 22, 2, 6, 2
}; };
static const uint8 byte_9A40CC[] = { static constexpr const uint8 byte_9A40CC[] = {
0, 0, 20, 24, 28, 32, 32, 32, 32, 32, 28, 24, 20, 0, 4, 0, 0, 0, 20, 24, 28, 32, 32, 32, 32, 32, 28, 24, 20, 0, 4, 0,
0, 0, 4, 8, 12, 16, 16, 16, 16, 16, 12, 8, 4, 0, 20, 0 0, 0, 4, 8, 12, 16, 16, 16, 16, 16, 12, 8, 4, 0, 20, 0
}; };

2
src/openrct2/paint/tile_element/LargeScenery.cpp
View File

@ -161,7 +161,7 @@ typedef struct boundbox {
LocationXY16 length; LocationXY16 length;
} boundbox; } boundbox;
static const boundbox s98E3C4[] = { static constexpr const boundbox s98E3C4[] = {
{ 3, 3, 26, 26 }, { 3, 3, 26, 26 },
{ 17, 17, 12, 12 }, { 17, 17, 12, 12 },
{ 17, 3, 12, 12 }, { 17, 3, 12, 12 },

10
src/openrct2/paint/tile_element/Path.cpp
View File

@ -36,7 +36,7 @@ const uint8 byte_98D800[] = {
12, 9, 3, 6 12, 9, 3, 6
}; };
static const uint8 byte_98D6E0[] = { static constexpr const uint8 byte_98D6E0[] = {
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
0, 1, 2, 20, 4, 5, 6, 22, 8, 9, 10, 26, 12, 13, 14, 36, 0, 1, 2, 20, 4, 5, 6, 22, 8, 9, 10, 26, 12, 13, 14, 36,
0, 1, 2, 3, 4, 5, 21, 23, 8, 9, 10, 11, 12, 13, 33, 37, 0, 1, 2, 3, 4, 5, 21, 23, 8, 9, 10, 11, 12, 13, 33, 37,
@ -55,7 +55,7 @@ static const uint8 byte_98D6E0[] = {
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 50 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 50
}; };
static const sint16 stru_98D804[][4] = { static constexpr const sint16 stru_98D804[][4] = {
{3, 3, 26, 26}, {3, 3, 26, 26},
{0, 3, 29, 26}, {0, 3, 29, 26},
{3, 3, 26, 29}, {3, 3, 26, 29},
@ -74,7 +74,7 @@ static const sint16 stru_98D804[][4] = {
{0, 0, 32, 32}, {0, 0, 32, 32},
}; };
static const uint8 byte_98D8A4[] = { static constexpr const uint8 byte_98D8A4[] = {
0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 1, 0 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 1, 0
}; };
// clang-format on // clang-format on
@ -842,7 +842,7 @@ void path_paint_box_support(paint_session * session, rct_tile_element * tileElem
// By default, add 1 to the z bounding box to always clip above the surface // By default, add 1 to the z bounding box to always clip above the surface
uint8 boundingBoxZOffset = 1; uint8 boundingBoxZOffset = 1;
// If we are on the same tile as a straight track, add the offset 2 so we // If we are on the same tile as a straight track, add the offset 2 so we
// can clip above gravel part of the track sprite // can clip above gravel part of the track sprite
if (session->TrackElementOnSameHeight) if (session->TrackElementOnSameHeight)
{ {
@ -969,7 +969,7 @@ void path_paint_pole_support(paint_session * session, rct_tile_element* tileElem
// By default, add 1 to the z bounding box to always clip above the surface // By default, add 1 to the z bounding box to always clip above the surface
uint8 boundingBoxZOffset = 1; uint8 boundingBoxZOffset = 1;
// If we are on the same tile as a straight track, add the offset 2 so we // If we are on the same tile as a straight track, add the offset 2 so we
// can clip above gravel part of the track sprite // can clip above gravel part of the track sprite
if (session->TrackElementOnSameHeight) if (session->TrackElementOnSameHeight)
{ {

4
src/openrct2/paint/tile_element/SmallScenery.cpp
View File

@ -25,14 +25,14 @@
#include "../../world/Scenery.h" #include "../../world/Scenery.h"
#include "../../world/SmallScenery.h" #include "../../world/SmallScenery.h"
static const LocationXY16 offsets[] = { static constexpr const LocationXY16 offsets[] = {
{ 3, 3 }, { 3, 3 },
{ 3, 17 }, { 3, 17 },
{ 17, 3 }, { 17, 3 },
{ 3, 3 } { 3, 3 }
}; };
static const LocationXY16 lengths[] = { static constexpr const LocationXY16 lengths[] = {
{ 12, 26 }, { 12, 26 },
{ 26, 12 }, { 26, 12 },
{ 12, 26 }, { 12, 26 },

2
src/openrct2/paint/tile_element/TileElement.cpp
View File

@ -349,7 +349,7 @@ static void sub_68B3FB(paint_session * session, sint32 x, sint32 y)
return; return;
} }
static const sint32 segmentPositions[][3] = { static constexpr const sint32 segmentPositions[][3] = {
{0, 6, 2}, {0, 6, 2},
{5, 4, 8}, {5, 4, 8},
{1, 7, 3}, {1, 7, 3},

64
src/openrct2/peep/Peep.cpp
View File

@ -184,7 +184,7 @@ bool loc_690FD0(rct_peep * peep, uint8 * rideToView, uint8 * rideSeatToView, rct
#endif #endif
// clang-format off // clang-format off
static const char *gPeepEasterEggNames[] = { static constexpr const char *gPeepEasterEggNames[] = {
"MICHAEL SCHUMACHER", "MICHAEL SCHUMACHER",
"JACQUES VILLENEUVE", "JACQUES VILLENEUVE",
"DAMON HILL", "DAMON HILL",
@ -433,7 +433,7 @@ static uint8 PeepActionToSpriteTypeMap[] = {
PEEP_ACTION_SPRITE_TYPE_WITHDRAW_MONEY PEEP_ACTION_SPRITE_TYPE_WITHDRAW_MONEY
}; };
static const bool SpriteTypeToSlowWalkMap[] = { static constexpr const bool SpriteTypeToSlowWalkMap[] = {
false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false,
false, false, false, true, false, false, true, true, false, false, false, true, false, false, true, true,
true, true, true, false, true, false, true, true, true, true, true, false, true, false, true, true,
@ -443,18 +443,18 @@ static const bool SpriteTypeToSlowWalkMap[] = {
}; };
// These arrays contain the base minimum and maximum nausea ratings for peeps, based on their nausea tolerance level. // These arrays contain the base minimum and maximum nausea ratings for peeps, based on their nausea tolerance level.
static const ride_rating NauseaMinimumThresholds[] = { static constexpr const ride_rating NauseaMinimumThresholds[] = {
0, 0, 200, 400 0, 0, 200, 400
}; };
static const ride_rating NauseaMaximumThresholds[] = { static constexpr const ride_rating NauseaMaximumThresholds[] = {
300, 600, 800, 1000 300, 600, 800, 1000
}; };
// Locations of the spiral slide platform that a peep walks from the entrance of the ride to the // Locations of the spiral slide platform that a peep walks from the entrance of the ride to the
// entrance of the slide. Up to 4 locations for each 4 sides that an ride entrance can be located // entrance of the slide. Up to 4 locations for each 4 sides that an ride entrance can be located
// and 4 different rotations of the ride. 4 * 4 * 4 = 64 locations. // and 4 different rotations of the ride. 4 * 4 * 4 = 64 locations.
static const LocationXY16 SpiralSlideWalkingPath[64] = { static constexpr const LocationXY16 SpiralSlideWalkingPath[64] = {
{ 56, 8 }, { 56, 8 },
{ 8, 8 }, { 8, 8 },
{ 8, 32 }, { 8, 32 },
@ -800,7 +800,7 @@ static void peep_decide_whether_to_leave_park(rct_peep * peep)
// clang-format off // clang-format off
/** rct2: 0x009822F4, 0x00982310 */ /** rct2: 0x009822F4, 0x00982310 */
static const uint8 byte_9822F4[] = { static constexpr const uint8 byte_9822F4[] = {
0, // SHOP_ITEM_BALLOON 0, // SHOP_ITEM_BALLOON
0, // SHOP_ITEM_TOY 0, // SHOP_ITEM_TOY
0, // SHOP_ITEM_MAP 0, // SHOP_ITEM_MAP
@ -858,7 +858,7 @@ static const uint8 byte_9822F4[] = {
}; };
/** rct2: 009823AC */ /** rct2: 009823AC */
static const uint8 crowded_thoughts[] = { static constexpr const uint8 crowded_thoughts[] = {
PEEP_THOUGHT_TYPE_LOST, PEEP_THOUGHT_TYPE_LOST,
PEEP_THOUGHT_TYPE_TIRED, PEEP_THOUGHT_TYPE_TIRED,
PEEP_THOUGHT_TYPE_BAD_LITTER, PEEP_THOUGHT_TYPE_BAD_LITTER,
@ -878,7 +878,7 @@ static const uint8 crowded_thoughts[] = {
}; };
/** rct2: 0x00982326 */ /** rct2: 0x00982326 */
static const uint8 peep_item_containers[] = { static constexpr const uint8 peep_item_containers[] = {
0xFF, // PEEP_ITEM_BALLOON 0xFF, // PEEP_ITEM_BALLOON
0xFF, // PEEP_ITEM_TOY 0xFF, // PEEP_ITEM_TOY
0xFF, // PEEP_ITEM_MAP 0xFF, // PEEP_ITEM_MAP
@ -910,7 +910,7 @@ static const uint8 peep_item_containers[] = {
}; };
/** rct2: 0x00982342 */ /** rct2: 0x00982342 */
static const uint8 peep_extra_item_containers[] = { static constexpr const uint8 peep_extra_item_containers[] = {
0xFF, // PEEP_ITEM_PHOTO2 0xFF, // PEEP_ITEM_PHOTO2
0xFF, // PEEP_ITEM_PHOTO3 0xFF, // PEEP_ITEM_PHOTO3
0xFF, // PEEP_ITEM_PHOTO4 0xFF, // PEEP_ITEM_PHOTO4
@ -1646,7 +1646,7 @@ static void peep_check_cant_find_ride(rct_peep * peep)
* *
* rct2: 0x69C2D0 * rct2: 0x69C2D0
* Check if cant find exit. * Check if cant find exit.
*/ */
static void peep_check_cant_find_exit(rct_peep * peep) static void peep_check_cant_find_exit(rct_peep * peep)
{ {
if (!(peep->peep_flags & PEEP_FLAGS_LEAVING_PARK)) if (!(peep->peep_flags & PEEP_FLAGS_LEAVING_PARK))
@ -1664,7 +1664,7 @@ static void peep_check_cant_find_exit(rct_peep * peep)
} }
/** rct2: 0x00981D7C, 0x00981D7E */ /** rct2: 0x00981D7C, 0x00981D7E */
static const LocationXY16 word_981D7C[4] = { { -2, 0 }, { 0, 2 }, { 2, 0 }, { 0, -2 } }; static constexpr const LocationXY16 word_981D7C[4] = { { -2, 0 }, { 0, 2 }, { 2, 0 }, { 0, -2 } };
/** /**
* *
@ -2404,7 +2404,7 @@ static void peep_try_get_up_from_sitting(rct_peep * peep)
} }
/** rct2: 0x00981F2C, 0x00981F2E */ /** rct2: 0x00981F2C, 0x00981F2E */
static const LocationXY16 _981F2C[] = { static constexpr const LocationXY16 _981F2C[] = {
{ 7, 12 }, { 12, 25 }, { 25, 20 }, { 20, 7 }, { 7, 20 }, { 20, 25 }, { 25, 12 }, { 12, 7 }, { 7, 12 }, { 12, 25 }, { 25, 20 }, { 20, 7 }, { 7, 20 }, { 20, 25 }, { 25, 12 }, { 12, 7 },
}; };
@ -2852,7 +2852,7 @@ static void peep_update_ride_sub_state_0(rct_peep * peep)
} }
/** rct2: 0x00981FD4, 0x00981FD6 */ /** rct2: 0x00981FD4, 0x00981FD6 */
static const LocationXY16 _981FD4[] = { static constexpr const LocationXY16 _981FD4[] = {
{ 8, 8 }, { 8, 8 },
{ 8, 24 }, { 8, 24 },
{ 24, 24 }, { 24, 24 },
@ -3989,7 +3989,7 @@ static void peep_update_ride_sub_state_14(rct_peep * peep)
} }
/** rct2: 0x00981F0C, 0x00981F0E */ /** rct2: 0x00981F0C, 0x00981F0E */
static const LocationXY16 _981F0C[] = { static constexpr const LocationXY16 _981F0C[] = {
{ 25, 56 }, { 25, 56 },
{ 56, 7 }, { 56, 7 },
{ 7, -24 }, { 7, -24 },
@ -3997,7 +3997,7 @@ static const LocationXY16 _981F0C[] = {
}; };
/** rct2: 0x00981F1C, 0x00981F1E */ /** rct2: 0x00981F1C, 0x00981F1E */
static const LocationXY16 _981F1C[] = { static constexpr const LocationXY16 _981F1C[] = {
{ 8, 56 }, { 8, 56 },
{ 56, 24 }, { 56, 24 },
{ 24, -24 }, { 24, -24 },
@ -4173,7 +4173,7 @@ static void peep_update_ride_sub_state_16(rct_peep * peep)
} }
/** rct2: 0x00981FE4 */ /** rct2: 0x00981FE4 */
static const uint8 _981FE4[][4] = { static constexpr const uint8 _981FE4[][4] = {
{ 15, 7, 15, 7 }, { 15, 7, 15, 7 },
{ 11, 3, 11, 3 }, { 11, 3, 11, 3 },
{ 7, 15, 7, 15 }, { 7, 15, 7, 15 },
@ -4181,7 +4181,7 @@ static const uint8 _981FE4[][4] = {
}; };
/** rct2: 0x00981FF4 */ /** rct2: 0x00981FF4 */
static const uint8 _981FF4[][4] = { static constexpr const uint8 _981FF4[][4] = {
{ 1, 2, 14, 0 }, { 1, 2, 14, 0 },
{ 4, 5, 6, 2 }, { 4, 5, 6, 2 },
{ 6, 8, 9, 10 }, { 6, 8, 9, 10 },
@ -4606,7 +4606,7 @@ static void peep_update_ride(rct_peep * peep)
} }
} }
static const uint32 loc_992A18[9] = { static constexpr const uint32 loc_992A18[9] = {
(1 << 14) | (1 << 13) | (1 << 12) | (1 << 10) | (1 << 9) | (1 << 8) | (1 << 7), (1 << 14) | (1 << 13) | (1 << 12) | (1 << 10) | (1 << 9) | (1 << 8) | (1 << 7),
(1 << 14) | (1 << 13) | (1 << 12) | (1 << 2) | (1 << 1), (1 << 14) | (1 << 13) | (1 << 12) | (1 << 2) | (1 << 1),
(1 << 14) | (1 << 13) | (1 << 12) | (1 << 4) | (1 << 1), (1 << 14) | (1 << 13) | (1 << 12) | (1 << 4) | (1 << 1),
@ -4874,7 +4874,7 @@ static bool peep_update_fixing_sub_state_6(bool firstRun, rct_peep * peep, Ride
} }
/** rct2: 0x00992A3C */ /** rct2: 0x00992A3C */
static const LocationXY16 _992A3C[] = { static constexpr const LocationXY16 _992A3C[] = {
{ -12, 0 }, { -12, 0 },
{ 0, 12 }, { 0, 12 },
{ 12, 0 }, { 12, 0 },
@ -5427,7 +5427,7 @@ static void peep_update_queuing(rct_peep * peep)
} }
/** rct2: 0x009929C8 */ /** rct2: 0x009929C8 */
static const LocationXY16 _9929C8[] = { static constexpr const LocationXY16 _9929C8[] = {
{ 28, 28 }, { 28, 4 }, { 20, 4 }, { 20, 28 }, { 12, 28 }, { 12, 4 }, { 4, 4 }, { 4, 28 }, { 28, 28 }, { 28, 4 }, { 20, 4 }, { 20, 28 }, { 12, 28 }, { 12, 4 }, { 4, 4 }, { 4, 28 },
}; };
@ -5985,7 +5985,7 @@ static sint32 peep_update_walking_find_bench(rct_peep * peep)
} }
/** rct2: 0x00992A4C */ /** rct2: 0x00992A4C */
static const LocationXY16 _992A4C[] = { static constexpr const LocationXY16 _992A4C[] = {
{ 11, 16 }, { 11, 16 },
{ 16, 21 }, { 16, 21 },
{ 21, 16 }, { 21, 16 },
@ -6293,7 +6293,7 @@ static void peep_update_buying(rct_peep * peep)
} }
/** rct2: 0x0097EFCC */ /** rct2: 0x0097EFCC */
static const uint8 item_standard_litter[32] = { static constexpr const uint8 item_standard_litter[32] = {
LITTER_TYPE_RUBBISH, // PEEP_ITEM_BALLOON LITTER_TYPE_RUBBISH, // PEEP_ITEM_BALLOON
LITTER_TYPE_RUBBISH, // PEEP_ITEM_TOY LITTER_TYPE_RUBBISH, // PEEP_ITEM_TOY
LITTER_TYPE_RUBBISH, // PEEP_ITEM_MAP LITTER_TYPE_RUBBISH, // PEEP_ITEM_MAP
@ -6325,7 +6325,7 @@ static const uint8 item_standard_litter[32] = {
}; };
/** rct2: 0x0097EFE8 */ /** rct2: 0x0097EFE8 */
static const uint8 item_extra_litter[32] = { static constexpr const uint8 item_extra_litter[32] = {
LITTER_TYPE_RUBBISH, // PEEP_ITEM_PHOTO2 LITTER_TYPE_RUBBISH, // PEEP_ITEM_PHOTO2
LITTER_TYPE_RUBBISH, // PEEP_ITEM_PHOTO3 LITTER_TYPE_RUBBISH, // PEEP_ITEM_PHOTO3
LITTER_TYPE_RUBBISH, // PEEP_ITEM_PHOTO4 LITTER_TYPE_RUBBISH, // PEEP_ITEM_PHOTO4
@ -6755,7 +6755,7 @@ static void peep_update_answering(rct_peep * peep)
} }
/** rct2: 0x00992A5C */ /** rct2: 0x00992A5C */
static const LocationXY16 _992A5C[] = { static constexpr const LocationXY16 _992A5C[] = {
{ 3, 16 }, { 16, 29 }, { 29, 16 }, { 16, 3 }, { 3, 29 }, { 29, 29 }, { 29, 3 }, { 3, 3 }, { 3, 16 }, { 16, 29 }, { 29, 16 }, { 16, 3 }, { 3, 29 }, { 29, 29 }, { 29, 3 }, { 3, 3 },
}; };
@ -7024,7 +7024,7 @@ static void peep_update_patrolling(rct_peep * peep)
// clang-format off // clang-format off
/** rct2: 0x00981F4C, 0x00981F4E */ /** rct2: 0x00981F4C, 0x00981F4E */
static const LocationXY16 _981F4C[] = { static constexpr const LocationXY16 _981F4C[] = {
{ 7, 5 }, { 7, 5 },
{ 5, 25 }, { 5, 25 },
{ 25, 5 }, { 25, 5 },
@ -7129,7 +7129,7 @@ static void peep_update_walking(rct_peep * peep)
{ {
if ((0xFFFF & peep_rand()) <= 4096) if ((0xFFFF & peep_rand()) <= 4096)
{ {
static const uint8 litter_types[] = { static constexpr const uint8 litter_types[] = {
LITTER_TYPE_EMPTY_CAN, LITTER_TYPE_EMPTY_CAN,
LITTER_TYPE_RUBBISH, LITTER_TYPE_RUBBISH,
LITTER_TYPE_EMPTY_BURGER_BOX, LITTER_TYPE_EMPTY_BURGER_BOX,
@ -7833,7 +7833,7 @@ void peep_update_days_in_queue()
// clang-format off // clang-format off
/** rct2: 0x009823A0 */ /** rct2: 0x009823A0 */
static const enum PEEP_NAUSEA_TOLERANCE nausea_tolerance_distribution[] = { static constexpr const enum PEEP_NAUSEA_TOLERANCE nausea_tolerance_distribution[] = {
PEEP_NAUSEA_TOLERANCE_NONE, PEEP_NAUSEA_TOLERANCE_NONE,
PEEP_NAUSEA_TOLERANCE_LOW, PEEP_NAUSEA_TOLERANCE_LOW, PEEP_NAUSEA_TOLERANCE_LOW, PEEP_NAUSEA_TOLERANCE_LOW,
PEEP_NAUSEA_TOLERANCE_AVERAGE, PEEP_NAUSEA_TOLERANCE_AVERAGE, PEEP_NAUSEA_TOLERANCE_AVERAGE, PEEP_NAUSEA_TOLERANCE_AVERAGE, PEEP_NAUSEA_TOLERANCE_AVERAGE, PEEP_NAUSEA_TOLERANCE_AVERAGE,
@ -7841,7 +7841,7 @@ static const enum PEEP_NAUSEA_TOLERANCE nausea_tolerance_distribution[] = {
}; };
/** rct2: 0x009823BC */ /** rct2: 0x009823BC */
static const uint8 trouser_colours[] = { static constexpr const uint8 trouser_colours[] = {
COLOUR_BLACK, COLOUR_BLACK,
COLOUR_GREY, COLOUR_GREY,
COLOUR_LIGHT_BROWN, COLOUR_LIGHT_BROWN,
@ -7870,7 +7870,7 @@ static const uint8 trouser_colours[] = {
}; };
/** rct2: 0x009823D5 */ /** rct2: 0x009823D5 */
static const uint8 tshirt_colours[] = { static constexpr const uint8 tshirt_colours[] = {
COLOUR_BLACK, COLOUR_BLACK,
COLOUR_GREY, COLOUR_GREY,
COLOUR_LIGHT_BROWN, COLOUR_LIGHT_BROWN,
@ -8260,7 +8260,7 @@ void peep_thought_set_format_args(rct_peep_thought * thought)
} }
/** rct2: 0x00982004 */ /** rct2: 0x00982004 */
static const bool peep_allow_pick_up[] = { static constexpr const bool peep_allow_pick_up[] = {
true, // PEEP_STATE_FALLING true, // PEEP_STATE_FALLING
false, // PEEP_STATE_1 false, // PEEP_STATE_1
false, // PEEP_STATE_QUEUING_FRONT false, // PEEP_STATE_QUEUING_FRONT
@ -8314,7 +8314,7 @@ enum
PEEP_FACE_OFFSET_VERY_VERY_HAPPY, PEEP_FACE_OFFSET_VERY_VERY_HAPPY,
}; };
static const sint32 face_sprite_small[] = { static constexpr const sint32 face_sprite_small[] = {
SPR_PEEP_SMALL_FACE_ANGRY, SPR_PEEP_SMALL_FACE_ANGRY,
SPR_PEEP_SMALL_FACE_VERY_VERY_SICK, SPR_PEEP_SMALL_FACE_VERY_VERY_SICK,
SPR_PEEP_SMALL_FACE_VERY_SICK, SPR_PEEP_SMALL_FACE_VERY_SICK,
@ -8330,7 +8330,7 @@ static const sint32 face_sprite_small[] = {
SPR_PEEP_SMALL_FACE_VERY_VERY_HAPPY, SPR_PEEP_SMALL_FACE_VERY_VERY_HAPPY,
}; };
static const sint32 face_sprite_large[] = { static constexpr const sint32 face_sprite_large[] = {
SPR_PEEP_LARGE_FACE_ANGRY_0, SPR_PEEP_LARGE_FACE_ANGRY_0,
SPR_PEEP_LARGE_FACE_VERY_VERY_SICK_0, SPR_PEEP_LARGE_FACE_VERY_VERY_SICK_0,
SPR_PEEP_LARGE_FACE_VERY_SICK_0, SPR_PEEP_LARGE_FACE_VERY_SICK_0,

3730
src/openrct2/peep/PeepData.cpp
View File

File diff suppressed because it is too large Load Diff

6
src/openrct2/peep/Staff.cpp
View File

@ -315,7 +315,7 @@ static money32 staff_hire_new_staff_member(uint8 staff_type, uint8 flags, sint16
newPeep->id = newStaffIndex; newPeep->id = newStaffIndex;
newPeep->staff_type = staff_type; newPeep->staff_type = staff_type;
static const rct_string_id staffNames[] = { static constexpr const rct_string_id staffNames[] = {
STR_HANDYMAN_X, STR_HANDYMAN_X,
STR_MECHANIC_X, STR_MECHANIC_X,
STR_SECURITY_GUARD_X, STR_SECURITY_GUARD_X,
@ -323,7 +323,7 @@ static money32 staff_hire_new_staff_member(uint8 staff_type, uint8 flags, sint16
}; };
/* rct2: 0x009929FC */ /* rct2: 0x009929FC */
static const uint8 spriteTypes[] = { static constexpr const uint8 spriteTypes[] = {
PEEP_SPRITE_TYPE_HANDYMAN, PEEP_SPRITE_TYPE_HANDYMAN,
PEEP_SPRITE_TYPE_MECHANIC, PEEP_SPRITE_TYPE_MECHANIC,
PEEP_SPRITE_TYPE_SECURITY, PEEP_SPRITE_TYPE_SECURITY,
@ -399,7 +399,7 @@ void game_command_hire_new_staff_member(sint32 * eax, sint32 * ebx, sint32 * ecx
} }
/** rct2: 0x00982134 */ /** rct2: 0x00982134 */
static const bool peep_slow_walking_types[] = { static constexpr const bool peep_slow_walking_types[] = {
false, // PEEP_SPRITE_TYPE_NORMAL false, // PEEP_SPRITE_TYPE_NORMAL
false, // PEEP_SPRITE_TYPE_HANDYMAN false, // PEEP_SPRITE_TYPE_HANDYMAN
false, // PEEP_SPRITE_TYPE_MECHANIC false, // PEEP_SPRITE_TYPE_MECHANIC

12
src/openrct2/ride/Ride.cpp
View File

@ -135,7 +135,7 @@ uint8 gTypeToRideEntryIndexMap[TYPE_TO_RIDE_ENTRY_SLOTS];
#pragma endregion #pragma endregion
static const sint32 RideInspectionInterval[] = { static constexpr const sint32 RideInspectionInterval[] = {
10, 20, 30, 45, 60, 120, 0, 0 10, 20, 30, 45, 60, 120, 0, 0
}; };
@ -2145,7 +2145,7 @@ void ride_update_popularity(Ride* ride, uint8 pop_amount){
} }
/** rct2: 0x0098DDB8, 0x0098DDBA */ /** rct2: 0x0098DDB8, 0x0098DDBA */
static const LocationXY16 ride_spiral_slide_main_tile_offset[][4] = { static constexpr const LocationXY16 ride_spiral_slide_main_tile_offset[][4] = {
{ {
{ 32, 32 }, { 32, 32 },
{ 0, 32 }, { 0, 32 },
@ -4439,14 +4439,14 @@ static sint32 count_free_misc_sprite_slots()
return Math::Max(0, miscSpriteCount + remainingSpriteCount - 300); return Math::Max(0, miscSpriteCount + remainingSpriteCount - 300);
} }
static const LocationXY16 word_9A3AB4[4] = { static constexpr const LocationXY16 word_9A3AB4[4] = {
{ 0, 0 }, { 0, 0 },
{ 0, -96 }, { 0, -96 },
{ -96, -96 }, { -96, -96 },
{ -96, 0 }, { -96, 0 },
}; };
static const LocationXY16 word_9A2A60[] = { static constexpr const LocationXY16 word_9A2A60[] = {
{ 0, 16 }, { 0, 16 },
{ 16, 31 }, { 16, 31 },
{ 31, 16 }, { 31, 16 },
@ -5487,7 +5487,7 @@ sint32 ride_get_refund_price(sint32 ride_id)
GAME_COMMAND_SET_MAZE_TRACK, GAME_COMMAND_SET_MAZE_TRACK,
z, z,
0); 0);
// Above gamecommand may remove the tile element which will cause the next game command to // Above gamecommand may remove the tile element which will cause the next game command to
// return MONEY32_UNDEFINED as it does not need to be called. // return MONEY32_UNDEFINED as it does not need to be called.
money32 removePrice = game_do_command( money32 removePrice = game_do_command(
@ -7937,7 +7937,7 @@ bool ride_has_ratings(const Ride * ride)
const char * ride_type_get_enum_name(sint32 rideType) const char * ride_type_get_enum_name(sint32 rideType)
{ {
static const char * RideTypeEnumNames[RIDE_TYPE_COUNT] = static constexpr const char * RideTypeEnumNames[RIDE_TYPE_COUNT] =
{ {
nameof(RIDE_TYPE_SPIRAL_ROLLER_COASTER), nameof(RIDE_TYPE_SPIRAL_ROLLER_COASTER),
nameof(RIDE_TYPE_STAND_UP_ROLLER_COASTER), nameof(RIDE_TYPE_STAND_UP_ROLLER_COASTER),

20
src/openrct2/ride/RideGroupManager.cpp
View File

@ -27,70 +27,70 @@
#include "Track.h" #include "Track.h"
#include "TrackData.h" #include "TrackData.h"
static const RideGroup ride_group_corkscrew_rc = { static constexpr const RideGroup ride_group_corkscrew_rc = {
/*.RideType =*/ RIDE_TYPE_CORKSCREW_ROLLER_COASTER, /*.RideType =*/ RIDE_TYPE_CORKSCREW_ROLLER_COASTER,
/*.MaximumHeight =*/ 28, /*.MaximumHeight =*/ 28,
/*.AvailableTrackPieces =*/ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_FLAT_ROLL_BANKING) | (1ULL << TRACK_VERTICAL_LOOP) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_SLOPE_CURVE_STEEP) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_HALF_LOOP) | (1ULL << TRACK_CORKSCREW) | (1ULL << TRACK_HELIX_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_ON_RIDE_PHOTO) | (1ULL << TRACK_BLOCK_BRAKES) | (1ULL << TRACK_BOOSTER), /*.AvailableTrackPieces =*/ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_FLAT_ROLL_BANKING) | (1ULL << TRACK_VERTICAL_LOOP) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_SLOPE_CURVE_STEEP) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_HALF_LOOP) | (1ULL << TRACK_CORKSCREW) | (1ULL << TRACK_HELIX_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_ON_RIDE_PHOTO) | (1ULL << TRACK_BLOCK_BRAKES) | (1ULL << TRACK_BOOSTER),
/*.Naming =*/ { STR_CORKSCREW_RC_GROUP, STR_CORKSCREW_RC_GROUP_DESC }, /*.Naming =*/ { STR_CORKSCREW_RC_GROUP, STR_CORKSCREW_RC_GROUP_DESC },
}; };
static const RideGroup ride_group_hypercoaster = { static constexpr const RideGroup ride_group_hypercoaster = {
/*.RideType =*/ RIDE_TYPE_CORKSCREW_ROLLER_COASTER, /*.RideType =*/ RIDE_TYPE_CORKSCREW_ROLLER_COASTER,
/*.MaximumHeight =*/ 45, /*.MaximumHeight =*/ 45,
/*.AvailableTrackPieces =*/ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_FLAT_ROLL_BANKING) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_SLOPE_CURVE_STEEP) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_HELIX_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_ON_RIDE_PHOTO) | (1ULL << TRACK_BLOCK_BRAKES) | (1ULL << TRACK_SLOPE_STEEP_LONG), /*.AvailableTrackPieces =*/ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_FLAT_ROLL_BANKING) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_SLOPE_CURVE_STEEP) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_HELIX_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_ON_RIDE_PHOTO) | (1ULL << TRACK_BLOCK_BRAKES) | (1ULL << TRACK_SLOPE_STEEP_LONG),
/*.Naming =*/ { STR_HYPERCOASTER_GROUP, STR_HYPERCOASTER_GROUP_DESC }, /*.Naming =*/ { STR_HYPERCOASTER_GROUP, STR_HYPERCOASTER_GROUP_DESC },
}; };
static const RideGroup ride_group_car_ride = { static constexpr const RideGroup ride_group_car_ride = {
/*.RideType =*/ RIDE_TYPE_CAR_RIDE, /*.RideType =*/ RIDE_TYPE_CAR_RIDE,
/*.MaximumHeight =*/ 6, /*.MaximumHeight =*/ 6,
/*.AvailableTrackPieces =*/ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_CURVE_VERY_SMALL) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_SPINNING_TUNNEL), /*.AvailableTrackPieces =*/ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_CURVE_VERY_SMALL) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_SPINNING_TUNNEL),
/*.Naming =*/ { STR_CAR_RIDE_GROUP, STR_CAR_RIDE_GROUP_DESC }, /*.Naming =*/ { STR_CAR_RIDE_GROUP, STR_CAR_RIDE_GROUP_DESC },
}; };
static const RideGroup ride_group_monster_trucks = { static constexpr const RideGroup ride_group_monster_trucks = {
/*.RideType =*/ RIDE_TYPE_CAR_RIDE, /*.RideType =*/ RIDE_TYPE_CAR_RIDE,
/*.MaximumHeight =*/ 18, /*.MaximumHeight =*/ 18,
/*.AvailableTrackPieces =*/ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_CURVE_VERY_SMALL) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_RAPIDS), /*.AvailableTrackPieces =*/ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_CURVE_VERY_SMALL) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_RAPIDS),
/*.Naming =*/ { STR_MONSTER_TRUCKS_GROUP, STR_MONSTER_TRUCKS_GROUP_DESC }, /*.Naming =*/ { STR_MONSTER_TRUCKS_GROUP, STR_MONSTER_TRUCKS_GROUP_DESC },
}; };
static const RideGroup ride_group_steel_twister_rc = { static constexpr const RideGroup ride_group_steel_twister_rc = {
/*.RideType =*/ RIDE_TYPE_TWISTER_ROLLER_COASTER, /*.RideType =*/ RIDE_TYPE_TWISTER_ROLLER_COASTER,
/*.MaximumHeight =*/ 40, /*.MaximumHeight =*/ 40,
/*.AvailableTrackPieces =*/ (1ULL << TRACK_FLAT) | (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_FLAT_ROLL_BANKING) | (1ULL << TRACK_VERTICAL_LOOP) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_SLOPE_CURVE_STEEP) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_HALF_LOOP) | (1ULL << TRACK_CORKSCREW) | (1ULL << TRACK_HELIX_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_ON_RIDE_PHOTO) | (1ULL << TRACK_SLOPE_VERTICAL) | (1ULL << TRACK_BARREL_ROLL) | (1ULL << TRACK_POWERED_LIFT) | (1ULL << TRACK_HALF_LOOP_LARGE) | (1ULL << TRACK_SLOPE_CURVE_BANKED) | (1ULL << TRACK_BLOCK_BRAKES) | (1ULL << TRACK_SLOPE_ROLL_BANKING) | (1ULL << TRACK_SLOPE_STEEP_LONG) | (1ULL << TRACK_CURVE_VERTICAL) | (1ULL << TRACK_QUARTER_LOOP) | (1ULL << TRACK_BOOSTER), /*.AvailableTrackPieces =*/ (1ULL << TRACK_FLAT) | (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_FLAT_ROLL_BANKING) | (1ULL << TRACK_VERTICAL_LOOP) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_SLOPE_CURVE_STEEP) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_HALF_LOOP) | (1ULL << TRACK_CORKSCREW) | (1ULL << TRACK_HELIX_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_ON_RIDE_PHOTO) | (1ULL << TRACK_SLOPE_VERTICAL) | (1ULL << TRACK_BARREL_ROLL) | (1ULL << TRACK_POWERED_LIFT) | (1ULL << TRACK_HALF_LOOP_LARGE) | (1ULL << TRACK_SLOPE_CURVE_BANKED) | (1ULL << TRACK_BLOCK_BRAKES) | (1ULL << TRACK_SLOPE_ROLL_BANKING) | (1ULL << TRACK_SLOPE_STEEP_LONG) | (1ULL << TRACK_CURVE_VERTICAL) | (1ULL << TRACK_QUARTER_LOOP) | (1ULL << TRACK_BOOSTER),
/*.Naming =*/ { STR_STEEL_TWISTER_GROUP, STR_STEEL_TWISTER_GROUP_DESC }, /*.Naming =*/ { STR_STEEL_TWISTER_GROUP, STR_STEEL_TWISTER_GROUP_DESC },
}; };
static const RideGroup ride_group_hyper_twister = { static constexpr const RideGroup ride_group_hyper_twister = {
/*.RideType =*/ RIDE_TYPE_TWISTER_ROLLER_COASTER, /*.RideType =*/ RIDE_TYPE_TWISTER_ROLLER_COASTER,
/*.MaximumHeight =*/ 54, /*.MaximumHeight =*/ 54,
/*.AvailableTrackPieces =*/ (1ULL << TRACK_FLAT) | (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_FLAT_ROLL_BANKING) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_SLOPE_CURVE_STEEP) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_HELIX_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_ON_RIDE_PHOTO) | (1ULL << TRACK_POWERED_LIFT) | (1ULL << TRACK_SLOPE_CURVE_BANKED) | (1ULL << TRACK_BLOCK_BRAKES) | (1ULL << TRACK_SLOPE_ROLL_BANKING) | (1ULL << TRACK_SLOPE_STEEP_LONG), /*.AvailableTrackPieces =*/ (1ULL << TRACK_FLAT) | (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_FLAT_ROLL_BANKING) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_SLOPE_CURVE_STEEP) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_HELIX_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_ON_RIDE_PHOTO) | (1ULL << TRACK_POWERED_LIFT) | (1ULL << TRACK_SLOPE_CURVE_BANKED) | (1ULL << TRACK_BLOCK_BRAKES) | (1ULL << TRACK_SLOPE_ROLL_BANKING) | (1ULL << TRACK_SLOPE_STEEP_LONG),
/*.Naming =*/ { STR_HYPER_TWISTER_GROUP, STR_HYPER_TWISTER_GROUP_DESC }, /*.Naming =*/ { STR_HYPER_TWISTER_GROUP, STR_HYPER_TWISTER_GROUP_DESC },
}; };
static const RideGroup ride_group_junior_rc = { static constexpr const RideGroup ride_group_junior_rc = {
/*.RideType =*/ RIDE_TYPE_JUNIOR_ROLLER_COASTER, /*.RideType =*/ RIDE_TYPE_JUNIOR_ROLLER_COASTER,
/*.MaximumHeight =*/ 12, /*.MaximumHeight =*/ 12,
/*.AvailableTrackPieces =*/ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_LIFT_HILL_CURVE) | (1ULL << TRACK_FLAT_ROLL_BANKING) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_LONG) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_HELIX_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_BLOCK_BRAKES) | (1ULL << TRACK_BOOSTER), /*.AvailableTrackPieces =*/ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_LIFT_HILL_CURVE) | (1ULL << TRACK_FLAT_ROLL_BANKING) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_LONG) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_HELIX_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_BLOCK_BRAKES) | (1ULL << TRACK_BOOSTER),
/*.Naming =*/ { STR_JUNIOR_RC_GROUP, STR_JUNIOR_RC_GROUP_DESC }, /*.Naming =*/ { STR_JUNIOR_RC_GROUP, STR_JUNIOR_RC_GROUP_DESC },
}; };
static const RideGroup ride_group_classic_mini_coaster = { static constexpr const RideGroup ride_group_classic_mini_coaster = {
/*.RideType =*/ RIDE_TYPE_JUNIOR_ROLLER_COASTER, /*.RideType =*/ RIDE_TYPE_JUNIOR_ROLLER_COASTER,
/*.MaximumHeight =*/ 15, /*.MaximumHeight =*/ 15,
/*.AvailableTrackPieces =*/ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_LIFT_HILL_CURVE) | (1ULL << TRACK_FLAT_ROLL_BANKING) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_SLOPE_LONG) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_HELIX_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_BLOCK_BRAKES) | (1ULL << TRACK_BOOSTER), /*.AvailableTrackPieces =*/ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_LIFT_HILL_CURVE) | (1ULL << TRACK_FLAT_ROLL_BANKING) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_SLOPE_LONG) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_HELIX_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_BLOCK_BRAKES) | (1ULL << TRACK_BOOSTER),
/*.Naming =*/ { STR_CLASSIC_MINI_COASTER_GROUP, STR_CLASSIC_MINI_COASTER_GROUP_DESC }, /*.Naming =*/ { STR_CLASSIC_MINI_COASTER_GROUP, STR_CLASSIC_MINI_COASTER_GROUP_DESC },
}; };
static const RideGroup ride_group_steel_wild_mouse = { static constexpr const RideGroup ride_group_steel_wild_mouse = {
/*.RideType =*/ RIDE_TYPE_STEEL_WILD_MOUSE, /*.RideType =*/ RIDE_TYPE_STEEL_WILD_MOUSE,
/*.MaximumHeight =*/ 16, /*.MaximumHeight =*/ 16,
/*.AvailableTrackPieces =*/ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_LIFT_HILL_STEEP) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_SLOPE_LONG) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_CURVE_VERY_SMALL) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_BLOCK_BRAKES), /*.AvailableTrackPieces =*/ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_LIFT_HILL_STEEP) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_SLOPE_LONG) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_CURVE_VERY_SMALL) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_BLOCK_BRAKES),
/*.Naming =*/ { STR_RIDE_NAME_WILD_MOUSE, STR_RIDE_DESCRIPTION_WILD_MOUSE }, /*.Naming =*/ { STR_RIDE_NAME_WILD_MOUSE, STR_RIDE_DESCRIPTION_WILD_MOUSE },
}; };
static const RideGroup ride_group_spinning_wild_mouse = { static constexpr const RideGroup ride_group_spinning_wild_mouse = {
/*.RideType =*/ RIDE_TYPE_STEEL_WILD_MOUSE, /*.RideType =*/ RIDE_TYPE_STEEL_WILD_MOUSE,
/*.MaximumHeight =*/ 16, /*.MaximumHeight =*/ 16,
/*.AvailableTrackPieces =*/ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_LONG) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_CURVE_VERY_SMALL) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_BLOCK_BRAKES) | (1ULL << TRACK_ROTATION_CONTROL_TOGGLE), /*.AvailableTrackPieces =*/ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_LONG) | (1ULL << TRACK_SLOPE_CURVE) | (1ULL << TRACK_CURVE_VERY_SMALL) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_BLOCK_BRAKES) | (1ULL << TRACK_ROTATION_CONTROL_TOGGLE),

6
src/openrct2/ride/Track.cpp
View File

@ -1971,7 +1971,7 @@ static uint8 maze_element_get_segment_bit(uint16 x, uint16 y)
} }
/** rct2: 0x00993CE9 */ /** rct2: 0x00993CE9 */
static const uint8 byte_993CE9[] = { static constexpr const uint8 byte_993CE9[] = {
0xFF, 0xE0, 0xFF, 0xFF, 0xE0, 0xFF,
14, 0, 1, 2, 14, 0, 1, 2,
6, 2, 4, 5, 6, 2, 4, 5,
@ -1980,12 +1980,12 @@ static const uint8 byte_993CE9[] = {
}; };
/** rct2: 0x00993CFC */ /** rct2: 0x00993CFC */
static const uint8 byte_993CFC[] = { static constexpr const uint8 byte_993CFC[] = {
5, 12, 0xFF, 0xFF, 9, 0, 0xFF, 0xFF, 13, 4, 0xFF, 0xFF, 1, 8, 0xFF, 0xFF 5, 12, 0xFF, 0xFF, 9, 0, 0xFF, 0xFF, 13, 4, 0xFF, 0xFF, 1, 8, 0xFF, 0xFF
}; };
/** rct2: 0x00993D0C */ /** rct2: 0x00993D0C */
static const uint8 byte_993D0C[] = { static constexpr const uint8 byte_993D0C[] = {
3, 0, 0xFF, 0xFF, 0, 1, 0xFF, 0xFF, 1, 2, 0xFF, 0xFF, 2, 3, 0xFF, 0xFF 3, 0, 0xFF, 0xFF, 0, 1, 0xFF, 0xFF, 1, 2, 0xFF, 0xFF, 2, 3, 0xFF, 0xFF
}; };

4
src/openrct2/ride/TrackData.cpp
View File

@ -6487,8 +6487,8 @@ const track_descriptor gTrackDescriptors[142] = {
}; };
#define CREATE_VEHICLE_INFO(VAR, ...) \ #define CREATE_VEHICLE_INFO(VAR, ...) \
static const rct_vehicle_info VAR##_data [] = __VA_ARGS__ ; \ static constexpr const rct_vehicle_info VAR##_data [] = __VA_ARGS__ ; \
static const rct_vehicle_info_list VAR = { static_cast<uint16>(Util::CountOf(VAR##_data)), VAR##_data }; static constexpr const rct_vehicle_info_list VAR = { static_cast<uint16>(Util::CountOf(VAR##_data)), VAR##_data };
CREATE_VEHICLE_INFO(TrackVehicleInfo_8BE57A, { CREATE_VEHICLE_INFO(TrackVehicleInfo_8BE57A, {
{ 31, 16, 0, 0, 0, 0 }, { 30, 16, 0, 0, 0, 0 }, { 29, 16, 0, 0, 0, 0 }, { 28, 16, 0, 0, 0, 0 }, { 27, 16, 0, 0, 0, 0 }, { 31, 16, 0, 0, 0, 0 }, { 30, 16, 0, 0, 0, 0 }, { 29, 16, 0, 0, 0, 0 }, { 28, 16, 0, 0, 0, 0 }, { 27, 16, 0, 0, 0, 0 },

150
src/openrct2/ride/TrackDataOld.cpp
View File

@ -18,7 +18,7 @@
/** rct2: 0x008A42F4 */ /** rct2: 0x008A42F4 */
// clang-format off // clang-format off
static const uint32 _OldSpiralRollerCoasterTrackPaintFunctions[256] = { static constexpr const uint32 _OldSpiralRollerCoasterTrackPaintFunctions[256] = {
0x008A4ABC, // TRACK_ELEM_FLAT 0x008A4ABC, // TRACK_ELEM_FLAT
0x008A4D0C, // TRACK_ELEM_END_STATION 0x008A4D0C, // TRACK_ELEM_END_STATION
0x008A4D1C, // TRACK_ELEM_BEGIN_STATION 0x008A4D1C, // TRACK_ELEM_BEGIN_STATION
@ -278,7 +278,7 @@ static const uint32 _OldSpiralRollerCoasterTrackPaintFunctions[256] = {
}; };
/** rct2: 0x008A6DB0 */ /** rct2: 0x008A6DB0 */
static const uint32 _OldStandUpRollerCoasterTrackPaintFunctions[256] = { static constexpr const uint32 _OldStandUpRollerCoasterTrackPaintFunctions[256] = {
0x008A7114, // TRACK_ELEM_FLAT 0x008A7114, // TRACK_ELEM_FLAT
0x008A7384, // TRACK_ELEM_END_STATION 0x008A7384, // TRACK_ELEM_END_STATION
0x008A7394, // TRACK_ELEM_BEGIN_STATION 0x008A7394, // TRACK_ELEM_BEGIN_STATION
@ -538,7 +538,7 @@ static const uint32 _OldStandUpRollerCoasterTrackPaintFunctions[256] = {
}; };
/** rct2: 0x008A85E4 */ /** rct2: 0x008A85E4 */
static const uint32 _OldSuspendedSwingingCoasterTrackPaintFunctions[256] = { static constexpr const uint32 _OldSuspendedSwingingCoasterTrackPaintFunctions[256] = {
0x008A8958, // TRACK_ELEM_FLAT 0x008A8958, // TRACK_ELEM_FLAT
0x008A8AA8, // TRACK_ELEM_END_STATION 0x008A8AA8, // TRACK_ELEM_END_STATION
0x008A8AB8, // TRACK_ELEM_BEGIN_STATION 0x008A8AB8, // TRACK_ELEM_BEGIN_STATION
@ -798,7 +798,7 @@ static const uint32 _OldSuspendedSwingingCoasterTrackPaintFunctions[256] = {
}; };
/** rct2: 0x008A8EE4 */ /** rct2: 0x008A8EE4 */
static const uint32 _OldInvertedRollerCoasterTrackPaintFunctions[256] = { static constexpr const uint32 _OldInvertedRollerCoasterTrackPaintFunctions[256] = {
0x008A92E8, // TRACK_ELEM_FLAT 0x008A92E8, // TRACK_ELEM_FLAT
0x008A9558, // TRACK_ELEM_END_STATION 0x008A9558, // TRACK_ELEM_END_STATION
0x008A9568, // TRACK_ELEM_BEGIN_STATION 0x008A9568, // TRACK_ELEM_BEGIN_STATION
@ -1058,7 +1058,7 @@ static const uint32 _OldInvertedRollerCoasterTrackPaintFunctions[256] = {
}; };
/** rct2: 0x008AAA0C */ /** rct2: 0x008AAA0C */
static const uint32 _OldJuniorRollerCoasterTrackPaintFunctions[256] = { static constexpr const uint32 _OldJuniorRollerCoasterTrackPaintFunctions[256] = {
0x008AAD80, // TRACK_ELEM_FLAT 0x008AAD80, // TRACK_ELEM_FLAT
0x008AAE70, // TRACK_ELEM_END_STATION 0x008AAE70, // TRACK_ELEM_END_STATION
0x008AAE80, // TRACK_ELEM_BEGIN_STATION 0x008AAE80, // TRACK_ELEM_BEGIN_STATION
@ -1318,7 +1318,7 @@ static const uint32 _OldJuniorRollerCoasterTrackPaintFunctions[256] = {
}; };
/** rct2: 0x008ACE48 */ /** rct2: 0x008ACE48 */
static const uint32 _OldMiniatureRailwayTrackPaintFunctions[256] = { static constexpr const uint32 _OldMiniatureRailwayTrackPaintFunctions[256] = {
0x008AD0C0, // TRACK_ELEM_FLAT 0x008AD0C0, // TRACK_ELEM_FLAT
0x008AD170, // TRACK_ELEM_END_STATION 0x008AD170, // TRACK_ELEM_END_STATION
0x008AD180, // TRACK_ELEM_BEGIN_STATION 0x008AD180, // TRACK_ELEM_BEGIN_STATION
@ -1578,7 +1578,7 @@ static const uint32 _OldMiniatureRailwayTrackPaintFunctions[256] = {
}; };
/** rct2: 0x008ADF34 */ /** rct2: 0x008ADF34 */
static const uint32 _OldMonorailTrackPaintFunctions[256] = { static constexpr const uint32 _OldMonorailTrackPaintFunctions[256] = {
0x008AE1AC, // TRACK_ELEM_FLAT 0x008AE1AC, // TRACK_ELEM_FLAT
0x008AE25C, // TRACK_ELEM_END_STATION 0x008AE25C, // TRACK_ELEM_END_STATION
0x008AE26C, // TRACK_ELEM_BEGIN_STATION 0x008AE26C, // TRACK_ELEM_BEGIN_STATION
@ -1838,7 +1838,7 @@ static const uint32 _OldMonorailTrackPaintFunctions[256] = {
}; };
/** rct2: 0x008AFC24 */ /** rct2: 0x008AFC24 */
static const uint32 _OldMiniSuspendedCoasterTrackPaintFunctions[256] = { static constexpr const uint32 _OldMiniSuspendedCoasterTrackPaintFunctions[256] = {
0x008AFE9C, // TRACK_ELEM_FLAT 0x008AFE9C, // TRACK_ELEM_FLAT
0x008AFF4C, // TRACK_ELEM_END_STATION 0x008AFF4C, // TRACK_ELEM_END_STATION
0x008AFF5C, // TRACK_ELEM_BEGIN_STATION 0x008AFF5C, // TRACK_ELEM_BEGIN_STATION
@ -2098,7 +2098,7 @@ static const uint32 _OldMiniSuspendedCoasterTrackPaintFunctions[256] = {
}; };
/** rct2: 0x008B0D60 */ /** rct2: 0x008B0D60 */
static const uint32 _OldBoatHireTrackPaintFunctions[256] = { static constexpr const uint32 _OldBoatHireTrackPaintFunctions[256] = {
0x008B0E40, // TRACK_ELEM_FLAT 0x008B0E40, // TRACK_ELEM_FLAT
0x008B0E50, // TRACK_ELEM_END_STATION 0x008B0E50, // TRACK_ELEM_END_STATION
0x008B0E60, // TRACK_ELEM_BEGIN_STATION 0x008B0E60, // TRACK_ELEM_BEGIN_STATION
@ -2358,7 +2358,7 @@ static const uint32 _OldBoatHireTrackPaintFunctions[256] = {
}; };
/** rct2: 0x008A534C */ /** rct2: 0x008A534C */
static const uint32 _OldWoodenWildMouseTrackPaintFunctions[256] = { static constexpr const uint32 _OldWoodenWildMouseTrackPaintFunctions[256] = {
0x008A5464, // TRACK_ELEM_FLAT 0x008A5464, // TRACK_ELEM_FLAT
0x008A5534, // TRACK_ELEM_END_STATION 0x008A5534, // TRACK_ELEM_END_STATION
0x008A5544, // TRACK_ELEM_BEGIN_STATION 0x008A5544, // TRACK_ELEM_BEGIN_STATION
@ -2618,7 +2618,7 @@ static const uint32 _OldWoodenWildMouseTrackPaintFunctions[256] = {
}; };
/** rct2: 0x008A5634 */ /** rct2: 0x008A5634 */
static const uint32 _OldSteeplechaseTrackPaintFunctions[256] = { static constexpr const uint32 _OldSteeplechaseTrackPaintFunctions[256] = {
0x008A59A8, // TRACK_ELEM_FLAT 0x008A59A8, // TRACK_ELEM_FLAT
0x008A5A58, // TRACK_ELEM_END_STATION 0x008A5A58, // TRACK_ELEM_END_STATION
0x008A5A68, // TRACK_ELEM_BEGIN_STATION 0x008A5A68, // TRACK_ELEM_BEGIN_STATION
@ -2878,7 +2878,7 @@ static const uint32 _OldSteeplechaseTrackPaintFunctions[256] = {
}; };
/** rct2: 0x006F7000 */ /** rct2: 0x006F7000 */
static const uint32 _OldCarRideTrackPaintFunctions[256] = { static constexpr const uint32 _OldCarRideTrackPaintFunctions[256] = {
0x006F72C8, // TRACK_ELEM_FLAT 0x006F72C8, // TRACK_ELEM_FLAT
0x006F7338, // TRACK_ELEM_END_STATION 0x006F7338, // TRACK_ELEM_END_STATION
0x006F7348, // TRACK_ELEM_BEGIN_STATION 0x006F7348, // TRACK_ELEM_BEGIN_STATION
@ -3138,7 +3138,7 @@ static const uint32 _OldCarRideTrackPaintFunctions[256] = {
}; };
/** rct2: 0x006FD0E8 */ /** rct2: 0x006FD0E8 */
static const uint32 _OldLaunchedFreefallTrackPaintFunctions[256] = { static constexpr const uint32 _OldLaunchedFreefallTrackPaintFunctions[256] = {
0, 0,
0, 0,
0, 0,
@ -3398,7 +3398,7 @@ static const uint32 _OldLaunchedFreefallTrackPaintFunctions[256] = {
}; };
/** rct2: 0x006FE240 */ /** rct2: 0x006FE240 */
static const uint32 _OldBobsleighCoasterTrackPaintFunctions[256] = { static constexpr const uint32 _OldBobsleighCoasterTrackPaintFunctions[256] = {
0x006FE5B4, // TRACK_ELEM_FLAT 0x006FE5B4, // TRACK_ELEM_FLAT
0x006FE764, // TRACK_ELEM_END_STATION 0x006FE764, // TRACK_ELEM_END_STATION
0x006FE774, // TRACK_ELEM_BEGIN_STATION 0x006FE774, // TRACK_ELEM_BEGIN_STATION
@ -3658,7 +3658,7 @@ static const uint32 _OldBobsleighCoasterTrackPaintFunctions[256] = {
}; };
/** rct2: 0x0070DC5C */ /** rct2: 0x0070DC5C */
static const uint32 _OldObservationTowerTrackPaintFunctions[256] = { static constexpr const uint32 _OldObservationTowerTrackPaintFunctions[256] = {
0, 0,
0, 0,
0, 0,
@ -3918,7 +3918,7 @@ static const uint32 _OldObservationTowerTrackPaintFunctions[256] = {
}; };
/** rct2: 0x008A5B88 */ /** rct2: 0x008A5B88 */
static const uint32 _OldLoopingRollerCoasterTrackPaintFunctions[256] = { static constexpr const uint32 _OldLoopingRollerCoasterTrackPaintFunctions[256] = {
0x008A6370, // TRACK_ELEM_FLAT 0x008A6370, // TRACK_ELEM_FLAT
0x008A6600, // TRACK_ELEM_END_STATION 0x008A6600, // TRACK_ELEM_END_STATION
0x008A6610, // TRACK_ELEM_BEGIN_STATION 0x008A6610, // TRACK_ELEM_BEGIN_STATION
@ -4178,7 +4178,7 @@ static const uint32 _OldLoopingRollerCoasterTrackPaintFunctions[256] = {
}; };
/** rct2: 0x0070EDB4 */ /** rct2: 0x0070EDB4 */
static const uint32 _OldDinghySlideTrackPaintFunctions[256] = { static constexpr const uint32 _OldDinghySlideTrackPaintFunctions[256] = {
0x0070EF20, // TRACK_ELEM_FLAT 0x0070EF20, // TRACK_ELEM_FLAT
0x0070F030, // TRACK_ELEM_END_STATION 0x0070F030, // TRACK_ELEM_END_STATION
0x0070F040, // TRACK_ELEM_BEGIN_STATION 0x0070F040, // TRACK_ELEM_BEGIN_STATION
@ -4438,7 +4438,7 @@ static const uint32 _OldDinghySlideTrackPaintFunctions[256] = {
}; };
/** rct2: 0x0071BC40 */ /** rct2: 0x0071BC40 */
static const uint32 _OldMineTrainCoasterTrackPaintFunctions[256] = { static constexpr const uint32 _OldMineTrainCoasterTrackPaintFunctions[256] = {
0x0071BFA4, // TRACK_ELEM_FLAT 0x0071BFA4, // TRACK_ELEM_FLAT
0x0071C154, // TRACK_ELEM_END_STATION 0x0071C154, // TRACK_ELEM_END_STATION
0x0071C164, // TRACK_ELEM_BEGIN_STATION 0x0071C164, // TRACK_ELEM_BEGIN_STATION
@ -4698,7 +4698,7 @@ static const uint32 _OldMineTrainCoasterTrackPaintFunctions[256] = {
}; };
/** rct2: 0x00743EC8 */ /** rct2: 0x00743EC8 */
static const uint32 _OldChairliftTrackPaintFunctions[256] = { static constexpr const uint32 _OldChairliftTrackPaintFunctions[256] = {
0x00743FC8, // TRACK_ELEM_FLAT 0x00743FC8, // TRACK_ELEM_FLAT
0x00743F98, // TRACK_ELEM_END_STATION 0x00743F98, // TRACK_ELEM_END_STATION
0x00743FA8, // TRACK_ELEM_BEGIN_STATION 0x00743FA8, // TRACK_ELEM_BEGIN_STATION
@ -4958,7 +4958,7 @@ static const uint32 _OldChairliftTrackPaintFunctions[256] = {
}; };
/** rct2: 0x008A7784 */ /** rct2: 0x008A7784 */
static const uint32 _OldCorkscrewRollerCoasterTrackPaintFunctions[256] = { static constexpr const uint32 _OldCorkscrewRollerCoasterTrackPaintFunctions[256] = {
0x008A7AF8, // TRACK_ELEM_FLAT 0x008A7AF8, // TRACK_ELEM_FLAT
0x008A7D68, // TRACK_ELEM_END_STATION 0x008A7D68, // TRACK_ELEM_END_STATION
0x008A7D78, // TRACK_ELEM_BEGIN_STATION 0x008A7D78, // TRACK_ELEM_BEGIN_STATION
@ -5218,7 +5218,7 @@ static const uint32 _OldCorkscrewRollerCoasterTrackPaintFunctions[256] = {
}; };
/** rct2: 0x008A81E8 */ /** rct2: 0x008A81E8 */
static const uint32 _OldMazeTrackPaintFunctions[256] = { static constexpr const uint32 _OldMazeTrackPaintFunctions[256] = {
0, 0,
0, 0,
0, 0,
@ -5478,7 +5478,7 @@ static const uint32 _OldMazeTrackPaintFunctions[256] = {
}; };
/** rct2: 0x0074840C */ /** rct2: 0x0074840C */
static const uint32 _OldSpiralSlideTrackPaintFunctions[256] = { static constexpr const uint32 _OldSpiralSlideTrackPaintFunctions[256] = {
0, 0,
0, 0,
0, 0,
@ -5738,7 +5738,7 @@ static const uint32 _OldSpiralSlideTrackPaintFunctions[256] = {
}; };
/** rct2: 0x0074A668 */ /** rct2: 0x0074A668 */
static const uint32 _OldGoKartsTrackPaintFunctions[256] = { static constexpr const uint32 _OldGoKartsTrackPaintFunctions[256] = {
0x0074A748, // TRACK_ELEM_FLAT 0x0074A748, // TRACK_ELEM_FLAT
0x0074A7B8, // TRACK_ELEM_END_STATION 0x0074A7B8, // TRACK_ELEM_END_STATION
0x0074A7C8, // TRACK_ELEM_BEGIN_STATION 0x0074A7C8, // TRACK_ELEM_BEGIN_STATION
@ -5998,7 +5998,7 @@ static const uint32 _OldGoKartsTrackPaintFunctions[256] = {
}; };
/** rct2: 0x0074DDEC */ /** rct2: 0x0074DDEC */
static const uint32 _OldLogFlumeTrackPaintFunctions[256] = { static constexpr const uint32 _OldLogFlumeTrackPaintFunctions[256] = {
0x0074E0B0, // TRACK_ELEM_FLAT 0x0074E0B0, // TRACK_ELEM_FLAT
0x0074E140, // TRACK_ELEM_END_STATION 0x0074E140, // TRACK_ELEM_END_STATION
0x0074E150, // TRACK_ELEM_BEGIN_STATION 0x0074E150, // TRACK_ELEM_BEGIN_STATION
@ -6258,7 +6258,7 @@ static const uint32 _OldLogFlumeTrackPaintFunctions[256] = {
}; };
/** rct2: 0x0075745C */ /** rct2: 0x0075745C */
static const uint32 _OldRiverRapidsTrackPaintFunctions[256] = { static constexpr const uint32 _OldRiverRapidsTrackPaintFunctions[256] = {
0x00757650, // TRACK_ELEM_FLAT 0x00757650, // TRACK_ELEM_FLAT
0x007576C0, // TRACK_ELEM_END_STATION 0x007576C0, // TRACK_ELEM_END_STATION
0x007576D0, // TRACK_ELEM_BEGIN_STATION 0x007576D0, // TRACK_ELEM_BEGIN_STATION
@ -6518,7 +6518,7 @@ static const uint32 _OldRiverRapidsTrackPaintFunctions[256] = {
}; };
/** rct2: 0x0075C9D0 */ /** rct2: 0x0075C9D0 */
static const uint32 _OldDodgemsTrackPaintFunctions[256] = { static constexpr const uint32 _OldDodgemsTrackPaintFunctions[256] = {
0, 0,
0, 0,
0, 0,
@ -6778,7 +6778,7 @@ static const uint32 _OldDodgemsTrackPaintFunctions[256] = {
}; };
/** rct2: 0x008A83E0 */ /** rct2: 0x008A83E0 */
static const uint32 _OldPirateShipTrackPaintFunctions[256] = { static constexpr const uint32 _OldPirateShipTrackPaintFunctions[256] = {
0, 0,
0, 0,
0, 0,
@ -7038,7 +7038,7 @@ static const uint32 _OldPirateShipTrackPaintFunctions[256] = {
}; };
/** rct2: 0x00760070 */ /** rct2: 0x00760070 */
static const uint32 _OldSwingingInverterShipTrackPaintFunctions[256] = { static constexpr const uint32 _OldSwingingInverterShipTrackPaintFunctions[256] = {
0, 0,
0, 0,
0, 0,
@ -7302,7 +7302,7 @@ static const uint32 _OldSwingingInverterShipTrackPaintFunctions[256] = {
* *
* rct2: 0x00761160 * rct2: 0x00761160
*/ */
static const uint32 _OldShopTrackPaintFunctions[256] = { static constexpr const uint32 _OldShopTrackPaintFunctions[256] = {
0, 0,
0, 0,
0, 0,
@ -7562,7 +7562,7 @@ static const uint32 _OldShopTrackPaintFunctions[256] = {
}; };
/** rct2: 0x0076190C */ /** rct2: 0x0076190C */
static const uint32 _OldMerryGoRoundTrackPaintFunctions[256] = { static constexpr const uint32 _OldMerryGoRoundTrackPaintFunctions[256] = {
0, 0,
0, 0,
0, 0,
@ -7826,7 +7826,7 @@ static const uint32 _OldMerryGoRoundTrackPaintFunctions[256] = {
* *
* rct2: 0x00762D44 * rct2: 0x00762D44
*/ */
static const uint32 _OldFacilityTrackPaintFunctions[256] = { static constexpr const uint32 _OldFacilityTrackPaintFunctions[256] = {
0, 0,
0, 0,
0, 0,
@ -8086,7 +8086,7 @@ static const uint32 _OldFacilityTrackPaintFunctions[256] = {
}; };
/** rct2: 0x008A8CC8 */ /** rct2: 0x008A8CC8 */
static const uint32 _OldFerrisWheelTrackPaintFunctions[256] = { static constexpr const uint32 _OldFerrisWheelTrackPaintFunctions[256] = {
0, 0,
0, 0,
0, 0,
@ -8346,7 +8346,7 @@ static const uint32 _OldFerrisWheelTrackPaintFunctions[256] = {
}; };
/** rct2: 0x00763520 */ /** rct2: 0x00763520 */
static const uint32 _OldMotionSimulatorTrackPaintFunctions[256] = { static constexpr const uint32 _OldMotionSimulatorTrackPaintFunctions[256] = {
0, 0,
0, 0,
0, 0,
@ -8606,7 +8606,7 @@ static const uint32 _OldMotionSimulatorTrackPaintFunctions[256] = {
}; };
/** rct2: 0x0076554C */ /** rct2: 0x0076554C */
static const uint32 _Old3DCinemaTrackPaintFunctions[256] = { static constexpr const uint32 _Old3DCinemaTrackPaintFunctions[256] = {
0, 0,
0, 0,
0, 0,
@ -8866,7 +8866,7 @@ static const uint32 _Old3DCinemaTrackPaintFunctions[256] = {
}; };
/** rct2: 0x0076659C */ /** rct2: 0x0076659C */
static const uint32 _OldTopSpinTrackPaintFunctions[256] = { static constexpr const uint32 _OldTopSpinTrackPaintFunctions[256] = {
0, 0,
0, 0,
0, 0,
@ -9126,7 +9126,7 @@ static const uint32 _OldTopSpinTrackPaintFunctions[256] = {
}; };
/** rct2: 0x00767A40 */ /** rct2: 0x00767A40 */
static const uint32 _OldSpaceRingsTrackPaintFunctions[256] = { static constexpr const uint32 _OldSpaceRingsTrackPaintFunctions[256] = {
0, 0,
0, 0,
0, 0,
@ -9386,7 +9386,7 @@ static const uint32 _OldSpaceRingsTrackPaintFunctions[256] = {
}; };
/** rct2: 0x00768BAC */ /** rct2: 0x00768BAC */
static const uint32 _OldReverseFreefallCoasterTrackPaintFunctions[256] = { static constexpr const uint32 _OldReverseFreefallCoasterTrackPaintFunctions[256] = {
0x00768DB4, // TRACK_ELEM_FLAT 0x00768DB4, // TRACK_ELEM_FLAT
0x00768DC4, // TRACK_ELEM_END_STATION 0x00768DC4, // TRACK_ELEM_END_STATION
0x00768DD4, // TRACK_ELEM_BEGIN_STATION 0x00768DD4, // TRACK_ELEM_BEGIN_STATION
@ -9646,7 +9646,7 @@ static const uint32 _OldReverseFreefallCoasterTrackPaintFunctions[256] = {
}; };
/** rct2: 0x0076C5BC */ /** rct2: 0x0076C5BC */
static const uint32 _OldLiftTrackPaintFunctions[256] = { static constexpr const uint32 _OldLiftTrackPaintFunctions[256] = {
0, 0,
0, 0,
0, 0,
@ -9906,7 +9906,7 @@ static const uint32 _OldLiftTrackPaintFunctions[256] = {
}; };
/** rct2: 0x008A9C08 */ /** rct2: 0x008A9C08 */
static const uint32 _OldVerticalDropRollerCoasterTrackPaintFunctions[256] = { static constexpr const uint32 _OldVerticalDropRollerCoasterTrackPaintFunctions[256] = {
0x008AA00C, // TRACK_ELEM_FLAT 0x008AA00C, // TRACK_ELEM_FLAT
0x008AA25C, // TRACK_ELEM_END_STATION 0x008AA25C, // TRACK_ELEM_END_STATION
0x008AA26C, // TRACK_ELEM_BEGIN_STATION 0x008AA26C, // TRACK_ELEM_BEGIN_STATION
@ -10166,7 +10166,7 @@ static const uint32 _OldVerticalDropRollerCoasterTrackPaintFunctions[256] = {
}; };
/** rct2: 0x0076D658 */ /** rct2: 0x0076D658 */
static const uint32 _OldTwistTrackPaintFunctions[256] = { static constexpr const uint32 _OldTwistTrackPaintFunctions[256] = {
0, 0,
0, 0,
0, 0,
@ -10426,7 +10426,7 @@ static const uint32 _OldTwistTrackPaintFunctions[256] = {
}; };
/** rct2: 0x0076E7B0 */ /** rct2: 0x0076E7B0 */
static const uint32 _OldHauntedHouseTrackPaintFunctions[256] = { static constexpr const uint32 _OldHauntedHouseTrackPaintFunctions[256] = {
0, 0,
0, 0,
0, 0,
@ -10686,7 +10686,7 @@ static const uint32 _OldHauntedHouseTrackPaintFunctions[256] = {
}; };
/** rct2: 0x0076F8D4 */ /** rct2: 0x0076F8D4 */
static const uint32 _OldCircusShowTrackPaintFunctions[256] = { static constexpr const uint32 _OldCircusShowTrackPaintFunctions[256] = {
0, 0,
0, 0,
0, 0,
@ -10946,7 +10946,7 @@ static const uint32 _OldCircusShowTrackPaintFunctions[256] = {
}; };
/** rct2: 0x00770924 */ /** rct2: 0x00770924 */
static const uint32 _OldGhostTrainTrackPaintFunctions[256] = { static constexpr const uint32 _OldGhostTrainTrackPaintFunctions[256] = {
0x00770BEC, // TRACK_ELEM_FLAT 0x00770BEC, // TRACK_ELEM_FLAT
0x00770C5C, // TRACK_ELEM_END_STATION 0x00770C5C, // TRACK_ELEM_END_STATION
0x00770C6C, // TRACK_ELEM_BEGIN_STATION 0x00770C6C, // TRACK_ELEM_BEGIN_STATION
@ -11206,7 +11206,7 @@ static const uint32 _OldGhostTrainTrackPaintFunctions[256] = {
}; };
/** rct2: 0x008AB2A0 */ /** rct2: 0x008AB2A0 */
static const uint32 _OldTwisterRollerCoasterTrackPaintFunctions[256] = { static constexpr const uint32 _OldTwisterRollerCoasterTrackPaintFunctions[256] = {
0x008AB6A4, // TRACK_ELEM_FLAT 0x008AB6A4, // TRACK_ELEM_FLAT
0x008AB8F4, // TRACK_ELEM_END_STATION 0x008AB8F4, // TRACK_ELEM_END_STATION
0x008AB904, // TRACK_ELEM_BEGIN_STATION 0x008AB904, // TRACK_ELEM_BEGIN_STATION
@ -11466,7 +11466,7 @@ static const uint32 _OldTwisterRollerCoasterTrackPaintFunctions[256] = {
}; };
/** rct2: 0x008AC164 */ /** rct2: 0x008AC164 */
static const uint32 _OldWoodenRollerCoasterTrackPaintFunctions[256] = { static constexpr const uint32 _OldWoodenRollerCoasterTrackPaintFunctions[256] = {
0x008AC568, // TRACK_ELEM_FLAT 0x008AC568, // TRACK_ELEM_FLAT
0x008AC7B8, // TRACK_ELEM_END_STATION 0x008AC7B8, // TRACK_ELEM_END_STATION
0x008AC7C8, // TRACK_ELEM_BEGIN_STATION 0x008AC7C8, // TRACK_ELEM_BEGIN_STATION
@ -11726,7 +11726,7 @@ static const uint32 _OldWoodenRollerCoasterTrackPaintFunctions[256] = {
}; };
/** rct2: 0x00778124 */ /** rct2: 0x00778124 */
static const uint32 _OldSideFrictionRollerCoasterTrackPaintFunctions[256] = { static constexpr const uint32 _OldSideFrictionRollerCoasterTrackPaintFunctions[256] = {
0x0077839C, // TRACK_ELEM_FLAT 0x0077839C, // TRACK_ELEM_FLAT
0x007784AC, // TRACK_ELEM_END_STATION 0x007784AC, // TRACK_ELEM_END_STATION
0x007784BC, // TRACK_ELEM_BEGIN_STATION 0x007784BC, // TRACK_ELEM_BEGIN_STATION
@ -11986,7 +11986,7 @@ static const uint32 _OldSideFrictionRollerCoasterTrackPaintFunctions[256] = {
}; };
/** rct2: 0x0078AE80 */ /** rct2: 0x0078AE80 */
static const uint32 _OldWildMouseTrackPaintFunctions[256] = { static constexpr const uint32 _OldWildMouseTrackPaintFunctions[256] = {
0x0078B1E4, // TRACK_ELEM_FLAT 0x0078B1E4, // TRACK_ELEM_FLAT
0x0078B2B4, // TRACK_ELEM_END_STATION 0x0078B2B4, // TRACK_ELEM_END_STATION
0x0078B2C4, // TRACK_ELEM_BEGIN_STATION 0x0078B2C4, // TRACK_ELEM_BEGIN_STATION
@ -12246,7 +12246,7 @@ static const uint32 _OldWildMouseTrackPaintFunctions[256] = {
}; };
/** rct2: 0x00792978 */ /** rct2: 0x00792978 */
static const uint32 _OldMultiDimensionRollerCoasterTrackPaintFunctions[256] = { static constexpr const uint32 _OldMultiDimensionRollerCoasterTrackPaintFunctions[256] = {
0x00792D88, // TRACK_ELEM_FLAT 0x00792D88, // TRACK_ELEM_FLAT
0x00792F98, // TRACK_ELEM_END_STATION 0x00792F98, // TRACK_ELEM_END_STATION
0x00792FA8, // TRACK_ELEM_BEGIN_STATION 0x00792FA8, // TRACK_ELEM_BEGIN_STATION
@ -12506,7 +12506,7 @@ static const uint32 _OldMultiDimensionRollerCoasterTrackPaintFunctions[256] = {
}; };
/** rct2: 0x007C6C00 */ /** rct2: 0x007C6C00 */
static const uint32 _OldFlyingRollerCoasterTrackPaintFunctions[256] = { static constexpr const uint32 _OldFlyingRollerCoasterTrackPaintFunctions[256] = {
0x007C6FF4, // TRACK_ELEM_FLAT 0x007C6FF4, // TRACK_ELEM_FLAT
0x007C7244, // TRACK_ELEM_END_STATION 0x007C7244, // TRACK_ELEM_END_STATION
0x007C7254, // TRACK_ELEM_BEGIN_STATION 0x007C7254, // TRACK_ELEM_BEGIN_STATION
@ -12766,7 +12766,7 @@ static const uint32 _OldFlyingRollerCoasterTrackPaintFunctions[256] = {
}; };
/** rct2: 0x00811184 */ /** rct2: 0x00811184 */
static const uint32 _OldVirginiaReelTrackPaintFunctions[256] = { static constexpr const uint32 _OldVirginiaReelTrackPaintFunctions[256] = {
0x00811264, // TRACK_ELEM_FLAT 0x00811264, // TRACK_ELEM_FLAT
0x008112D4, // TRACK_ELEM_END_STATION 0x008112D4, // TRACK_ELEM_END_STATION
0x008112E4, // TRACK_ELEM_BEGIN_STATION 0x008112E4, // TRACK_ELEM_BEGIN_STATION
@ -13026,7 +13026,7 @@ static const uint32 _OldVirginiaReelTrackPaintFunctions[256] = {
}; };
/** rct2: 0x008164AC */ /** rct2: 0x008164AC */
static const uint32 _OldSplashBoatsTrackPaintFunctions[256] = { static constexpr const uint32 _OldSplashBoatsTrackPaintFunctions[256] = {
0x00816584, // TRACK_ELEM_FLAT 0x00816584, // TRACK_ELEM_FLAT
0x00816614, // TRACK_ELEM_END_STATION 0x00816614, // TRACK_ELEM_END_STATION
0x00816624, // TRACK_ELEM_BEGIN_STATION 0x00816624, // TRACK_ELEM_BEGIN_STATION
@ -13286,7 +13286,7 @@ static const uint32 _OldSplashBoatsTrackPaintFunctions[256] = {
}; };
/** rct2: 0x0081F268 */ /** rct2: 0x0081F268 */
static const uint32 _OldMiniHelicoptersTrackPaintFunctions[256] = { static constexpr const uint32 _OldMiniHelicoptersTrackPaintFunctions[256] = {
0x0081F348, // TRACK_ELEM_FLAT 0x0081F348, // TRACK_ELEM_FLAT
0x0081F3B8, // TRACK_ELEM_END_STATION 0x0081F3B8, // TRACK_ELEM_END_STATION
0x0081F3C8, // TRACK_ELEM_BEGIN_STATION 0x0081F3C8, // TRACK_ELEM_BEGIN_STATION
@ -13546,7 +13546,7 @@ static const uint32 _OldMiniHelicoptersTrackPaintFunctions[256] = {
}; };
/** rct2: 0x008245A8 */ /** rct2: 0x008245A8 */
static const uint32 _OldLayDownRollerCoasterTrackPaintFunctions[256] = { static constexpr const uint32 _OldLayDownRollerCoasterTrackPaintFunctions[256] = {
0x0082491C, // TRACK_ELEM_FLAT 0x0082491C, // TRACK_ELEM_FLAT
0x00824B8C, // TRACK_ELEM_END_STATION 0x00824B8C, // TRACK_ELEM_END_STATION
0x00824B9C, // TRACK_ELEM_BEGIN_STATION 0x00824B9C, // TRACK_ELEM_BEGIN_STATION
@ -13806,7 +13806,7 @@ static const uint32 _OldLayDownRollerCoasterTrackPaintFunctions[256] = {
}; };
/** rct2: 0x0086347C */ /** rct2: 0x0086347C */
static const uint32 _OldSuspendedMonorailTrackPaintFunctions[256] = { static constexpr const uint32 _OldSuspendedMonorailTrackPaintFunctions[256] = {
0x008636F4, // TRACK_ELEM_FLAT 0x008636F4, // TRACK_ELEM_FLAT
0x008637A4, // TRACK_ELEM_END_STATION 0x008637A4, // TRACK_ELEM_END_STATION
0x008637B4, // TRACK_ELEM_BEGIN_STATION 0x008637B4, // TRACK_ELEM_BEGIN_STATION
@ -14066,7 +14066,7 @@ static const uint32 _OldSuspendedMonorailTrackPaintFunctions[256] = {
}; };
/** rct2: 0x0086E2F8 */ /** rct2: 0x0086E2F8 */
static const uint32 _OldReverserRollerCoasterTrackPaintFunctions[256] = { static constexpr const uint32 _OldReverserRollerCoasterTrackPaintFunctions[256] = {
0x0086E65C, // TRACK_ELEM_FLAT 0x0086E65C, // TRACK_ELEM_FLAT
0x0086E70C, // TRACK_ELEM_END_STATION 0x0086E70C, // TRACK_ELEM_END_STATION
0x0086E71C, // TRACK_ELEM_BEGIN_STATION 0x0086E71C, // TRACK_ELEM_BEGIN_STATION
@ -14326,7 +14326,7 @@ static const uint32 _OldReverserRollerCoasterTrackPaintFunctions[256] = {
}; };
/** rct2: 0x00876618 */ /** rct2: 0x00876618 */
static const uint32 _OldHeartlineTwisterCoasterTrackPaintFunctions[256] = { static constexpr const uint32 _OldHeartlineTwisterCoasterTrackPaintFunctions[256] = {
0x0087694C, // TRACK_ELEM_FLAT 0x0087694C, // TRACK_ELEM_FLAT
0x00876A1C, // TRACK_ELEM_END_STATION 0x00876A1C, // TRACK_ELEM_END_STATION
0x00876A2C, // TRACK_ELEM_BEGIN_STATION 0x00876A2C, // TRACK_ELEM_BEGIN_STATION
@ -14586,7 +14586,7 @@ static const uint32 _OldHeartlineTwisterCoasterTrackPaintFunctions[256] = {
}; };
/** rct2: 0x0087EDC4 */ /** rct2: 0x0087EDC4 */
static const uint32 _OldMiniGolfTrackPaintFunctions[256] = { static constexpr const uint32 _OldMiniGolfTrackPaintFunctions[256] = {
0x0087F10C, // TRACK_ELEM_FLAT 0x0087F10C, // TRACK_ELEM_FLAT
0x0087F17C, // TRACK_ELEM_END_STATION 0x0087F17C, // TRACK_ELEM_END_STATION
0x0087F18C, // TRACK_ELEM_BEGIN_STATION 0x0087F18C, // TRACK_ELEM_BEGIN_STATION
@ -14846,7 +14846,7 @@ static const uint32 _OldMiniGolfTrackPaintFunctions[256] = {
}; };
/** rct2: 0x008AD280 */ /** rct2: 0x008AD280 */
static const uint32 _OldGigaCoasterTrackPaintFunctions[256] = { static constexpr const uint32 _OldGigaCoasterTrackPaintFunctions[256] = {
0x008AD674, // TRACK_ELEM_FLAT 0x008AD674, // TRACK_ELEM_FLAT
0x008AD8C4, // TRACK_ELEM_END_STATION 0x008AD8C4, // TRACK_ELEM_END_STATION
0x008AD8D4, // TRACK_ELEM_BEGIN_STATION 0x008AD8D4, // TRACK_ELEM_BEGIN_STATION
@ -15106,7 +15106,7 @@ static const uint32 _OldGigaCoasterTrackPaintFunctions[256] = {
}; };
/** rct2: 0x00886074 */ /** rct2: 0x00886074 */
static const uint32 _OldRoToDropTrackPaintFunctions[256] = { static constexpr const uint32 _OldRoToDropTrackPaintFunctions[256] = {
0, 0,
0, 0,
0, 0,
@ -15366,7 +15366,7 @@ static const uint32 _OldRoToDropTrackPaintFunctions[256] = {
}; };
/** rct2: 0x00887208 */ /** rct2: 0x00887208 */
static const uint32 _OldFlyingSaucersTrackPaintFunctions[256] = { static constexpr const uint32 _OldFlyingSaucersTrackPaintFunctions[256] = {
0, 0,
0, 0,
0, 0,
@ -15626,7 +15626,7 @@ static const uint32 _OldFlyingSaucersTrackPaintFunctions[256] = {
}; };
/** rct2: 0x00889C28 */ /** rct2: 0x00889C28 */
static const uint32 _OldCrookedHouseTrackPaintFunctions[256] = { static constexpr const uint32 _OldCrookedHouseTrackPaintFunctions[256] = {
0, 0,
0, 0,
0, 0,
@ -15886,7 +15886,7 @@ static const uint32 _OldCrookedHouseTrackPaintFunctions[256] = {
}; };
/** rct2: 0x0088AC88 */ /** rct2: 0x0088AC88 */
static const uint32 _OldMonorailCyclesTrackPaintFunctions[256] = { static constexpr const uint32 _OldMonorailCyclesTrackPaintFunctions[256] = {
0x0088AD48, // TRACK_ELEM_FLAT 0x0088AD48, // TRACK_ELEM_FLAT
0x0088AD58, // TRACK_ELEM_END_STATION 0x0088AD58, // TRACK_ELEM_END_STATION
0x0088AD68, // TRACK_ELEM_BEGIN_STATION 0x0088AD68, // TRACK_ELEM_BEGIN_STATION
@ -16146,7 +16146,7 @@ static const uint32 _OldMonorailCyclesTrackPaintFunctions[256] = {
}; };
/** rct2: 0x008AE36C */ /** rct2: 0x008AE36C */
static const uint32 _OldCompactInvertedCoasterTrackPaintFunctions[256] = { static constexpr const uint32 _OldCompactInvertedCoasterTrackPaintFunctions[256] = {
0x008AE6E0, // TRACK_ELEM_FLAT 0x008AE6E0, // TRACK_ELEM_FLAT
0x008AE950, // TRACK_ELEM_END_STATION 0x008AE950, // TRACK_ELEM_END_STATION
0x008AE960, // TRACK_ELEM_BEGIN_STATION 0x008AE960, // TRACK_ELEM_BEGIN_STATION
@ -16406,7 +16406,7 @@ static const uint32 _OldCompactInvertedCoasterTrackPaintFunctions[256] = {
}; };
/** rct2: 0x008AEDE0 */ /** rct2: 0x008AEDE0 */
static const uint32 _OldWaterCoasterTrackPaintFunctions[256] = { static constexpr const uint32 _OldWaterCoasterTrackPaintFunctions[256] = {
0x008AF154, // TRACK_ELEM_FLAT 0x008AF154, // TRACK_ELEM_FLAT
0x008AF2A4, // TRACK_ELEM_END_STATION 0x008AF2A4, // TRACK_ELEM_END_STATION
0x008AF2B4, // TRACK_ELEM_BEGIN_STATION 0x008AF2B4, // TRACK_ELEM_BEGIN_STATION
@ -16666,7 +16666,7 @@ static const uint32 _OldWaterCoasterTrackPaintFunctions[256] = {
}; };
/** rct2: 0x008AF764 */ /** rct2: 0x008AF764 */
static const uint32 _OldAirPoweredVerticalCoasterTrackPaintFunctions[256] = { static constexpr const uint32 _OldAirPoweredVerticalCoasterTrackPaintFunctions[256] = {
0x008AFAD4, // TRACK_ELEM_FLAT 0x008AFAD4, // TRACK_ELEM_FLAT
0x008AFAE4, // TRACK_ELEM_END_STATION 0x008AFAE4, // TRACK_ELEM_END_STATION
0x008AFAF4, // TRACK_ELEM_BEGIN_STATION 0x008AFAF4, // TRACK_ELEM_BEGIN_STATION
@ -16926,7 +16926,7 @@ static const uint32 _OldAirPoweredVerticalCoasterTrackPaintFunctions[256] = {
}; };
/** rct2: 0x00890940 */ /** rct2: 0x00890940 */
static const uint32 _OldInvertedHairpinCoasterTrackPaintFunctions[256] = { static constexpr const uint32 _OldInvertedHairpinCoasterTrackPaintFunctions[256] = {
0x00890CB4, // TRACK_ELEM_FLAT 0x00890CB4, // TRACK_ELEM_FLAT
0x00890D84, // TRACK_ELEM_END_STATION 0x00890D84, // TRACK_ELEM_END_STATION
0x00890D94, // TRACK_ELEM_BEGIN_STATION 0x00890D94, // TRACK_ELEM_BEGIN_STATION
@ -17186,7 +17186,7 @@ static const uint32 _OldInvertedHairpinCoasterTrackPaintFunctions[256] = {
}; };
/** rct2: 0x00898384 */ /** rct2: 0x00898384 */
static const uint32 _OldMagicCarpetTrackPaintFunctions[256] = { static constexpr const uint32 _OldMagicCarpetTrackPaintFunctions[256] = {
0, 0,
0, 0,
0, 0,
@ -17446,7 +17446,7 @@ static const uint32 _OldMagicCarpetTrackPaintFunctions[256] = {
}; };
/** rct2: 0x008995D4 */ /** rct2: 0x008995D4 */
static const uint32 _OldSubmarineRideTrackPaintFunctions[256] = { static constexpr const uint32 _OldSubmarineRideTrackPaintFunctions[256] = {
0x008996B4, // TRACK_ELEM_FLAT 0x008996B4, // TRACK_ELEM_FLAT
0x008996C4, // TRACK_ELEM_END_STATION 0x008996C4, // TRACK_ELEM_END_STATION
0x008996D4, // TRACK_ELEM_BEGIN_STATION 0x008996D4, // TRACK_ELEM_BEGIN_STATION
@ -17706,7 +17706,7 @@ static const uint32 _OldSubmarineRideTrackPaintFunctions[256] = {
}; };
/** rct2: 0x0089B0C0 */ /** rct2: 0x0089B0C0 */
static const uint32 _OldRiverRaftsTrackPaintFunctions[256] = { static constexpr const uint32 _OldRiverRaftsTrackPaintFunctions[256] = {
0x0089B170, // TRACK_ELEM_FLAT 0x0089B170, // TRACK_ELEM_FLAT
0x0089B1A0, // TRACK_ELEM_END_STATION 0x0089B1A0, // TRACK_ELEM_END_STATION
0x0089B1B0, // TRACK_ELEM_BEGIN_STATION 0x0089B1B0, // TRACK_ELEM_BEGIN_STATION
@ -17966,7 +17966,7 @@ static const uint32 _OldRiverRaftsTrackPaintFunctions[256] = {
}; };
/** rct2: 0x008A13B4 */ /** rct2: 0x008A13B4 */
static const uint32 _OldEnterpriseTrackPaintFunctions[256] = { static constexpr const uint32 _OldEnterpriseTrackPaintFunctions[256] = {
0, 0,
0, 0,
0, 0,
@ -18226,7 +18226,7 @@ static const uint32 _OldEnterpriseTrackPaintFunctions[256] = {
}; };
/** rct2: 0x008B005C */ /** rct2: 0x008B005C */
static const uint32 _OldInvertedImpulseCoasterTrackPaintFunctions[256] = { static constexpr const uint32 _OldInvertedImpulseCoasterTrackPaintFunctions[256] = {
0x008B0460, // TRACK_ELEM_FLAT 0x008B0460, // TRACK_ELEM_FLAT
0x008B0470, // TRACK_ELEM_END_STATION 0x008B0470, // TRACK_ELEM_END_STATION
0x008B0480, // TRACK_ELEM_BEGIN_STATION 0x008B0480, // TRACK_ELEM_BEGIN_STATION
@ -18486,7 +18486,7 @@ static const uint32 _OldInvertedImpulseCoasterTrackPaintFunctions[256] = {
}; };
/** rct2: 0x008A46D8 */ /** rct2: 0x008A46D8 */
static const uint32 _OldMiniRollerCoasterTrackPaintFunctions[256] = { static constexpr const uint32 _OldMiniRollerCoasterTrackPaintFunctions[256] = {
0x008A4ABC, // TRACK_ELEM_FLAT 0x008A4ABC, // TRACK_ELEM_FLAT
0x008A4D0C, // TRACK_ELEM_END_STATION 0x008A4D0C, // TRACK_ELEM_END_STATION
0x008A4D1C, // TRACK_ELEM_BEGIN_STATION 0x008A4D1C, // TRACK_ELEM_BEGIN_STATION
@ -18746,7 +18746,7 @@ static const uint32 _OldMiniRollerCoasterTrackPaintFunctions[256] = {
}; };
/** rct2: 0x008B0610 */ /** rct2: 0x008B0610 */
static const uint32 _OldMineRideTrackPaintFunctions[256] = { static constexpr const uint32 _OldMineRideTrackPaintFunctions[256] = {
0x008B08D0, // TRACK_ELEM_FLAT 0x008B08D0, // TRACK_ELEM_FLAT
0x008B0A80, // TRACK_ELEM_END_STATION 0x008B0A80, // TRACK_ELEM_END_STATION
0x008B0A90, // TRACK_ELEM_BEGIN_STATION 0x008B0A90, // TRACK_ELEM_BEGIN_STATION
@ -19006,7 +19006,7 @@ static const uint32 _OldMineRideTrackPaintFunctions[256] = {
}; };
/** rct2: 0x008A5F6C */ /** rct2: 0x008A5F6C */
static const uint32 _OldLimLaunchedRollerCoasterTrackPaintFunctions[256] = { static constexpr const uint32 _OldLimLaunchedRollerCoasterTrackPaintFunctions[256] = {
0x008A6370, // TRACK_ELEM_FLAT 0x008A6370, // TRACK_ELEM_FLAT
0x008A6D50, // TRACK_ELEM_END_STATION 0x008A6D50, // TRACK_ELEM_END_STATION
0x008A6D60, // TRACK_ELEM_BEGIN_STATION 0x008A6D60, // TRACK_ELEM_BEGIN_STATION
@ -19265,7 +19265,7 @@ static const uint32 _OldLimLaunchedRollerCoasterTrackPaintFunctions[256] = {
0, 0,
}; };
static const uint32 _null[256] = {0}; static constexpr const uint32 _null[256] = {0};
const uint32 * RideTypeTrackPaintFunctionsOld[RIDE_TYPE_COUNT] = { const uint32 * RideTypeTrackPaintFunctionsOld[RIDE_TYPE_COUNT] = {
_OldSpiralRollerCoasterTrackPaintFunctions, // RIDE_TYPE_SPIRAL_ROLLER_COASTER _OldSpiralRollerCoasterTrackPaintFunctions, // RIDE_TYPE_SPIRAL_ROLLER_COASTER

2
src/openrct2/ride/TrackDesign.cpp
View File

@ -608,7 +608,7 @@ static void track_design_mirror_ride(rct_track_td6 * td6)
} }
/** rct2: 0x00993EDC */ /** rct2: 0x00993EDC */
static const uint8 maze_segment_mirror_map[] = { static constexpr const uint8 maze_segment_mirror_map[] = {
5, 4, 2, 7, 1, 0, 14, 3, 13, 12, 10, 15, 9, 8, 6, 11 5, 4, 2, 7, 1, 0, 14, 3, 13, 12, 10, 15, 9, 8, 6, 11
}; };

60
src/openrct2/ride/Vehicle.cpp
View File

@ -103,13 +103,13 @@ rct_vehicle * _vehicleFrontVehicle;
LocationXYZ16 unk_F64E20; LocationXYZ16 unk_F64E20;
// clang-format off // clang-format off
static const uint8 byte_9A3A14[] = { SOUND_SCREAM_8, SOUND_SCREAM_1 }; static constexpr const uint8 byte_9A3A14[] = { SOUND_SCREAM_8, SOUND_SCREAM_1 };
static const uint8 byte_9A3A16[] = { SOUND_SCREAM_1, SOUND_SCREAM_6 }; static constexpr const uint8 byte_9A3A16[] = { SOUND_SCREAM_1, SOUND_SCREAM_6 };
static const uint8 byte_9A3A18[] = { static constexpr const uint8 byte_9A3A18[] = {
SOUND_SCREAM_3, SOUND_SCREAM_1, SOUND_SCREAM_5, SOUND_SCREAM_6, SOUND_SCREAM_3, SOUND_SCREAM_1, SOUND_SCREAM_5, SOUND_SCREAM_6,
SOUND_SCREAM_7, SOUND_SCREAM_2, SOUND_SCREAM_4 SOUND_SCREAM_7, SOUND_SCREAM_2, SOUND_SCREAM_4
}; };
static const uint8 _soundParams[SOUND_MAXID][2] = static constexpr const uint8 _soundParams[SOUND_MAXID][2] =
{ {
{ 1, 0 }, // SOUND_LIFT_1 { 1, 0 }, // SOUND_LIFT_1
{ 1, 0 }, // SOUND_TRACK_FRICTION_1 { 1, 0 }, // SOUND_TRACK_FRICTION_1
@ -176,7 +176,7 @@ static const uint8 _soundParams[SOUND_MAXID][2] =
{ 0, 0 } // SOUND_62 { 0, 0 } // SOUND_62
}; };
static const uint8 SpaceRingsTimeToSpriteMap[] = static constexpr const uint8 SpaceRingsTimeToSpriteMap[] =
{ {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1,
1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4,
@ -310,7 +310,7 @@ static const uint8 SpaceRingsTimeToSpriteMap[] =
255 255
}; };
static const sint8 SwingingTimeToSpriteMap_0[] = static constexpr const sint8 SwingingTimeToSpriteMap_0[] =
{ {
0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0,
@ -318,7 +318,7 @@ static const sint8 SwingingTimeToSpriteMap_0[] =
-3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -2, -2, -2, -2, -2, -2, -2, -2, -2, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -3, -2, -2, -2, -2, -2, -2, -2, -2, -2,
-2, -2, -1, -1, -1, -1, -1, -1, -1, 0, 0, -128 -2, -2, -1, -1, -1, -1, -1, -1, -1, 0, 0, -128
}; };
static const sint8 SwingingTimeToSpriteMap_1[] = static constexpr const sint8 SwingingTimeToSpriteMap_1[] =
{ {
0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 1, 1, 1, 1, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 1, 1, 1, 1,
@ -326,7 +326,7 @@ static const sint8 SwingingTimeToSpriteMap_1[] =
-5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -4, -4, -4, -4, -4, -4, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -4, -4, -4, -4, -4, -4,
-4, -4, -4, -3, -3, -3, -3, -3, -3, -2, -2, -2, -2, -2, -1, -1, -1, -1, 0, -128 -4, -4, -4, -3, -3, -3, -3, -3, -3, -2, -2, -2, -2, -2, -1, -1, -1, -1, 0, -128
}; };
static const sint8 SwingingTimeToSpriteMap_2[] = static constexpr const sint8 SwingingTimeToSpriteMap_2[] =
{ {
0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 5, 5, 5, 5, 5, 5, 4, 4, 4, 4, 4, 3, 3, 3, 3, 2, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 5, 5, 5, 5, 5, 5, 4, 4, 4, 4, 4, 3, 3, 3, 3, 2,
@ -335,7 +335,7 @@ static const sint8 SwingingTimeToSpriteMap_2[] =
-6, -6, -6, -6, -6, -6, -5, -5, -5, -5, -5, -5, -4, -4, -4, -4, -4, -3, -3, -3, -3, -2, -2, -2, -1, -1, -6, -6, -6, -6, -6, -6, -5, -5, -5, -5, -5, -5, -4, -4, -4, -4, -4, -3, -3, -3, -3, -2, -2, -2, -1, -1,
-1, 0, -128 -1, 0, -128
}; };
static const sint8 SwingingTimeToSpriteMap_3[] = static constexpr const sint8 SwingingTimeToSpriteMap_3[] =
{ {
0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9,
9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 5, 5, 5, 5, 4, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 8, 8, 8, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 5, 5, 5, 5, 4,
@ -344,7 +344,7 @@ static const sint8 SwingingTimeToSpriteMap_3[] =
-9, -8, -8, -8, -8, -8, -8, -8, -8, -7, -7, -7, -7, -7, -7, -6, -6, -6, -6, -6, -5, -5, -5, -5, -4, -4, -9, -8, -8, -8, -8, -8, -8, -8, -8, -7, -7, -7, -7, -7, -7, -6, -6, -6, -6, -6, -5, -5, -5, -5, -4, -4,
-4, -3, -3, -2, -2, -1, -1, 0, -128 -4, -3, -3, -2, -2, -1, -1, 0, -128
}; };
static const sint8 SwingingTimeToSpriteMap_4[] = static constexpr const sint8 SwingingTimeToSpriteMap_4[] =
{ {
0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6,
6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6,
@ -355,7 +355,7 @@ static const sint8 SwingingTimeToSpriteMap_4[] =
-6, -6, -6, -5, -5, -5, -5, -5, -5, -5, -4, -4, -4, -4, -4, -3, -3, -3, -3, -3, -2, -2, -2, -2, -2, -1, -6, -6, -6, -5, -5, -5, -5, -5, -5, -5, -4, -4, -4, -4, -4, -3, -3, -3, -3, -3, -2, -2, -2, -2, -2, -1,
-1, -1, -1, -1, 0, 0, -128 -1, -1, -1, -1, 0, 0, -128
}; };
static const sint8 SwingingTimeToSpriteMap_5[] = static constexpr const sint8 SwingingTimeToSpriteMap_5[] =
{ {
0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9,
9, 9, 9, 10, 10, 10, 10, 11, 11, 11, 11, 12, 12, 12, 12, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 9, 9, 9, 10, 10, 10, 10, 11, 11, 11, 11, 12, 12, 12, 12, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14,
@ -370,7 +370,7 @@ static const sint8 SwingingTimeToSpriteMap_5[] =
-11, -11, -11, -10, -10, -10, -10, -9, -9, -9, -9, -8, -8, -8, -8, -7, -7, -7, -7, -6, -6, -6, -6, -5, -11, -11, -11, -10, -10, -10, -10, -9, -9, -9, -9, -8, -8, -8, -8, -7, -7, -7, -7, -6, -6, -6, -6, -5,
-5, -5, -5, -4, -4, -4, -4, -3, -3, -3, -3, -2, -2, -2, -2, -1, -1, -1, -1, 0, 0, -128 -5, -5, -5, -4, -4, -4, -4, -3, -3, -3, -3, -2, -2, -2, -2, -1, -1, -1, -1, 0, 0, -128
}; };
static const sint8 SwingingTimeToSpriteMap_6[] = static constexpr const sint8 SwingingTimeToSpriteMap_6[] =
{ {
0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10, 11, 11, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10, 11, 11,
11, 12, 12, 12, 13, 13, 13, 14, 14, 14, 15, 15, 15, 16, 16, 16, 17, 17, 17, 18, 18, 18, 19, 19, 19, 20, 11, 12, 12, 12, 13, 13, 13, 14, 14, 14, 15, 15, 15, 16, 16, 16, 17, 17, 17, 18, 18, 18, 19, 19, 19, 20,
@ -388,7 +388,7 @@ static const sint8 SwingingTimeToSpriteMap_6[] =
-13, -13, -12, -12, -12, -11, -11, -11, -10, -10, -10, -9, -9, -9, -8, -8, -8, -7, -7, -7, -6, -6, -6, -13, -13, -12, -12, -12, -11, -11, -11, -10, -10, -10, -9, -9, -9, -8, -8, -8, -7, -7, -7, -6, -6, -6,
-5, -5, -5, -4, -4, -4, -3, -3, -3, -2, -2, -2, -1, -1, -1, 0, 0, -128 -5, -5, -5, -4, -4, -4, -3, -3, -3, -2, -2, -2, -1, -1, -1, 0, 0, -128
}; };
static const sint8 SwingingTimeToSpriteMap_7[] = static constexpr const sint8 SwingingTimeToSpriteMap_7[] =
{ {
0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10, 11, 11, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10, 11, 11,
11, 12, 12, 12, 13, 13, 13, 14, 14, 14, 15, 15, 15, 16, 16, 16, 17, 17, 17, 18, 18, 18, 19, 19, 19, 20, 11, 12, 12, 12, 13, 13, 13, 14, 14, 14, 15, 15, 15, 16, 16, 16, 17, 17, 17, 18, 18, 18, 19, 19, 19, 20,
@ -400,7 +400,7 @@ static const sint8 SwingingTimeToSpriteMap_7[] =
-14, -14, -13, -13, -13, -12, -12, -12, -11, -11, -11, -10, -10, -10, -9, -9, -9, -8, -8, -8, -7, -7, -14, -14, -13, -13, -13, -12, -12, -12, -11, -11, -11, -10, -10, -10, -9, -9, -9, -8, -8, -8, -7, -7,
-7, -6, -6, -6, -5, -5, -5, -4, -4, -4, -3, -3, -3, -2, -2, -2, -1, -1, -1, 0, 0, -128 -7, -6, -6, -6, -5, -5, -5, -4, -4, -4, -3, -3, -3, -2, -2, -2, -1, -1, -1, 0, 0, -128
}; };
static const sint8 SwingingTimeToSpriteMap_8[] = static constexpr const sint8 SwingingTimeToSpriteMap_8[] =
{ {
0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6,
6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6,
@ -411,7 +411,7 @@ static const sint8 SwingingTimeToSpriteMap_8[] =
26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 30, 30, 30, 30, 30, 31, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 30, 30, 30, 30, 30, 31,
31, 31, 31, 31, 0, 0, -128 31, 31, 31, 31, 0, 0, -128
}; };
static const sint8 SwingingTimeToSpriteMap_9[] = static constexpr const sint8 SwingingTimeToSpriteMap_9[] =
{ {
0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6,
6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6,
@ -422,7 +422,7 @@ static const sint8 SwingingTimeToSpriteMap_9[] =
26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 30, 30, 30, 30, 30, 31, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 30, 30, 30, 30, 30, 31,
31, 31, 31, 31, 0, 0, -128 31, 31, 31, 31, 0, 0, -128
}; };
static const sint8 SwingingTimeToSpriteMap_10[] = static constexpr const sint8 SwingingTimeToSpriteMap_10[] =
{ {
0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9,
9, 9, 9, 10, 10, 10, 10, 11, 11, 11, 11, 12, 12, 12, 12, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 15, 15, 9, 9, 9, 10, 10, 10, 10, 11, 11, 11, 11, 12, 12, 12, 12, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 15, 15,
@ -438,7 +438,7 @@ static const sint8 SwingingTimeToSpriteMap_10[] =
19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 23, 23, 23, 23, 24, 24, 24, 24, 25, 25, 25, 25, 26, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 23, 23, 23, 23, 24, 24, 24, 24, 25, 25, 25, 25, 26,
26, 26, 26, 27, 27, 27, 27, 28, 28, 28, 28, 29, 29, 29, 29, 30, 30, 30, 30, 31, 31, 31, 31, 0, 0, -128 26, 26, 26, 27, 27, 27, 27, 28, 28, 28, 28, 29, 29, 29, 29, 30, 30, 30, 30, 31, 31, 31, 31, 0, 0, -128
}; };
static const sint8 SwingingTimeToSpriteMap_11[] = static constexpr const sint8 SwingingTimeToSpriteMap_11[] =
{ {
0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 9,
10, 10, 10, 10, 11, 11, 11, 11, 12, 12, 12, 12, 13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 10, 10, 10, 10, 11, 11, 11, 11, 12, 12, 12, 12, 13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16,
@ -448,7 +448,7 @@ static const sint8 SwingingTimeToSpriteMap_11[] =
}; };
/** rct2: 0x0099F9D0 */ /** rct2: 0x0099F9D0 */
static const sint8 * SwingingTimeToSpriteMaps[] = { static constexpr const sint8 * SwingingTimeToSpriteMaps[] = {
SwingingTimeToSpriteMap_0, SwingingTimeToSpriteMap_0,
SwingingTimeToSpriteMap_1, SwingingTimeToSpriteMap_1,
SwingingTimeToSpriteMap_2, SwingingTimeToSpriteMap_2,
@ -471,7 +471,7 @@ typedef struct
} unk_9a36c4; } unk_9a36c4;
/** rct2: 0x009A36C4 */ /** rct2: 0x009A36C4 */
static const unk_9a36c4 Unk9A36C4[] = static constexpr const unk_9a36c4 Unk9A36C4[] =
{ {
{-1, 0, 8716}, {-1, 0, 8716},
{-1, 0, 8716}, {-1, 0, 8716},
@ -508,7 +508,7 @@ static const unk_9a36c4 Unk9A36C4[] =
}; };
/** rct2: 0x009A37C4 */ /** rct2: 0x009A37C4 */
static const LocationXY16 Unk9A37C4[] = static constexpr const LocationXY16 Unk9A37C4[] =
{ {
{ 0, 0}, { 0, 0},
{ 0, +1}, { 0, +1},
@ -522,7 +522,7 @@ static const LocationXY16 Unk9A37C4[] =
}; };
/** rct2: 0x009A37E4 */ /** rct2: 0x009A37E4 */
static const sint32 Unk9A37E4[] = static constexpr const sint32 Unk9A37E4[] =
{ {
2147483647, 2147483647,
2106585154, 2106585154,
@ -587,7 +587,7 @@ static const sint32 Unk9A37E4[] =
}; };
/** rct2: 0x009A38D4 */ /** rct2: 0x009A38D4 */
static const sint32 Unk9A38D4[] = static constexpr const sint32 Unk9A38D4[] =
{ {
0, 0,
417115092, 417115092,
@ -652,7 +652,7 @@ static const sint32 Unk9A38D4[] =
}; };
/** rct2: 0x009A39C4 */ /** rct2: 0x009A39C4 */
static const sint32 Unk9A39C4[] = static constexpr const sint32 Unk9A39C4[] =
{ {
2147483647, 2147483647,
2096579710, 2096579710,
@ -676,7 +676,7 @@ static const sint32 Unk9A39C4[] =
1946281152, 1946281152,
}; };
static const LocationXY16 AvoidCollisionMoveOffset[] = static constexpr const LocationXY16 AvoidCollisionMoveOffset[] =
{ {
{ -1, 0 }, { -1, 0 },
{ 0, 1 }, { 0, 1 },
@ -685,13 +685,13 @@ static const LocationXY16 AvoidCollisionMoveOffset[] =
}; };
static const uint8 DoorOpenSoundIds[] = static constexpr const uint8 DoorOpenSoundIds[] =
{ {
SOUND_DOOR_OPEN, SOUND_DOOR_OPEN,
SOUND_62 SOUND_62
}; };
static const uint8 DoorCloseSoundIds[] = static constexpr const uint8 DoorCloseSoundIds[] =
{ {
SOUND_DOOR_CLOSE, SOUND_DOOR_CLOSE,
SOUND_62 SOUND_62
@ -808,7 +808,7 @@ const rct_vehicle_info * vehicle_get_move_info(sint32 cd, sint32 typeAndDirectio
{ {
if (!vehicle_move_info_valid(cd, typeAndDirection, offset)) if (!vehicle_move_info_valid(cd, typeAndDirection, offset))
{ {
static const rct_vehicle_info zero = { 0 }; static constexpr const rct_vehicle_info zero = { 0 };
return &zero; return &zero;
} }
return &gTrackVehicleInfo[cd][typeAndDirection]->info[offset]; return &gTrackVehicleInfo[cd][typeAndDirection]->info[offset];
@ -3596,7 +3596,7 @@ static void vehicle_update_collision_setup(rct_vehicle * vehicle)
} }
/** rct2: 0x009A3AC4, 0x009A3AC6 */ /** rct2: 0x009A3AC4, 0x009A3AC6 */
static const LocationXY16 stru_9A3AC4[] = { static constexpr const LocationXY16 stru_9A3AC4[] = {
{ -256, 0 }, { -236, 98 }, { -181, 181 }, { -98, 236 }, { 0, 256 }, { 98, 236 }, { 181, 181 }, { 236, 98 }, { -256, 0 }, { -236, 98 }, { -181, 181 }, { -98, 236 }, { 0, 256 }, { 98, 236 }, { 181, 181 }, { 236, 98 },
{ 256, 0 }, { 236, -98 }, { 181, -181 }, { 98, -236 }, { 0, -256 }, { -98, -236 }, { -181, -181 }, { -236, -98 }, { 256, 0 }, { 236, -98 }, { 181, -181 }, { 98, -236 }, { 0, -256 }, { -98, -236 }, { -181, -181 }, { -236, -98 },
}; };
@ -4637,7 +4637,7 @@ static void vehicle_update_boat_location(rct_vehicle * vehicle)
} }
} }
static const sint8 rotations[] = { 0, 1, -1, 2 }; static constexpr const sint8 rotations[] = { 0, 1, -1, 2 };
for (auto rotation : rotations) for (auto rotation : rotations)
{ {
if (randDirection + rotation == curDirection) if (randDirection + rotation == curDirection)
@ -7093,7 +7093,7 @@ enum
loc_6D6718 loc_6D6718
}; };
static const uint8 off_9A2E84[256] = { static constexpr const uint8 off_9A2E84[256] = {
loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C,
loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D66F0, loc_6D672B, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D66F0, loc_6D672B, loc_6D673C, loc_6D673C,
loc_6D673C, loc_6D673C, loc_6D66F0, loc_6D672B, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D66F0, loc_6D672B, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C, loc_6D673C,

24
src/openrct2/ride/VehicleData.cpp
View File

@ -19,7 +19,7 @@
// clang-format off // clang-format off
/** rct2: 0x0099F100 */ /** rct2: 0x0099F100 */
static const uint8 Rotation1TimeToSpriteMap_0[] = { static constexpr const uint8 Rotation1TimeToSpriteMap_0[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@ -72,7 +72,7 @@ static const uint8 Rotation1TimeToSpriteMap_0[] = {
}; };
/** rct2: 0x0099F422 */ /** rct2: 0x0099F422 */
static const uint8 Rotation1TimeToSpriteMap_1[] = { static constexpr const uint8 Rotation1TimeToSpriteMap_1[] = {
0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5,
5, 6, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10, 11, 5, 6, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10, 11,
11, 11, 12, 12, 12, 13, 13, 13, 14, 14, 14, 15, 15, 15, 16, 16, 16, 11, 11, 12, 12, 12, 13, 13, 13, 14, 14, 14, 15, 15, 15, 16, 16, 16,
@ -116,7 +116,7 @@ static const uint8 Rotation1TimeToSpriteMap_1[] = {
}; };
/** rct2: 0x0099F6AB */ /** rct2: 0x0099F6AB */
static const uint8 Rotation1TimeToSpriteMap_2[] = { static constexpr const uint8 Rotation1TimeToSpriteMap_2[] = {
0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5,
5, 6, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10, 11, 5, 6, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10, 11,
11, 11, 12, 12, 12, 13, 13, 13, 14, 14, 14, 15, 15, 15, 16, 16, 16, 11, 11, 12, 12, 12, 13, 13, 13, 14, 14, 14, 15, 15, 15, 16, 16, 16,
@ -176,7 +176,7 @@ const uint8 * Rotation1TimeToSpriteMaps[] = {
}; };
/** rct2: 0x009A2434 */ /** rct2: 0x009A2434 */
static const uint8 Rotation2TimeToSpriteMap_0[] = { static constexpr const uint8 Rotation2TimeToSpriteMap_0[] = {
0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2,
2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4,
4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6,
@ -218,7 +218,7 @@ static const uint8 Rotation2TimeToSpriteMap_0[] = {
}; };
/** rct2: 0x009A26A6 */ /** rct2: 0x009A26A6 */
static const uint8 Rotation2TimeToSpriteMap_1[] = { static constexpr const uint8 Rotation2TimeToSpriteMap_1[] = {
46, 46, 47, 47, 48, 48, 46, 46, 47, 47, 48, 48, 46, 46, 47, 47, 48, 46, 46, 47, 47, 48, 48, 46, 46, 47, 47, 48, 48, 46, 46, 47, 47, 48,
48, 46, 46, 47, 47, 48, 48, 46, 46, 47, 47, 48, 48, 46, 46, 47, 47, 48, 46, 46, 47, 47, 48, 48, 46, 46, 47, 47, 48, 48, 46, 46, 47, 47,
48, 48, 46, 46, 47, 47, 48, 48, 46, 46, 47, 47, 48, 48, 46, 46, 47, 48, 48, 46, 46, 47, 47, 48, 48, 46, 46, 47, 47, 48, 48, 46, 46, 47,
@ -229,7 +229,7 @@ static const uint8 Rotation2TimeToSpriteMap_1[] = {
}; };
/** rct2: 0x009A270E */ /** rct2: 0x009A270E */
static const uint8 Rotation2TimeToSpriteMap_2[] = { static constexpr const uint8 Rotation2TimeToSpriteMap_2[] = {
43, 43, 44, 44, 45, 45, 43, 43, 44, 44, 45, 45, 43, 43, 44, 44, 45, 43, 43, 44, 44, 45, 45, 43, 43, 44, 44, 45, 45, 43, 43, 44, 44, 45,
45, 40, 40, 41, 41, 42, 42, 40, 40, 41, 41, 42, 42, 40, 40, 41, 41, 45, 40, 40, 41, 41, 42, 42, 40, 40, 41, 41, 42, 42, 40, 40, 41, 41,
42, 42, 37, 37, 38, 38, 39, 39, 37, 37, 38, 38, 39, 39, 37, 37, 38, 42, 42, 37, 37, 38, 38, 39, 39, 37, 37, 38, 38, 39, 39, 37, 37, 38,
@ -269,7 +269,7 @@ const uint8 * Rotation2TimeToSpriteMaps[] = {
}; };
/** rct2: 0x0099EB28 */ /** rct2: 0x0099EB28 */
static const uint8 Rotation3TimeToSpriteMap_0[] = { static constexpr const uint8 Rotation3TimeToSpriteMap_0[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@ -306,7 +306,7 @@ static const uint8 Rotation3TimeToSpriteMap_0[] = {
}; };
/** rct2: 0x0099ED49 */ /** rct2: 0x0099ED49 */
static const uint8 Rotation3TimeToSpriteMap_1[] = { static constexpr const uint8 Rotation3TimeToSpriteMap_1[] = {
0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5,
5, 6, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10, 11, 5, 6, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10, 11,
11, 11, 12, 12, 12, 13, 13, 13, 14, 14, 14, 15, 15, 15, 16, 16, 16, 11, 11, 12, 12, 12, 13, 13, 13, 14, 14, 14, 15, 15, 15, 16, 16, 16,
@ -334,7 +334,7 @@ static const uint8 Rotation3TimeToSpriteMap_1[] = {
}; };
/** rct2: 0x0099EED1 */ /** rct2: 0x0099EED1 */
static const uint8 Rotation3TimeToSpriteMap_2[] = { static constexpr const uint8 Rotation3TimeToSpriteMap_2[] = {
0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 0, 0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5,
5, 6, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10, 11, 5, 6, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10, 11,
11, 11, 12, 12, 12, 13, 13, 13, 14, 14, 14, 15, 15, 15, 16, 16, 16, 11, 11, 12, 12, 12, 13, 13, 13, 14, 14, 14, 15, 15, 15, 16, 16, 16,
@ -378,7 +378,7 @@ const uint8 * Rotation3TimeToSpriteMaps[] = {
}; };
/** rct2: 0x009A12EC */ /** rct2: 0x009A12EC */
static const top_spin_time_to_sprite_map TopSpinTimeToSpriteMap_0[] = { static constexpr const top_spin_time_to_sprite_map TopSpinTimeToSpriteMap_0[] = {
{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
{ 0, 0 }, { 0, 0 }, { 1, 0 }, { 1, 0 }, { 1, 0 }, { 1, 0 }, { 1, 0 }, { 0, 0 }, { 0, 0 }, { 1, 0 }, { 1, 0 }, { 1, 0 }, { 1, 0 }, { 1, 0 },
{ 1, 0 }, { 1, 0 }, { 1, 0 }, { 2, 0 }, { 2, 0 }, { 2, 0 }, { 2, 0 }, { 1, 0 }, { 1, 0 }, { 1, 0 }, { 2, 0 }, { 2, 0 }, { 2, 0 }, { 2, 0 },
@ -464,7 +464,7 @@ static const top_spin_time_to_sprite_map TopSpinTimeToSpriteMap_0[] = {
}; };
/** rct2: 0x009A1751 */ /** rct2: 0x009A1751 */
static const top_spin_time_to_sprite_map TopSpinTimeToSpriteMap_1[] = { static constexpr const top_spin_time_to_sprite_map TopSpinTimeToSpriteMap_1[] = {
{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
{ 0, 0 }, { 0, 0 }, { 1, 0 }, { 1, 0 }, { 1, 0 }, { 1, 0 }, { 1, 0 }, { 0, 0 }, { 0, 0 }, { 1, 0 }, { 1, 0 }, { 1, 0 }, { 1, 0 }, { 1, 0 },
{ 1, 0 }, { 1, 0 }, { 1, 0 }, { 2, 0 }, { 2, 0 }, { 2, 0 }, { 2, 0 }, { 1, 0 }, { 1, 0 }, { 1, 0 }, { 2, 0 }, { 2, 0 }, { 2, 0 }, { 2, 0 },
@ -569,7 +569,7 @@ static const top_spin_time_to_sprite_map TopSpinTimeToSpriteMap_1[] = {
}; };
/** rct2: 0x009A1CC6 */ /** rct2: 0x009A1CC6 */
static const top_spin_time_to_sprite_map TopSpinTimeToSpriteMap_2[] = { static constexpr const top_spin_time_to_sprite_map TopSpinTimeToSpriteMap_2[] = {
{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 },
{ 0, 0 }, { 0, 0 }, { 1, 0 }, { 1, 0 }, { 1, 0 }, { 1, 0 }, { 1, 0 }, { 0, 0 }, { 0, 0 }, { 1, 0 }, { 1, 0 }, { 1, 0 }, { 1, 0 }, { 1, 0 },
{ 1, 0 }, { 1, 0 }, { 1, 0 }, { 2, 0 }, { 2, 0 }, { 2, 0 }, { 2, 0 }, { 1, 0 }, { 1, 0 }, { 1, 0 }, { 2, 0 }, { 2, 0 }, { 2, 0 }, { 2, 0 },

30
src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp
View File

@ -184,7 +184,7 @@ static uint32 air_powered_vertical_rc_get_support_colour(paint_session * session
static void air_powered_vertical_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void air_powered_vertical_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4] = { static constexpr const uint32 imageIds[4] = {
SPR_AIR_POWERED_VERTICAL_RC_FLAT_SW_NE, SPR_AIR_POWERED_VERTICAL_RC_FLAT_SW_NE,
SPR_AIR_POWERED_VERTICAL_RC_FLAT_NW_SE, SPR_AIR_POWERED_VERTICAL_RC_FLAT_NW_SE,
SPR_AIR_POWERED_VERTICAL_RC_FLAT_SW_NE, SPR_AIR_POWERED_VERTICAL_RC_FLAT_SW_NE,
@ -205,7 +205,7 @@ static void air_powered_vertical_rc_track_flat(paint_session * session, uint8 ri
static void air_powered_vertical_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, static void air_powered_vertical_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence,
uint8 direction, sint32 height, rct_tile_element * tileElement) uint8 direction, sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][2] = { static constexpr const uint32 imageIds[4][2] = {
{ SPR_AIR_POWERED_VERTICAL_RC_STATION_SW_NE, SPR_STATION_BASE_B_SW_NE }, { SPR_AIR_POWERED_VERTICAL_RC_STATION_SW_NE, SPR_STATION_BASE_B_SW_NE },
{ SPR_AIR_POWERED_VERTICAL_RC_STATION_NW_SE, SPR_STATION_BASE_B_NW_SE }, { SPR_AIR_POWERED_VERTICAL_RC_STATION_NW_SE, SPR_STATION_BASE_B_NW_SE },
{ SPR_AIR_POWERED_VERTICAL_RC_STATION_SW_NE, SPR_STATION_BASE_B_SW_NE }, { SPR_AIR_POWERED_VERTICAL_RC_STATION_SW_NE, SPR_STATION_BASE_B_SW_NE },
@ -231,7 +231,7 @@ static void air_powered_vertical_rc_track_station(paint_session * session, uint8
static void air_powered_vertical_rc_track_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, static void air_powered_vertical_rc_track_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence,
uint8 direction, sint32 height, rct_tile_element * tileElement) uint8 direction, sint32 height, rct_tile_element * tileElement)
{ {
static const sprite_bb imageIds[4][5] = { static constexpr const sprite_bb imageIds[4][5] = {
{ {
{ SPR_AIR_POWERED_VERTICAL_RC_QUARTER_TURN_5_SW_SE_PART_0, { 0, 2, 0 }, { 0, 0, 0 }, { 32, 32, 2 } }, { SPR_AIR_POWERED_VERTICAL_RC_QUARTER_TURN_5_SW_SE_PART_0, { 0, 2, 0 }, { 0, 0, 0 }, { 32, 32, 2 } },
{ SPR_AIR_POWERED_VERTICAL_RC_QUARTER_TURN_5_SW_SE_PART_1, { 0, 16, 0 }, { 0, 0, 0 }, { 32, 16, 2 } }, { SPR_AIR_POWERED_VERTICAL_RC_QUARTER_TURN_5_SW_SE_PART_1, { 0, 16, 0 }, { 0, 0, 0 }, { 32, 16, 2 } },
@ -319,7 +319,7 @@ static void air_powered_vertical_rc_track_left_quarter_turn_5(paint_session * se
static void air_powered_vertical_rc_track_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, static void air_powered_vertical_rc_track_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence,
uint8 direction, sint32 height, rct_tile_element * tileElement) uint8 direction, sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][2] = { static constexpr const uint32 imageIds[4][2] = {
{ SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_LEFT_BANK_SW_NE, SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_LEFT_BANK_FRONT_SW_NE }, { SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_LEFT_BANK_SW_NE, SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_LEFT_BANK_FRONT_SW_NE },
{ SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_LEFT_BANK_NW_SE, SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_LEFT_BANK_FRONT_NW_SE }, { SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_LEFT_BANK_NW_SE, SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_LEFT_BANK_FRONT_NW_SE },
{ SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_LEFT_BANK_NE_SW, SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_LEFT_BANK_FRONT_NE_SW }, { SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_LEFT_BANK_NE_SW, SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_LEFT_BANK_FRONT_NE_SW },
@ -347,7 +347,7 @@ static void air_powered_vertical_rc_track_flat_to_left_bank(paint_session * sess
static void air_powered_vertical_rc_track_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, static void air_powered_vertical_rc_track_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence,
uint8 direction, sint32 height, rct_tile_element * tileElement) uint8 direction, sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][2] = { static constexpr const uint32 imageIds[4][2] = {
{ SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_RIGHT_BANK_SW_NE, SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_LEFT_BANK_FRONT_SW_NE }, { SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_RIGHT_BANK_SW_NE, SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_LEFT_BANK_FRONT_SW_NE },
{ SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_RIGHT_BANK_NW_SE, SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_LEFT_BANK_FRONT_NW_SE }, { SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_RIGHT_BANK_NW_SE, SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_LEFT_BANK_FRONT_NW_SE },
{ SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_RIGHT_BANK_NE_SW, SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_LEFT_BANK_FRONT_NE_SW }, { SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_RIGHT_BANK_NE_SW, SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_LEFT_BANK_FRONT_NE_SW },
@ -389,7 +389,7 @@ static void air_powered_vertical_rc_track_banked_right_quarter_turn_5(paint_sess
uint8 trackSequence, uint8 direction, sint32 height, uint8 trackSequence, uint8 direction, sint32 height,
rct_tile_element * tileElement) rct_tile_element * tileElement)
{ {
static const sprite_bb imageIds[4][5] = { static constexpr const sprite_bb imageIds[4][5] = {
{ {
{ SPR_AIR_POWERED_VERTICAL_RC_BANKED_QUARTER_TURN_5_SW_SE_PART_0, { 0, 0, 0 }, { 0, 6, 0 }, { 32, 20, 3 } }, { SPR_AIR_POWERED_VERTICAL_RC_BANKED_QUARTER_TURN_5_SW_SE_PART_0, { 0, 0, 0 }, { 0, 6, 0 }, { 32, 20, 3 } },
{ SPR_AIR_POWERED_VERTICAL_RC_BANKED_QUARTER_TURN_5_SW_SE_PART_1, { 0, 0, 0 }, { 0, 16, 0 }, { 32, 16, 3 } }, { SPR_AIR_POWERED_VERTICAL_RC_BANKED_QUARTER_TURN_5_SW_SE_PART_1, { 0, 0, 0 }, { 0, 16, 0 }, { 32, 16, 3 } },
@ -492,7 +492,7 @@ static void air_powered_vertical_rc_track_banked_left_quarter_turn_5(paint_sessi
static void air_powered_vertical_rc_track_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, static void air_powered_vertical_rc_track_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence,
uint8 direction, sint32 height, rct_tile_element * tileElement) uint8 direction, sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4] = { static constexpr const uint32 imageIds[4] = {
SPR_AIR_POWERED_VERTICAL_RC_LEFT_BANK_SW_NE, SPR_AIR_POWERED_VERTICAL_RC_LEFT_BANK_SW_NE,
SPR_AIR_POWERED_VERTICAL_RC_LEFT_BANK_NW_SE, SPR_AIR_POWERED_VERTICAL_RC_LEFT_BANK_NW_SE,
SPR_AIR_POWERED_VERTICAL_RC_LEFT_BANK_NE_SW, SPR_AIR_POWERED_VERTICAL_RC_LEFT_BANK_NE_SW,
@ -526,7 +526,7 @@ static void air_powered_vertical_rc_track_right_bank(paint_session * session, ui
static void air_powered_vertical_rc_track_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void air_powered_vertical_rc_track_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4] = { static constexpr const uint32 imageIds[4] = {
SPR_AIR_POWERED_VERTICAL_RC_BRAKES_NW_SE, SPR_AIR_POWERED_VERTICAL_RC_BRAKES_NW_SE,
SPR_AIR_POWERED_VERTICAL_RC_BRAKES_SW_NE, SPR_AIR_POWERED_VERTICAL_RC_BRAKES_SW_NE,
SPR_AIR_POWERED_VERTICAL_RC_BRAKES_NW_SE, SPR_AIR_POWERED_VERTICAL_RC_BRAKES_NW_SE,
@ -547,7 +547,7 @@ static void air_powered_vertical_rc_track_brakes(paint_session * session, uint8
static void air_powered_vertical_rc_track_vertical_slope_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, static void air_powered_vertical_rc_track_vertical_slope_up(paint_session * session, uint8 rideIndex, uint8 trackSequence,
uint8 direction, sint32 height, rct_tile_element * tileElement) uint8 direction, sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 trackImageIds[7][4] = { static constexpr const uint32 trackImageIds[7][4] = {
{ {
SPR_AIR_POWERED_VERTICAL_RC_SLOPE_SW_NE_0, SPR_AIR_POWERED_VERTICAL_RC_SLOPE_SW_NE_0,
SPR_AIR_POWERED_VERTICAL_RC_SLOPE_NW_SE_0, SPR_AIR_POWERED_VERTICAL_RC_SLOPE_NW_SE_0,
@ -587,7 +587,7 @@ static void air_powered_vertical_rc_track_vertical_slope_up(paint_session * sess
}, },
}; };
static const uint32 supportImageIds[7][4] = { static constexpr const uint32 supportImageIds[7][4] = {
{ {
22264, 22264,
SPR_AIR_POWERED_VERTICAL_RC_SLOPE_SUPPORTS_NW_SE_0, SPR_AIR_POWERED_VERTICAL_RC_SLOPE_SUPPORTS_NW_SE_0,
@ -632,9 +632,9 @@ static void air_powered_vertical_rc_track_vertical_slope_up(paint_session * sess
}, },
}; };
static const sint8 bbHeights03[] = { 1, 6, 14, 37, 76 }; static constexpr const sint8 bbHeights03[] = { 1, 6, 14, 37, 76 };
static const sint8 bbHeights12[] = { 1, 6, 14, 27, 59 }; static constexpr const sint8 bbHeights12[] = { 1, 6, 14, 27, 59 };
static const sint32 supportHeights[] = { 48, 64, 128, 176, 208, 240, 240 }; static constexpr const sint32 supportHeights[] = { 48, 64, 128, 176, 208, 240, 240 };
uint32 supportsImageId = supportImageIds[trackSequence][direction] | air_powered_vertical_rc_get_support_colour(session); uint32 supportsImageId = supportImageIds[trackSequence][direction] | air_powered_vertical_rc_get_support_colour(session);
uint32 trackImageId = trackImageIds[trackSequence][direction] | session->TrackColours[SCHEME_TRACK]; uint32 trackImageId = trackImageIds[trackSequence][direction] | session->TrackColours[SCHEME_TRACK];
@ -749,7 +749,7 @@ static void air_powered_vertical_rc_track_vertical_slope_up(paint_session * sess
static void air_powered_vertical_rc_track_vertical_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, static void air_powered_vertical_rc_track_vertical_up(paint_session * session, uint8 rideIndex, uint8 trackSequence,
uint8 direction, sint32 height, rct_tile_element * tileElement) uint8 direction, sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][2] = { static constexpr const uint32 imageIds[4][2] = {
{ SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_UP_SW_NE_SEQ_0, SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_UP_SW_NE_SEQ_1 }, { SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_UP_SW_NE_SEQ_0, SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_UP_SW_NE_SEQ_1 },
{ SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_UP_NW_SE_SEQ_0, SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_UP_NW_SE_SEQ_1 }, { SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_UP_NW_SE_SEQ_0, SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_UP_NW_SE_SEQ_1 },
{ SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_UP_NE_SW_SEQ_0, SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_UP_NE_SW_SEQ_1 }, { SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_UP_NE_SW_SEQ_0, SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_UP_NE_SW_SEQ_1 },
@ -792,7 +792,7 @@ static void air_powered_vertical_rc_track_vertical_top(paint_session * session,
return; return;
} }
static const uint32 imageIds[4][6] = { static constexpr const uint32 imageIds[4][6] = {
{ SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_SUPPORT_SW_NE, SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_SW_NE_SEQ_0, { SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_SUPPORT_SW_NE, SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_SW_NE_SEQ_0,
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_SW_NE_SEQ_1, SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_SW_NE_SEQ_1,
SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_SW_NE_SEQ_2, SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_SUPPORT_NE_SW, SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_SW_NE_SEQ_2, SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_SUPPORT_NE_SW,

2
src/openrct2/ride/coaster/BobsleighCoaster.cpp
View File

@ -87,7 +87,7 @@ static void bobsleigh_rc_track_flat(paint_session * session, uint8 rideIndex, ui
static void bobsleigh_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void bobsleigh_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][2] = { static constexpr const uint32 imageIds[4][2] = {
{ 14580, SPR_STATION_BASE_B_SW_NE }, { 14580, SPR_STATION_BASE_B_SW_NE },
{ 14581, SPR_STATION_BASE_B_NW_SE }, { 14581, SPR_STATION_BASE_B_NW_SE },
{ 14580, SPR_STATION_BASE_B_SW_NE }, { 14580, SPR_STATION_BASE_B_SW_NE },

2
src/openrct2/ride/coaster/BolligerMabillardTrack.cpp
View File

@ -85,7 +85,7 @@ void bolliger_mabillard_track_flat(paint_session * session, uint8 rideIndex, uin
void bolliger_mabillard_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, void bolliger_mabillard_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement, sint32 supportType) sint32 height, rct_tile_element * tileElement, sint32 supportType)
{ {
static const uint32 imageIds[4][3] = { static constexpr const uint32 imageIds[4][3] = {
{ 17154, 17150, SPR_STATION_BASE_A_SW_NE }, { 17154, 17150, SPR_STATION_BASE_A_SW_NE },
{ 17155, 17151, SPR_STATION_BASE_A_NW_SE }, { 17155, 17151, SPR_STATION_BASE_A_NW_SE },
{ 17154, 17150, SPR_STATION_BASE_A_SW_NE }, { 17154, 17150, SPR_STATION_BASE_A_SW_NE },

2
src/openrct2/ride/coaster/CompactInvertedCoaster.cpp
View File

@ -79,7 +79,7 @@ static void compact_inverted_rc_track_flat(paint_session * session, uint8 rideIn
static void compact_inverted_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void compact_inverted_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][3] = { static constexpr const uint32 imageIds[4][3] = {
{ SPR_STATION_BASE_C_SW_NE, 26557, SPR_STATION_INVERTED_BAR_A_SW_NE }, { SPR_STATION_BASE_C_SW_NE, 26557, SPR_STATION_INVERTED_BAR_A_SW_NE },
{ SPR_STATION_BASE_C_NW_SE, 26558, SPR_STATION_INVERTED_BAR_A_NW_SE }, { SPR_STATION_BASE_C_NW_SE, 26558, SPR_STATION_INVERTED_BAR_A_NW_SE },
{ SPR_STATION_BASE_C_SW_NE, 26557, SPR_STATION_INVERTED_BAR_A_SW_NE }, { SPR_STATION_BASE_C_SW_NE, 26557, SPR_STATION_INVERTED_BAR_A_SW_NE },

2
src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp
View File

@ -86,7 +86,7 @@ static void corkscrew_rc_track_flat(paint_session * session, uint8 rideIndex, ui
static void corkscrew_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void corkscrew_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][3] = { static constexpr const uint32 imageIds[4][3] = {
{ 16236, 16232, SPR_STATION_BASE_A_SW_NE }, { 16236, 16232, SPR_STATION_BASE_A_SW_NE },
{ 16237, 16233, SPR_STATION_BASE_A_NW_SE }, { 16237, 16233, SPR_STATION_BASE_A_NW_SE },
{ 16236, 16232, SPR_STATION_BASE_A_SW_NE }, { 16236, 16232, SPR_STATION_BASE_A_SW_NE },

4
src/openrct2/ride/coaster/FlyingRollerCoaster.cpp
View File

@ -139,7 +139,7 @@ static void flying_rc_track_station(paint_session * session, uint8 rideIndex, ui
{ {
if (track_element_is_inverted(tileElement)) if (track_element_is_inverted(tileElement))
{ {
static const uint32 imageIds[4][3] = { static constexpr const uint32 imageIds[4][3] = {
{ SPR_STATION_BASE_C_SW_NE, 27131, SPR_STATION_INVERTED_BAR_C_SW_NE }, { SPR_STATION_BASE_C_SW_NE, 27131, SPR_STATION_INVERTED_BAR_C_SW_NE },
{ SPR_STATION_BASE_C_NW_SE, 27132, SPR_STATION_INVERTED_BAR_C_NW_SE }, { SPR_STATION_BASE_C_NW_SE, 27132, SPR_STATION_INVERTED_BAR_C_NW_SE },
{ SPR_STATION_BASE_C_SW_NE, 27131, SPR_STATION_INVERTED_BAR_C_SW_NE }, { SPR_STATION_BASE_C_SW_NE, 27131, SPR_STATION_INVERTED_BAR_C_SW_NE },
@ -157,7 +157,7 @@ static void flying_rc_track_station(paint_session * session, uint8 rideIndex, ui
} }
else else
{ {
static const uint32 imageIds[4][3] = { static constexpr const uint32 imageIds[4][3] = {
{ 17154, 17150, SPR_STATION_BASE_A_SW_NE }, { 17154, 17150, SPR_STATION_BASE_A_SW_NE },
{ 17155, 17151, SPR_STATION_BASE_A_NW_SE }, { 17155, 17151, SPR_STATION_BASE_A_NW_SE },
{ 17154, 17150, SPR_STATION_BASE_A_SW_NE }, { 17154, 17150, SPR_STATION_BASE_A_SW_NE },

2
src/openrct2/ride/coaster/GigaCoaster.cpp
View File

@ -105,7 +105,7 @@ static void giga_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 t
static void giga_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, static void giga_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height,
rct_tile_element * tileElement) rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][3] = { static constexpr const uint32 imageIds[4][3] = {
{ 18084, 18076, SPR_STATION_BASE_A_SW_NE }, { 18084, 18076, SPR_STATION_BASE_A_SW_NE },
{ 18085, 18077, SPR_STATION_BASE_A_NW_SE }, { 18085, 18077, SPR_STATION_BASE_A_NW_SE },
{ 18084, 18076, SPR_STATION_BASE_A_SW_NE }, { 18084, 18076, SPR_STATION_BASE_A_SW_NE },

2
src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp
View File

@ -94,7 +94,7 @@ static void heartline_twister_rc_track_flat(paint_session * session, uint8 rideI
static void heartline_twister_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void heartline_twister_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][3] = { static constexpr const uint32 imageIds[4][3] = {
{ 19732, SPR_STATION_BASE_B_SW_NE }, { 19732, SPR_STATION_BASE_B_SW_NE },
{ 19733, SPR_STATION_BASE_B_NW_SE }, { 19733, SPR_STATION_BASE_B_NW_SE },
{ 19732, SPR_STATION_BASE_B_SW_NE }, { 19732, SPR_STATION_BASE_B_SW_NE },

2
src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp
View File

@ -85,7 +85,7 @@ static void inverted_hairpin_rc_track_flat(paint_session * session, uint8 rideIn
static void inverted_hairpin_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void inverted_hairpin_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][3] = { static constexpr const uint32 imageIds[4][3] = {
{ SPR_STATION_BASE_C_SW_NE, 17028, SPR_STATION_INVERTED_BAR_0_SW_NE }, { SPR_STATION_BASE_C_SW_NE, 17028, SPR_STATION_INVERTED_BAR_0_SW_NE },
{ SPR_STATION_BASE_C_NW_SE, 17029, SPR_STATION_INVERTED_BAR_0_NW_SE }, { SPR_STATION_BASE_C_NW_SE, 17029, SPR_STATION_INVERTED_BAR_0_NW_SE },
{ SPR_STATION_BASE_C_SW_NE, 17028, SPR_STATION_INVERTED_BAR_0_SW_NE }, { SPR_STATION_BASE_C_SW_NE, 17028, SPR_STATION_INVERTED_BAR_0_SW_NE },

2
src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp
View File

@ -60,7 +60,7 @@ static void inverted_impulse_rc_track_flat(paint_session * session, uint8 rideIn
static void inverted_impulse_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void inverted_impulse_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][3] = { static constexpr const uint32 imageIds[4][3] = {
{ SPR_STATION_BASE_C_SW_NE, 19662, SPR_STATION_INVERTED_BAR_B_SW_NE }, { SPR_STATION_BASE_C_SW_NE, 19662, SPR_STATION_INVERTED_BAR_B_SW_NE },
{ SPR_STATION_BASE_C_NW_SE, 19663, SPR_STATION_INVERTED_BAR_B_NW_SE }, { SPR_STATION_BASE_C_NW_SE, 19663, SPR_STATION_INVERTED_BAR_B_NW_SE },
{ SPR_STATION_BASE_C_SW_NE, 19662, SPR_STATION_INVERTED_BAR_B_SW_NE }, { SPR_STATION_BASE_C_SW_NE, 19662, SPR_STATION_INVERTED_BAR_B_SW_NE },

2
src/openrct2/ride/coaster/InvertedRollerCoaster.cpp
View File

@ -78,7 +78,7 @@ static void inverted_rc_track_flat(paint_session * session, uint8 rideIndex, uin
static void inverted_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void inverted_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][3] = { static constexpr const uint32 imageIds[4][3] = {
{ SPR_STATION_BASE_C_SW_NE, 27131, SPR_STATION_INVERTED_BAR_C_SW_NE }, { SPR_STATION_BASE_C_SW_NE, 27131, SPR_STATION_INVERTED_BAR_C_SW_NE },
{ SPR_STATION_BASE_C_NW_SE, 27132, SPR_STATION_INVERTED_BAR_C_NW_SE }, { SPR_STATION_BASE_C_NW_SE, 27132, SPR_STATION_INVERTED_BAR_C_NW_SE },
{ SPR_STATION_BASE_C_SW_NE, 27131, SPR_STATION_INVERTED_BAR_C_SW_NE }, { SPR_STATION_BASE_C_SW_NE, 27131, SPR_STATION_INVERTED_BAR_C_SW_NE },

198
src/openrct2/ride/coaster/JuniorRollerCoaster.cpp
View File

@ -644,7 +644,7 @@ enum
SPR_JUNIOR_RC_BOOSTER_NE_SW = SPR_G2_BEGIN + 86, SPR_JUNIOR_RC_BOOSTER_NE_SW = SPR_G2_BEGIN + 86,
}; };
static const uint32 junior_rc_track_pieces_flat[3][4] = { static constexpr const uint32 junior_rc_track_pieces_flat[3][4] = {
{ SPR_JUNIOR_RC_FLAT_SW_NE, SPR_JUNIOR_RC_FLAT_NW_SE, SPR_JUNIOR_RC_FLAT_SW_NE, SPR_JUNIOR_RC_FLAT_NW_SE }, { SPR_JUNIOR_RC_FLAT_SW_NE, SPR_JUNIOR_RC_FLAT_NW_SE, SPR_JUNIOR_RC_FLAT_SW_NE, SPR_JUNIOR_RC_FLAT_NW_SE },
{ SPR_JUNIOR_RC_FLAT_CHAIN_SW_NE, SPR_JUNIOR_RC_FLAT_CHAIN_NW_SE, SPR_JUNIOR_RC_FLAT_CHAIN_SW_NE, { SPR_JUNIOR_RC_FLAT_CHAIN_SW_NE, SPR_JUNIOR_RC_FLAT_CHAIN_NW_SE, SPR_JUNIOR_RC_FLAT_CHAIN_SW_NE,
SPR_JUNIOR_RC_FLAT_CHAIN_NW_SE }, SPR_JUNIOR_RC_FLAT_CHAIN_NW_SE },
@ -656,20 +656,20 @@ static const uint32 junior_rc_track_pieces_flat[3][4] = {
}, },
}; };
static const uint32 junior_rc_track_pieces_block_brake[2][4] = { static constexpr const uint32 junior_rc_track_pieces_block_brake[2][4] = {
{ SPR_JUNIOR_RC_FLAT_BLOCK_SW_NE, SPR_JUNIOR_RC_FLAT_BLOCK_NW_SE, SPR_JUNIOR_RC_FLAT_BLOCK_SW_NE, { SPR_JUNIOR_RC_FLAT_BLOCK_SW_NE, SPR_JUNIOR_RC_FLAT_BLOCK_NW_SE, SPR_JUNIOR_RC_FLAT_BLOCK_SW_NE,
SPR_JUNIOR_RC_FLAT_BLOCK_NW_SE }, SPR_JUNIOR_RC_FLAT_BLOCK_NW_SE },
{ SPR_JUNIOR_RC_FLAT_BLOCK_SW_NE_BRAKED, SPR_JUNIOR_RC_FLAT_BLOCK_NW_SE_BRAKED, SPR_JUNIOR_RC_FLAT_BLOCK_SW_NE_BRAKED, { SPR_JUNIOR_RC_FLAT_BLOCK_SW_NE_BRAKED, SPR_JUNIOR_RC_FLAT_BLOCK_NW_SE_BRAKED, SPR_JUNIOR_RC_FLAT_BLOCK_SW_NE_BRAKED,
SPR_JUNIOR_RC_FLAT_BLOCK_NW_SE_BRAKED }, SPR_JUNIOR_RC_FLAT_BLOCK_NW_SE_BRAKED },
}; };
static const uint32 junior_rc_track_pieces_station[2][4] = { static constexpr const uint32 junior_rc_track_pieces_station[2][4] = {
{ SPR_JUNIOR_RC_STATION_SW_NE, SPR_JUNIOR_RC_STATION_NW_SE, SPR_JUNIOR_RC_STATION_SW_NE, SPR_JUNIOR_RC_STATION_NW_SE }, { SPR_JUNIOR_RC_STATION_SW_NE, SPR_JUNIOR_RC_STATION_NW_SE, SPR_JUNIOR_RC_STATION_SW_NE, SPR_JUNIOR_RC_STATION_NW_SE },
{ SPR_JUNIOR_RC_FLAT_SW_NE_BRAKED, SPR_JUNIOR_RC_FLAT_NW_SE_BRAKED, SPR_JUNIOR_RC_FLAT_SW_NE_BRAKED, { SPR_JUNIOR_RC_FLAT_SW_NE_BRAKED, SPR_JUNIOR_RC_FLAT_NW_SE_BRAKED, SPR_JUNIOR_RC_FLAT_SW_NE_BRAKED,
SPR_JUNIOR_RC_FLAT_NW_SE_BRAKED }, SPR_JUNIOR_RC_FLAT_NW_SE_BRAKED },
}; };
static const uint32 junior_rc_track_pieces_25_deg_up[3][4] = { static constexpr const uint32 junior_rc_track_pieces_25_deg_up[3][4] = {
{ SPR_JUNIOR_RC_25_DEG_SW_NE, SPR_JUNIOR_RC_25_DEG_NW_SE, SPR_JUNIOR_RC_25_DEG_NE_SW, SPR_JUNIOR_RC_25_DEG_SE_NW }, { SPR_JUNIOR_RC_25_DEG_SW_NE, SPR_JUNIOR_RC_25_DEG_NW_SE, SPR_JUNIOR_RC_25_DEG_NE_SW, SPR_JUNIOR_RC_25_DEG_SE_NW },
{ SPR_JUNIOR_RC_25_DEG_CHAIN_SW_NE, SPR_JUNIOR_RC_25_DEG_CHAIN_NW_SE, SPR_JUNIOR_RC_25_DEG_CHAIN_NE_SW, { SPR_JUNIOR_RC_25_DEG_CHAIN_SW_NE, SPR_JUNIOR_RC_25_DEG_CHAIN_NW_SE, SPR_JUNIOR_RC_25_DEG_CHAIN_NE_SW,
SPR_JUNIOR_RC_25_DEG_CHAIN_SE_NW }, SPR_JUNIOR_RC_25_DEG_CHAIN_SE_NW },
@ -681,7 +681,7 @@ static const uint32 junior_rc_track_pieces_25_deg_up[3][4] = {
}, },
}; };
static const uint32 junior_rc_track_pieces_flat_to_25_deg_up[3][4] = { static constexpr const uint32 junior_rc_track_pieces_flat_to_25_deg_up[3][4] = {
{ SPR_JUNIOR_RC_FLAT_TO_25_DEG_UP_SW_NE, SPR_JUNIOR_RC_FLAT_TO_25_DEG_UP_NW_SE, SPR_JUNIOR_RC_FLAT_TO_25_DEG_UP_NE_SW, { SPR_JUNIOR_RC_FLAT_TO_25_DEG_UP_SW_NE, SPR_JUNIOR_RC_FLAT_TO_25_DEG_UP_NW_SE, SPR_JUNIOR_RC_FLAT_TO_25_DEG_UP_NE_SW,
SPR_JUNIOR_RC_FLAT_TO_25_DEG_UP_SE_NW }, SPR_JUNIOR_RC_FLAT_TO_25_DEG_UP_SE_NW },
{ SPR_JUNIOR_RC_FLAT_TO_25_DEG_UP_CHAIN_SW_NE, SPR_JUNIOR_RC_FLAT_TO_25_DEG_UP_CHAIN_NW_SE, { SPR_JUNIOR_RC_FLAT_TO_25_DEG_UP_CHAIN_SW_NE, SPR_JUNIOR_RC_FLAT_TO_25_DEG_UP_CHAIN_NW_SE,
@ -694,7 +694,7 @@ static const uint32 junior_rc_track_pieces_flat_to_25_deg_up[3][4] = {
}, },
}; };
static const uint32 junior_rc_track_pieces_25_deg_up_to_flat[3][4] = { static constexpr const uint32 junior_rc_track_pieces_25_deg_up_to_flat[3][4] = {
{ SPR_JUNIOR_RC_25_DEG_UP_TO_FLAT_SW_NE, SPR_JUNIOR_RC_25_DEG_UP_TO_FLAT_NW_SE, SPR_JUNIOR_RC_25_DEG_UP_TO_FLAT_NE_SW, { SPR_JUNIOR_RC_25_DEG_UP_TO_FLAT_SW_NE, SPR_JUNIOR_RC_25_DEG_UP_TO_FLAT_NW_SE, SPR_JUNIOR_RC_25_DEG_UP_TO_FLAT_NE_SW,
SPR_JUNIOR_RC_25_DEG_UP_TO_FLAT_SE_NW }, SPR_JUNIOR_RC_25_DEG_UP_TO_FLAT_SE_NW },
{ SPR_JUNIOR_RC_25_DEG_UP_TO_FLAT_CHAIN_SW_NE, SPR_JUNIOR_RC_25_DEG_UP_TO_FLAT_CHAIN_NW_SE, { SPR_JUNIOR_RC_25_DEG_UP_TO_FLAT_CHAIN_SW_NE, SPR_JUNIOR_RC_25_DEG_UP_TO_FLAT_CHAIN_NW_SE,
@ -707,21 +707,21 @@ static const uint32 junior_rc_track_pieces_25_deg_up_to_flat[3][4] = {
}, },
}; };
static const uint32 junior_rc_track_pieces_flat_to_left_bank[4][2] = { static constexpr const uint32 junior_rc_track_pieces_flat_to_left_bank[4][2] = {
{ SPR_JUNIOR_RC_FLAT_TO_LEFT_BANK_SW_NE, SPR_JUNIOR_RC_FLAT_TO_LEFT_BANK_SW_NE_FRONT }, { SPR_JUNIOR_RC_FLAT_TO_LEFT_BANK_SW_NE, SPR_JUNIOR_RC_FLAT_TO_LEFT_BANK_SW_NE_FRONT },
{ SPR_JUNIOR_RC_FLAT_TO_LEFT_BANK_NW_SE, SPR_JUNIOR_RC_FLAT_TO_LEFT_BANK_NW_SE_FRONT }, { SPR_JUNIOR_RC_FLAT_TO_LEFT_BANK_NW_SE, SPR_JUNIOR_RC_FLAT_TO_LEFT_BANK_NW_SE_FRONT },
{ SPR_JUNIOR_RC_FLAT_TO_LEFT_BANK_NE_SW, 0 }, { SPR_JUNIOR_RC_FLAT_TO_LEFT_BANK_NE_SW, 0 },
{ SPR_JUNIOR_RC_FLAT_TO_LEFT_BANK_SE_NW, 0 } { SPR_JUNIOR_RC_FLAT_TO_LEFT_BANK_SE_NW, 0 }
}; };
static const uint32 junior_rc_track_pieces_flat_to_right_bank[4][2] = { static constexpr const uint32 junior_rc_track_pieces_flat_to_right_bank[4][2] = {
{ SPR_JUNIOR_RC_FLAT_TO_RIGHT_BANK_SW_NE, 0 }, { SPR_JUNIOR_RC_FLAT_TO_RIGHT_BANK_SW_NE, 0 },
{ SPR_JUNIOR_RC_FLAT_TO_RIGHT_BANK_NW_SE, 0 }, { SPR_JUNIOR_RC_FLAT_TO_RIGHT_BANK_NW_SE, 0 },
{ SPR_JUNIOR_RC_FLAT_TO_RIGHT_BANK_NE_SW, SPR_JUNIOR_RC_FLAT_TO_RIGHT_BANK_NE_SW_FRONT }, { SPR_JUNIOR_RC_FLAT_TO_RIGHT_BANK_NE_SW, SPR_JUNIOR_RC_FLAT_TO_RIGHT_BANK_NE_SW_FRONT },
{ SPR_JUNIOR_RC_FLAT_TO_RIGHT_BANK_SE_NW, SPR_JUNIOR_RC_FLAT_TO_RIGHT_BANK_SE_NW_FRONT } { SPR_JUNIOR_RC_FLAT_TO_RIGHT_BANK_SE_NW, SPR_JUNIOR_RC_FLAT_TO_RIGHT_BANK_SE_NW_FRONT }
}; };
static const uint32 junior_rc_track_pieces_flat_quarter_turn_5_tiles[4][5] = { static constexpr const uint32 junior_rc_track_pieces_flat_quarter_turn_5_tiles[4][5] = {
{ {
SPR_JUNIOR_RC_FLAT_QUARTER_TURN_5_TILES_SW_SE_PART_0, SPR_JUNIOR_RC_FLAT_QUARTER_TURN_5_TILES_SW_SE_PART_0,
SPR_JUNIOR_RC_FLAT_QUARTER_TURN_5_TILES_SW_SE_PART_1, SPR_JUNIOR_RC_FLAT_QUARTER_TURN_5_TILES_SW_SE_PART_1,
@ -752,7 +752,7 @@ static const uint32 junior_rc_track_pieces_flat_quarter_turn_5_tiles[4][5] = {
} }
}; };
static const uint32 junior_rc_track_pieces_banked_quarter_turn_5_tiles[4][5] = { static constexpr const uint32 junior_rc_track_pieces_banked_quarter_turn_5_tiles[4][5] = {
{ {
SPR_JUNIOR_RC_BANKED_QUARTER_TURN_5_TILES_SW_SE_PART_0, SPR_JUNIOR_RC_BANKED_QUARTER_TURN_5_TILES_SW_SE_PART_0,
SPR_JUNIOR_RC_BANKED_QUARTER_TURN_5_TILES_SW_SE_PART_1, SPR_JUNIOR_RC_BANKED_QUARTER_TURN_5_TILES_SW_SE_PART_1,
@ -783,38 +783,38 @@ static const uint32 junior_rc_track_pieces_banked_quarter_turn_5_tiles[4][5] = {
} }
}; };
static const uint32 junior_rc_track_pieces_left_banked_to_25_deg_up[4][2] = { static constexpr const uint32 junior_rc_track_pieces_left_banked_to_25_deg_up[4][2] = {
{ SPR_JUNIOR_RC_LEFT_BANK_TO_25_DEG_UP_SW_NE, SPR_JUNIOR_RC_LEFT_BANK_TO_25_DEG_UP_SW_NE_FRONT }, { SPR_JUNIOR_RC_LEFT_BANK_TO_25_DEG_UP_SW_NE, SPR_JUNIOR_RC_LEFT_BANK_TO_25_DEG_UP_SW_NE_FRONT },
{ SPR_JUNIOR_RC_LEFT_BANK_TO_25_DEG_UP_NW_SE, SPR_JUNIOR_RC_LEFT_BANK_TO_25_DEG_UP_NW_SE_FRONT }, { SPR_JUNIOR_RC_LEFT_BANK_TO_25_DEG_UP_NW_SE, SPR_JUNIOR_RC_LEFT_BANK_TO_25_DEG_UP_NW_SE_FRONT },
{ SPR_JUNIOR_RC_LEFT_BANK_TO_25_DEG_UP_NE_SW, 0 }, { SPR_JUNIOR_RC_LEFT_BANK_TO_25_DEG_UP_NE_SW, 0 },
{ SPR_JUNIOR_RC_LEFT_BANK_TO_25_DEG_UP_SE_NW, 0 } { SPR_JUNIOR_RC_LEFT_BANK_TO_25_DEG_UP_SE_NW, 0 }
}; };
static const uint32 junior_rc_track_pieces_right_banked_to_25_deg_up[4][2] = { static constexpr const uint32 junior_rc_track_pieces_right_banked_to_25_deg_up[4][2] = {
{ SPR_JUNIOR_RC_RIGHT_BANK_TO_25_DEG_UP_SW_NE, 0 }, { SPR_JUNIOR_RC_RIGHT_BANK_TO_25_DEG_UP_SW_NE, 0 },
{ SPR_JUNIOR_RC_RIGHT_BANK_TO_25_DEG_UP_NW_SE, 0 }, { SPR_JUNIOR_RC_RIGHT_BANK_TO_25_DEG_UP_NW_SE, 0 },
{ SPR_JUNIOR_RC_RIGHT_BANK_TO_25_DEG_UP_NE_SW, SPR_JUNIOR_RC_RIGHT_BANK_TO_25_DEG_UP_NE_SW_FRONT }, { SPR_JUNIOR_RC_RIGHT_BANK_TO_25_DEG_UP_NE_SW, SPR_JUNIOR_RC_RIGHT_BANK_TO_25_DEG_UP_NE_SW_FRONT },
{ SPR_JUNIOR_RC_RIGHT_BANK_TO_25_DEG_UP_SE_NW, SPR_JUNIOR_RC_RIGHT_BANK_TO_25_DEG_UP_SE_NW_FRONT } { SPR_JUNIOR_RC_RIGHT_BANK_TO_25_DEG_UP_SE_NW, SPR_JUNIOR_RC_RIGHT_BANK_TO_25_DEG_UP_SE_NW_FRONT }
}; };
static const uint32 junior_rc_track_pieces_25_deg_up_to_left_bank[4][2] = { static constexpr const uint32 junior_rc_track_pieces_25_deg_up_to_left_bank[4][2] = {
{ SPR_JUNIOR_RC_25_DEG_UP_TO_LEFT_BANK_SW_NE, SPR_JUNIOR_RC_25_DEG_UP_TO_LEFT_BANK_SW_NE_FRONT }, { SPR_JUNIOR_RC_25_DEG_UP_TO_LEFT_BANK_SW_NE, SPR_JUNIOR_RC_25_DEG_UP_TO_LEFT_BANK_SW_NE_FRONT },
{ SPR_JUNIOR_RC_25_DEG_UP_TO_LEFT_BANK_NW_SE, SPR_JUNIOR_RC_25_DEG_UP_TO_LEFT_BANK_NW_SE_FRONT }, { SPR_JUNIOR_RC_25_DEG_UP_TO_LEFT_BANK_NW_SE, SPR_JUNIOR_RC_25_DEG_UP_TO_LEFT_BANK_NW_SE_FRONT },
{ SPR_JUNIOR_RC_25_DEG_UP_TO_LEFT_BANK_NE_SW, 0 }, { SPR_JUNIOR_RC_25_DEG_UP_TO_LEFT_BANK_NE_SW, 0 },
{ SPR_JUNIOR_RC_25_DEG_UP_TO_LEFT_BANK_SE_NW, 0 } { SPR_JUNIOR_RC_25_DEG_UP_TO_LEFT_BANK_SE_NW, 0 }
}; };
static const uint32 junior_rc_track_pieces_25_deg_up_to_right_bank[4][2] = { static constexpr const uint32 junior_rc_track_pieces_25_deg_up_to_right_bank[4][2] = {
{ SPR_JUNIOR_RC_25_DEG_UP_TO_RIGHT_BANK_SW_NE, 0 }, { SPR_JUNIOR_RC_25_DEG_UP_TO_RIGHT_BANK_SW_NE, 0 },
{ SPR_JUNIOR_RC_25_DEG_UP_TO_RIGHT_BANK_NW_SE, 0 }, { SPR_JUNIOR_RC_25_DEG_UP_TO_RIGHT_BANK_NW_SE, 0 },
{ SPR_JUNIOR_RC_25_DEG_UP_TO_RIGHT_BANK_NE_SW, SPR_JUNIOR_RC_25_DEG_UP_TO_RIGHT_BANK_NE_SW_FRONT }, { SPR_JUNIOR_RC_25_DEG_UP_TO_RIGHT_BANK_NE_SW, SPR_JUNIOR_RC_25_DEG_UP_TO_RIGHT_BANK_NE_SW_FRONT },
{ SPR_JUNIOR_RC_25_DEG_UP_TO_RIGHT_BANK_SE_NW, SPR_JUNIOR_RC_25_DEG_UP_TO_RIGHT_BANK_SE_NW_FRONT } { SPR_JUNIOR_RC_25_DEG_UP_TO_RIGHT_BANK_SE_NW, SPR_JUNIOR_RC_25_DEG_UP_TO_RIGHT_BANK_SE_NW_FRONT }
}; };
static const uint32 junior_rc_track_pieces_left_bank[4] = { SPR_JUNIOR_RC_LEFT_BANK_SW_NE, SPR_JUNIOR_RC_LEFT_BANK_NW_SE, static constexpr const uint32 junior_rc_track_pieces_left_bank[4] = { SPR_JUNIOR_RC_LEFT_BANK_SW_NE, SPR_JUNIOR_RC_LEFT_BANK_NW_SE,
SPR_JUNIOR_RC_LEFT_BANK_NE_SW, SPR_JUNIOR_RC_LEFT_BANK_SE_NW }; SPR_JUNIOR_RC_LEFT_BANK_NE_SW, SPR_JUNIOR_RC_LEFT_BANK_SE_NW };
static const uint32 junior_rc_track_pieces_left_quarter_turn_5_tiles_25_deg_up[2][4][5] = { static constexpr const uint32 junior_rc_track_pieces_left_quarter_turn_5_tiles_25_deg_up[2][4][5] = {
{ { { {
SPR_JUNIOR_RC_LEFT_QUARTER_TURN_5_TILES_25_DEG_UP_SW_SE_PART_0, SPR_JUNIOR_RC_LEFT_QUARTER_TURN_5_TILES_25_DEG_UP_SW_SE_PART_0,
SPR_JUNIOR_RC_LEFT_QUARTER_TURN_5_TILES_25_DEG_UP_SW_SE_PART_1, SPR_JUNIOR_RC_LEFT_QUARTER_TURN_5_TILES_25_DEG_UP_SW_SE_PART_1,
@ -874,7 +874,7 @@ static const uint32 junior_rc_track_pieces_left_quarter_turn_5_tiles_25_deg_up[2
}; };
// clang-format off // clang-format off
const LocationXY16 junior_rc_left_quarter_turn_5_tiles_25_deg_up_offsets[4][5] = { { static constexpr const LocationXY16 junior_rc_left_quarter_turn_5_tiles_25_deg_up_offsets[4][5] = { {
{ 0, 6 }, { 0, 6 },
{ 0, 0 }, { 0, 0 },
{ 0, 16 }, { 0, 16 },
@ -903,7 +903,7 @@ const LocationXY16 junior_rc_left_quarter_turn_5_tiles_25_deg_up_offsets[4][5] =
{ 0, 6 }, { 0, 6 },
} }; } };
static const uint32 junior_rc_track_pieces_right_quarter_turn_5_tiles_25_deg_up[2][4][5] = { static constexpr const uint32 junior_rc_track_pieces_right_quarter_turn_5_tiles_25_deg_up[2][4][5] = {
{ { { {
SPR_JUNIOR_RC_RIGHT_QUARTER_TURN_5_TILES_25_DEG_UP_SW_SE_PART_0, SPR_JUNIOR_RC_RIGHT_QUARTER_TURN_5_TILES_25_DEG_UP_SW_SE_PART_0,
SPR_JUNIOR_RC_RIGHT_QUARTER_TURN_5_TILES_25_DEG_UP_SW_SE_PART_1, SPR_JUNIOR_RC_RIGHT_QUARTER_TURN_5_TILES_25_DEG_UP_SW_SE_PART_1,
@ -962,7 +962,7 @@ static const uint32 junior_rc_track_pieces_right_quarter_turn_5_tiles_25_deg_up[
} } } }
}; };
static const uint32 junior_rc_track_pieces_s_bend_left[2][4] = { { static constexpr const uint32 junior_rc_track_pieces_s_bend_left[2][4] = { {
SPR_JUNIOR_RC_S_BEND_LEFT_SW_NE_PART_0, SPR_JUNIOR_RC_S_BEND_LEFT_SW_NE_PART_0,
SPR_JUNIOR_RC_S_BEND_LEFT_SW_NE_PART_1, SPR_JUNIOR_RC_S_BEND_LEFT_SW_NE_PART_1,
SPR_JUNIOR_RC_S_BEND_LEFT_SW_NE_PART_2, SPR_JUNIOR_RC_S_BEND_LEFT_SW_NE_PART_2,
@ -975,7 +975,7 @@ static const uint32 junior_rc_track_pieces_s_bend_left[2][4] = { {
SPR_JUNIOR_RC_S_BEND_LEFT_SE_NW_PART_0, SPR_JUNIOR_RC_S_BEND_LEFT_SE_NW_PART_0,
} }; } };
static const uint32 junior_rc_track_pieces_s_bend_right[2][4] = { { static constexpr const uint32 junior_rc_track_pieces_s_bend_right[2][4] = { {
SPR_JUNIOR_RC_S_BEND_RIGHT_SW_NE_PART_0, SPR_JUNIOR_RC_S_BEND_RIGHT_SW_NE_PART_0,
SPR_JUNIOR_RC_S_BEND_RIGHT_SW_NE_PART_1, SPR_JUNIOR_RC_S_BEND_RIGHT_SW_NE_PART_1,
SPR_JUNIOR_RC_S_BEND_RIGHT_SW_NE_PART_2, SPR_JUNIOR_RC_S_BEND_RIGHT_SW_NE_PART_2,
@ -988,7 +988,7 @@ static const uint32 junior_rc_track_pieces_s_bend_right[2][4] = { {
SPR_JUNIOR_RC_S_BEND_RIGHT_SE_NW_PART_0, SPR_JUNIOR_RC_S_BEND_RIGHT_SE_NW_PART_0,
} }; } };
static const uint32 junior_rc_track_pieces_flat_quarter_turn_3_tiles[4][3] = { static constexpr const uint32 junior_rc_track_pieces_flat_quarter_turn_3_tiles[4][3] = {
{ SPR_JUNIOR_RC_QUARTER_TURN_3_TILES_SW_SE_PART_0, SPR_JUNIOR_RC_QUARTER_TURN_3_TILES_SW_SE_PART_1, { SPR_JUNIOR_RC_QUARTER_TURN_3_TILES_SW_SE_PART_0, SPR_JUNIOR_RC_QUARTER_TURN_3_TILES_SW_SE_PART_1,
SPR_JUNIOR_RC_QUARTER_TURN_3_TILES_SW_SE_PART_2 }, SPR_JUNIOR_RC_QUARTER_TURN_3_TILES_SW_SE_PART_2 },
{ SPR_JUNIOR_RC_QUARTER_TURN_3_TILES_NW_SW_PART_0, SPR_JUNIOR_RC_QUARTER_TURN_3_TILES_NW_SW_PART_1, { SPR_JUNIOR_RC_QUARTER_TURN_3_TILES_NW_SW_PART_0, SPR_JUNIOR_RC_QUARTER_TURN_3_TILES_NW_SW_PART_1,
@ -999,7 +999,7 @@ static const uint32 junior_rc_track_pieces_flat_quarter_turn_3_tiles[4][3] = {
SPR_JUNIOR_RC_QUARTER_TURN_3_TILES_SE_NE_PART_2 } SPR_JUNIOR_RC_QUARTER_TURN_3_TILES_SE_NE_PART_2 }
}; };
static const uint32 junior_rc_track_pieces_banked_quarter_turn_3_tiles[4][3] = { static constexpr const uint32 junior_rc_track_pieces_banked_quarter_turn_3_tiles[4][3] = {
{ SPR_JUNIOR_RC_BANKED_QUARTER_TURN_3_TILES_SW_SE_PART_0, SPR_JUNIOR_RC_BANKED_QUARTER_TURN_3_TILES_SW_SE_PART_1, { SPR_JUNIOR_RC_BANKED_QUARTER_TURN_3_TILES_SW_SE_PART_0, SPR_JUNIOR_RC_BANKED_QUARTER_TURN_3_TILES_SW_SE_PART_1,
SPR_JUNIOR_RC_BANKED_QUARTER_TURN_3_TILES_SW_SE_PART_2 }, SPR_JUNIOR_RC_BANKED_QUARTER_TURN_3_TILES_SW_SE_PART_2 },
{ SPR_JUNIOR_RC_BANKED_QUARTER_TURN_3_TILES_NW_SW_PART_0, SPR_JUNIOR_RC_BANKED_QUARTER_TURN_3_TILES_NW_SW_PART_1, { SPR_JUNIOR_RC_BANKED_QUARTER_TURN_3_TILES_NW_SW_PART_0, SPR_JUNIOR_RC_BANKED_QUARTER_TURN_3_TILES_NW_SW_PART_1,
@ -1010,7 +1010,7 @@ static const uint32 junior_rc_track_pieces_banked_quarter_turn_3_tiles[4][3] = {
SPR_JUNIOR_RC_BANKED_QUARTER_TURN_3_TILES_SE_NE_PART_2 } SPR_JUNIOR_RC_BANKED_QUARTER_TURN_3_TILES_SE_NE_PART_2 }
}; };
static const uint32 junior_rc_track_pieces_right_quarter_turn_3_tiles_25_deg_up[2][4][2] = { static constexpr const uint32 junior_rc_track_pieces_right_quarter_turn_3_tiles_25_deg_up[2][4][2] = {
{ { SPR_JUNIOR_RC_RIGHT_QUARTER_TURN_3_TILES_25_DEG_UP_SW_SE_PART_0, { { SPR_JUNIOR_RC_RIGHT_QUARTER_TURN_3_TILES_25_DEG_UP_SW_SE_PART_0,
SPR_JUNIOR_RC_RIGHT_QUARTER_TURN_3_TILES_25_DEG_UP_SW_SE_PART_1 }, SPR_JUNIOR_RC_RIGHT_QUARTER_TURN_3_TILES_25_DEG_UP_SW_SE_PART_1 },
{ SPR_JUNIOR_RC_RIGHT_QUARTER_TURN_3_TILES_25_DEG_UP_NW_SW_PART_0, { SPR_JUNIOR_RC_RIGHT_QUARTER_TURN_3_TILES_25_DEG_UP_NW_SW_PART_0,
@ -1029,7 +1029,7 @@ static const uint32 junior_rc_track_pieces_right_quarter_turn_3_tiles_25_deg_up[
SPR_JUNIOR_RC_RIGHT_QUARTER_TURN_3_TILES_25_DEG_UP_CHAIN_SE_NE_PART_1 } } SPR_JUNIOR_RC_RIGHT_QUARTER_TURN_3_TILES_25_DEG_UP_CHAIN_SE_NE_PART_1 } }
}; };
static const uint32 junior_rc_track_pieces_right_quarter_turn_3_tiles_25_deg_down[2][4][2] = { static constexpr const uint32 junior_rc_track_pieces_right_quarter_turn_3_tiles_25_deg_down[2][4][2] = {
{ { SPR_JUNIOR_RC_RIGHT_QUARTER_TURN_3_TILES_25_DEG_DOWN_SW_SE_PART_0, { { SPR_JUNIOR_RC_RIGHT_QUARTER_TURN_3_TILES_25_DEG_DOWN_SW_SE_PART_0,
SPR_JUNIOR_RC_RIGHT_QUARTER_TURN_3_TILES_25_DEG_DOWN_SW_SE_PART_1 }, SPR_JUNIOR_RC_RIGHT_QUARTER_TURN_3_TILES_25_DEG_DOWN_SW_SE_PART_1 },
{ SPR_JUNIOR_RC_RIGHT_QUARTER_TURN_3_TILES_25_DEG_DOWN_NW_SW_PART_0, { SPR_JUNIOR_RC_RIGHT_QUARTER_TURN_3_TILES_25_DEG_DOWN_NW_SW_PART_0,
@ -1048,7 +1048,7 @@ static const uint32 junior_rc_track_pieces_right_quarter_turn_3_tiles_25_deg_dow
SPR_JUNIOR_RC_RIGHT_QUARTER_TURN_3_TILES_25_DEG_DOWN_CHAIN_SE_NE_PART_1 } } SPR_JUNIOR_RC_RIGHT_QUARTER_TURN_3_TILES_25_DEG_DOWN_CHAIN_SE_NE_PART_1 } }
}; };
static const uint32 junior_rc_track_pieces_right_half_banked_helix_up_small_quarter_tiles[4][3][2] = { static constexpr const uint32 junior_rc_track_pieces_right_half_banked_helix_up_small_quarter_tiles[4][3][2] = {
{ {
{ SPR_JUNIOR_RC_RIGHT_HALF_BANKED_HELIX_UP_SMALL_SW_SE_PART_0 }, { SPR_JUNIOR_RC_RIGHT_HALF_BANKED_HELIX_UP_SMALL_SW_SE_PART_0 },
{ SPR_JUNIOR_RC_RIGHT_HALF_BANKED_HELIX_UP_SMALL_SW_SE_PART_1 }, { SPR_JUNIOR_RC_RIGHT_HALF_BANKED_HELIX_UP_SMALL_SW_SE_PART_1 },
@ -1067,7 +1067,7 @@ static const uint32 junior_rc_track_pieces_right_half_banked_helix_up_small_quar
{ SPR_JUNIOR_RC_RIGHT_HALF_BANKED_HELIX_UP_SMALL_SE_NE_PART_2 } } { SPR_JUNIOR_RC_RIGHT_HALF_BANKED_HELIX_UP_SMALL_SE_NE_PART_2 } }
}; };
static const uint32 junior_rc_track_pieces_right_half_banked_helix_down_small_quarter_tiles[4][3][2] = { static constexpr const uint32 junior_rc_track_pieces_right_half_banked_helix_down_small_quarter_tiles[4][3][2] = {
{ {
{ SPR_JUNIOR_RC_RIGHT_HALF_BANKED_HELIX_DOWN_SMALL_SW_SE_PART_0 }, { SPR_JUNIOR_RC_RIGHT_HALF_BANKED_HELIX_DOWN_SMALL_SW_SE_PART_0 },
{ SPR_JUNIOR_RC_RIGHT_HALF_BANKED_HELIX_DOWN_SMALL_SW_SE_PART_1 }, { SPR_JUNIOR_RC_RIGHT_HALF_BANKED_HELIX_DOWN_SMALL_SW_SE_PART_1 },
@ -1086,7 +1086,7 @@ static const uint32 junior_rc_track_pieces_right_half_banked_helix_down_small_qu
{ SPR_JUNIOR_RC_RIGHT_HALF_BANKED_HELIX_DOWN_SMALL_SE_NE_PART_2 } } { SPR_JUNIOR_RC_RIGHT_HALF_BANKED_HELIX_DOWN_SMALL_SE_NE_PART_2 } }
}; };
static const uint32 junior_rc_track_pieces_right_half_banked_helix_up_large_quarter_tiles[4][5][2] = { static constexpr const uint32 junior_rc_track_pieces_right_half_banked_helix_up_large_quarter_tiles[4][5][2] = {
{ {
{ SPR_JUNIOR_RC_RIGHT_HALF_BANKED_HELIX_UP_LARGE_SW_SE_PART_0 }, { SPR_JUNIOR_RC_RIGHT_HALF_BANKED_HELIX_UP_LARGE_SW_SE_PART_0 },
{ SPR_JUNIOR_RC_RIGHT_HALF_BANKED_HELIX_UP_LARGE_SW_SE_PART_1 }, { SPR_JUNIOR_RC_RIGHT_HALF_BANKED_HELIX_UP_LARGE_SW_SE_PART_1 },
@ -1113,7 +1113,7 @@ static const uint32 junior_rc_track_pieces_right_half_banked_helix_up_large_quar
{ SPR_JUNIOR_RC_RIGHT_HALF_BANKED_HELIX_UP_LARGE_SE_NE_PART_4 } } { SPR_JUNIOR_RC_RIGHT_HALF_BANKED_HELIX_UP_LARGE_SE_NE_PART_4 } }
}; };
static const uint32 junior_rc_track_pieces_right_half_banked_helix_down_large_quarter_tiles[4][5][2] = { static constexpr const uint32 junior_rc_track_pieces_right_half_banked_helix_down_large_quarter_tiles[4][5][2] = {
{ {
{ SPR_JUNIOR_RC_RIGHT_HALF_BANKED_HELIX_DOWN_LARGE_SW_SE_PART_0 }, { SPR_JUNIOR_RC_RIGHT_HALF_BANKED_HELIX_DOWN_LARGE_SW_SE_PART_0 },
{ SPR_JUNIOR_RC_RIGHT_HALF_BANKED_HELIX_DOWN_LARGE_SW_SE_PART_1 }, { SPR_JUNIOR_RC_RIGHT_HALF_BANKED_HELIX_DOWN_LARGE_SW_SE_PART_1 },
@ -1140,10 +1140,10 @@ static const uint32 junior_rc_track_pieces_right_half_banked_helix_down_large_qu
{ SPR_JUNIOR_RC_RIGHT_HALF_BANKED_HELIX_DOWN_LARGE_SE_NE_PART_4 } } { SPR_JUNIOR_RC_RIGHT_HALF_BANKED_HELIX_DOWN_LARGE_SE_NE_PART_4 } }
}; };
static const uint32 junior_rc_track_pieces_brake[4] = { SPR_JUNIOR_RC_FLAT_SW_NE_BRAKED, SPR_JUNIOR_RC_FLAT_NW_SE_BRAKED, static constexpr const uint32 junior_rc_track_pieces_brake[4] = { SPR_JUNIOR_RC_FLAT_SW_NE_BRAKED, SPR_JUNIOR_RC_FLAT_NW_SE_BRAKED,
SPR_JUNIOR_RC_FLAT_SW_NE_BRAKED, SPR_JUNIOR_RC_FLAT_NW_SE_BRAKED }; SPR_JUNIOR_RC_FLAT_SW_NE_BRAKED, SPR_JUNIOR_RC_FLAT_NW_SE_BRAKED };
static const uint32 junior_rc_track_pieces_left_eight_to_diag[4][4] = { static constexpr const uint32 junior_rc_track_pieces_left_eight_to_diag[4][4] = {
{ {
SPR_JUNIOR_RC_EIGHT_TO_DIAG_SW_N_PART_0, SPR_JUNIOR_RC_EIGHT_TO_DIAG_SW_N_PART_0,
SPR_JUNIOR_RC_EIGHT_TO_DIAG_SW_N_PART_1, SPR_JUNIOR_RC_EIGHT_TO_DIAG_SW_N_PART_1,
@ -1170,7 +1170,7 @@ static const uint32 junior_rc_track_pieces_left_eight_to_diag[4][4] = {
}, },
}; };
static const uint32 junior_rc_track_pieces_right_eight_to_diag[4][4] = { static constexpr const uint32 junior_rc_track_pieces_right_eight_to_diag[4][4] = {
{ {
SPR_JUNIOR_RC_EIGHT_TO_DIAG_SW_E_PART_0, SPR_JUNIOR_RC_EIGHT_TO_DIAG_SW_E_PART_0,
SPR_JUNIOR_RC_EIGHT_TO_DIAG_SW_E_PART_1, SPR_JUNIOR_RC_EIGHT_TO_DIAG_SW_E_PART_1,
@ -1197,7 +1197,7 @@ static const uint32 junior_rc_track_pieces_right_eight_to_diag[4][4] = {
}, },
}; };
static const uint32 junior_rc_track_pieces_left_eight_to_diag_bank[4][4] = { static constexpr const uint32 junior_rc_track_pieces_left_eight_to_diag_bank[4][4] = {
{ {
SPR_JUNIOR_RC_EIGHT_TO_DIAG_BANK_SW_N_PART_0, SPR_JUNIOR_RC_EIGHT_TO_DIAG_BANK_SW_N_PART_0,
SPR_JUNIOR_RC_EIGHT_TO_DIAG_BANK_SW_N_PART_1, SPR_JUNIOR_RC_EIGHT_TO_DIAG_BANK_SW_N_PART_1,
@ -1224,7 +1224,7 @@ static const uint32 junior_rc_track_pieces_left_eight_to_diag_bank[4][4] = {
}, },
}; };
static const uint32 junior_rc_track_pieces_right_eight_to_diag_bank[4][4] = { static constexpr const uint32 junior_rc_track_pieces_right_eight_to_diag_bank[4][4] = {
{ {
SPR_JUNIOR_RC_EIGHT_TO_DIAG_BANK_SW_E_PART_0, SPR_JUNIOR_RC_EIGHT_TO_DIAG_BANK_SW_E_PART_0,
SPR_JUNIOR_RC_EIGHT_TO_DIAG_BANK_SW_E_PART_1, SPR_JUNIOR_RC_EIGHT_TO_DIAG_BANK_SW_E_PART_1,
@ -1251,7 +1251,7 @@ static const uint32 junior_rc_track_pieces_right_eight_to_diag_bank[4][4] = {
}, },
}; };
static const uint32 junior_rc_track_pieces_diag_flat[3][4] = { static constexpr const uint32 junior_rc_track_pieces_diag_flat[3][4] = {
{ SPR_JUNIOR_RC_DIAG_FLAT_W_E, SPR_JUNIOR_RC_DIAG_FLAT_N_S, SPR_JUNIOR_RC_DIAG_FLAT_E_W, SPR_JUNIOR_RC_DIAG_FLAT_S_N }, { SPR_JUNIOR_RC_DIAG_FLAT_W_E, SPR_JUNIOR_RC_DIAG_FLAT_N_S, SPR_JUNIOR_RC_DIAG_FLAT_E_W, SPR_JUNIOR_RC_DIAG_FLAT_S_N },
{ SPR_JUNIOR_RC_DIAG_FLAT_CHAIN_W_E, SPR_JUNIOR_RC_DIAG_FLAT_CHAIN_N_S, SPR_JUNIOR_RC_DIAG_FLAT_CHAIN_E_W, { SPR_JUNIOR_RC_DIAG_FLAT_CHAIN_W_E, SPR_JUNIOR_RC_DIAG_FLAT_CHAIN_N_S, SPR_JUNIOR_RC_DIAG_FLAT_CHAIN_E_W,
SPR_JUNIOR_RC_DIAG_FLAT_CHAIN_S_N }, SPR_JUNIOR_RC_DIAG_FLAT_CHAIN_S_N },
@ -1259,7 +1259,7 @@ static const uint32 junior_rc_track_pieces_diag_flat[3][4] = {
SPR_WATER_RC_DIAG_FLAT_CHAIN_S_N }, SPR_WATER_RC_DIAG_FLAT_CHAIN_S_N },
}; };
static const uint32 junior_rc_track_pieces_diag_25_deg_up[3][4] = { static constexpr const uint32 junior_rc_track_pieces_diag_25_deg_up[3][4] = {
{ SPR_JUNIOR_RC_DIAG_25_DEG_UP_W_E, SPR_JUNIOR_RC_DIAG_25_DEG_UP_N_S, SPR_JUNIOR_RC_DIAG_25_DEG_UP_E_W, { SPR_JUNIOR_RC_DIAG_25_DEG_UP_W_E, SPR_JUNIOR_RC_DIAG_25_DEG_UP_N_S, SPR_JUNIOR_RC_DIAG_25_DEG_UP_E_W,
SPR_JUNIOR_RC_DIAG_25_DEG_UP_S_N }, SPR_JUNIOR_RC_DIAG_25_DEG_UP_S_N },
{ SPR_JUNIOR_RC_DIAG_25_DEG_UP_CHAIN_W_E, SPR_JUNIOR_RC_DIAG_25_DEG_UP_CHAIN_N_S, SPR_JUNIOR_RC_DIAG_25_DEG_UP_CHAIN_E_W, { SPR_JUNIOR_RC_DIAG_25_DEG_UP_CHAIN_W_E, SPR_JUNIOR_RC_DIAG_25_DEG_UP_CHAIN_N_S, SPR_JUNIOR_RC_DIAG_25_DEG_UP_CHAIN_E_W,
@ -1268,7 +1268,7 @@ static const uint32 junior_rc_track_pieces_diag_25_deg_up[3][4] = {
SPR_WATER_RC_DIAG_25_DEG_UP_CHAIN_S_N }, SPR_WATER_RC_DIAG_25_DEG_UP_CHAIN_S_N },
}; };
static const uint32 junior_rc_track_pieces_diag_flat_to_25_deg_up[3][4] = { static constexpr const uint32 junior_rc_track_pieces_diag_flat_to_25_deg_up[3][4] = {
{ SPR_JUNIOR_RC_DIAG_FLAT_TO_25_DEG_UP_W_E, SPR_JUNIOR_RC_DIAG_FLAT_TO_25_DEG_UP_N_S, { SPR_JUNIOR_RC_DIAG_FLAT_TO_25_DEG_UP_W_E, SPR_JUNIOR_RC_DIAG_FLAT_TO_25_DEG_UP_N_S,
SPR_JUNIOR_RC_DIAG_FLAT_TO_25_DEG_UP_E_W, SPR_JUNIOR_RC_DIAG_FLAT_TO_25_DEG_UP_S_N }, SPR_JUNIOR_RC_DIAG_FLAT_TO_25_DEG_UP_E_W, SPR_JUNIOR_RC_DIAG_FLAT_TO_25_DEG_UP_S_N },
{ SPR_JUNIOR_RC_DIAG_FLAT_TO_25_DEG_UP_CHAIN_W_E, SPR_JUNIOR_RC_DIAG_FLAT_TO_25_DEG_UP_CHAIN_N_S, { SPR_JUNIOR_RC_DIAG_FLAT_TO_25_DEG_UP_CHAIN_W_E, SPR_JUNIOR_RC_DIAG_FLAT_TO_25_DEG_UP_CHAIN_N_S,
@ -1277,14 +1277,14 @@ static const uint32 junior_rc_track_pieces_diag_flat_to_25_deg_up[3][4] = {
SPR_WATER_RC_DIAG_FLAT_TO_25_DEG_UP_CHAIN_E_W, SPR_WATER_RC_DIAG_FLAT_TO_25_DEG_UP_CHAIN_S_N }, SPR_WATER_RC_DIAG_FLAT_TO_25_DEG_UP_CHAIN_E_W, SPR_WATER_RC_DIAG_FLAT_TO_25_DEG_UP_CHAIN_S_N },
}; };
static const uint32 junior_rc_track_pieces_diag_flat_to_60_deg_up[2][4] = { static constexpr const uint32 junior_rc_track_pieces_diag_flat_to_60_deg_up[2][4] = {
{ SPR_JUNIOR_RC_DIAG_FLAT_TO_60_DEG_UP_W_E, SPR_JUNIOR_RC_DIAG_FLAT_TO_60_DEG_UP_N_S, { SPR_JUNIOR_RC_DIAG_FLAT_TO_60_DEG_UP_W_E, SPR_JUNIOR_RC_DIAG_FLAT_TO_60_DEG_UP_N_S,
SPR_JUNIOR_RC_DIAG_FLAT_TO_60_DEG_UP_E_W, SPR_JUNIOR_RC_DIAG_FLAT_TO_60_DEG_UP_S_N }, SPR_JUNIOR_RC_DIAG_FLAT_TO_60_DEG_UP_E_W, SPR_JUNIOR_RC_DIAG_FLAT_TO_60_DEG_UP_S_N },
{ SPR_JUNIOR_RC_DIAG_FLAT_TO_60_DEG_UP_CHAIN_W_E, SPR_JUNIOR_RC_DIAG_FLAT_TO_60_DEG_UP_CHAIN_N_S, { SPR_JUNIOR_RC_DIAG_FLAT_TO_60_DEG_UP_CHAIN_W_E, SPR_JUNIOR_RC_DIAG_FLAT_TO_60_DEG_UP_CHAIN_N_S,
SPR_JUNIOR_RC_DIAG_FLAT_TO_60_DEG_UP_CHAIN_E_W, SPR_JUNIOR_RC_DIAG_FLAT_TO_60_DEG_UP_CHAIN_S_N }, SPR_JUNIOR_RC_DIAG_FLAT_TO_60_DEG_UP_CHAIN_E_W, SPR_JUNIOR_RC_DIAG_FLAT_TO_60_DEG_UP_CHAIN_S_N },
}; };
static const uint32 junior_rc_track_pieces_diag_25_deg_up_to_flat[3][4] = { static constexpr const uint32 junior_rc_track_pieces_diag_25_deg_up_to_flat[3][4] = {
{ SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_FLAT_W_E, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_FLAT_N_S, { SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_FLAT_W_E, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_FLAT_N_S,
SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_FLAT_E_W, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_FLAT_S_N }, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_FLAT_E_W, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_FLAT_S_N },
{ SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_FLAT_CHAIN_W_E, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_FLAT_CHAIN_N_S, { SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_FLAT_CHAIN_W_E, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_FLAT_CHAIN_N_S,
@ -1293,14 +1293,14 @@ static const uint32 junior_rc_track_pieces_diag_25_deg_up_to_flat[3][4] = {
SPR_WATER_RC_DIAG_25_DEG_UP_TO_FLAT_CHAIN_E_W, SPR_WATER_RC_DIAG_25_DEG_UP_TO_FLAT_CHAIN_S_N }, SPR_WATER_RC_DIAG_25_DEG_UP_TO_FLAT_CHAIN_E_W, SPR_WATER_RC_DIAG_25_DEG_UP_TO_FLAT_CHAIN_S_N },
}; };
static const uint32 junior_rc_track_pieces_diag_60_deg_up_to_flat[2][4] = { static constexpr const uint32 junior_rc_track_pieces_diag_60_deg_up_to_flat[2][4] = {
{ SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_FLAT_W_E, SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_FLAT_N_S, { SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_FLAT_W_E, SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_FLAT_N_S,
SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_FLAT_E_W, SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_FLAT_S_N }, SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_FLAT_E_W, SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_FLAT_S_N },
{ SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_FLAT_CHAIN_W_E, SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_FLAT_CHAIN_N_S, { SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_FLAT_CHAIN_W_E, SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_FLAT_CHAIN_N_S,
SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_FLAT_CHAIN_E_W, SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_FLAT_CHAIN_S_N }, SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_FLAT_CHAIN_E_W, SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_FLAT_CHAIN_S_N },
}; };
static const uint32 junior_rc_track_pieces_diag_25_deg_down[3][4] = { static constexpr const uint32 junior_rc_track_pieces_diag_25_deg_down[3][4] = {
{ {
SPR_JUNIOR_RC_DIAG_25_DEG_UP_E_W, SPR_JUNIOR_RC_DIAG_25_DEG_UP_E_W,
SPR_JUNIOR_RC_DIAG_25_DEG_UP_S_N, SPR_JUNIOR_RC_DIAG_25_DEG_UP_S_N,
@ -1321,7 +1321,7 @@ static const uint32 junior_rc_track_pieces_diag_25_deg_down[3][4] = {
}, },
}; };
static const uint32 junior_rc_track_pieces_diag_flat_to_25_deg_down[3][4] = { static constexpr const uint32 junior_rc_track_pieces_diag_flat_to_25_deg_down[3][4] = {
{ {
SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_FLAT_E_W, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_FLAT_E_W,
SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_FLAT_S_N, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_FLAT_S_N,
@ -1342,7 +1342,7 @@ static const uint32 junior_rc_track_pieces_diag_flat_to_25_deg_down[3][4] = {
}, },
}; };
static const uint32 junior_rc_track_pieces_diag_flat_to_60_deg_down[2][4] = { static constexpr const uint32 junior_rc_track_pieces_diag_flat_to_60_deg_down[2][4] = {
{ {
SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_FLAT_E_W, SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_FLAT_E_W,
SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_FLAT_S_N, SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_FLAT_S_N,
@ -1357,7 +1357,7 @@ static const uint32 junior_rc_track_pieces_diag_flat_to_60_deg_down[2][4] = {
}, },
}; };
static const uint32 junior_rc_track_pieces_diag_25_deg_down_to_flat[3][4] = { static constexpr const uint32 junior_rc_track_pieces_diag_25_deg_down_to_flat[3][4] = {
{ {
SPR_JUNIOR_RC_DIAG_FLAT_TO_25_DEG_UP_E_W, SPR_JUNIOR_RC_DIAG_FLAT_TO_25_DEG_UP_E_W,
SPR_JUNIOR_RC_DIAG_FLAT_TO_25_DEG_UP_S_N, SPR_JUNIOR_RC_DIAG_FLAT_TO_25_DEG_UP_S_N,
@ -1378,7 +1378,7 @@ static const uint32 junior_rc_track_pieces_diag_25_deg_down_to_flat[3][4] = {
}, },
}; };
static const uint32 junior_rc_track_pieces_diag_60_deg_down_to_flat[2][4] = { static constexpr const uint32 junior_rc_track_pieces_diag_60_deg_down_to_flat[2][4] = {
{ {
SPR_JUNIOR_RC_DIAG_FLAT_TO_60_DEG_UP_E_W, SPR_JUNIOR_RC_DIAG_FLAT_TO_60_DEG_UP_E_W,
SPR_JUNIOR_RC_DIAG_FLAT_TO_60_DEG_UP_S_N, SPR_JUNIOR_RC_DIAG_FLAT_TO_60_DEG_UP_S_N,
@ -1393,105 +1393,105 @@ static const uint32 junior_rc_track_pieces_diag_60_deg_down_to_flat[2][4] = {
}, },
}; };
static const uint32 junior_rc_track_pieces_diag_flat_to_left_bank[4] = { static constexpr const uint32 junior_rc_track_pieces_diag_flat_to_left_bank[4] = {
SPR_JUNIOR_RC_DIAG_FLAT_TO_LEFT_BANK_W_E, SPR_JUNIOR_RC_DIAG_FLAT_TO_LEFT_BANK_W_E,
SPR_JUNIOR_RC_DIAG_FLAT_TO_LEFT_BANK_N_S, SPR_JUNIOR_RC_DIAG_FLAT_TO_LEFT_BANK_N_S,
SPR_JUNIOR_RC_DIAG_FLAT_TO_LEFT_BANK_E_W, SPR_JUNIOR_RC_DIAG_FLAT_TO_LEFT_BANK_E_W,
SPR_JUNIOR_RC_DIAG_FLAT_TO_LEFT_BANK_S_N, SPR_JUNIOR_RC_DIAG_FLAT_TO_LEFT_BANK_S_N,
}; };
static const uint32 junior_rc_track_pieces_diag_flat_to_right_bank[4] = { static constexpr const uint32 junior_rc_track_pieces_diag_flat_to_right_bank[4] = {
SPR_JUNIOR_RC_DIAG_FLAT_TO_RIGHT_BANK_W_E, SPR_JUNIOR_RC_DIAG_FLAT_TO_RIGHT_BANK_W_E,
SPR_JUNIOR_RC_DIAG_FLAT_TO_RIGHT_BANK_N_S, SPR_JUNIOR_RC_DIAG_FLAT_TO_RIGHT_BANK_N_S,
SPR_JUNIOR_RC_DIAG_FLAT_TO_RIGHT_BANK_E_W, SPR_JUNIOR_RC_DIAG_FLAT_TO_RIGHT_BANK_E_W,
SPR_JUNIOR_RC_DIAG_FLAT_TO_RIGHT_BANK_S_N, SPR_JUNIOR_RC_DIAG_FLAT_TO_RIGHT_BANK_S_N,
}; };
static const uint32 junior_rc_track_pieces_diag_right_bank_to_flat[4] = { static constexpr const uint32 junior_rc_track_pieces_diag_right_bank_to_flat[4] = {
SPR_JUNIOR_RC_DIAG_FLAT_TO_LEFT_BANK_E_W, SPR_JUNIOR_RC_DIAG_FLAT_TO_LEFT_BANK_E_W,
SPR_JUNIOR_RC_DIAG_FLAT_TO_LEFT_BANK_S_N, SPR_JUNIOR_RC_DIAG_FLAT_TO_LEFT_BANK_S_N,
SPR_JUNIOR_RC_DIAG_FLAT_TO_LEFT_BANK_W_E, SPR_JUNIOR_RC_DIAG_FLAT_TO_LEFT_BANK_W_E,
SPR_JUNIOR_RC_DIAG_FLAT_TO_LEFT_BANK_N_S, SPR_JUNIOR_RC_DIAG_FLAT_TO_LEFT_BANK_N_S,
}; };
static const uint32 junior_rc_track_pieces_diag_left_bank_to_flat[4] = { static constexpr const uint32 junior_rc_track_pieces_diag_left_bank_to_flat[4] = {
SPR_JUNIOR_RC_DIAG_FLAT_TO_RIGHT_BANK_E_W, SPR_JUNIOR_RC_DIAG_FLAT_TO_RIGHT_BANK_E_W,
SPR_JUNIOR_RC_DIAG_FLAT_TO_RIGHT_BANK_S_N, SPR_JUNIOR_RC_DIAG_FLAT_TO_RIGHT_BANK_S_N,
SPR_JUNIOR_RC_DIAG_FLAT_TO_RIGHT_BANK_W_E, SPR_JUNIOR_RC_DIAG_FLAT_TO_RIGHT_BANK_W_E,
SPR_JUNIOR_RC_DIAG_FLAT_TO_RIGHT_BANK_N_S, SPR_JUNIOR_RC_DIAG_FLAT_TO_RIGHT_BANK_N_S,
}; };
static const uint32 junior_rc_track_pieces_diag_left_bank_to_25_deg_up[4] = { static constexpr const uint32 junior_rc_track_pieces_diag_left_bank_to_25_deg_up[4] = {
SPR_JUNIOR_RC_DIAG_LEFT_BANK_TO_25_DEG_UP_W_E, SPR_JUNIOR_RC_DIAG_LEFT_BANK_TO_25_DEG_UP_W_E,
SPR_JUNIOR_RC_DIAG_LEFT_BANK_TO_25_DEG_UP_N_S, SPR_JUNIOR_RC_DIAG_LEFT_BANK_TO_25_DEG_UP_N_S,
SPR_JUNIOR_RC_DIAG_LEFT_BANK_TO_25_DEG_UP_E_W, SPR_JUNIOR_RC_DIAG_LEFT_BANK_TO_25_DEG_UP_E_W,
SPR_JUNIOR_RC_DIAG_LEFT_BANK_TO_25_DEG_UP_S_N, SPR_JUNIOR_RC_DIAG_LEFT_BANK_TO_25_DEG_UP_S_N,
}; };
static const uint32 junior_rc_track_pieces_diag_right_bank_to_25_deg_up[4] = { static constexpr const uint32 junior_rc_track_pieces_diag_right_bank_to_25_deg_up[4] = {
SPR_JUNIOR_RC_DIAG_RIGHT_BANK_TO_25_DEG_UP_W_E, SPR_JUNIOR_RC_DIAG_RIGHT_BANK_TO_25_DEG_UP_W_E,
SPR_JUNIOR_RC_DIAG_RIGHT_BANK_TO_25_DEG_UP_N_S, SPR_JUNIOR_RC_DIAG_RIGHT_BANK_TO_25_DEG_UP_N_S,
SPR_JUNIOR_RC_DIAG_RIGHT_BANK_TO_25_DEG_UP_E_W, SPR_JUNIOR_RC_DIAG_RIGHT_BANK_TO_25_DEG_UP_E_W,
SPR_JUNIOR_RC_DIAG_RIGHT_BANK_TO_25_DEG_UP_S_N, SPR_JUNIOR_RC_DIAG_RIGHT_BANK_TO_25_DEG_UP_S_N,
}; };
static const uint32 junior_rc_track_pieces_diag_25_deg_up_to_left_bank[4] = { static constexpr const uint32 junior_rc_track_pieces_diag_25_deg_up_to_left_bank[4] = {
SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_LEFT_BANK_W_E, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_LEFT_BANK_W_E,
SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_LEFT_BANK_N_S, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_LEFT_BANK_N_S,
SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_LEFT_BANK_E_W, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_LEFT_BANK_E_W,
SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_LEFT_BANK_S_N, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_LEFT_BANK_S_N,
}; };
static const uint32 junior_rc_track_pieces_diag_25_deg_up_to_right_bank[4] = { static constexpr const uint32 junior_rc_track_pieces_diag_25_deg_up_to_right_bank[4] = {
SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_RIGHT_BANK_W_E, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_RIGHT_BANK_W_E,
SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_RIGHT_BANK_N_S, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_RIGHT_BANK_N_S,
SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_RIGHT_BANK_E_W, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_RIGHT_BANK_E_W,
SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_RIGHT_BANK_S_N, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_RIGHT_BANK_S_N,
}; };
static const uint32 junior_rc_track_pieces_diag_right_bank_to_25_deg_down[4] = { static constexpr const uint32 junior_rc_track_pieces_diag_right_bank_to_25_deg_down[4] = {
SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_LEFT_BANK_E_W, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_LEFT_BANK_E_W,
SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_LEFT_BANK_S_N, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_LEFT_BANK_S_N,
SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_LEFT_BANK_W_E, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_LEFT_BANK_W_E,
SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_LEFT_BANK_N_S, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_LEFT_BANK_N_S,
}; };
static const uint32 junior_rc_track_pieces_diag_left_bank_to_25_deg_down[4] = { static constexpr const uint32 junior_rc_track_pieces_diag_left_bank_to_25_deg_down[4] = {
SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_RIGHT_BANK_E_W, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_RIGHT_BANK_E_W,
SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_RIGHT_BANK_S_N, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_RIGHT_BANK_S_N,
SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_RIGHT_BANK_W_E, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_RIGHT_BANK_W_E,
SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_RIGHT_BANK_N_S, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_RIGHT_BANK_N_S,
}; };
static const uint32 junior_rc_track_pieces_diag_25_deg_down_to_right_bank[4] = { static constexpr const uint32 junior_rc_track_pieces_diag_25_deg_down_to_right_bank[4] = {
SPR_JUNIOR_RC_DIAG_LEFT_BANK_TO_25_DEG_UP_E_W, SPR_JUNIOR_RC_DIAG_LEFT_BANK_TO_25_DEG_UP_E_W,
SPR_JUNIOR_RC_DIAG_LEFT_BANK_TO_25_DEG_UP_S_N, SPR_JUNIOR_RC_DIAG_LEFT_BANK_TO_25_DEG_UP_S_N,
SPR_JUNIOR_RC_DIAG_LEFT_BANK_TO_25_DEG_UP_W_E, SPR_JUNIOR_RC_DIAG_LEFT_BANK_TO_25_DEG_UP_W_E,
SPR_JUNIOR_RC_DIAG_LEFT_BANK_TO_25_DEG_UP_N_S, SPR_JUNIOR_RC_DIAG_LEFT_BANK_TO_25_DEG_UP_N_S,
}; };
static const uint32 junior_rc_track_pieces_diag_25_deg_down_to_left_bank[4] = { static constexpr const uint32 junior_rc_track_pieces_diag_25_deg_down_to_left_bank[4] = {
SPR_JUNIOR_RC_DIAG_RIGHT_BANK_TO_25_DEG_UP_E_W, SPR_JUNIOR_RC_DIAG_RIGHT_BANK_TO_25_DEG_UP_E_W,
SPR_JUNIOR_RC_DIAG_RIGHT_BANK_TO_25_DEG_UP_S_N, SPR_JUNIOR_RC_DIAG_RIGHT_BANK_TO_25_DEG_UP_S_N,
SPR_JUNIOR_RC_DIAG_RIGHT_BANK_TO_25_DEG_UP_W_E, SPR_JUNIOR_RC_DIAG_RIGHT_BANK_TO_25_DEG_UP_W_E,
SPR_JUNIOR_RC_DIAG_RIGHT_BANK_TO_25_DEG_UP_N_S, SPR_JUNIOR_RC_DIAG_RIGHT_BANK_TO_25_DEG_UP_N_S,
}; };
static const uint32 junior_rc_track_pieces_diag_left_bank[4] = { static constexpr const uint32 junior_rc_track_pieces_diag_left_bank[4] = {
SPR_JUNIOR_RC_DIAG_LEFT_BANK_W_E, SPR_JUNIOR_RC_DIAG_LEFT_BANK_W_E,
SPR_JUNIOR_RC_DIAG_LEFT_BANK_N_S, SPR_JUNIOR_RC_DIAG_LEFT_BANK_N_S,
SPR_JUNIOR_RC_DIAG_LEFT_BANK_E_W, SPR_JUNIOR_RC_DIAG_LEFT_BANK_E_W,
SPR_JUNIOR_RC_DIAG_LEFT_BANK_S_N, SPR_JUNIOR_RC_DIAG_LEFT_BANK_S_N,
}; };
static const uint32 junior_rc_track_pieces_diag_right_bank[4] = { static constexpr const uint32 junior_rc_track_pieces_diag_right_bank[4] = {
SPR_JUNIOR_RC_DIAG_LEFT_BANK_E_W, SPR_JUNIOR_RC_DIAG_LEFT_BANK_E_W,
SPR_JUNIOR_RC_DIAG_LEFT_BANK_S_N, SPR_JUNIOR_RC_DIAG_LEFT_BANK_S_N,
SPR_JUNIOR_RC_DIAG_LEFT_BANK_W_E, SPR_JUNIOR_RC_DIAG_LEFT_BANK_W_E,
SPR_JUNIOR_RC_DIAG_LEFT_BANK_N_S, SPR_JUNIOR_RC_DIAG_LEFT_BANK_N_S,
}; };
static const uint32 junior_rc_track_pieces_flat_to_60_deg_up[2][4][2] = { static constexpr const uint32 junior_rc_track_pieces_flat_to_60_deg_up[2][4][2] = {
{ {
{ SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_SW_NE, 0 }, { SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_SW_NE, 0 },
{ SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_NW_SE, SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_NW_SE_PART_0_2 }, { SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_NW_SE, SPR_JUNIOR_RC_FLAT_TO_60_DEG_UP_NW_SE_PART_0_2 },
@ -1506,7 +1506,7 @@ static const uint32 junior_rc_track_pieces_flat_to_60_deg_up[2][4][2] = {
}, },
}; };
static const uint32 junior_rc_track_pieces_60_deg_up_to_flat[2][4][2] = { static constexpr const uint32 junior_rc_track_pieces_60_deg_up_to_flat[2][4][2] = {
{ {
{ SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_SW_NE, 0 }, { SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_SW_NE, 0 },
{ SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_NW_SE, SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_NW_SE_PART_0_2 }, { SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_NW_SE, SPR_JUNIOR_RC_60_DEG_UP_TO_FLAT_NW_SE_PART_0_2 },
@ -1521,13 +1521,13 @@ static const uint32 junior_rc_track_pieces_60_deg_up_to_flat[2][4][2] = {
}, },
}; };
static const uint32 junior_rc_track_pieces_60_deg_up[2][4] = { static constexpr const uint32 junior_rc_track_pieces_60_deg_up[2][4] = {
{ SPR_JUNIOR_RC_60_DEG_SW_NE, SPR_JUNIOR_RC_60_DEG_NW_SE, SPR_JUNIOR_RC_60_DEG_NE_SW, SPR_JUNIOR_RC_60_DEG_SE_NW }, { SPR_JUNIOR_RC_60_DEG_SW_NE, SPR_JUNIOR_RC_60_DEG_NW_SE, SPR_JUNIOR_RC_60_DEG_NE_SW, SPR_JUNIOR_RC_60_DEG_SE_NW },
{ SPR_JUNIOR_RC_60_DEG_CHAIN_SW_NE, SPR_JUNIOR_RC_60_DEG_CHAIN_NW_SE, SPR_JUNIOR_RC_60_DEG_CHAIN_NE_SW, { SPR_JUNIOR_RC_60_DEG_CHAIN_SW_NE, SPR_JUNIOR_RC_60_DEG_CHAIN_NW_SE, SPR_JUNIOR_RC_60_DEG_CHAIN_NE_SW,
SPR_JUNIOR_RC_60_DEG_CHAIN_SE_NW }, SPR_JUNIOR_RC_60_DEG_CHAIN_SE_NW },
}; };
static const uint32 junior_rc_track_pieces_25_deg_up_to_60_deg_up[2][4][2] = { static constexpr const uint32 junior_rc_track_pieces_25_deg_up_to_60_deg_up[2][4][2] = {
{ {
{ SPR_JUNIOR_RC_25_DEG_TO_60_DEG_UP_SW_NE, 0 }, { SPR_JUNIOR_RC_25_DEG_TO_60_DEG_UP_SW_NE, 0 },
{ SPR_JUNIOR_RC_25_DEG_TO_60_DEG_UP_NW_SE, SPR_JUNIOR_RC_25_DEG_TO_60_DEG_UP_NW_SE_PART_0_2 }, { SPR_JUNIOR_RC_25_DEG_TO_60_DEG_UP_NW_SE, SPR_JUNIOR_RC_25_DEG_TO_60_DEG_UP_NW_SE_PART_0_2 },
@ -1542,7 +1542,7 @@ static const uint32 junior_rc_track_pieces_25_deg_up_to_60_deg_up[2][4][2] = {
}, },
}; };
static const uint32 junior_rc_track_pieces_60_deg_up_to_25_deg_up[2][4][2] = { static constexpr const uint32 junior_rc_track_pieces_60_deg_up_to_25_deg_up[2][4][2] = {
{ {
{ SPR_JUNIOR_RC_60_DEG_TO_25_DEG_UP_SW_NE, 0 }, { SPR_JUNIOR_RC_60_DEG_TO_25_DEG_UP_SW_NE, 0 },
{ SPR_JUNIOR_RC_60_DEG_TO_25_DEG_UP_NW_SE, SPR_JUNIOR_RC_60_DEG_TO_25_DEG_UP_NW_SE_PART_0_2 }, { SPR_JUNIOR_RC_60_DEG_TO_25_DEG_UP_NW_SE, SPR_JUNIOR_RC_60_DEG_TO_25_DEG_UP_NW_SE_PART_0_2 },
@ -1557,14 +1557,14 @@ static const uint32 junior_rc_track_pieces_60_deg_up_to_25_deg_up[2][4][2] = {
} }
}; };
static const uint32 junior_rc_track_pieces_diag_60_deg_up[2][4] = { static constexpr const uint32 junior_rc_track_pieces_diag_60_deg_up[2][4] = {
{ SPR_JUNIOR_RC_DIAG_60_DEG_UP_W_E, SPR_JUNIOR_RC_DIAG_60_DEG_UP_N_S, SPR_JUNIOR_RC_DIAG_60_DEG_UP_E_W, { SPR_JUNIOR_RC_DIAG_60_DEG_UP_W_E, SPR_JUNIOR_RC_DIAG_60_DEG_UP_N_S, SPR_JUNIOR_RC_DIAG_60_DEG_UP_E_W,
SPR_JUNIOR_RC_DIAG_60_DEG_UP_S_N }, SPR_JUNIOR_RC_DIAG_60_DEG_UP_S_N },
{ SPR_JUNIOR_RC_DIAG_60_DEG_UP_CHAIN_W_E, SPR_JUNIOR_RC_DIAG_60_DEG_UP_CHAIN_N_S, SPR_JUNIOR_RC_DIAG_60_DEG_UP_CHAIN_E_W, { SPR_JUNIOR_RC_DIAG_60_DEG_UP_CHAIN_W_E, SPR_JUNIOR_RC_DIAG_60_DEG_UP_CHAIN_N_S, SPR_JUNIOR_RC_DIAG_60_DEG_UP_CHAIN_E_W,
SPR_JUNIOR_RC_DIAG_60_DEG_UP_CHAIN_S_N }, SPR_JUNIOR_RC_DIAG_60_DEG_UP_CHAIN_S_N },
}; };
static const uint32 junior_rc_track_pieces_diag_60_deg_down[2][4] = { static constexpr const uint32 junior_rc_track_pieces_diag_60_deg_down[2][4] = {
{ {
SPR_JUNIOR_RC_DIAG_60_DEG_UP_E_W, SPR_JUNIOR_RC_DIAG_60_DEG_UP_E_W,
SPR_JUNIOR_RC_DIAG_60_DEG_UP_S_N, SPR_JUNIOR_RC_DIAG_60_DEG_UP_S_N,
@ -1579,21 +1579,21 @@ static const uint32 junior_rc_track_pieces_diag_60_deg_down[2][4] = {
}, },
}; };
static const uint32 junior_rc_track_pieces_diag_25_deg_up_to_60_deg_up[2][4] = { static constexpr const uint32 junior_rc_track_pieces_diag_25_deg_up_to_60_deg_up[2][4] = {
{ SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_60_DEG_UP_W_E, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_60_DEG_UP_N_S, { SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_60_DEG_UP_W_E, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_60_DEG_UP_N_S,
SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_60_DEG_UP_E_W, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_60_DEG_UP_S_N }, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_60_DEG_UP_E_W, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_60_DEG_UP_S_N },
{ SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_60_DEG_UP_CHAIN_W_E, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_60_DEG_UP_CHAIN_N_S, { SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_60_DEG_UP_CHAIN_W_E, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_60_DEG_UP_CHAIN_N_S,
SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_60_DEG_UP_CHAIN_E_W, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_60_DEG_UP_CHAIN_S_N }, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_60_DEG_UP_CHAIN_E_W, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_60_DEG_UP_CHAIN_S_N },
}; };
static const uint32 junior_rc_track_pieces_diag_60_deg_up_to_25_deg_up[2][4] = { static constexpr const uint32 junior_rc_track_pieces_diag_60_deg_up_to_25_deg_up[2][4] = {
{ SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_25_DEG_UP_W_E, SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_25_DEG_UP_N_S, { SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_25_DEG_UP_W_E, SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_25_DEG_UP_N_S,
SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_25_DEG_UP_E_W, SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_25_DEG_UP_S_N }, SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_25_DEG_UP_E_W, SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_25_DEG_UP_S_N },
{ SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_25_DEG_UP_CHAIN_W_E, SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_25_DEG_UP_CHAIN_N_S, { SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_25_DEG_UP_CHAIN_W_E, SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_25_DEG_UP_CHAIN_N_S,
SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_25_DEG_UP_CHAIN_E_W, SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_25_DEG_UP_CHAIN_S_N }, SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_25_DEG_UP_CHAIN_E_W, SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_25_DEG_UP_CHAIN_S_N },
}; };
static const uint32 junior_rc_track_pieces_diag_25_deg_down_to_60_deg_down[2][4] = { static constexpr const uint32 junior_rc_track_pieces_diag_25_deg_down_to_60_deg_down[2][4] = {
{ {
SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_25_DEG_UP_E_W, SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_25_DEG_UP_E_W,
SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_25_DEG_UP_S_N, SPR_JUNIOR_RC_DIAG_60_DEG_UP_TO_25_DEG_UP_S_N,
@ -1608,7 +1608,7 @@ static const uint32 junior_rc_track_pieces_diag_25_deg_down_to_60_deg_down[2][4]
}, },
}; };
static const uint32 junior_rc_track_pieces_diag_60_deg_down_to_25_deg_down[2][4] = { static constexpr const uint32 junior_rc_track_pieces_diag_60_deg_down_to_25_deg_down[2][4] = {
{ {
SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_60_DEG_UP_E_W, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_60_DEG_UP_E_W,
SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_60_DEG_UP_S_N, SPR_JUNIOR_RC_DIAG_25_DEG_UP_TO_60_DEG_UP_S_N,
@ -1786,7 +1786,7 @@ void junior_rc_paint_track_25_deg_up_to_flat(paint_session * session, uint8 ride
paint_util_set_general_support_height(session, height + 40, 0x20); paint_util_set_general_support_height(session, height + 40, 0x20);
} }
static const sint8 junior_rc_track_right_quarter_turn_5_tiles_support_height_offset[][7] = { static constexpr const sint8 junior_rc_track_right_quarter_turn_5_tiles_support_height_offset[][7] = {
{ 0, 0, 0, 0, 0, 0, -1 }, { 0, 0, 0, 0, 0, 0, -1 },
{ -1, 0, 0, 0, 0, 0, 0 }, { -1, 0, 0, 0, 0, 0, 0 },
{ 0 }, { 0 },
@ -1984,7 +1984,7 @@ static void junior_rc_right_bank_to_flat_paint_setup(paint_session * session, ui
junior_rc_flat_to_left_bank_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); junior_rc_flat_to_left_bank_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
} }
const LocationXY16 junior_rc_banked_right_quarter_turn_5_tiles_bound_lengths[4][5] = { { static constexpr const LocationXY16 junior_rc_banked_right_quarter_turn_5_tiles_bound_lengths[4][5] = { {
{ 32, 20 }, { 32, 20 },
{ 32, 16 }, { 32, 16 },
{ 16, 16 }, { 16, 16 },
@ -2013,7 +2013,7 @@ const LocationXY16 junior_rc_banked_right_quarter_turn_5_tiles_bound_lengths[4][
{ 32, 20 }, { 32, 20 },
} }; } };
const LocationXYZ16 junior_rc_banked_right_quarter_turn_5_tiles_bound_offsets[4][5] = { { static constexpr const LocationXYZ16 junior_rc_banked_right_quarter_turn_5_tiles_bound_offsets[4][5] = { {
{ 0, 6 }, { 0, 6 },
{ 0, 16 }, { 0, 16 },
{ 0, 0 }, { 0, 0 },
@ -2420,14 +2420,14 @@ static void junior_rc_25_deg_down_to_right_bank_paint_setup(paint_session * sess
junior_rc_left_bank_to_25_deg_up_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); junior_rc_left_bank_to_25_deg_up_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
} }
static const LocationXYZ16 junior_rc_left_bank_bound_lengths[4] = { static constexpr const LocationXYZ16 junior_rc_left_bank_bound_lengths[4] = {
{ 32, 1, 26 }, { 32, 1, 26 },
{ 1, 32, 26 }, { 1, 32, 26 },
{ 32, 20, 1 }, { 32, 20, 1 },
{ 20, 32, 1 }, { 20, 32, 1 },
}; };
static const LocationXY16 junior_rc_left_bank_bound_offsets[4] = { static constexpr const LocationXY16 junior_rc_left_bank_bound_offsets[4] = {
{ 0, 27 }, { 0, 27 },
{ 27, 0 }, { 27, 0 },
{ 0, 6 }, { 0, 6 },
@ -2921,7 +2921,7 @@ static void junior_rc_left_quarter_turn_3_tiles_paint_setup(paint_session * sess
tileElement); tileElement);
} }
const LocationXY16 junior_rc_right_quarter_turn_3_tiles_bank_bound_lengths[4][3] = { { static constexpr const LocationXY16 junior_rc_right_quarter_turn_3_tiles_bank_bound_lengths[4][3] = { {
{ 32, 20 }, { 32, 20 },
{ 16, 16 }, { 16, 16 },
{ 20, 32 }, { 20, 32 },
@ -2942,7 +2942,7 @@ const LocationXY16 junior_rc_right_quarter_turn_3_tiles_bank_bound_lengths[4][3]
{ 32, 20 }, { 32, 20 },
} }; } };
const LocationXYZ16 junior_rc_right_quarter_turn_3_tiles_bank_offsets[4][3] = { { static constexpr const LocationXYZ16 junior_rc_right_quarter_turn_3_tiles_bank_offsets[4][3] = { {
{ 0, 6 }, { 0, 6 },
{ 16, 16 }, { 16, 16 },
{ 6, 0 }, { 6, 0 },
@ -3201,7 +3201,7 @@ static void junior_rc_right_quarter_turn_3_tiles_25_deg_down_paint_setup(paint_s
isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE); isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE);
} }
static const uint8 junior_rc_left_quarter_turn_3_tiles_to_right_turn_map[] = { 3, 1, 2, 0 }; static constexpr const uint8 junior_rc_left_quarter_turn_3_tiles_to_right_turn_map[] = { 3, 1, 2, 0 };
/** rct2: 0x008AAEC0 */ /** rct2: 0x008AAEC0 */
static void junior_rc_left_quarter_turn_3_tiles_25_deg_up_paint_setup(paint_session * session, uint8 rideIndex, static void junior_rc_left_quarter_turn_3_tiles_25_deg_up_paint_setup(paint_session * session, uint8 rideIndex,
@ -3793,7 +3793,7 @@ static void junior_rc_right_eighth_to_orthogonal_paint_setup(paint_session * ses
junior_rc_left_eighth_to_diag_paint_setup(session, rideIndex, trackSequence, (direction + 3) % 4, height, tileElement); junior_rc_left_eighth_to_diag_paint_setup(session, rideIndex, trackSequence, (direction + 3) % 4, height, tileElement);
} }
static const LocationXY16 junior_rc_left_eighth_to_diag_bank_bound_lengths[4][4] = { static constexpr const LocationXY16 junior_rc_left_eighth_to_diag_bank_bound_lengths[4][4] = {
{ {
{ 32, 1 }, { 32, 1 },
{ 32, 16 }, { 32, 16 },
@ -3820,7 +3820,7 @@ static const LocationXY16 junior_rc_left_eighth_to_diag_bank_bound_lengths[4][4]
}, },
}; };
static const LocationXYZ16 junior_rc_left_eighth_to_diag_bank_bound_offsets[4][4] = { static constexpr const LocationXYZ16 junior_rc_left_eighth_to_diag_bank_bound_offsets[4][4] = {
{ {
{ 0, 27 }, { 0, 27 },
{ 0, 0 }, { 0, 0 },
@ -3847,7 +3847,7 @@ static const LocationXYZ16 junior_rc_left_eighth_to_diag_bank_bound_offsets[4][4
}, },
}; };
static const sint8 junior_rc_left_eighth_to_diag_bank_thickness[4][4] = { static constexpr const sint8 junior_rc_left_eighth_to_diag_bank_thickness[4][4] = {
{ {
26, 26,
1, 1,
@ -3937,7 +3937,7 @@ static void junior_rc_left_eighth_to_diag_bank_paint_setup(paint_session * sessi
paint_util_set_general_support_height(session, height + 32, 0x20); paint_util_set_general_support_height(session, height + 32, 0x20);
} }
static const LocationXY16 junior_rc_right_eighth_to_diag_bank_bound_lengths[4][4] = { static constexpr const LocationXY16 junior_rc_right_eighth_to_diag_bank_bound_lengths[4][4] = {
{ {
{ 32, 20 }, { 32, 20 },
{ 16, 16 }, { 16, 16 },
@ -3964,7 +3964,7 @@ static const LocationXY16 junior_rc_right_eighth_to_diag_bank_bound_lengths[4][4
}, },
}; };
static const LocationXYZ16 junior_rc_right_eighth_to_diag_bank_bound_offsets[4][4] = { static constexpr const LocationXYZ16 junior_rc_right_eighth_to_diag_bank_bound_offsets[4][4] = {
{ {
{ 0, 6 }, { 0, 6 },
{ 0, 0 }, { 0, 0 },
@ -3991,7 +3991,7 @@ static const LocationXYZ16 junior_rc_right_eighth_to_diag_bank_bound_offsets[4][
}, },
}; };
static const sint8 junior_rc_right_eighth_to_diag_bank_thickness[4][4] = { static constexpr const sint8 junior_rc_right_eighth_to_diag_bank_thickness[4][4] = {
{ {
1, 1,
1, 1,
@ -4099,12 +4099,12 @@ static void junior_rc_right_eighth_to_orthogonal_bank_paint_setup(paint_session
junior_rc_left_eighth_to_diag_bank_paint_setup(session, rideIndex, trackSequence, (direction + 3) % 4, height, tileElement); junior_rc_left_eighth_to_diag_bank_paint_setup(session, rideIndex, trackSequence, (direction + 3) % 4, height, tileElement);
} }
static const sint32 junior_rc_diag_blocked_segments[] = { SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4 | SEGMENT_BC, static constexpr const sint32 junior_rc_diag_blocked_segments[] = { SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4 | SEGMENT_BC,
SEGMENT_C4 | SEGMENT_CC | SEGMENT_C8 | SEGMENT_B4, SEGMENT_C4 | SEGMENT_CC | SEGMENT_C8 | SEGMENT_B4,
SEGMENT_D0 | SEGMENT_C4 | SEGMENT_C0 | SEGMENT_D4, SEGMENT_D0 | SEGMENT_C4 | SEGMENT_C0 | SEGMENT_D4,
SEGMENT_D0 | SEGMENT_C4 | SEGMENT_B8 | SEGMENT_C8 }; SEGMENT_D0 | SEGMENT_C4 | SEGMENT_B8 | SEGMENT_C8 };
static const uint8 junior_rc_diag_support_segment[] = { 1, 0, 2, 3 }; static constexpr const uint8 junior_rc_diag_support_segment[] = { 1, 0, 2, 3 };
void junior_rc_paint_track_diag_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, void junior_rc_paint_track_diag_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
uint16 height, rct_tile_element * tileElement, JUNIOR_RC_CHAINTYPE chainType) uint16 height, rct_tile_element * tileElement, JUNIOR_RC_CHAINTYPE chainType)
@ -4725,14 +4725,14 @@ static void junior_rc_diag_25_deg_down_to_right_bank_paint_setup(paint_session *
paint_util_set_general_support_height(session, height + 48, 0x20); paint_util_set_general_support_height(session, height + 48, 0x20);
} }
const LocationXYZ16 junior_rc_diag_left_bank_bound_offsets[4] = { static constexpr const LocationXYZ16 junior_rc_diag_left_bank_bound_offsets[4] = {
{ -16, -16, 27 }, { -16, -16, 27 },
{ -16, -16 }, { -16, -16 },
{ -16, -16 }, { -16, -16 },
{ -16, -16 }, { -16, -16 },
}; };
const LocationXYZ16 junior_rc_diag_right_bank_bound_offsets[4] = { static constexpr const LocationXYZ16 junior_rc_diag_right_bank_bound_offsets[4] = {
{ -16, -16 }, { -16, -16 },
{ -16, -16 }, { -16, -16 },
{ -16, -16, 27 }, { -16, -16, 27 },
@ -4781,23 +4781,23 @@ static void junior_rc_diag_right_bank_paint_setup(paint_session * session, uint8
paint_util_set_general_support_height(session, height + 32, 0x20); paint_util_set_general_support_height(session, height + 32, 0x20);
} }
static const LocationXY16 junior_rc_60_deg_up_bound_offsets[4] = { static constexpr const LocationXY16 junior_rc_60_deg_up_bound_offsets[4] = {
{ 0, 6 }, { 0, 6 },
{ 10, 29 }, { 10, 29 },
{ 29, 10 }, { 29, 10 },
{ 6, 0 }, { 6, 0 },
}; };
static const LocationXY16 junior_rc_60_deg_up_tile_offsets[4] = { static constexpr const LocationXY16 junior_rc_60_deg_up_tile_offsets[4] = {
{ 0, 6 }, { 0, 6 },
{ 6, 0 }, { 6, 0 },
{ 0, 6 }, { 0, 6 },
{ 6, 0 }, { 6, 0 },
}; };
static const sint8 junior_rc_60_deg_up_bound_thickness[4] = { 1, 75, 75, 1 }; static constexpr const sint8 junior_rc_60_deg_up_bound_thickness[4] = { 1, 75, 75, 1 };
static const LocationXY16 junior_rc_60_deg_up_bound_lengths[4] = { static constexpr const LocationXY16 junior_rc_60_deg_up_bound_lengths[4] = {
{ 32, 20 }, { 32, 20 },
{ 10, 1 }, { 10, 1 },
{ 1, 10 }, { 1, 10 },
@ -4861,16 +4861,16 @@ static void junior_rc_60_deg_down_paint_setup(paint_session * session, uint8 rid
junior_rc_60_deg_up_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); junior_rc_60_deg_up_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
} }
static const LocationXY16 junior_rc_25_deg_up_to_60_deg_up_bound_lengths[4][2] = { static constexpr const LocationXY16 junior_rc_25_deg_up_to_60_deg_up_bound_lengths[4][2] = {
{ { 32, 20 }, { 0 } }, { { 32, 20 }, { 0 } },
{ { 10, 32 }, { 2, 32 } }, { { 10, 32 }, { 2, 32 } },
{ { 32, 10 }, { 32, 2 } }, { { 32, 10 }, { 32, 2 } },
{ { 20, 32 }, { 0 } }, { { 20, 32 }, { 0 } },
}; };
static const sint8 junior_rc_25_deg_up_to_60_deg_up_bound_thickness[4] = { 1, 43, 43, 1 }; static constexpr const sint8 junior_rc_25_deg_up_to_60_deg_up_bound_thickness[4] = { 1, 43, 43, 1 };
static const LocationXY16 junior_rc_25_deg_up_to_60_deg_up_bound_offsets[4][2] = { static constexpr const LocationXY16 junior_rc_25_deg_up_to_60_deg_up_bound_offsets[4][2] = {
{ { 0, 6 }, { 0 } }, { { 0, 6 }, { 0 } },
{ { 10, 0 }, { 4, 0 } }, { { 10, 0 }, { 4, 0 } },
{ { 0, 10 }, { 0, 4 } }, { { 0, 10 }, { 0, 4 } },
@ -5206,27 +5206,27 @@ static void junior_rc_diag_60_deg_down_to_25_deg_down_paint_setup(paint_session
isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE); isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE);
} }
static const LocationXY16 junior_rc_flat_to_60_deg_up_bound_lengths[4][2] = { static constexpr const LocationXY16 junior_rc_flat_to_60_deg_up_bound_lengths[4][2] = {
{ { 32, 24 }, { 0 } }, { { 32, 24 }, { 0 } },
{ { 10, 1 }, { 2, 32 } }, { { 10, 1 }, { 2, 32 } },
{ { 1, 10 }, { 32, 2 } }, { { 1, 10 }, { 32, 2 } },
{ { 24, 32 }, { 0 } }, { { 24, 32 }, { 0 } },
}; };
static const sint8 junior_rc_flat_to_60_deg_up_bound_thickness[4] = { 1, 43, 43, 1 }; static constexpr const sint8 junior_rc_flat_to_60_deg_up_bound_thickness[4] = { 1, 43, 43, 1 };
static const LocationXY16 junior_rc_flat_to_60_deg_up_bound_offsets[4][2] = { static constexpr const LocationXY16 junior_rc_flat_to_60_deg_up_bound_offsets[4][2] = {
{ { 0, 4 }, { 0 } }, { { 0, 4 }, { 0 } },
{ { 10, 0 }, { 4, 0 } }, { { 10, 0 }, { 4, 0 } },
{ { 0, 10 }, { 0, 4 } }, { { 0, 10 }, { 0, 4 } },
{ { 4, 0 }, { 0 } }, { { 4, 0 }, { 0 } },
}; };
static const LocationXY16 junior_rc_flat_to_60_deg_up_tile_offsets[4][2] = { static constexpr const LocationXY16 junior_rc_flat_to_60_deg_up_tile_offsets[4][2] = {
{ { 12, -10 }, { 0 } }, { { 22, 9 }, { 12, -11 } }, { { 30, 7 }, { 5, 0 } }, { { 12, -12 }, { 0 } } { { 12, -10 }, { 0 } }, { { 22, 9 }, { 12, -11 } }, { { 30, 7 }, { 5, 0 } }, { { 12, -12 }, { 0 } }
}; };
static const LocationXY16 junior_rc_60_deg_up_to_flat_tile_offsets[4][2] = { static constexpr const LocationXY16 junior_rc_60_deg_up_to_flat_tile_offsets[4][2] = {
{ { 13, -9 }, { 0 } }, { { 32, 9 }, { -7, -11 } }, { { 22, 18 }, { 2, -19 } }, { { 13, -9 }, { 0 } } { { 13, -9 }, { 0 } }, { { 32, 9 }, { -7, -11 } }, { { 22, 18 }, { 2, -19 } }, { { 13, -9 }, { 0 } }
}; };

4
src/openrct2/ride/coaster/LayDownRollerCoaster.cpp
View File

@ -139,7 +139,7 @@ static void lay_down_rc_track_station(paint_session * session, uint8 rideIndex,
{ {
if (track_element_is_inverted(tileElement)) if (track_element_is_inverted(tileElement))
{ {
static const uint32 imageIds[4][3] = { static constexpr const uint32 imageIds[4][3] = {
{ SPR_STATION_BASE_C_SW_NE, 26557, SPR_STATION_INVERTED_BAR_A_SW_NE }, { SPR_STATION_BASE_C_SW_NE, 26557, SPR_STATION_INVERTED_BAR_A_SW_NE },
{ SPR_STATION_BASE_C_NW_SE, 26558, SPR_STATION_INVERTED_BAR_A_NW_SE }, { SPR_STATION_BASE_C_NW_SE, 26558, SPR_STATION_INVERTED_BAR_A_NW_SE },
{ SPR_STATION_BASE_C_SW_NE, 26557, SPR_STATION_INVERTED_BAR_A_SW_NE }, { SPR_STATION_BASE_C_SW_NE, 26557, SPR_STATION_INVERTED_BAR_A_SW_NE },
@ -159,7 +159,7 @@ static void lay_down_rc_track_station(paint_session * session, uint8 rideIndex,
} }
else else
{ {
static const uint32 imageIds[4][3] = { static constexpr const uint32 imageIds[4][3] = {
{ 16236, 16232, SPR_STATION_BASE_A_SW_NE }, { 16236, 16232, SPR_STATION_BASE_A_SW_NE },
{ 16237, 16233, SPR_STATION_BASE_A_NW_SE }, { 16237, 16233, SPR_STATION_BASE_A_NW_SE },
{ 16236, 16232, SPR_STATION_BASE_A_SW_NE }, { 16236, 16232, SPR_STATION_BASE_A_SW_NE },

2
src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp
View File

@ -30,7 +30,7 @@
static void lim_launched_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void lim_launched_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][3] = { static constexpr const uint32 imageIds[4][3] = {
{ 15018, 15020, SPR_STATION_BASE_B_SW_NE }, { 15018, 15020, SPR_STATION_BASE_B_SW_NE },
{ 15019, 15021, SPR_STATION_BASE_B_NW_SE }, { 15019, 15021, SPR_STATION_BASE_B_NW_SE },
{ 15018, 15020, SPR_STATION_BASE_B_SW_NE }, { 15018, 15020, SPR_STATION_BASE_B_SW_NE },

2
src/openrct2/ride/coaster/MineRide.cpp
View File

@ -61,7 +61,7 @@ static void mine_ride_track_flat(paint_session * session, uint8 rideIndex, uint8
static void mine_ride_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void mine_ride_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][3] = { static constexpr const uint32 imageIds[4][3] = {
{ 19338, SPR_STATION_BASE_A_SW_NE }, { 19338, SPR_STATION_BASE_A_SW_NE },
{ 19339, SPR_STATION_BASE_A_NW_SE }, { 19339, SPR_STATION_BASE_A_NW_SE },
{ 19338, SPR_STATION_BASE_A_SW_NE }, { 19338, SPR_STATION_BASE_A_SW_NE },

2
src/openrct2/ride/coaster/MineTrainCoaster.cpp
View File

@ -83,7 +83,7 @@ static void mine_train_rc_track_flat(paint_session * session, uint8 rideIndex, u
static void mine_train_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void mine_train_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][3] = { static constexpr const uint32 imageIds[4][3] = {
{ 20064, 20060, SPR_STATION_BASE_B_SW_NE }, { 20064, 20060, SPR_STATION_BASE_B_SW_NE },
{ 20065, 20061, SPR_STATION_BASE_B_NW_SE }, { 20065, 20061, SPR_STATION_BASE_B_NW_SE },
{ 20064, 20060, SPR_STATION_BASE_B_SW_NE }, { 20064, 20060, SPR_STATION_BASE_B_SW_NE },

2
src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp
View File

@ -86,7 +86,7 @@ static void mini_suspended_rc_track_flat(paint_session * session, uint8 rideInde
static void mini_suspended_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void mini_suspended_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][3] = { static constexpr const uint32 imageIds[4][3] = {
{ SPR_STATION_BASE_C_SW_NE, 28433, SPR_STATION_INVERTED_BAR_E_SW_NE }, { SPR_STATION_BASE_C_SW_NE, 28433, SPR_STATION_INVERTED_BAR_E_SW_NE },
{ SPR_STATION_BASE_C_NW_SE, 28434, SPR_STATION_INVERTED_BAR_E_NW_SE }, { SPR_STATION_BASE_C_NW_SE, 28434, SPR_STATION_INVERTED_BAR_E_NW_SE },
{ SPR_STATION_BASE_C_SW_NE, 28433, SPR_STATION_INVERTED_BAR_E_SW_NE }, { SPR_STATION_BASE_C_SW_NE, 28433, SPR_STATION_INVERTED_BAR_E_SW_NE },

2
src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp
View File

@ -111,7 +111,7 @@ static void multi_dimension_rc_track_flat(paint_session * session, uint8 rideInd
static void multi_dimension_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void multi_dimension_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][3] = { static constexpr const uint32 imageIds[4][3] = {
{ 15810, 15812, SPR_STATION_INVERTED_BAR_A_SW_NE }, { 15810, 15812, SPR_STATION_INVERTED_BAR_A_SW_NE },
{ 15811, 15813, SPR_STATION_INVERTED_BAR_A_NW_SE }, { 15811, 15813, SPR_STATION_INVERTED_BAR_A_NW_SE },
{ 15810, 15812, SPR_STATION_INVERTED_BAR_A_SW_NE }, { 15810, 15812, SPR_STATION_INVERTED_BAR_A_SW_NE },

18
src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp
View File

@ -94,14 +94,14 @@ enum
SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_SE_NW_5 = 22225, SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_SE_NW_5 = 22225,
}; };
static const uint32 reverse_freefall_rc_track_pieces_station[4] = { static constexpr const uint32 reverse_freefall_rc_track_pieces_station[4] = {
SPR_REVERSE_FREEFALL_RC_STATION_SW_NE, SPR_REVERSE_FREEFALL_RC_STATION_SW_NE,
SPR_REVERSE_FREEFALL_RC_STATION_NW_SE, SPR_REVERSE_FREEFALL_RC_STATION_NW_SE,
SPR_REVERSE_FREEFALL_RC_STATION_SW_NE, SPR_REVERSE_FREEFALL_RC_STATION_SW_NE,
SPR_REVERSE_FREEFALL_RC_STATION_NW_SE, SPR_REVERSE_FREEFALL_RC_STATION_NW_SE,
}; };
static const uint32 reverse_freefall_rc_track_pieces_slope[7][4] = { static constexpr const uint32 reverse_freefall_rc_track_pieces_slope[7][4] = {
{ {
SPR_REVERSE_FREEFALL_RC_SLOPE_SW_NE_0, SPR_REVERSE_FREEFALL_RC_SLOPE_SW_NE_0,
SPR_REVERSE_FREEFALL_RC_SLOPE_NW_SE_0, SPR_REVERSE_FREEFALL_RC_SLOPE_NW_SE_0,
@ -141,7 +141,7 @@ static const uint32 reverse_freefall_rc_track_pieces_slope[7][4] = {
}, },
}; };
static const uint32 reverse_freefall_rc_track_pieces_slope_supports[7][4] = { static constexpr const uint32 reverse_freefall_rc_track_pieces_slope_supports[7][4] = {
{ {
SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_SW_NE_0, SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_SW_NE_0,
SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_NW_SE_0, SPR_REVERSE_FREEFALL_RC_SLOPE_SUPPORTS_NW_SE_0,
@ -186,14 +186,14 @@ static const uint32 reverse_freefall_rc_track_pieces_slope_supports[7][4] = {
}, },
}; };
static const uint32 reverse_freefall_rc_track_pieces_vertical[4] = { static constexpr const uint32 reverse_freefall_rc_track_pieces_vertical[4] = {
SPR_REVERSE_FREEFALL_RC_VERTICAL_SW_NE, SPR_REVERSE_FREEFALL_RC_VERTICAL_SW_NE,
SPR_REVERSE_FREEFALL_RC_VERTICAL_NW_SE, SPR_REVERSE_FREEFALL_RC_VERTICAL_NW_SE,
SPR_REVERSE_FREEFALL_RC_VERTICAL_NE_SW, SPR_REVERSE_FREEFALL_RC_VERTICAL_NE_SW,
SPR_REVERSE_FREEFALL_RC_VERTICAL_SE_NW, SPR_REVERSE_FREEFALL_RC_VERTICAL_SE_NW,
}; };
static const uint32 reverse_freefall_rc_track_pieces_vertical_supports[4] = { static constexpr const uint32 reverse_freefall_rc_track_pieces_vertical_supports[4] = {
SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_SW_NE, SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_SW_NE,
SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_NW_SE, SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_NW_SE,
SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_NE_SW, SPR_REVERSE_FREEFALL_RC_VERTICAL_SUPPORTS_NE_SW,
@ -267,10 +267,10 @@ static void paint_reverse_freefall_rc_slope(paint_session * session, uint8 rideI
{ {
TESTPAINT_IGNORE_ALL(); TESTPAINT_IGNORE_ALL();
static const sint8 bbHeights03[] = { 1, 6, 14, 37, 64 }; static constexpr const sint8 bbHeights03[] = { 1, 6, 14, 37, 64 };
static const sint8 bbHeights12[] = { 1, 6, 14, 27, 59 }; static constexpr const sint8 bbHeights12[] = { 1, 6, 14, 27, 59 };
static const sint32 supportHeights[] = { 48, 64, 128, 176, 208, 240, 240 }; static constexpr const sint32 supportHeights[] = { 48, 64, 128, 176, 208, 240, 240 };
static const sint32 tunnelOffsets03[] = { 0, 0, 0, 16, 64 }; static constexpr const sint32 tunnelOffsets03[] = { 0, 0, 0, 16, 64 };
uint32 supportsImageId = uint32 supportsImageId =
reverse_freefall_rc_track_pieces_slope_supports[trackSequence][direction] | session->TrackColours[SCHEME_SUPPORTS]; reverse_freefall_rc_track_pieces_slope_supports[trackSequence][direction] | session->TrackColours[SCHEME_SUPPORTS];

2
src/openrct2/ride/coaster/ReverserRollerCoaster.cpp
View File

@ -94,7 +94,7 @@ static void reverser_rc_track_flat(paint_session * session, uint8 rideIndex, uin
static void reverser_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void reverser_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][3] = { static constexpr const uint32 imageIds[4][3] = {
{ 21506, SPR_STATION_BASE_A_SW_NE }, { 21506, SPR_STATION_BASE_A_SW_NE },
{ 21507, SPR_STATION_BASE_A_NW_SE }, { 21507, SPR_STATION_BASE_A_NW_SE },
{ 21506, SPR_STATION_BASE_A_SW_NE }, { 21506, SPR_STATION_BASE_A_SW_NE },

2
src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp
View File

@ -95,7 +95,7 @@ static void side_friction_rc_track_flat(paint_session * session, uint8 rideIndex
static void side_friction_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void side_friction_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4] = { static constexpr const uint32 imageIds[4] = {
21610, 21610,
21611, 21611,
21610, 21610,

2
src/openrct2/ride/coaster/StandUpRollerCoaster.cpp
View File

@ -80,7 +80,7 @@ static void stand_up_rc_track_flat(paint_session * session, uint8 rideIndex, uin
static void stand_up_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void stand_up_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][3] = { static constexpr const uint32 imageIds[4][3] = {
{ 25567, 25571, SPR_STATION_BASE_A_SW_NE }, { 25567, 25571, SPR_STATION_BASE_A_SW_NE },
{ 25568, 25572, SPR_STATION_BASE_A_NW_SE }, { 25568, 25572, SPR_STATION_BASE_A_NW_SE },
{ 25567, 25571, SPR_STATION_BASE_A_SW_NE }, { 25567, 25571, SPR_STATION_BASE_A_SW_NE },

2
src/openrct2/ride/coaster/Steeplechase.cpp
View File

@ -73,7 +73,7 @@ static void steeplechase_track_flat(paint_session * session, uint8 rideIndex, ui
static void steeplechase_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void steeplechase_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][3] = { static constexpr const uint32 imageIds[4][3] = {
{ 28635, SPR_STATION_BASE_B_SW_NE }, { 28635, SPR_STATION_BASE_B_SW_NE },
{ 28636, SPR_STATION_BASE_B_NW_SE }, { 28636, SPR_STATION_BASE_B_NW_SE },
{ 28635, SPR_STATION_BASE_B_SW_NE }, { 28635, SPR_STATION_BASE_B_SW_NE },

2
src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp
View File

@ -78,7 +78,7 @@ static void suspended_swinging_rc_track_flat(paint_session * session, uint8 ride
static void suspended_swinging_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void suspended_swinging_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][3] = { static constexpr const uint32 imageIds[4][3] = {
{ SPR_STATION_BASE_C_SW_NE, 25963, SPR_STATION_INVERTED_BAR_D_SW_NE }, { SPR_STATION_BASE_C_SW_NE, 25963, SPR_STATION_INVERTED_BAR_D_SW_NE },
{ SPR_STATION_BASE_C_NW_SE, 25964, SPR_STATION_INVERTED_BAR_D_NW_SE }, { SPR_STATION_BASE_C_NW_SE, 25964, SPR_STATION_INVERTED_BAR_D_NW_SE },
{ SPR_STATION_BASE_C_SW_NE, 25963, SPR_STATION_INVERTED_BAR_D_SW_NE }, { SPR_STATION_BASE_C_SW_NE, 25963, SPR_STATION_INVERTED_BAR_D_SW_NE },

26
src/openrct2/ride/coaster/VirginiaReel.cpp
View File

@ -24,7 +24,7 @@
#include "../VehiclePaint.h" #include "../VehiclePaint.h"
// 0x009927E6: // 0x009927E6:
static const vehicle_boundbox _virginiaReelBoundbox[] = { static constexpr const vehicle_boundbox _virginiaReelBoundbox[] = {
{ -11, -11, 1, 22, 22, 13 }, { -11, -11, 1, 22, 22, 13 }, { -11, -11, 1, 22, 22, 13 }, { -11, -11, 1, 22, 22, 13 }, { -11, -11, 1, 22, 22, 13 }, { -11, -11, 1, 22, 22, 13 },
{ -11, -11, 1, 22, 22, 13 }, { -11, -11, 1, 22, 22, 13 }, { -11, -11, 1, 22, 22, 13 }, { -11, -11, 1, 22, 22, 13 }, { -11, -11, 1, 22, 22, 13 }, { -11, -11, 1, 22, 22, 13 },
{ -11, -11, 1, 22, 22, 13 }, { -11, -11, 1, 22, 22, 13 }, { -11, -11, 1, 22, 22, 13 }, { -11, -11, 1, 22, 22, 13 }, { -11, -11, 1, 22, 22, 13 }, { -11, -11, 1, 22, 22, 13 },
@ -80,63 +80,63 @@ enum
SPR_VIRGINIA_REEL_25_DEG_UP_LIFT_HILL_SE_NW = 21503, SPR_VIRGINIA_REEL_25_DEG_UP_LIFT_HILL_SE_NW = 21503,
}; };
static const uint32 virginia_reel_track_pieces_flat[4] = { static constexpr const uint32 virginia_reel_track_pieces_flat[4] = {
SPR_VIRGINIA_REEL_FLAT_SW_NE, SPR_VIRGINIA_REEL_FLAT_SW_NE,
SPR_VIRGINIA_REEL_FLAT_NW_SE, SPR_VIRGINIA_REEL_FLAT_NW_SE,
SPR_VIRGINIA_REEL_FLAT_SW_NE, SPR_VIRGINIA_REEL_FLAT_SW_NE,
SPR_VIRGINIA_REEL_FLAT_NW_SE, SPR_VIRGINIA_REEL_FLAT_NW_SE,
}; };
static const uint32 virginia_reel_track_pieces_flat_lift_hill[4] = { static constexpr const uint32 virginia_reel_track_pieces_flat_lift_hill[4] = {
SPR_VIRGINIA_REEL_FLAT_LIFT_HILL_SW_NE, SPR_VIRGINIA_REEL_FLAT_LIFT_HILL_SW_NE,
SPR_VIRGINIA_REEL_FLAT_LIFT_HILL_NW_SE, SPR_VIRGINIA_REEL_FLAT_LIFT_HILL_NW_SE,
SPR_VIRGINIA_REEL_FLAT_LIFT_HILL_NE_SW, SPR_VIRGINIA_REEL_FLAT_LIFT_HILL_NE_SW,
SPR_VIRGINIA_REEL_FLAT_LIFT_HILL_SE_NW, SPR_VIRGINIA_REEL_FLAT_LIFT_HILL_SE_NW,
}; };
static const uint32 virginia_reel_track_pieces_flat_to_25_deg_up[4] = { static constexpr const uint32 virginia_reel_track_pieces_flat_to_25_deg_up[4] = {
SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_SW_NE, SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_SW_NE,
SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_NW_SE, SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_NW_SE,
SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_NE_SW, SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_NE_SW,
SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_SE_NW, SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_SE_NW,
}; };
static const uint32 virginia_reel_track_pieces_flat_to_25_deg_up_lift_hill[4] = { static constexpr const uint32 virginia_reel_track_pieces_flat_to_25_deg_up_lift_hill[4] = {
SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_LIFT_HILL_SW_NE, SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_LIFT_HILL_SW_NE,
SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_LIFT_HILL_NW_SE, SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_LIFT_HILL_NW_SE,
SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_LIFT_HILL_NE_SW, SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_LIFT_HILL_NE_SW,
SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_LIFT_HILL_SE_NW, SPR_VIRGINIA_REEL_FLAT_TO_25_DEG_UP_LIFT_HILL_SE_NW,
}; };
static const uint32 virginia_reel_track_pieces_25_deg_up_to_flat[4] = { static constexpr const uint32 virginia_reel_track_pieces_25_deg_up_to_flat[4] = {
SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_SW_NE, SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_SW_NE,
SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_NW_SE, SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_NW_SE,
SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_NE_SW, SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_NE_SW,
SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_SE_NW, SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_SE_NW,
}; };
static const uint32 virginia_reel_track_pieces_25_deg_up_to_flat_lift_hill[4] = { static constexpr const uint32 virginia_reel_track_pieces_25_deg_up_to_flat_lift_hill[4] = {
SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_LIFT_HILL_SW_NE, SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_LIFT_HILL_SW_NE,
SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_LIFT_HILL_NW_SE, SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_LIFT_HILL_NW_SE,
SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_LIFT_HILL_NE_SW, SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_LIFT_HILL_NE_SW,
SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_LIFT_HILL_SE_NW, SPR_VIRGINIA_REEL_25_DEG_UP_TO_FLAT_LIFT_HILL_SE_NW,
}; };
static const uint32 virginia_reel_track_pieces_25_deg_up[4] = { static constexpr const uint32 virginia_reel_track_pieces_25_deg_up[4] = {
SPR_VIRGINIA_REEL_25_DEG_UP_SW_NE, SPR_VIRGINIA_REEL_25_DEG_UP_SW_NE,
SPR_VIRGINIA_REEL_25_DEG_UP_NW_SE, SPR_VIRGINIA_REEL_25_DEG_UP_NW_SE,
SPR_VIRGINIA_REEL_25_DEG_UP_NE_SW, SPR_VIRGINIA_REEL_25_DEG_UP_NE_SW,
SPR_VIRGINIA_REEL_25_DEG_UP_SE_NW, SPR_VIRGINIA_REEL_25_DEG_UP_SE_NW,
}; };
static const uint32 virginia_reel_track_pieces_25_deg_up_lift_hill[4] = { static constexpr const uint32 virginia_reel_track_pieces_25_deg_up_lift_hill[4] = {
SPR_VIRGINIA_REEL_25_DEG_UP_LIFT_HILL_SW_NE, SPR_VIRGINIA_REEL_25_DEG_UP_LIFT_HILL_SW_NE,
SPR_VIRGINIA_REEL_25_DEG_UP_LIFT_HILL_NW_SE, SPR_VIRGINIA_REEL_25_DEG_UP_LIFT_HILL_NW_SE,
SPR_VIRGINIA_REEL_25_DEG_UP_LIFT_HILL_NE_SW, SPR_VIRGINIA_REEL_25_DEG_UP_LIFT_HILL_NE_SW,
SPR_VIRGINIA_REEL_25_DEG_UP_LIFT_HILL_SE_NW, SPR_VIRGINIA_REEL_25_DEG_UP_LIFT_HILL_SE_NW,
}; };
static const uint32 virginia_reel_track_pieces_flat_quarter_turn_3_tiles[4][3] = { static constexpr const uint32 virginia_reel_track_pieces_flat_quarter_turn_3_tiles[4][3] = {
{ SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_0, SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_1, { SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_0, SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_1,
SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_2 }, SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_2 },
{ SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_NW_SW_PART_0, SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_NW_SW_PART_1, { SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_NW_SW_PART_0, SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_NW_SW_PART_1,
@ -147,7 +147,7 @@ static const uint32 virginia_reel_track_pieces_flat_quarter_turn_3_tiles[4][3] =
SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_SE_NE_PART_2 } SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_SE_NE_PART_2 }
}; };
static const uint32 virginia_reel_track_pieces_flat_quarter_turn_1_tile[4] = { static constexpr const uint32 virginia_reel_track_pieces_flat_quarter_turn_1_tile[4] = {
SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_1_TILE_SW_NW, SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_1_TILE_SW_NW,
SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_1_TILE_NW_NE, SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_1_TILE_NW_NE,
SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_1_TILE_NE_SE, SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_1_TILE_NE_SE,
@ -460,7 +460,7 @@ static void paint_virginia_reel_station(paint_session * session, uint8 rideIndex
paint_util_set_general_support_height(session, height + 32, 0x20); paint_util_set_general_support_height(session, height + 32, 0x20);
} }
static const uint8 virginia_reel_left_quarter_turn_supports[] = { 5, 2, 3, 4 }; static constexpr const uint8 virginia_reel_left_quarter_turn_supports[] = { 5, 2, 3, 4 };
/** rct2: 0x00811304 */ /** rct2: 0x00811304 */
static void paint_virginia_reel_track_left_quarter_turn_3_tiles(paint_session * session, uint8 rideIndex, uint8 trackSequence, static void paint_virginia_reel_track_left_quarter_turn_3_tiles(paint_session * session, uint8 rideIndex, uint8 trackSequence,
@ -488,7 +488,7 @@ static void paint_virginia_reel_track_left_quarter_turn_3_tiles(paint_session *
paint_util_set_general_support_height(session, height + 32, 0x20); paint_util_set_general_support_height(session, height + 32, 0x20);
} }
static const uint8 virginia_reel_right_quarter_turn_3_tiles_to_left_turn_map[] = { 3, 1, 2, 0 }; static constexpr const uint8 virginia_reel_right_quarter_turn_3_tiles_to_left_turn_map[] = { 3, 1, 2, 0 };
/** rct2: 0x00811314 */ /** rct2: 0x00811314 */
static void paint_virginia_reel_track_right_quarter_turn_3_tiles(paint_session * session, uint8 rideIndex, uint8 trackSequence, static void paint_virginia_reel_track_right_quarter_turn_3_tiles(paint_session * session, uint8 rideIndex, uint8 trackSequence,

44
src/openrct2/ride/coaster/WildMouse.cpp
View File

@ -155,14 +155,14 @@ enum
SPR_WILD_MOUSE_QUARTER_TURN_3_25_DEG_DOWN_SE_NE_PART_1 = 17025, SPR_WILD_MOUSE_QUARTER_TURN_3_25_DEG_DOWN_SE_NE_PART_1 = 17025,
}; };
static const uint32 _wild_mouse_brakes_image_ids[4] = { static constexpr const uint32 _wild_mouse_brakes_image_ids[4] = {
SPR_WILD_MOUSE_BRAKES_SW_NE, SPR_WILD_MOUSE_BRAKES_SW_NE,
SPR_WILD_MOUSE_BRAKES_NW_SE, SPR_WILD_MOUSE_BRAKES_NW_SE,
SPR_WILD_MOUSE_BRAKES_SW_NE, SPR_WILD_MOUSE_BRAKES_SW_NE,
SPR_WILD_MOUSE_BRAKES_NW_SE, SPR_WILD_MOUSE_BRAKES_NW_SE,
}; };
static const uint32 _wild_mouse_block_brakes_image_ids[4] = { static constexpr const uint32 _wild_mouse_block_brakes_image_ids[4] = {
SPR_WILD_MOUSE_BLOCK_BRAKES_SW_NE, SPR_WILD_MOUSE_BLOCK_BRAKES_SW_NE,
SPR_WILD_MOUSE_BLOCK_BRAKES_NW_SE, SPR_WILD_MOUSE_BLOCK_BRAKES_NW_SE,
SPR_WILD_MOUSE_BLOCK_BRAKES_SW_NE, SPR_WILD_MOUSE_BLOCK_BRAKES_SW_NE,
@ -173,7 +173,7 @@ static const uint32 _wild_mouse_block_brakes_image_ids[4] = {
static void wild_mouse_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, static void wild_mouse_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height,
rct_tile_element * tileElement) rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][2] = { static constexpr const uint32 imageIds[4][2] = {
{ SPR_WILD_MOUSE_FLAT_SW_NE, SPR_WILD_MOUSE_FLAT_CHAIN_SW_NE }, { SPR_WILD_MOUSE_FLAT_SW_NE, SPR_WILD_MOUSE_FLAT_CHAIN_SW_NE },
{ SPR_WILD_MOUSE_FLAT_NW_SE, SPR_WILD_MOUSE_FLAT_CHAIN_NW_SE }, { SPR_WILD_MOUSE_FLAT_NW_SE, SPR_WILD_MOUSE_FLAT_CHAIN_NW_SE },
{ SPR_WILD_MOUSE_FLAT_SW_NE, SPR_WILD_MOUSE_FLAT_CHAIN_NE_SW }, { SPR_WILD_MOUSE_FLAT_SW_NE, SPR_WILD_MOUSE_FLAT_CHAIN_NE_SW },
@ -196,7 +196,7 @@ static void wild_mouse_track_flat(paint_session * session, uint8 rideIndex, uint
static void wild_mouse_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void wild_mouse_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 baseImageIds[4] = { static constexpr const uint32 baseImageIds[4] = {
SPR_STATION_BASE_B_SW_NE, SPR_STATION_BASE_B_SW_NE,
SPR_STATION_BASE_B_NW_SE, SPR_STATION_BASE_B_NW_SE,
SPR_STATION_BASE_B_SW_NE, SPR_STATION_BASE_B_SW_NE,
@ -228,7 +228,7 @@ static void wild_mouse_track_station(paint_session * session, uint8 rideIndex, u
static void wild_mouse_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void wild_mouse_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][2] = { static constexpr const uint32 imageIds[4][2] = {
{ SPR_WILD_MOUSE_25_DEG_SW_NE, SPR_WILD_MOUSE_25_DEG_CHAIN_SW_NE }, { SPR_WILD_MOUSE_25_DEG_SW_NE, SPR_WILD_MOUSE_25_DEG_CHAIN_SW_NE },
{ SPR_WILD_MOUSE_25_DEG_NW_SE, SPR_WILD_MOUSE_25_DEG_CHAIN_NW_SE }, { SPR_WILD_MOUSE_25_DEG_NW_SE, SPR_WILD_MOUSE_25_DEG_CHAIN_NW_SE },
{ SPR_WILD_MOUSE_25_DEG_NE_SW, SPR_WILD_MOUSE_25_DEG_CHAIN_NE_SW }, { SPR_WILD_MOUSE_25_DEG_NE_SW, SPR_WILD_MOUSE_25_DEG_CHAIN_NE_SW },
@ -259,7 +259,7 @@ static void wild_mouse_track_25_deg_up(paint_session * session, uint8 rideIndex,
static void wild_mouse_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void wild_mouse_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][2] = { static constexpr const uint32 imageIds[4][2] = {
{ SPR_WILD_MOUSE_60_DEG_SW_NE, SPR_WILD_MOUSE_60_DEG_CHAIN_SW_NE }, { SPR_WILD_MOUSE_60_DEG_SW_NE, SPR_WILD_MOUSE_60_DEG_CHAIN_SW_NE },
{ SPR_WILD_MOUSE_60_DEG_NW_SE, SPR_WILD_MOUSE_60_DEG_CHAIN_NW_SE }, { SPR_WILD_MOUSE_60_DEG_NW_SE, SPR_WILD_MOUSE_60_DEG_CHAIN_NW_SE },
{ SPR_WILD_MOUSE_60_DEG_NE_SW, SPR_WILD_MOUSE_60_DEG_CHAIN_NE_SW }, { SPR_WILD_MOUSE_60_DEG_NE_SW, SPR_WILD_MOUSE_60_DEG_CHAIN_NE_SW },
@ -304,7 +304,7 @@ static void wild_mouse_track_60_deg_up(paint_session * session, uint8 rideIndex,
static void wild_mouse_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void wild_mouse_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][2] = { static constexpr const uint32 imageIds[4][2] = {
{ SPR_WILD_MOUSE_FLAT_TO_25_DEG_SW_NE, SPR_WILD_MOUSE_FLAT_TO_25_DEG_CHAIN_SW_NE }, { SPR_WILD_MOUSE_FLAT_TO_25_DEG_SW_NE, SPR_WILD_MOUSE_FLAT_TO_25_DEG_CHAIN_SW_NE },
{ SPR_WILD_MOUSE_FLAT_TO_25_DEG_NW_SE, SPR_WILD_MOUSE_FLAT_TO_25_DEG_CHAIN_NW_SE }, { SPR_WILD_MOUSE_FLAT_TO_25_DEG_NW_SE, SPR_WILD_MOUSE_FLAT_TO_25_DEG_CHAIN_NW_SE },
{ SPR_WILD_MOUSE_FLAT_TO_25_DEG_NE_SW, SPR_WILD_MOUSE_FLAT_TO_25_DEG_CHAIN_NE_SW }, { SPR_WILD_MOUSE_FLAT_TO_25_DEG_NE_SW, SPR_WILD_MOUSE_FLAT_TO_25_DEG_CHAIN_NE_SW },
@ -335,13 +335,13 @@ static void wild_mouse_track_flat_to_25_deg_up(paint_session * session, uint8 ri
static void wild_mouse_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, static void wild_mouse_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence,
uint8 direction, sint32 height, rct_tile_element * tileElement) uint8 direction, sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][2] = { static constexpr const uint32 imageIds[4][2] = {
{ SPR_WILD_MOUSE_25_DEG_TO_60_DEG_SW_NE, SPR_WILD_MOUSE_25_DEG_TO_60_DEG_CHAIN_SW_NE }, { SPR_WILD_MOUSE_25_DEG_TO_60_DEG_SW_NE, SPR_WILD_MOUSE_25_DEG_TO_60_DEG_CHAIN_SW_NE },
{ SPR_WILD_MOUSE_25_DEG_TO_60_DEG_NW_SE, SPR_WILD_MOUSE_25_DEG_TO_60_DEG_CHAIN_NW_SE }, { SPR_WILD_MOUSE_25_DEG_TO_60_DEG_NW_SE, SPR_WILD_MOUSE_25_DEG_TO_60_DEG_CHAIN_NW_SE },
{ SPR_WILD_MOUSE_25_DEG_TO_60_DEG_NE_SW, SPR_WILD_MOUSE_25_DEG_TO_60_DEG_CHAIN_NE_SW }, { SPR_WILD_MOUSE_25_DEG_TO_60_DEG_NE_SW, SPR_WILD_MOUSE_25_DEG_TO_60_DEG_CHAIN_NE_SW },
{ SPR_WILD_MOUSE_25_DEG_TO_60_DEG_SE_NW, SPR_WILD_MOUSE_25_DEG_TO_60_DEG_CHAIN_SE_NW }, { SPR_WILD_MOUSE_25_DEG_TO_60_DEG_SE_NW, SPR_WILD_MOUSE_25_DEG_TO_60_DEG_CHAIN_SE_NW },
}; };
static const uint32 frontImageIds[4][2] = { static constexpr const uint32 frontImageIds[4][2] = {
{ 0, 0 }, { 0, 0 },
{ SPR_WILD_MOUSE_25_DEG_TO_60_DEG_FRONT_NW_SE, SPR_WILD_MOUSE_25_DEG_TO_60_DEG_CHAIN_FRONT_NW_SE }, { SPR_WILD_MOUSE_25_DEG_TO_60_DEG_FRONT_NW_SE, SPR_WILD_MOUSE_25_DEG_TO_60_DEG_CHAIN_FRONT_NW_SE },
{ SPR_WILD_MOUSE_25_DEG_TO_60_DEG_FRONT_NE_SW, SPR_WILD_MOUSE_25_DEG_TO_60_DEG_CHAIN_FRONT_NE_SW }, { SPR_WILD_MOUSE_25_DEG_TO_60_DEG_FRONT_NE_SW, SPR_WILD_MOUSE_25_DEG_TO_60_DEG_CHAIN_FRONT_NE_SW },
@ -381,13 +381,13 @@ static void wild_mouse_track_25_deg_up_to_60_deg_up(paint_session * session, uin
static void wild_mouse_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, static void wild_mouse_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence,
uint8 direction, sint32 height, rct_tile_element * tileElement) uint8 direction, sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][2] = { static constexpr const uint32 imageIds[4][2] = {
{ SPR_WILD_MOUSE_60_DEG_TO_25_DEG_SW_NE, SPR_WILD_MOUSE_60_DEG_TO_25_DEG_CHAIN_SW_NE }, { SPR_WILD_MOUSE_60_DEG_TO_25_DEG_SW_NE, SPR_WILD_MOUSE_60_DEG_TO_25_DEG_CHAIN_SW_NE },
{ SPR_WILD_MOUSE_60_DEG_TO_25_DEG_NW_SE, SPR_WILD_MOUSE_60_DEG_TO_25_DEG_CHAIN_NW_SE }, { SPR_WILD_MOUSE_60_DEG_TO_25_DEG_NW_SE, SPR_WILD_MOUSE_60_DEG_TO_25_DEG_CHAIN_NW_SE },
{ SPR_WILD_MOUSE_60_DEG_TO_25_DEG_NE_SW, SPR_WILD_MOUSE_60_DEG_TO_25_DEG_CHAIN_NE_SW }, { SPR_WILD_MOUSE_60_DEG_TO_25_DEG_NE_SW, SPR_WILD_MOUSE_60_DEG_TO_25_DEG_CHAIN_NE_SW },
{ SPR_WILD_MOUSE_60_DEG_TO_25_DEG_SE_NW, SPR_WILD_MOUSE_60_DEG_TO_25_DEG_CHAIN_SE_NW }, { SPR_WILD_MOUSE_60_DEG_TO_25_DEG_SE_NW, SPR_WILD_MOUSE_60_DEG_TO_25_DEG_CHAIN_SE_NW },
}; };
static const uint32 frontImageIds[4][2] = { static constexpr const uint32 frontImageIds[4][2] = {
{ 0, 0 }, { 0, 0 },
{ SPR_WILD_MOUSE_60_DEG_TO_25_DEG_FRONT_NW_SE, SPR_WILD_MOUSE_60_DEG_TO_25_DEG_CHAIN_FRONT_NW_SE }, { SPR_WILD_MOUSE_60_DEG_TO_25_DEG_FRONT_NW_SE, SPR_WILD_MOUSE_60_DEG_TO_25_DEG_CHAIN_FRONT_NW_SE },
{ SPR_WILD_MOUSE_60_DEG_TO_25_DEG_FRONT_NE_SW, SPR_WILD_MOUSE_60_DEG_TO_25_DEG_CHAIN_FRONT_NE_SW }, { SPR_WILD_MOUSE_60_DEG_TO_25_DEG_FRONT_NE_SW, SPR_WILD_MOUSE_60_DEG_TO_25_DEG_CHAIN_FRONT_NE_SW },
@ -427,7 +427,7 @@ static void wild_mouse_track_60_deg_up_to_25_deg_up(paint_session * session, uin
static void wild_mouse_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void wild_mouse_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][2] = { static constexpr const uint32 imageIds[4][2] = {
{ SPR_WILD_MOUSE_25_DEG_TO_FLAT_SW_NE, SPR_WILD_MOUSE_25_DEG_TO_FLAT_CHAIN_SW_NE }, { SPR_WILD_MOUSE_25_DEG_TO_FLAT_SW_NE, SPR_WILD_MOUSE_25_DEG_TO_FLAT_CHAIN_SW_NE },
{ SPR_WILD_MOUSE_25_DEG_TO_FLAT_NW_SE, SPR_WILD_MOUSE_25_DEG_TO_FLAT_CHAIN_NW_SE }, { SPR_WILD_MOUSE_25_DEG_TO_FLAT_NW_SE, SPR_WILD_MOUSE_25_DEG_TO_FLAT_CHAIN_NW_SE },
{ SPR_WILD_MOUSE_25_DEG_TO_FLAT_NE_SW, SPR_WILD_MOUSE_25_DEG_TO_FLAT_CHAIN_NE_SW }, { SPR_WILD_MOUSE_25_DEG_TO_FLAT_NE_SW, SPR_WILD_MOUSE_25_DEG_TO_FLAT_CHAIN_NE_SW },
@ -499,7 +499,7 @@ static void wild_mouse_track_25_deg_down_to_flat(paint_session * session, uint8
static void wild_mouse_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, static void wild_mouse_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence,
uint8 direction, sint32 height, rct_tile_element * tileElement) uint8 direction, sint32 height, rct_tile_element * tileElement)
{ {
static const sprite_bb imageIds[4][3] = { static constexpr const sprite_bb imageIds[4][3] = {
{ {
{ SPR_WILD_MOUSE_QUARTER_TURN_3_SW_SE_PART_0, { 0, 0, 0 }, { 0, 6, 0 }, { 32, 20, 3 } }, { SPR_WILD_MOUSE_QUARTER_TURN_3_SW_SE_PART_0, { 0, 0, 0 }, { 0, 6, 0 }, { 32, 20, 3 } },
{ SPR_WILD_MOUSE_QUARTER_TURN_3_SW_SE_PART_1, { 0, 0, 0 }, { 16, 16, 0 }, { 16, 16, 3 } }, { SPR_WILD_MOUSE_QUARTER_TURN_3_SW_SE_PART_1, { 0, 0, 0 }, { 16, 16, 0 }, { 16, 16, 3 } },
@ -554,7 +554,7 @@ static void wild_mouse_track_right_quarter_turn_3(paint_session * session, uint8
static void wild_mouse_track_right_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, static void wild_mouse_track_right_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence,
uint8 direction, sint32 height, rct_tile_element * tileElement) uint8 direction, sint32 height, rct_tile_element * tileElement)
{ {
static const sprite_bb imageIds[4][2] = { static constexpr const sprite_bb imageIds[4][2] = {
{ {
{ SPR_WILD_MOUSE_QUARTER_TURN_3_25_DEG_DOWN_SW_SE_PART_0, { 0, 6, 0 }, { 0, 0, 0 }, { 32, 20, 3 } }, { SPR_WILD_MOUSE_QUARTER_TURN_3_25_DEG_DOWN_SW_SE_PART_0, { 0, 6, 0 }, { 0, 0, 0 }, { 32, 20, 3 } },
{ SPR_WILD_MOUSE_QUARTER_TURN_3_25_DEG_DOWN_SW_SE_PART_1, { 6, 0, 0 }, { 0, 0, 0 }, { 20, 32, 3 } }, { SPR_WILD_MOUSE_QUARTER_TURN_3_25_DEG_DOWN_SW_SE_PART_1, { 6, 0, 0 }, { 0, 0, 0 }, { 20, 32, 3 } },
@ -572,7 +572,7 @@ static void wild_mouse_track_right_quarter_turn_3_25_deg_down(paint_session * se
{ SPR_WILD_MOUSE_QUARTER_TURN_3_25_DEG_DOWN_SE_NE_PART_1, { 0, 6, 0 }, { 0, 0, 0 }, { 32, 20, 3 } }, { SPR_WILD_MOUSE_QUARTER_TURN_3_25_DEG_DOWN_SE_NE_PART_1, { 0, 6, 0 }, { 0, 0, 0 }, { 32, 20, 3 } },
} }
}; };
static const sint16 generalSupportHeights[] = { 72, 56, 56, 72 }; static constexpr const sint16 generalSupportHeights[] = { 72, 56, 56, 72 };
if (trackSequence == 0 || trackSequence == 3) if (trackSequence == 0 || trackSequence == 3)
{ {
@ -620,7 +620,7 @@ static void wild_mouse_track_left_quarter_turn_3_25_deg_up(paint_session * sessi
static void wild_mouse_track_right_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, static void wild_mouse_track_right_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence,
uint8 direction, sint32 height, rct_tile_element * tileElement) uint8 direction, sint32 height, rct_tile_element * tileElement)
{ {
static const sprite_bb imageIds[4][2] = { static constexpr const sprite_bb imageIds[4][2] = {
{ {
{ SPR_WILD_MOUSE_QUARTER_TURN_3_25_DEG_UP_SW_SE_PART_0, { 0, 6, 0 }, { 0, 0, 0 }, { 32, 20, 3 } }, { SPR_WILD_MOUSE_QUARTER_TURN_3_25_DEG_UP_SW_SE_PART_0, { 0, 6, 0 }, { 0, 0, 0 }, { 32, 20, 3 } },
{ SPR_WILD_MOUSE_QUARTER_TURN_3_25_DEG_UP_SW_SE_PART_1, { 6, 0, 0 }, { 0, 0, 0 }, { 20, 32, 3 } }, { SPR_WILD_MOUSE_QUARTER_TURN_3_25_DEG_UP_SW_SE_PART_1, { 6, 0, 0 }, { 0, 0, 0 }, { 20, 32, 3 } },
@ -638,7 +638,7 @@ static void wild_mouse_track_right_quarter_turn_3_25_deg_up(paint_session * sess
{ SPR_WILD_MOUSE_QUARTER_TURN_3_25_DEG_UP_SE_NE_PART_1, { 0, 6, 0 }, { 0, 0, 0 }, { 32, 20, 3 } }, { SPR_WILD_MOUSE_QUARTER_TURN_3_25_DEG_UP_SE_NE_PART_1, { 0, 6, 0 }, { 0, 0, 0 }, { 32, 20, 3 } },
} }
}; };
static const sint16 generalSupportHeights[] = { 72, 56, 56, 72 }; static constexpr const sint16 generalSupportHeights[] = { 72, 56, 56, 72 };
if (trackSequence == 0 || trackSequence == 3) if (trackSequence == 0 || trackSequence == 3)
{ {
@ -742,13 +742,13 @@ static void wild_mouse_track_right_quarter_turn_1(paint_session * session, uint8
static void wild_mouse_track_flat_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void wild_mouse_track_flat_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][2] = { static constexpr const uint32 imageIds[4][2] = {
{ SPR_WILD_MOUSE_FLAT_TO_60_DEG_SW_NE, SPR_WILD_MOUSE_FLAT_TO_60_DEG_CHAIN_SW_NE }, { SPR_WILD_MOUSE_FLAT_TO_60_DEG_SW_NE, SPR_WILD_MOUSE_FLAT_TO_60_DEG_CHAIN_SW_NE },
{ SPR_WILD_MOUSE_FLAT_TO_60_DEG_NW_SE, SPR_WILD_MOUSE_FLAT_TO_60_DEG_CHAIN_NW_SE }, { SPR_WILD_MOUSE_FLAT_TO_60_DEG_NW_SE, SPR_WILD_MOUSE_FLAT_TO_60_DEG_CHAIN_NW_SE },
{ SPR_WILD_MOUSE_FLAT_TO_60_DEG_NE_SW, SPR_WILD_MOUSE_FLAT_TO_60_DEG_CHAIN_NE_SW }, { SPR_WILD_MOUSE_FLAT_TO_60_DEG_NE_SW, SPR_WILD_MOUSE_FLAT_TO_60_DEG_CHAIN_NE_SW },
{ SPR_WILD_MOUSE_FLAT_TO_60_DEG_SE_NW, SPR_WILD_MOUSE_FLAT_TO_60_DEG_CHAIN_SE_NW }, { SPR_WILD_MOUSE_FLAT_TO_60_DEG_SE_NW, SPR_WILD_MOUSE_FLAT_TO_60_DEG_CHAIN_SE_NW },
}; };
static const uint32 frontImageIds[4][2] = { static constexpr const uint32 frontImageIds[4][2] = {
{ 0, 0 }, { 0, 0 },
{ SPR_WILD_MOUSE_FLAT_TO_60_DEG_FRONT_NW_SE, SPR_WILD_MOUSE_FLAT_TO_60_DEG_CHAIN_FRONT_NW_SE }, { SPR_WILD_MOUSE_FLAT_TO_60_DEG_FRONT_NW_SE, SPR_WILD_MOUSE_FLAT_TO_60_DEG_CHAIN_FRONT_NW_SE },
{ SPR_WILD_MOUSE_FLAT_TO_60_DEG_FRONT_NE_SW, SPR_WILD_MOUSE_FLAT_TO_60_DEG_CHAIN_FRONT_NE_SW }, { SPR_WILD_MOUSE_FLAT_TO_60_DEG_FRONT_NE_SW, SPR_WILD_MOUSE_FLAT_TO_60_DEG_CHAIN_FRONT_NE_SW },
@ -788,13 +788,13 @@ static void wild_mouse_track_flat_to_60_deg_up(paint_session * session, uint8 ri
static void wild_mouse_track_60_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void wild_mouse_track_60_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][2] = { static constexpr const uint32 imageIds[4][2] = {
{ SPR_WILD_MOUSE_60_DEG_TO_FLAT_SW_NE, SPR_WILD_MOUSE_60_DEG_TO_FLAT_CHAIN_SW_NE }, { SPR_WILD_MOUSE_60_DEG_TO_FLAT_SW_NE, SPR_WILD_MOUSE_60_DEG_TO_FLAT_CHAIN_SW_NE },
{ SPR_WILD_MOUSE_60_DEG_TO_FLAT_NW_SE, SPR_WILD_MOUSE_60_DEG_TO_FLAT_CHAIN_NW_SE }, { SPR_WILD_MOUSE_60_DEG_TO_FLAT_NW_SE, SPR_WILD_MOUSE_60_DEG_TO_FLAT_CHAIN_NW_SE },
{ SPR_WILD_MOUSE_60_DEG_TO_FLAT_NE_SW, SPR_WILD_MOUSE_60_DEG_TO_FLAT_CHAIN_NE_SW }, { SPR_WILD_MOUSE_60_DEG_TO_FLAT_NE_SW, SPR_WILD_MOUSE_60_DEG_TO_FLAT_CHAIN_NE_SW },
{ SPR_WILD_MOUSE_60_DEG_TO_FLAT_SE_NW, SPR_WILD_MOUSE_60_DEG_TO_FLAT_CHAIN_SE_NW }, { SPR_WILD_MOUSE_60_DEG_TO_FLAT_SE_NW, SPR_WILD_MOUSE_60_DEG_TO_FLAT_CHAIN_SE_NW },
}; };
static const uint32 frontImageIds[4][2] = { static constexpr const uint32 frontImageIds[4][2] = {
{ 0, 0 }, { 0, 0 },
{ SPR_WILD_MOUSE_60_DEG_TO_FLAT_FRONT_NW_SE, SPR_WILD_MOUSE_60_DEG_TO_FLAT_CHAIN_FRONT_NW_SE }, { SPR_WILD_MOUSE_60_DEG_TO_FLAT_FRONT_NW_SE, SPR_WILD_MOUSE_60_DEG_TO_FLAT_CHAIN_FRONT_NW_SE },
{ SPR_WILD_MOUSE_60_DEG_TO_FLAT_FRONT_NE_SW, SPR_WILD_MOUSE_60_DEG_TO_FLAT_CHAIN_FRONT_NE_SW }, { SPR_WILD_MOUSE_60_DEG_TO_FLAT_FRONT_NE_SW, SPR_WILD_MOUSE_60_DEG_TO_FLAT_CHAIN_FRONT_NE_SW },
@ -871,7 +871,7 @@ static void wild_mouse_track_brakes(paint_session * session, uint8 rideIndex, ui
static void wild_mouse_track_rotation_control_toggle(paint_session * session, uint8 rideIndex, uint8 trackSequence, static void wild_mouse_track_rotation_control_toggle(paint_session * session, uint8 rideIndex, uint8 trackSequence,
uint8 direction, sint32 height, rct_tile_element * tileElement) uint8 direction, sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4] = { static constexpr const uint32 imageIds[4] = {
SPR_WILD_MOUSE_ROTATION_CONTROL_TOGGLE_SW_NE, SPR_WILD_MOUSE_ROTATION_CONTROL_TOGGLE_SW_NE,
SPR_WILD_MOUSE_ROTATION_CONTROL_TOGGLE_NW_SE, SPR_WILD_MOUSE_ROTATION_CONTROL_TOGGLE_NW_SE,
SPR_WILD_MOUSE_ROTATION_CONTROL_TOGGLE_SW_NE, SPR_WILD_MOUSE_ROTATION_CONTROL_TOGGLE_SW_NE,

40
src/openrct2/ride/coaster/WoodenRollerCoaster.cpp
View File

@ -390,7 +390,7 @@ enum
SPR_WOODEN_RC_STATION_RAILS_NW_SE = 24840, SPR_WOODEN_RC_STATION_RAILS_NW_SE = 24840,
}; };
static const uint32 _wooden_rc_block_brakes_image_ids[4][2] = { static constexpr const uint32 _wooden_rc_block_brakes_image_ids[4][2] = {
{ SPR_WOODEN_RC_BLOCK_BRAKES_SW_NE, SPR_WOODEN_RC_BLOCK_BRAKES_RAILS_SW_NE }, { SPR_WOODEN_RC_BLOCK_BRAKES_SW_NE, SPR_WOODEN_RC_BLOCK_BRAKES_RAILS_SW_NE },
{ SPR_WOODEN_RC_BLOCK_BRAKES_NW_SE, SPR_WOODEN_RC_BLOCK_BRAKES_RAILS_NW_SE }, { SPR_WOODEN_RC_BLOCK_BRAKES_NW_SE, SPR_WOODEN_RC_BLOCK_BRAKES_RAILS_NW_SE },
{ SPR_WOODEN_RC_BLOCK_BRAKES_SW_NE, SPR_WOODEN_RC_BLOCK_BRAKES_RAILS_SW_NE }, { SPR_WOODEN_RC_BLOCK_BRAKES_SW_NE, SPR_WOODEN_RC_BLOCK_BRAKES_RAILS_SW_NE },
@ -440,13 +440,13 @@ static void wooden_rc_track_paint_bb(paint_session * session, const sprite_bb_2
static void wooden_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, static void wooden_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height,
rct_tile_element * tileElement) rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][2] = { static constexpr const uint32 imageIds[4][2] = {
{ SPR_WOODEN_RC_FLAT_SW_NE, SPR_WOODEN_RC_FLAT_CHAIN_SW_NE }, { SPR_WOODEN_RC_FLAT_SW_NE, SPR_WOODEN_RC_FLAT_CHAIN_SW_NE },
{ SPR_WOODEN_RC_FLAT_NW_SE, SPR_WOODEN_RC_FLAT_CHAIN_NW_SE }, { SPR_WOODEN_RC_FLAT_NW_SE, SPR_WOODEN_RC_FLAT_CHAIN_NW_SE },
{ SPR_WOODEN_RC_FLAT_SW_NE, SPR_WOODEN_RC_FLAT_CHAIN_NE_SW }, { SPR_WOODEN_RC_FLAT_SW_NE, SPR_WOODEN_RC_FLAT_CHAIN_NE_SW },
{ SPR_WOODEN_RC_FLAT_NW_SE, SPR_WOODEN_RC_FLAT_CHAIN_SE_NW }, { SPR_WOODEN_RC_FLAT_NW_SE, SPR_WOODEN_RC_FLAT_CHAIN_SE_NW },
}; };
static const uint32 railsImageIds[4][2] = { static constexpr const uint32 railsImageIds[4][2] = {
{ SPR_WOODEN_RC_FLAT_RAILS_SW_NE, SPR_WOODEN_RC_FLAT_CHAIN_RAILS_SW_NE }, { SPR_WOODEN_RC_FLAT_RAILS_SW_NE, SPR_WOODEN_RC_FLAT_CHAIN_RAILS_SW_NE },
{ SPR_WOODEN_RC_FLAT_RAILS_NW_SE, SPR_WOODEN_RC_FLAT_CHAIN_RAILS_NW_SE }, { SPR_WOODEN_RC_FLAT_RAILS_NW_SE, SPR_WOODEN_RC_FLAT_CHAIN_RAILS_NW_SE },
{ SPR_WOODEN_RC_FLAT_RAILS_SW_NE, SPR_WOODEN_RC_FLAT_CHAIN_RAILS_NE_SW }, { SPR_WOODEN_RC_FLAT_RAILS_SW_NE, SPR_WOODEN_RC_FLAT_CHAIN_RAILS_NE_SW },
@ -465,7 +465,7 @@ static void wooden_rc_track_flat(paint_session * session, uint8 rideIndex, uint8
static void wooden_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void wooden_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 stationImageIds[4][2] = { static constexpr const uint32 stationImageIds[4][2] = {
{ SPR_WOODEN_RC_STATION_SW_NE, SPR_WOODEN_RC_STATION_RAILS_SW_NE }, { SPR_WOODEN_RC_STATION_SW_NE, SPR_WOODEN_RC_STATION_RAILS_SW_NE },
{ SPR_WOODEN_RC_STATION_NW_SE, SPR_WOODEN_RC_STATION_RAILS_NW_SE }, { SPR_WOODEN_RC_STATION_NW_SE, SPR_WOODEN_RC_STATION_RAILS_NW_SE },
{ SPR_WOODEN_RC_STATION_SW_NE, SPR_WOODEN_RC_STATION_RAILS_SW_NE }, { SPR_WOODEN_RC_STATION_SW_NE, SPR_WOODEN_RC_STATION_RAILS_SW_NE },
@ -495,7 +495,7 @@ static void wooden_rc_track_station(paint_session * session, uint8 rideIndex, ui
static void wooden_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void wooden_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[2][4][4] = { static constexpr const uint32 imageIds[2][4][4] = {
{ {
{ SPR_WOODEN_RC_25_DEG_SW_NE, SPR_WOODEN_RC_25_DEG_RAILS_SW_NE, 0, 0 }, { SPR_WOODEN_RC_25_DEG_SW_NE, SPR_WOODEN_RC_25_DEG_RAILS_SW_NE, 0, 0 },
{ SPR_WOODEN_RC_25_DEG_NW_SE, SPR_WOODEN_RC_25_DEG_RAILS_NW_SE, SPR_WOODEN_RC_25_DEG_FRONT_NW_SE, { SPR_WOODEN_RC_25_DEG_NW_SE, SPR_WOODEN_RC_25_DEG_RAILS_NW_SE, SPR_WOODEN_RC_25_DEG_FRONT_NW_SE,
@ -541,7 +541,7 @@ static void wooden_rc_track_25_deg_up(paint_session * session, uint8 rideIndex,
static void wooden_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void wooden_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][2] = { static constexpr const uint32 imageIds[4][2] = {
{ SPR_WOODEN_RC_60_DEG_SW_NE, SPR_WOODEN_RC_60_DEG_RAILS_SW_NE }, { SPR_WOODEN_RC_60_DEG_SW_NE, SPR_WOODEN_RC_60_DEG_RAILS_SW_NE },
{ SPR_WOODEN_RC_60_DEG_NW_SE, SPR_WOODEN_RC_60_DEG_RAILS_NW_SE }, { SPR_WOODEN_RC_60_DEG_NW_SE, SPR_WOODEN_RC_60_DEG_RAILS_NW_SE },
{ SPR_WOODEN_RC_60_DEG_NE_SW, SPR_WOODEN_RC_60_DEG_RAILS_NE_SW }, { SPR_WOODEN_RC_60_DEG_NE_SW, SPR_WOODEN_RC_60_DEG_RAILS_NE_SW },
@ -577,7 +577,7 @@ static void wooden_rc_track_60_deg_up(paint_session * session, uint8 rideIndex,
static void wooden_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void wooden_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[2][4][4] = { static constexpr const uint32 imageIds[2][4][4] = {
{ {
{ SPR_WOODEN_RC_FLAT_TO_25_DEG_SW_NE, SPR_WOODEN_RC_FLAT_TO_25_DEG_RAILS_SW_NE, 0, 0 }, { SPR_WOODEN_RC_FLAT_TO_25_DEG_SW_NE, SPR_WOODEN_RC_FLAT_TO_25_DEG_RAILS_SW_NE, 0, 0 },
{ SPR_WOODEN_RC_FLAT_TO_25_DEG_NW_SE, SPR_WOODEN_RC_FLAT_TO_25_DEG_RAILS_NW_SE, { SPR_WOODEN_RC_FLAT_TO_25_DEG_NW_SE, SPR_WOODEN_RC_FLAT_TO_25_DEG_RAILS_NW_SE,
@ -623,7 +623,7 @@ static void wooden_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rid
static void wooden_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, static void wooden_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence,
uint8 direction, sint32 height, rct_tile_element * tileElement) uint8 direction, sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][4] = { static constexpr const uint32 imageIds[4][4] = {
{ SPR_WOODEN_RC_25_DEG_TO_60_DEG_SW_NE, SPR_WOODEN_RC_25_DEG_TO_60_DEG_RAILS_SW_NE, 0, 0 }, { SPR_WOODEN_RC_25_DEG_TO_60_DEG_SW_NE, SPR_WOODEN_RC_25_DEG_TO_60_DEG_RAILS_SW_NE, 0, 0 },
{ SPR_WOODEN_RC_25_DEG_TO_60_DEG_NW_SE, SPR_WOODEN_RC_25_DEG_TO_60_DEG_RAILS_NW_SE, { SPR_WOODEN_RC_25_DEG_TO_60_DEG_NW_SE, SPR_WOODEN_RC_25_DEG_TO_60_DEG_RAILS_NW_SE,
SPR_WOODEN_RC_25_DEG_TO_60_DEG_FRONT_NW_SE, SPR_WOODEN_RC_25_DEG_TO_60_DEG_RAILS_FRONT_NW_SE }, SPR_WOODEN_RC_25_DEG_TO_60_DEG_FRONT_NW_SE, SPR_WOODEN_RC_25_DEG_TO_60_DEG_RAILS_FRONT_NW_SE },
@ -663,7 +663,7 @@ static void wooden_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uint
static void wooden_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, static void wooden_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence,
uint8 direction, sint32 height, rct_tile_element * tileElement) uint8 direction, sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][4] = { static constexpr const uint32 imageIds[4][4] = {
{ SPR_WOODEN_RC_60_DEG_TO_25_DEG_SW_NE, SPR_WOODEN_RC_60_DEG_TO_25_DEG_RAILS_SW_NE, 0, 0 }, { SPR_WOODEN_RC_60_DEG_TO_25_DEG_SW_NE, SPR_WOODEN_RC_60_DEG_TO_25_DEG_RAILS_SW_NE, 0, 0 },
{ SPR_WOODEN_RC_60_DEG_TO_25_DEG_NW_SE, SPR_WOODEN_RC_60_DEG_TO_25_DEG_RAILS_NW_SE, { SPR_WOODEN_RC_60_DEG_TO_25_DEG_NW_SE, SPR_WOODEN_RC_60_DEG_TO_25_DEG_RAILS_NW_SE,
SPR_WOODEN_RC_60_DEG_TO_25_DEG_FRONT_NW_SE, SPR_WOODEN_RC_60_DEG_TO_25_DEG_RAILS_FRONT_NW_SE }, SPR_WOODEN_RC_60_DEG_TO_25_DEG_FRONT_NW_SE, SPR_WOODEN_RC_60_DEG_TO_25_DEG_RAILS_FRONT_NW_SE },
@ -703,7 +703,7 @@ static void wooden_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uint
static void wooden_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void wooden_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[2][4][4] = { static constexpr const uint32 imageIds[2][4][4] = {
{ {
{ SPR_WOODEN_RC_25_DEG_TO_FLAT_SW_NE, SPR_WOODEN_RC_25_DEG_TO_FLAT_RAILS_SW_NE, 0, 0 }, { SPR_WOODEN_RC_25_DEG_TO_FLAT_SW_NE, SPR_WOODEN_RC_25_DEG_TO_FLAT_RAILS_SW_NE, 0, 0 },
{ SPR_WOODEN_RC_25_DEG_TO_FLAT_NW_SE, SPR_WOODEN_RC_25_DEG_TO_FLAT_RAILS_NW_SE, { SPR_WOODEN_RC_25_DEG_TO_FLAT_NW_SE, SPR_WOODEN_RC_25_DEG_TO_FLAT_RAILS_NW_SE,
@ -790,7 +790,7 @@ static void wooden_rc_track_25_deg_down_to_flat(paint_session * session, uint8 r
static void wooden_rc_track_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void wooden_rc_track_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const sprite_bb_2 imageIds[2][4][7] = { static constexpr const sprite_bb_2 imageIds[2][4][7] = {
{ { { {
{ SPR_WOODEN_RC_QUARTER_TURN_5_SW_SE_SEQ_0, { SPR_WOODEN_RC_QUARTER_TURN_5_SW_SE_SEQ_0,
SPR_WOODEN_RC_QUARTER_TURN_5_RAILS_SW_SE_SEQ_0, SPR_WOODEN_RC_QUARTER_TURN_5_RAILS_SW_SE_SEQ_0,
@ -1042,7 +1042,7 @@ static void wooden_rc_track_left_quarter_turn_5(paint_session * session, uint8 r
static void wooden_rc_track_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void wooden_rc_track_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][4] = { static constexpr const uint32 imageIds[4][4] = {
{ SPR_WOODEN_RC_FLAT_TO_LEFT_BANK_SW_NE, SPR_WOODEN_RC_FLAT_TO_LEFT_BANK_RAILS_SW_NE, 0, 0 }, { SPR_WOODEN_RC_FLAT_TO_LEFT_BANK_SW_NE, SPR_WOODEN_RC_FLAT_TO_LEFT_BANK_RAILS_SW_NE, 0, 0 },
{ SPR_WOODEN_RC_FLAT_TO_LEFT_BANK_NW_SE, SPR_WOODEN_RC_FLAT_TO_LEFT_BANK_RAILS_NW_SE, { SPR_WOODEN_RC_FLAT_TO_LEFT_BANK_NW_SE, SPR_WOODEN_RC_FLAT_TO_LEFT_BANK_RAILS_NW_SE,
SPR_WOODEN_RC_RC_FLAT_TO_LEFT_BANK_FRONT_NW_SE, SPR_WOODEN_RC_RC_FLAT_TO_LEFT_BANK_RAILS_FRONT_NW_SE }, SPR_WOODEN_RC_RC_FLAT_TO_LEFT_BANK_FRONT_NW_SE, SPR_WOODEN_RC_RC_FLAT_TO_LEFT_BANK_RAILS_FRONT_NW_SE },
@ -1068,7 +1068,7 @@ static void wooden_rc_track_flat_to_left_bank(paint_session * session, uint8 rid
static void wooden_rc_track_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void wooden_rc_track_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][4] = { static constexpr const uint32 imageIds[4][4] = {
{ SPR_WOODEN_RC_FLAT_TO_RIGHT_BANK_SW_NE, SPR_WOODEN_RC_FLAT_TO_RIGHT_BANK_RAILS_SW_NE, { SPR_WOODEN_RC_FLAT_TO_RIGHT_BANK_SW_NE, SPR_WOODEN_RC_FLAT_TO_RIGHT_BANK_RAILS_SW_NE,
SPR_WOODEN_RC_RC_FLAT_TO_RIGHT_BANK_FRONT_SW_NE, SPR_WOODEN_RC_RC_FLAT_TO_RIGHT_BANK_RAILS_FRONT_SW_NE }, SPR_WOODEN_RC_RC_FLAT_TO_RIGHT_BANK_FRONT_SW_NE, SPR_WOODEN_RC_RC_FLAT_TO_RIGHT_BANK_RAILS_FRONT_SW_NE },
{ SPR_WOODEN_RC_FLAT_TO_RIGHT_BANK_NW_SE, SPR_WOODEN_RC_FLAT_TO_RIGHT_BANK_RAILS_NW_SE, 0, 0 }, { SPR_WOODEN_RC_FLAT_TO_RIGHT_BANK_NW_SE, SPR_WOODEN_RC_FLAT_TO_RIGHT_BANK_RAILS_NW_SE, 0, 0 },
@ -1107,7 +1107,7 @@ static void wooden_rc_track_right_bank_to_flat(paint_session * session, uint8 ri
static void wooden_rc_track_banked_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, static void wooden_rc_track_banked_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence,
uint8 direction, sint32 height, rct_tile_element * tileElement) uint8 direction, sint32 height, rct_tile_element * tileElement)
{ {
static const sprite_bb_2 imageIds[2][4][7] = { static constexpr const sprite_bb_2 imageIds[2][4][7] = {
{ { { {
{ SPR_WOODEN_RC_BANKED_QUARTER_TURN_5_SW_SE_SEQ_0, { SPR_WOODEN_RC_BANKED_QUARTER_TURN_5_SW_SE_SEQ_0,
SPR_WOODEN_RC_BANKED_QUARTER_TURN_5_RAILS_SW_SE_SEQ_0, SPR_WOODEN_RC_BANKED_QUARTER_TURN_5_RAILS_SW_SE_SEQ_0,
@ -1359,7 +1359,7 @@ static void wooden_rc_track_banked_left_quarter_turn_5(paint_session * session,
static void wooden_rc_track_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, static void wooden_rc_track_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence,
uint8 direction, sint32 height, rct_tile_element * tileElement) uint8 direction, sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][4] = { static constexpr const uint32 imageIds[4][4] = {
{ SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_SW_NE, SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_RAILS_SW_NE, 0, 0 }, { SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_SW_NE, SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_RAILS_SW_NE, 0, 0 },
{ SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_NW_SE, SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_RAILS_NW_SE, { SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_NW_SE, SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_RAILS_NW_SE,
SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_FRONT_NW_SE, SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_RAILS_FRONT_NW_SE }, SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_FRONT_NW_SE, SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_RAILS_FRONT_NW_SE },
@ -1392,7 +1392,7 @@ static void wooden_rc_track_left_bank_to_25_deg_up(paint_session * session, uint
static void wooden_rc_track_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, static void wooden_rc_track_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence,
uint8 direction, sint32 height, rct_tile_element * tileElement) uint8 direction, sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][4] = { static constexpr const uint32 imageIds[4][4] = {
{ SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_SW_NE, SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_RAILS_SW_NE, 0, 0 }, { SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_SW_NE, SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_RAILS_SW_NE, 0, 0 },
{ SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_NW_SE, SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_RAILS_NW_SE, { SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_NW_SE, SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_RAILS_NW_SE,
SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_FRONT_NW_SE, SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_RAILS_FRONT_NW_SE }, SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_FRONT_NW_SE, SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_RAILS_FRONT_NW_SE },
@ -1425,7 +1425,7 @@ static void wooden_rc_track_right_bank_to_25_deg_up(paint_session * session, uin
static void wooden_rc_track_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, static void wooden_rc_track_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence,
uint8 direction, sint32 height, rct_tile_element * tileElement) uint8 direction, sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][4] = { static constexpr const uint32 imageIds[4][4] = {
{ SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_SW_NE, SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_RAILS_SW_NE, 0, 0 }, { SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_SW_NE, SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_RAILS_SW_NE, 0, 0 },
{ SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_NW_SE, SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_RAILS_NW_SE, { SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_NW_SE, SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_RAILS_NW_SE,
SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_FRONT_NW_SE, SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_RAILS_FRONT_NW_SE }, SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_FRONT_NW_SE, SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_RAILS_FRONT_NW_SE },
@ -1458,7 +1458,7 @@ static void wooden_rc_track_25_deg_up_to_left_bank(paint_session * session, uint
static void wooden_rc_track_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, static void wooden_rc_track_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence,
uint8 direction, sint32 height, rct_tile_element * tileElement) uint8 direction, sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][4] = { static constexpr const uint32 imageIds[4][4] = {
{ SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_SW_NE, SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_RAILS_SW_NE, 0, 0 }, { SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_SW_NE, SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_RAILS_SW_NE, 0, 0 },
{ SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_NW_SE, SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_RAILS_NW_SE, { SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_NW_SE, SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_RAILS_NW_SE,
SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_FRONT_NW_SE, SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_RAILS_FRONT_NW_SE }, SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_FRONT_NW_SE, SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_RAILS_FRONT_NW_SE },
@ -1519,7 +1519,7 @@ static void wooden_rc_track_25_deg_down_to_right_bank(paint_session * session, u
static void wooden_rc_track_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void wooden_rc_track_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][2] = { static constexpr const uint32 imageIds[4][2] = {
{ SPR_WOODEN_RC_LEFT_BANK_SW_NE, SPR_WOODEN_RC_LEFT_BANK_RAILS_SW_NE }, { SPR_WOODEN_RC_LEFT_BANK_SW_NE, SPR_WOODEN_RC_LEFT_BANK_RAILS_SW_NE },
{ SPR_WOODEN_RC_LEFT_BANK_NW_SE, SPR_WOODEN_RC_LEFT_BANK_RAILS_NW_SE }, { SPR_WOODEN_RC_LEFT_BANK_NW_SE, SPR_WOODEN_RC_LEFT_BANK_RAILS_NW_SE },
{ SPR_WOODEN_RC_LEFT_BANK_NE_SW, SPR_WOODEN_RC_LEFT_BANK_RAILS_NE_SW }, { SPR_WOODEN_RC_LEFT_BANK_NE_SW, SPR_WOODEN_RC_LEFT_BANK_RAILS_NE_SW },
@ -5339,7 +5339,7 @@ static void wooden_rc_track_right_quarter_turn_1_60_deg_down(paint_session * ses
static void wooden_rc_track_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void wooden_rc_track_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][2] = { static constexpr const uint32 imageIds[4][2] = {
{ SPR_WOODEN_RC_BRAKES_SW_NE, SPR_WOODEN_RC_BRAKES_RAILS_SW_NE }, { SPR_WOODEN_RC_BRAKES_SW_NE, SPR_WOODEN_RC_BRAKES_RAILS_SW_NE },
{ SPR_WOODEN_RC_BRAKES_NW_SE, SPR_WOODEN_RC_BRAKES_RAILS_NW_SE }, { SPR_WOODEN_RC_BRAKES_NW_SE, SPR_WOODEN_RC_BRAKES_RAILS_NW_SE },
{ SPR_WOODEN_RC_BRAKES_SW_NE, SPR_WOODEN_RC_BRAKES_RAILS_SW_NE }, { SPR_WOODEN_RC_BRAKES_SW_NE, SPR_WOODEN_RC_BRAKES_RAILS_SW_NE },

24
src/openrct2/ride/coaster/WoodenWildMouse.cpp
View File

@ -132,7 +132,7 @@ enum
static void wooden_wild_mouse_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void wooden_wild_mouse_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4] = { static constexpr const uint32 imageIds[4] = {
SPR_WOODEN_WILD_MOUSE_FLAT_SW_NE, SPR_WOODEN_WILD_MOUSE_FLAT_SW_NE,
SPR_WOODEN_WILD_MOUSE_FLAT_NW_SE, SPR_WOODEN_WILD_MOUSE_FLAT_NW_SE,
SPR_WOODEN_WILD_MOUSE_FLAT_SW_NE, SPR_WOODEN_WILD_MOUSE_FLAT_SW_NE,
@ -155,7 +155,7 @@ static void wooden_wild_mouse_track_flat(paint_session * session, uint8 rideInde
static void wooden_wild_mouse_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void wooden_wild_mouse_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4][2] = { static constexpr const uint32 imageIds[4][2] = {
{ SPR_WOODEN_WILD_MOUSE_FLAT_SW_NE, SPR_STATION_BASE_B_SW_NE }, { SPR_WOODEN_WILD_MOUSE_FLAT_SW_NE, SPR_STATION_BASE_B_SW_NE },
{ SPR_WOODEN_WILD_MOUSE_FLAT_NW_SE, SPR_STATION_BASE_B_NW_SE }, { SPR_WOODEN_WILD_MOUSE_FLAT_NW_SE, SPR_STATION_BASE_B_NW_SE },
{ SPR_WOODEN_WILD_MOUSE_FLAT_SW_NE, SPR_STATION_BASE_B_SW_NE }, { SPR_WOODEN_WILD_MOUSE_FLAT_SW_NE, SPR_STATION_BASE_B_SW_NE },
@ -177,7 +177,7 @@ static void wooden_wild_mouse_track_station(paint_session * session, uint8 rideI
static void wooden_wild_mouse_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void wooden_wild_mouse_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[2][4] = { static constexpr const uint32 imageIds[2][4] = {
{ {
SPR_WOODEN_WILD_MOUSE_25_DEG_SW_NE, SPR_WOODEN_WILD_MOUSE_25_DEG_SW_NE,
SPR_WOODEN_WILD_MOUSE_25_DEG_NW_SE, SPR_WOODEN_WILD_MOUSE_25_DEG_NW_SE,
@ -215,7 +215,7 @@ static void wooden_wild_mouse_track_25_deg_up(paint_session * session, uint8 rid
static void wooden_wild_mouse_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, static void wooden_wild_mouse_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement) sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[2][4] = { static constexpr const uint32 imageIds[2][4] = {
{ {
SPR_WOODEN_WILD_MOUSE_60_DEG_SW_NE, SPR_WOODEN_WILD_MOUSE_60_DEG_SW_NE,
SPR_WOODEN_WILD_MOUSE_60_DEG_NW_SE, SPR_WOODEN_WILD_MOUSE_60_DEG_NW_SE,
@ -261,7 +261,7 @@ static void wooden_wild_mouse_track_60_deg_up(paint_session * session, uint8 rid
static void wooden_wild_mouse_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, static void wooden_wild_mouse_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence,
uint8 direction, sint32 height, rct_tile_element * tileElement) uint8 direction, sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[2][4] = { static constexpr const uint32 imageIds[2][4] = {
{ {
SPR_WOODEN_WILD_MOUSE_FLAT_TO_25_DEG_SW_NE, SPR_WOODEN_WILD_MOUSE_FLAT_TO_25_DEG_SW_NE,
SPR_WOODEN_WILD_MOUSE_FLAT_TO_25_DEG_NW_SE, SPR_WOODEN_WILD_MOUSE_FLAT_TO_25_DEG_NW_SE,
@ -299,7 +299,7 @@ static void wooden_wild_mouse_track_flat_to_25_deg_up(paint_session * session, u
static void wooden_wild_mouse_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, static void wooden_wild_mouse_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence,
uint8 direction, sint32 height, rct_tile_element * tileElement) uint8 direction, sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[2][4][2] = { static constexpr const uint32 imageIds[2][4][2] = {
{ {
{ SPR_WOODEN_WILD_MOUSE_25_DEG_TO_60_DEG_SW_NE, 0 }, { SPR_WOODEN_WILD_MOUSE_25_DEG_TO_60_DEG_SW_NE, 0 },
{ SPR_WOODEN_WILD_MOUSE_25_DEG_TO_60_DEG_NW_SE, SPR_WOODEN_WILD_MOUSE_25_DEG_TO_60_DEG_FRONT_NW_SE }, { SPR_WOODEN_WILD_MOUSE_25_DEG_TO_60_DEG_NW_SE, SPR_WOODEN_WILD_MOUSE_25_DEG_TO_60_DEG_FRONT_NW_SE },
@ -348,7 +348,7 @@ static void wooden_wild_mouse_track_25_deg_up_to_60_deg_up(paint_session * sessi
static void wooden_wild_mouse_track_60_deg_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, static void wooden_wild_mouse_track_60_deg_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence,
uint8 direction, sint32 height, rct_tile_element * tileElement) uint8 direction, sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[2][4][2] = { static constexpr const uint32 imageIds[2][4][2] = {
{ {
{ SPR_WOODEN_WILD_MOUSE_60_DEG_TO_25_DEG_SW_NE, 0 }, { SPR_WOODEN_WILD_MOUSE_60_DEG_TO_25_DEG_SW_NE, 0 },
{ SPR_WOODEN_WILD_MOUSE_60_DEG_TO_25_DEG_NW_SE, SPR_WOODEN_WILD_MOUSE_60_DEG_TO_25_DEG_FRONT_NW_SE }, { SPR_WOODEN_WILD_MOUSE_60_DEG_TO_25_DEG_NW_SE, SPR_WOODEN_WILD_MOUSE_60_DEG_TO_25_DEG_FRONT_NW_SE },
@ -398,7 +398,7 @@ static void wooden_wild_mouse_track_60_deg_to_25_deg_up(paint_session * session,
static void wooden_wild_mouse_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, static void wooden_wild_mouse_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence,
uint8 direction, sint32 height, rct_tile_element * tileElement) uint8 direction, sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[2][4] = { static constexpr const uint32 imageIds[2][4] = {
{ {
SPR_WOODEN_WILD_MOUSE_25_DEG_TO_FLAT_SW_NE, SPR_WOODEN_WILD_MOUSE_25_DEG_TO_FLAT_SW_NE,
SPR_WOODEN_WILD_MOUSE_25_DEG_TO_FLAT_NW_SE, SPR_WOODEN_WILD_MOUSE_25_DEG_TO_FLAT_NW_SE,
@ -477,7 +477,7 @@ static void wooden_wild_mouse_track_25_deg_down_to_flat(paint_session * session,
static void wooden_wild_mouse_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, static void wooden_wild_mouse_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence,
uint8 direction, sint32 height, rct_tile_element * tileElement) uint8 direction, sint32 height, rct_tile_element * tileElement)
{ {
static const sprite_bb imageIds[4][3] = { static constexpr const sprite_bb imageIds[4][3] = {
{ {
{ SPR_WOODEN_WILD_MOUSE_QUARTER_TURN_3_SW_SE_PART_0, { 0, 6, 0 }, { 0, 0, 0 }, { 32, 20, 1 } }, { SPR_WOODEN_WILD_MOUSE_QUARTER_TURN_3_SW_SE_PART_0, { 0, 6, 0 }, { 0, 0, 0 }, { 32, 20, 1 } },
{ SPR_WOODEN_WILD_MOUSE_QUARTER_TURN_3_SW_SE_PART_1, { 16, 16, 0 }, { 0, 0, 0 }, { 16, 16, 1 } }, { SPR_WOODEN_WILD_MOUSE_QUARTER_TURN_3_SW_SE_PART_1, { 16, 16, 0 }, { 0, 0, 0 }, { 16, 16, 1 } },
@ -540,7 +540,7 @@ static void wooden_wild_mouse_track_left_quarter_turn_3(paint_session * session,
static void wooden_wild_mouse_track_left_quarter_turn_1(paint_session * session, uint8 rideIndex, uint8 trackSequence, static void wooden_wild_mouse_track_left_quarter_turn_1(paint_session * session, uint8 rideIndex, uint8 trackSequence,
uint8 direction, sint32 height, rct_tile_element * tileElement) uint8 direction, sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[4] = { static constexpr const uint32 imageIds[4] = {
SPR_WOODEN_WILD_MOUSE_QUARTER_TURN_1_SW_NE, SPR_WOODEN_WILD_MOUSE_QUARTER_TURN_1_SW_NE,
SPR_WOODEN_WILD_MOUSE_QUARTER_TURN_1_NW_SE, SPR_WOODEN_WILD_MOUSE_QUARTER_TURN_1_NW_SE,
SPR_WOODEN_WILD_MOUSE_QUARTER_TURN_1_NE_SW, SPR_WOODEN_WILD_MOUSE_QUARTER_TURN_1_NE_SW,
@ -581,7 +581,7 @@ static void wooden_wild_mouse_track_right_quarter_turn_1(paint_session * session
static void wooden_wild_mouse_track_flat_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, static void wooden_wild_mouse_track_flat_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence,
uint8 direction, sint32 height, rct_tile_element * tileElement) uint8 direction, sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[2][4][2] = { static constexpr const uint32 imageIds[2][4][2] = {
{ {
{ SPR_WOODEN_WILD_MOUSE_FLAT_TO_60_DEG_SW_NE, 0 }, { SPR_WOODEN_WILD_MOUSE_FLAT_TO_60_DEG_SW_NE, 0 },
{ SPR_WOODEN_WILD_MOUSE_FLAT_TO_60_DEG_NW_SE, SPR_WOODEN_WILD_MOUSE_FLAT_TO_60_DEG_FRONT_NW_SE }, { SPR_WOODEN_WILD_MOUSE_FLAT_TO_60_DEG_NW_SE, SPR_WOODEN_WILD_MOUSE_FLAT_TO_60_DEG_FRONT_NW_SE },
@ -630,7 +630,7 @@ static void wooden_wild_mouse_track_flat_to_60_deg_up(paint_session * session, u
static void wooden_wild_mouse_track_60_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, static void wooden_wild_mouse_track_60_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence,
uint8 direction, sint32 height, rct_tile_element * tileElement) uint8 direction, sint32 height, rct_tile_element * tileElement)
{ {
static const uint32 imageIds[2][4][2] = { static constexpr const uint32 imageIds[2][4][2] = {
{ {
{ SPR_WOODEN_WILD_MOUSE_60_DEG_TO_FLAT_SW_NE, 0 }, { SPR_WOODEN_WILD_MOUSE_60_DEG_TO_FLAT_SW_NE, 0 },
{ SPR_WOODEN_WILD_MOUSE_60_DEG_TO_FLAT_NW_SE, SPR_WOODEN_WILD_MOUSE_60_DEG_TO_FLAT_FRONT_NW_SE }, { SPR_WOODEN_WILD_MOUSE_60_DEG_TO_FLAT_NW_SE, SPR_WOODEN_WILD_MOUSE_60_DEG_TO_FLAT_FRONT_NW_SE },

20
src/openrct2/ride/gentle/CarRide.cpp
View File

@ -76,70 +76,70 @@ enum
SPR_CAR_RIDE_QUARTER_TURN_3_TILES_SE_NE_PART_2 = 28820, SPR_CAR_RIDE_QUARTER_TURN_3_TILES_SE_NE_PART_2 = 28820,
}; };
static const uint32 car_ride_track_pieces_flat[4] = { static constexpr const uint32 car_ride_track_pieces_flat[4] = {
SPR_CAR_RIDE_FLAT_SW_NE, SPR_CAR_RIDE_FLAT_SW_NE,
SPR_CAR_RIDE_FLAT_NW_SE, SPR_CAR_RIDE_FLAT_NW_SE,
SPR_CAR_RIDE_FLAT_SW_NE, SPR_CAR_RIDE_FLAT_SW_NE,
SPR_CAR_RIDE_FLAT_NW_SE, SPR_CAR_RIDE_FLAT_NW_SE,
}; };
static const uint32 car_ride_track_pieces_log_bumps[4] = { static constexpr const uint32 car_ride_track_pieces_log_bumps[4] = {
SPR_CAR_RIDE_LOG_BUMPS_SW_NE, SPR_CAR_RIDE_LOG_BUMPS_SW_NE,
SPR_CAR_RIDE_LOG_BUMPS_NW_SE, SPR_CAR_RIDE_LOG_BUMPS_NW_SE,
SPR_CAR_RIDE_LOG_BUMPS_SW_NE, SPR_CAR_RIDE_LOG_BUMPS_SW_NE,
SPR_CAR_RIDE_LOG_BUMPS_NW_SE, SPR_CAR_RIDE_LOG_BUMPS_NW_SE,
}; };
static const uint32 car_ride_track_pieces_25_deg_up[4] = { static constexpr const uint32 car_ride_track_pieces_25_deg_up[4] = {
SPR_CAR_RIDE_25_DEG_UP_SW_NE, SPR_CAR_RIDE_25_DEG_UP_SW_NE,
SPR_CAR_RIDE_25_DEG_UP_NW_SE, SPR_CAR_RIDE_25_DEG_UP_NW_SE,
SPR_CAR_RIDE_25_DEG_UP_NE_SW, SPR_CAR_RIDE_25_DEG_UP_NE_SW,
SPR_CAR_RIDE_25_DEG_UP_SE_NW, SPR_CAR_RIDE_25_DEG_UP_SE_NW,
}; };
static const uint32 car_ride_track_pieces_flat_to_25_deg_up[4] = { static constexpr const uint32 car_ride_track_pieces_flat_to_25_deg_up[4] = {
SPR_CAR_RIDE_FLAT_TO_25_DEG_UP_SW_NE, SPR_CAR_RIDE_FLAT_TO_25_DEG_UP_SW_NE,
SPR_CAR_RIDE_FLAT_TO_25_DEG_UP_NW_SE, SPR_CAR_RIDE_FLAT_TO_25_DEG_UP_NW_SE,
SPR_CAR_RIDE_FLAT_TO_25_DEG_UP_NE_SW, SPR_CAR_RIDE_FLAT_TO_25_DEG_UP_NE_SW,
SPR_CAR_RIDE_FLAT_TO_25_DEG_UP_SE_NW, SPR_CAR_RIDE_FLAT_TO_25_DEG_UP_SE_NW,
}; };
static const uint32 car_ride_track_pieces_25_deg_up_to_flat[4] = { static constexpr const uint32 car_ride_track_pieces_25_deg_up_to_flat[4] = {
SPR_CAR_RIDE_DEG_UP_TO_FLAT_SW_NE, SPR_CAR_RIDE_DEG_UP_TO_FLAT_SW_NE,
SPR_CAR_RIDE_DEG_UP_TO_FLAT_NW_SE, SPR_CAR_RIDE_DEG_UP_TO_FLAT_NW_SE,
SPR_CAR_RIDE_DEG_UP_TO_FLAT_NE_SW, SPR_CAR_RIDE_DEG_UP_TO_FLAT_NE_SW,
SPR_CAR_RIDE_DEG_UP_TO_FLAT_SE_NW, SPR_CAR_RIDE_DEG_UP_TO_FLAT_SE_NW,
}; };
static const uint32 car_ride_track_pieces_60_deg_up[4] = { static constexpr const uint32 car_ride_track_pieces_60_deg_up[4] = {
SPR_CAR_RIDE_60_DEG_UP_SW_NE, SPR_CAR_RIDE_60_DEG_UP_SW_NE,
SPR_CAR_RIDE_60_DEG_UP_NW_SE, SPR_CAR_RIDE_60_DEG_UP_NW_SE,
SPR_CAR_RIDE_60_DEG_UP_NE_SW, SPR_CAR_RIDE_60_DEG_UP_NE_SW,
SPR_CAR_RIDE_60_DEG_UP_SE_NW, SPR_CAR_RIDE_60_DEG_UP_SE_NW,
}; };
static const uint32 car_ride_track_pieces_25_deg_up_to_60_deg_up[4][2] = { static constexpr const uint32 car_ride_track_pieces_25_deg_up_to_60_deg_up[4][2] = {
{ SPR_CAR_RIDE_25_DEG_UP_TO_60_DEG_UP_SW_NE, 0 }, { SPR_CAR_RIDE_25_DEG_UP_TO_60_DEG_UP_SW_NE, 0 },
{ SPR_CAR_RIDE_25_DEG_UP_TO_60_DEG_UP_NW_SE, SPR_CAR_RIDE_25_DEG_UP_TO_60_DEG_UP_FRONT_NW_SE }, { SPR_CAR_RIDE_25_DEG_UP_TO_60_DEG_UP_NW_SE, SPR_CAR_RIDE_25_DEG_UP_TO_60_DEG_UP_FRONT_NW_SE },
{ SPR_CAR_RIDE_25_DEG_UP_TO_60_DEG_UP_NE_SW, SPR_CAR_RIDE_25_DEG_UP_TO_60_DEG_UP_FRONT_NE_SW }, { SPR_CAR_RIDE_25_DEG_UP_TO_60_DEG_UP_NE_SW, SPR_CAR_RIDE_25_DEG_UP_TO_60_DEG_UP_FRONT_NE_SW },
{ SPR_CAR_RIDE_25_DEG_UP_TO_60_DEG_UP_SE_NW, 0 }, { SPR_CAR_RIDE_25_DEG_UP_TO_60_DEG_UP_SE_NW, 0 },
}; };
static const uint32 car_ride_track_pieces_60_deg_up_to_25_deg_up[4][2] = { static constexpr const uint32 car_ride_track_pieces_60_deg_up_to_25_deg_up[4][2] = {
{ SPR_CAR_RIDE_60_DEG_UP_TO_25_DEG_UP_SW_NE, 0 }, { SPR_CAR_RIDE_60_DEG_UP_TO_25_DEG_UP_SW_NE, 0 },
{ SPR_CAR_RIDE_60_DEG_UP_TO_25_DEG_UP_NW_SE, SPR_CAR_RIDE_60_DEG_UP_TO_25_DEG_UP_FRONT_NW_SE }, { SPR_CAR_RIDE_60_DEG_UP_TO_25_DEG_UP_NW_SE, SPR_CAR_RIDE_60_DEG_UP_TO_25_DEG_UP_FRONT_NW_SE },
{ SPR_CAR_RIDE_60_DEG_UP_TO_25_DEG_UP_NE_SW, SPR_CAR_RIDE_60_DEG_UP_TO_25_DEG_UP_FRONT_NE_SW }, { SPR_CAR_RIDE_60_DEG_UP_TO_25_DEG_UP_NE_SW, SPR_CAR_RIDE_60_DEG_UP_TO_25_DEG_UP_FRONT_NE_SW },
{ SPR_CAR_RIDE_60_DEG_UP_TO_25_DEG_UP_SE_NW, 0 }, { SPR_CAR_RIDE_60_DEG_UP_TO_25_DEG_UP_SE_NW, 0 },
}; };
static const uint32 car_ride_track_pieces_left_quarter_turn_1_tile[4] = { static constexpr const uint32 car_ride_track_pieces_left_quarter_turn_1_tile[4] = {
SPR_CAR_RIDE_QUARTER_TURN_1_TILE_SW_NW, SPR_CAR_RIDE_QUARTER_TURN_1_TILE_SW_NW,
SPR_CAR_RIDE_QUARTER_TURN_1_TILE_NW_NE, SPR_CAR_RIDE_QUARTER_TURN_1_TILE_NW_NE,
SPR_CAR_RIDE_QUARTER_TURN_1_TILE_NE_SE, SPR_CAR_RIDE_QUARTER_TURN_1_TILE_NE_SE,
SPR_CAR_RIDE_QUARTER_TURN_1_TILE_SE_SW, SPR_CAR_RIDE_QUARTER_TURN_1_TILE_SE_SW,
}; };
static const uint32 car_ride_track_pieces_quarter_turn_3_tiles[4][3] = { static constexpr const uint32 car_ride_track_pieces_quarter_turn_3_tiles[4][3] = {
{ SPR_CAR_RIDE_QUARTER_TURN_3_TILES_SW_SE_PART_0, SPR_CAR_RIDE_QUARTER_TURN_3_TILES_SW_SE_PART_1, { SPR_CAR_RIDE_QUARTER_TURN_3_TILES_SW_SE_PART_0, SPR_CAR_RIDE_QUARTER_TURN_3_TILES_SW_SE_PART_1,
SPR_CAR_RIDE_QUARTER_TURN_3_TILES_SW_SE_PART_2 }, SPR_CAR_RIDE_QUARTER_TURN_3_TILES_SW_SE_PART_2 },
{ SPR_CAR_RIDE_QUARTER_TURN_3_TILES_NW_SW_PART_0, SPR_CAR_RIDE_QUARTER_TURN_3_TILES_NW_SW_PART_1, { SPR_CAR_RIDE_QUARTER_TURN_3_TILES_NW_SW_PART_0, SPR_CAR_RIDE_QUARTER_TURN_3_TILES_NW_SW_PART_1,

2
src/openrct2/ride/gentle/CrookedHouse.cpp
View File

@ -28,7 +28,7 @@ typedef struct rct_crooked_house_bound_box
sint16 length_y; sint16 length_y;
} rct_crooked_house_bound_box; } rct_crooked_house_bound_box;
static const rct_crooked_house_bound_box crooked_house_data[] = { { 6, 0, 42, 24 }, static constexpr const rct_crooked_house_bound_box crooked_house_data[] = { { 6, 0, 42, 24 },
{ 0, 0, 0, 0 }, { 0, 0, 0, 0 },
{ -16, -16, 32, 32 }, { -16, -16, 32, 32 },
{ 0, 0, 0, 0 }, // Unused { 0, 0, 0, 0 }, // Unused

2
src/openrct2/ride/gentle/Dodgems.cpp
View File

@ -31,7 +31,7 @@ enum
SPR_DODGEMS_FENCE_TOP_LEFT = 21937 SPR_DODGEMS_FENCE_TOP_LEFT = 21937
}; };
const uint32 dodgems_fence_sprites[] = { SPR_DODGEMS_FENCE_TOP_RIGHT, SPR_DODGEMS_FENCE_BOTTOM_RIGHT, static constexpr const uint32 dodgems_fence_sprites[] = { SPR_DODGEMS_FENCE_TOP_RIGHT, SPR_DODGEMS_FENCE_BOTTOM_RIGHT,
SPR_DODGEMS_FENCE_BOTTOM_LEFT, SPR_DODGEMS_FENCE_TOP_LEFT }; SPR_DODGEMS_FENCE_BOTTOM_LEFT, SPR_DODGEMS_FENCE_TOP_LEFT };
static void paint_dodgems_roof(paint_session * session, sint32 height, sint32 offset) static void paint_dodgems_roof(paint_session * session, sint32 height, sint32 offset)

4
src/openrct2/ride/gentle/FerrisWheel.cpp
View File

@ -20,14 +20,14 @@
#include "../Track.h" #include "../Track.h"
#include "../TrackPaint.h" #include "../TrackPaint.h"
static const uint8 edges_1x4_ne_sw[] = { static constexpr const uint8 edges_1x4_ne_sw[] = {
EDGE_NW | EDGE_SE, EDGE_NW | EDGE_SE,
EDGE_NW | EDGE_SE | EDGE_NE, EDGE_NW | EDGE_SE | EDGE_NE,
EDGE_NW | EDGE_SE, EDGE_NW | EDGE_SE,
EDGE_NW | EDGE_SE | EDGE_SW, EDGE_NW | EDGE_SE | EDGE_SW,
}; };
static const uint8 edges_1x4_nw_se[] = { static constexpr const uint8 edges_1x4_nw_se[] = {
EDGE_NE | EDGE_SW, EDGE_NE | EDGE_SW,
EDGE_NE | EDGE_SW | EDGE_NW, EDGE_NE | EDGE_SW | EDGE_NW,
EDGE_NE | EDGE_SW, EDGE_NE | EDGE_SW,

2
src/openrct2/ride/gentle/FlyingSaucers.cpp
View File

@ -29,7 +29,7 @@ enum
SPR_FLYING_SAUCERS_FENCE_NW = 21924, SPR_FLYING_SAUCERS_FENCE_NW = 21924,
}; };
static const uint32 flying_saucers_fence_sprites[] = { static constexpr const uint32 flying_saucers_fence_sprites[] = {
SPR_FLYING_SAUCERS_FENCE_NE, SPR_FLYING_SAUCERS_FENCE_NE,
SPR_FLYING_SAUCERS_FENCE_SE, SPR_FLYING_SAUCERS_FENCE_SE,
SPR_FLYING_SAUCERS_FENCE_SW, SPR_FLYING_SAUCERS_FENCE_SW,

16
src/openrct2/ride/gentle/GhostTrain.cpp
View File

@ -74,42 +74,42 @@ enum
SPR_GHOST_TRAIN_TRACK_BRAKES_NW_SE = 28882 SPR_GHOST_TRAIN_TRACK_BRAKES_NW_SE = 28882
}; };
static const uint32 ghost_train_track_pieces_flat[4] = { static constexpr const uint32 ghost_train_track_pieces_flat[4] = {
SPR_GHOST_TRAIN_TRACK_FLAT_SW_NE, SPR_GHOST_TRAIN_TRACK_FLAT_SW_NE,
SPR_GHOST_TRAIN_TRACK_FLAT_NW_SE, SPR_GHOST_TRAIN_TRACK_FLAT_NW_SE,
SPR_GHOST_TRAIN_TRACK_FLAT_SW_NE, SPR_GHOST_TRAIN_TRACK_FLAT_SW_NE,
SPR_GHOST_TRAIN_TRACK_FLAT_NW_SE, SPR_GHOST_TRAIN_TRACK_FLAT_NW_SE,
}; };
static const uint32 ghost_train_track_pieces_flat_to_25_deg_up[4][2] = { static constexpr const uint32 ghost_train_track_pieces_flat_to_25_deg_up[4][2] = {
{ SPR_GHOST_TRAIN_TRACK_FLAT_TO_25_DEG_UP_SW_NE, SPR_GHOST_TRAIN_TRACK_FLAT_TO_25_DEG_UP_FRONT_SW_NE }, { SPR_GHOST_TRAIN_TRACK_FLAT_TO_25_DEG_UP_SW_NE, SPR_GHOST_TRAIN_TRACK_FLAT_TO_25_DEG_UP_FRONT_SW_NE },
{ SPR_GHOST_TRAIN_TRACK_FLAT_TO_25_DEG_UP_NW_SE, SPR_GHOST_TRAIN_TRACK_FLAT_TO_25_DEG_UP_FRONT_NW_SE }, { SPR_GHOST_TRAIN_TRACK_FLAT_TO_25_DEG_UP_NW_SE, SPR_GHOST_TRAIN_TRACK_FLAT_TO_25_DEG_UP_FRONT_NW_SE },
{ SPR_GHOST_TRAIN_TRACK_FLAT_TO_25_DEG_UP_NE_SW, SPR_GHOST_TRAIN_TRACK_FLAT_TO_25_DEG_UP_FRONT_NE_SW }, { SPR_GHOST_TRAIN_TRACK_FLAT_TO_25_DEG_UP_NE_SW, SPR_GHOST_TRAIN_TRACK_FLAT_TO_25_DEG_UP_FRONT_NE_SW },
{ SPR_GHOST_TRAIN_TRACK_FLAT_TO_25_DEG_UP_SE_NW, SPR_GHOST_TRAIN_TRACK_FLAT_TO_25_DEG_UP_FRONT_SE_NW }, { SPR_GHOST_TRAIN_TRACK_FLAT_TO_25_DEG_UP_SE_NW, SPR_GHOST_TRAIN_TRACK_FLAT_TO_25_DEG_UP_FRONT_SE_NW },
}; };
static const uint32 ghost_train_track_pieces_25_deg_up_to_flat[4][2] = { static constexpr const uint32 ghost_train_track_pieces_25_deg_up_to_flat[4][2] = {
{ SPR_GHOST_TRAIN_TRACK_25_DEG_UP_TO_FLAT_SW_NE, SPR_GHOST_TRAIN_TRACK_25_DEG_UP_TO_FLAT_FRONT_SW_NE }, { SPR_GHOST_TRAIN_TRACK_25_DEG_UP_TO_FLAT_SW_NE, SPR_GHOST_TRAIN_TRACK_25_DEG_UP_TO_FLAT_FRONT_SW_NE },
{ SPR_GHOST_TRAIN_TRACK_25_DEG_UP_TO_FLAT_NW_SE, SPR_GHOST_TRAIN_TRACK_25_DEG_UP_TO_FLAT_FRONT_NW_SE }, { SPR_GHOST_TRAIN_TRACK_25_DEG_UP_TO_FLAT_NW_SE, SPR_GHOST_TRAIN_TRACK_25_DEG_UP_TO_FLAT_FRONT_NW_SE },
{ SPR_GHOST_TRAIN_TRACK_25_DEG_UP_TO_FLAT_NE_SW, SPR_GHOST_TRAIN_TRACK_25_DEG_UP_TO_FLAT_FRONT_NE_SW }, { SPR_GHOST_TRAIN_TRACK_25_DEG_UP_TO_FLAT_NE_SW, SPR_GHOST_TRAIN_TRACK_25_DEG_UP_TO_FLAT_FRONT_NE_SW },
{ SPR_GHOST_TRAIN_TRACK_25_DEG_UP_TO_FLAT_SE_NW, SPR_GHOST_TRAIN_TRACK_25_DEG_UP_TO_FLAT_FRONT_SE_NW }, { SPR_GHOST_TRAIN_TRACK_25_DEG_UP_TO_FLAT_SE_NW, SPR_GHOST_TRAIN_TRACK_25_DEG_UP_TO_FLAT_FRONT_SE_NW },
}; };
static const uint32 ghost_train_track_pieces_25_deg_up[4][2] = { static constexpr const uint32 ghost_train_track_pieces_25_deg_up[4][2] = {
{ SPR_GHOST_TRAIN_TRACK_25_DEG_UP_SW_NE, SPR_GHOST_TRAIN_TRACK_25_DEG_UP_FRONT_SW_NE }, { SPR_GHOST_TRAIN_TRACK_25_DEG_UP_SW_NE, SPR_GHOST_TRAIN_TRACK_25_DEG_UP_FRONT_SW_NE },
{ SPR_GHOST_TRAIN_TRACK_25_DEG_UP_NW_SE, SPR_GHOST_TRAIN_TRACK_25_DEG_UP_FRONT_NW_SE }, { SPR_GHOST_TRAIN_TRACK_25_DEG_UP_NW_SE, SPR_GHOST_TRAIN_TRACK_25_DEG_UP_FRONT_NW_SE },
{ SPR_GHOST_TRAIN_TRACK_25_DEG_UP_NE_SW, SPR_GHOST_TRAIN_TRACK_25_DEG_UP_FRONT_NE_SW }, { SPR_GHOST_TRAIN_TRACK_25_DEG_UP_NE_SW, SPR_GHOST_TRAIN_TRACK_25_DEG_UP_FRONT_NE_SW },
{ SPR_GHOST_TRAIN_TRACK_25_DEG_UP_SE_NW, SPR_GHOST_TRAIN_TRACK_25_DEG_UP_FRONT_SE_NW }, { SPR_GHOST_TRAIN_TRACK_25_DEG_UP_SE_NW, SPR_GHOST_TRAIN_TRACK_25_DEG_UP_FRONT_SE_NW },
}; };
static const uint32 ghost_train_track_pieces_quarter_turn_1_tile[4] = { static constexpr const uint32 ghost_train_track_pieces_quarter_turn_1_tile[4] = {
SPR_GHOST_TRAIN_QUARTER_TURN_1_TILE_SW_NW, SPR_GHOST_TRAIN_QUARTER_TURN_1_TILE_SW_NW,
SPR_GHOST_TRAIN_QUARTER_TURN_1_TILE_NW_NE, SPR_GHOST_TRAIN_QUARTER_TURN_1_TILE_NW_NE,
SPR_GHOST_TRAIN_QUARTER_TURN_1_TILE_NE_SE, SPR_GHOST_TRAIN_QUARTER_TURN_1_TILE_NE_SE,
SPR_GHOST_TRAIN_QUARTER_TURN_1_TILE_SE_SW, SPR_GHOST_TRAIN_QUARTER_TURN_1_TILE_SE_SW,
}; };
static const uint32 ghost_train_track_pieces_quarter_turn_3_tiles[4][3] = { static constexpr const uint32 ghost_train_track_pieces_quarter_turn_3_tiles[4][3] = {
{ SPR_GHOST_TRAIN_QUARTER_TURN_3_TILES_SW_SE_PART_0, SPR_GHOST_TRAIN_QUARTER_TURN_3_TILES_SW_SE_PART_1, { SPR_GHOST_TRAIN_QUARTER_TURN_3_TILES_SW_SE_PART_0, SPR_GHOST_TRAIN_QUARTER_TURN_3_TILES_SW_SE_PART_1,
SPR_GHOST_TRAIN_QUARTER_TURN_3_TILES_SW_SE_PART_2 }, SPR_GHOST_TRAIN_QUARTER_TURN_3_TILES_SW_SE_PART_2 },
{ SPR_GHOST_TRAIN_QUARTER_TURN_3_TILES_NW_SW_PART_0, SPR_GHOST_TRAIN_QUARTER_TURN_3_TILES_NW_SW_PART_1, { SPR_GHOST_TRAIN_QUARTER_TURN_3_TILES_NW_SW_PART_0, SPR_GHOST_TRAIN_QUARTER_TURN_3_TILES_NW_SW_PART_1,
@ -120,14 +120,14 @@ static const uint32 ghost_train_track_pieces_quarter_turn_3_tiles[4][3] = {
SPR_GHOST_TRAIN_QUARTER_TURN_3_TILES_SE_NE_PART_2 } SPR_GHOST_TRAIN_QUARTER_TURN_3_TILES_SE_NE_PART_2 }
}; };
static const uint32 ghost_train_track_pieces_spinning_tunnel_track[4] = { static constexpr const uint32 ghost_train_track_pieces_spinning_tunnel_track[4] = {
SPR_GHOST_TRAIN_SPINNING_TUNNEL_TRACK_SW_NE, SPR_GHOST_TRAIN_SPINNING_TUNNEL_TRACK_SW_NE,
SPR_GHOST_TRAIN_SPINNING_TUNNEL_TRACK_NW_SE, SPR_GHOST_TRAIN_SPINNING_TUNNEL_TRACK_NW_SE,
SPR_GHOST_TRAIN_SPINNING_TUNNEL_TRACK_SW_NE, SPR_GHOST_TRAIN_SPINNING_TUNNEL_TRACK_SW_NE,
SPR_GHOST_TRAIN_SPINNING_TUNNEL_TRACK_NW_SE, SPR_GHOST_TRAIN_SPINNING_TUNNEL_TRACK_NW_SE,
}; };
static const uint32 ghost_train_track_pieces_brakes[4] = { static constexpr const uint32 ghost_train_track_pieces_brakes[4] = {
SPR_GHOST_TRAIN_TRACK_BRAKES_SW_NE, SPR_GHOST_TRAIN_TRACK_BRAKES_SW_NE,
SPR_GHOST_TRAIN_TRACK_BRAKES_NW_SE, SPR_GHOST_TRAIN_TRACK_BRAKES_NW_SE,
SPR_GHOST_TRAIN_TRACK_BRAKES_SW_NE, SPR_GHOST_TRAIN_TRACK_BRAKES_SW_NE,

4
src/openrct2/ride/gentle/MerryGoRound.cpp
View File

@ -21,10 +21,10 @@
#include "../TrackPaint.h" #include "../TrackPaint.h"
/** rct2: 0x0142805C */ /** rct2: 0x0142805C */
static const uint32 merry_go_round_rider_offsets[] = { 0, 32, 64, 96, 16, 48, 80, 112 }; static constexpr const uint32 merry_go_round_rider_offsets[] = { 0, 32, 64, 96, 16, 48, 80, 112 };
/** rct2: 0x0142807C */ /** rct2: 0x0142807C */
static const uint16 merry_go_round_breakdown_vibration[] = { 0, 1, 2, 3, 4, 3, 2, 1, 0, 0 }; static constexpr const uint16 merry_go_round_breakdown_vibration[] = { 0, 1, 2, 3, 4, 3, 2, 1, 0, 0 };
/** /**
* rct2: 0x0076287D * rct2: 0x0076287D

Some files were not shown because too many files have changed in this diff Show More