diff --git a/src/openrct2-ui/WindowManager.cpp b/src/openrct2-ui/WindowManager.cpp index 8dc5272f4d..bf9bdf603e 100644 --- a/src/openrct2-ui/WindowManager.cpp +++ b/src/openrct2-ui/WindowManager.cpp @@ -256,7 +256,7 @@ public: case WD_VEHICLE: return window_ride_open_vehicle((rct_vehicle*)intent->GetPointerExtra(INTENT_EXTRA_VEHICLE)); case WD_TRACK: - return window_ride_open_track((rct_tile_element*)intent->GetPointerExtra(INTENT_EXTRA_TILE_ELEMENT)); + return window_ride_open_track((TileElement*)intent->GetPointerExtra(INTENT_EXTRA_TILE_ELEMENT)); case INTENT_ACTION_NEW_RIDE_OF_TYPE: { // Open ride list window diff --git a/src/openrct2-ui/input/MouseInput.cpp b/src/openrct2-ui/input/MouseInput.cpp index ba47847ee1..188b134868 100644 --- a/src/openrct2-ui/input/MouseInput.cpp +++ b/src/openrct2-ui/input/MouseInput.cpp @@ -72,7 +72,7 @@ void process_mouse_over(int32_t x, int32_t y); void process_mouse_tool(int32_t x, int32_t y); void invalidate_scroll(); static rct_mouse_data* get_mouse_input(); -void tile_element_right_click(int32_t type, rct_tile_element* tileElement, int32_t x, int32_t y); +void tile_element_right_click(int32_t type, TileElement* tileElement, int32_t x, int32_t y); static void game_handle_input_mouse(int32_t x, int32_t y, int32_t state); static void input_widget_left(int32_t x, int32_t y, rct_window* w, rct_widgetindex widgetIndex); void input_state_widget_pressed( diff --git a/src/openrct2-ui/interface/ViewportInteraction.cpp b/src/openrct2-ui/interface/ViewportInteraction.cpp index 60b8e63380..bd50241f67 100644 --- a/src/openrct2-ui/interface/ViewportInteraction.cpp +++ b/src/openrct2-ui/interface/ViewportInteraction.cpp @@ -33,12 +33,12 @@ #include #include -static void viewport_interaction_remove_scenery(rct_tile_element* tileElement, int32_t x, int32_t y); -static void viewport_interaction_remove_footpath(rct_tile_element* tileElement, int32_t x, int32_t y); -static void viewport_interaction_remove_footpath_item(rct_tile_element* tileElement, int32_t x, int32_t y); -static void viewport_interaction_remove_park_wall(rct_tile_element* tileElement, int32_t x, int32_t y); -static void viewport_interaction_remove_large_scenery(rct_tile_element* tileElement, int32_t x, int32_t y); -static void viewport_interaction_remove_park_entrance(rct_tile_element* tileElement, int32_t x, int32_t y); +static void viewport_interaction_remove_scenery(TileElement* tileElement, int32_t x, int32_t y); +static void viewport_interaction_remove_footpath(TileElement* tileElement, int32_t x, int32_t y); +static void viewport_interaction_remove_footpath_item(TileElement* tileElement, int32_t x, int32_t y); +static void viewport_interaction_remove_park_wall(TileElement* tileElement, int32_t x, int32_t y); +static void viewport_interaction_remove_large_scenery(TileElement* tileElement, int32_t x, int32_t y); +static void viewport_interaction_remove_park_entrance(TileElement* tileElement, int32_t x, int32_t y); static rct_peep* viewport_interaction_get_closest_peep(int32_t x, int32_t y, int32_t maxDistance); /** @@ -47,7 +47,7 @@ static rct_peep* viewport_interaction_get_closest_peep(int32_t x, int32_t y, int */ int32_t viewport_interaction_get_item_left(int32_t x, int32_t y, viewport_interaction_info* info) { - rct_tile_element* tileElement; + TileElement* tileElement; rct_sprite* sprite; rct_vehicle* vehicle; @@ -190,7 +190,7 @@ int32_t viewport_interaction_left_click(int32_t x, int32_t y) */ int32_t viewport_interaction_get_item_right(int32_t x, int32_t y, viewport_interaction_info* info) { - rct_tile_element* tileElement; + TileElement* tileElement; rct_scenery_entry* sceneryEntry; rct_banner* banner; Ride* ride; @@ -463,7 +463,7 @@ int32_t viewport_interaction_right_click(int32_t x, int32_t y) * * rct2: 0x006E08D2 */ -static void viewport_interaction_remove_scenery(rct_tile_element* tileElement, int32_t x, int32_t y) +static void viewport_interaction_remove_scenery(TileElement* tileElement, int32_t x, int32_t y) { gGameCommandErrorTitle = STR_CANT_REMOVE_THIS; game_do_command( @@ -475,11 +475,11 @@ static void viewport_interaction_remove_scenery(rct_tile_element* tileElement, i * * rct2: 0x006A614A */ -static void viewport_interaction_remove_footpath(rct_tile_element* tileElement, int32_t x, int32_t y) +static void viewport_interaction_remove_footpath(TileElement* tileElement, int32_t x, int32_t y) { int32_t z; rct_window* w; - rct_tile_element* tileElement2; + TileElement* tileElement2; z = tileElement->base_height; @@ -502,7 +502,7 @@ static void viewport_interaction_remove_footpath(rct_tile_element* tileElement, * * rct2: 0x006A61AB */ -static void viewport_interaction_remove_footpath_item(rct_tile_element* tileElement, int32_t x, int32_t y) +static void viewport_interaction_remove_footpath_item(TileElement* tileElement, int32_t x, int32_t y) { int32_t type = tileElement->AsPath()->GetEntryIndex(); if (tileElement->AsPath()->IsQueue()) @@ -520,7 +520,7 @@ static void viewport_interaction_remove_footpath_item(rct_tile_element* tileElem * * rct2: 0x00666C0E */ -void viewport_interaction_remove_park_entrance(rct_tile_element* tileElement, int32_t x, int32_t y) +void viewport_interaction_remove_park_entrance(TileElement* tileElement, int32_t x, int32_t y) { int32_t rotation = tileElement->GetDirectionWithOffset(1); switch (tileElement->AsEntrance()->GetSequenceIndex()) @@ -542,7 +542,7 @@ void viewport_interaction_remove_park_entrance(rct_tile_element* tileElement, in * * rct2: 0x006E57A9 */ -static void viewport_interaction_remove_park_wall(rct_tile_element* tileElement, int32_t x, int32_t y) +static void viewport_interaction_remove_park_wall(TileElement* tileElement, int32_t x, int32_t y) { rct_scenery_entry* sceneryEntry = tileElement->AsWall()->GetEntry(); if (sceneryEntry->wall.scrolling_mode != 0xFF) @@ -561,7 +561,7 @@ static void viewport_interaction_remove_park_wall(rct_tile_element* tileElement, * * rct2: 0x006B88DC */ -static void viewport_interaction_remove_large_scenery(rct_tile_element* tileElement, int32_t x, int32_t y) +static void viewport_interaction_remove_large_scenery(TileElement* tileElement, int32_t x, int32_t y) { rct_scenery_entry* sceneryEntry = tileElement->AsLargeScenery()->GetEntry(); @@ -625,11 +625,11 @@ static rct_peep* viewport_interaction_get_closest_peep(int32_t x, int32_t y, int * * rct2: 0x0068A15E */ -void sub_68A15E(int32_t screenX, int32_t screenY, int16_t* x, int16_t* y, int32_t* direction, rct_tile_element** tileElement) +void sub_68A15E(int32_t screenX, int32_t screenY, int16_t* x, int16_t* y, int32_t* direction, TileElement** tileElement) { int16_t my_x, my_y; int32_t interactionType; - rct_tile_element* myTileElement; + TileElement* myTileElement; rct_viewport* viewport; get_map_coordinates_from_pos( screenX, screenY, VIEWPORT_INTERACTION_MASK_TERRAIN & VIEWPORT_INTERACTION_MASK_WATER, &my_x, &my_y, &interactionType, diff --git a/src/openrct2-ui/windows/Banner.cpp b/src/openrct2-ui/windows/Banner.cpp index 519bafaf68..fd4480a5e1 100644 --- a/src/openrct2-ui/windows/Banner.cpp +++ b/src/openrct2-ui/windows/Banner.cpp @@ -132,7 +132,7 @@ rct_window* window_banner_open(rct_windownumber number) int32_t view_x = gBanners[w->number].x << 5; int32_t view_y = gBanners[w->number].y << 5; - rct_tile_element* tile_element = map_get_first_element_at(view_x / 32, view_y / 32); + TileElement* tile_element = map_get_first_element_at(view_x / 32, view_y / 32); while (1) { if ((tile_element->GetType() == TILE_ELEMENT_TYPE_BANNER) && (tile_element->AsBanner()->GetIndex() == w->number)) @@ -171,7 +171,7 @@ static void window_banner_mouseup(rct_window* w, rct_widgetindex widgetIndex) int32_t x = banner->x << 5; int32_t y = banner->y << 5; - rct_tile_element* tile_element = map_get_first_element_at(x / 32, y / 32); + TileElement* tile_element = map_get_first_element_at(x / 32, y / 32); while (1) { diff --git a/src/openrct2-ui/windows/Footpath.cpp b/src/openrct2-ui/windows/Footpath.cpp index b187c6ff8c..6d9ae8bd39 100644 --- a/src/openrct2-ui/windows/Footpath.cpp +++ b/src/openrct2-ui/windows/Footpath.cpp @@ -718,7 +718,7 @@ static void window_footpath_set_provisional_path_at_point(int32_t x, int32_t y) gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_ARROW; int32_t interactionType; - rct_tile_element* tileElement; + TileElement* tileElement; LocationXY16 mapCoord = {}; get_map_coordinates_from_pos( x, y, VIEWPORT_INTERACTION_MASK_FOOTPATH & VIEWPORT_INTERACTION_MASK_TERRAIN, &mapCoord.x, &mapCoord.y, @@ -783,7 +783,7 @@ static void window_footpath_set_provisional_path_at_point(int32_t x, int32_t y) static void window_footpath_set_selection_start_bridge_at_point(int32_t screenX, int32_t screenY) { int32_t x, y, direction; - rct_tile_element* tileElement; + TileElement* tileElement; map_invalidate_selection_rect(); gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE; @@ -832,7 +832,7 @@ static void window_footpath_set_selection_start_bridge_at_point(int32_t screenX, static void window_footpath_place_path_at_point(int32_t x, int32_t y) { int32_t interactionType, currentType, selectedType, z, cost; - rct_tile_element* tileElement; + TileElement* tileElement; if (_footpathErrorOccured) { @@ -900,7 +900,7 @@ static void window_footpath_place_path_at_point(int32_t x, int32_t y) static void window_footpath_start_bridge_at_point(int32_t screenX, int32_t screenY) { int32_t x, y, z, direction; - rct_tile_element* tileElement; + TileElement* tileElement; footpath_bridge_get_info_from_pos(screenX, screenY, &x, &y, &direction, &tileElement); if (x == LOCATION_NULL) @@ -1009,7 +1009,7 @@ static void window_footpath_construct() * * rct2: 0x006A78EF */ -static void footpath_remove_tile_element(rct_tile_element* tileElement) +static void footpath_remove_tile_element(TileElement* tileElement) { int32_t x, y, z; @@ -1062,9 +1062,9 @@ static void footpath_remove_tile_element(rct_tile_element* tileElement) * * rct2: 0x006A7873 */ -static rct_tile_element* footpath_get_tile_element_to_remove() +static TileElement* footpath_get_tile_element_to_remove() { - rct_tile_element* tileElement; + TileElement* tileElement; int32_t x, y, z, zLow; x = gFootpathConstructFromPosition.x / 32; @@ -1118,7 +1118,7 @@ static rct_tile_element* footpath_get_tile_element_to_remove() */ static void window_footpath_remove() { - rct_tile_element* tileElement; + TileElement* tileElement; _window_footpath_cost = MONEY32_UNDEFINED; footpath_provisional_update(); diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index b5c54b7474..66c0aac2b5 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -1252,7 +1252,7 @@ void window_guest_overview_tool_down(rct_window* w, rct_widgetindex widgetIndex, return; int32_t dest_x, dest_y; - rct_tile_element* tileElement; + TileElement* tileElement; footpath_get_coordinates_from_pos(x, y + 16, &dest_x, &dest_y, nullptr, &tileElement); if (dest_x == LOCATION_NULL) diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index cdfaff2f3b..45b183d5a8 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -1190,7 +1190,7 @@ static void window_map_set_land_rights_tool_update(int32_t x, int32_t y) static void place_park_entrance_get_map_position( int32_t x, int32_t y, int16_t* mapX, int16_t* mapY, int16_t* mapZ, int32_t* direction) { - rct_tile_element* tileElement; + TileElement* tileElement; sub_68A15E(x, y, mapX, mapY, direction, &tileElement); if (*mapX == LOCATION_NULL) @@ -1268,7 +1268,7 @@ static void window_map_place_park_entrance_tool_update(int32_t x, int32_t y) static void window_map_set_peep_spawn_tool_update(int32_t x, int32_t y) { int32_t mapX, mapY, mapZ, direction; - rct_tile_element* tileElement; + TileElement* tileElement; map_invalidate_selection_rect(); gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE; @@ -1327,7 +1327,7 @@ static void window_map_place_park_entrance_tool_down(int32_t x, int32_t y) */ static void window_map_set_peep_spawn_tool_down(int32_t x, int32_t y) { - rct_tile_element* tileElement; + TileElement* tileElement; int32_t mapX, mapY, mapZ, direction; // Verify footpath exists at location, and retrieve coordinates @@ -1541,7 +1541,7 @@ static constexpr const uint8_t RideColourKey[] = { static uint16_t map_window_get_pixel_colour_peep(CoordsXY c) { - rct_tile_element* tileElement = map_get_surface_element_at(c); + TileElement* tileElement = map_get_surface_element_at(c); uint16_t colour = TerrainColour[tileElement->AsSurface()->GetSurfaceStyle()]; if (tileElement->AsSurface()->GetWaterHeight() > 0) colour = WaterColour; @@ -1571,7 +1571,7 @@ static uint16_t map_window_get_pixel_colour_ride(CoordsXY c) uint16_t colourB = MAP_COLOUR(PALETTE_INDEX_13); // surface colour (dark grey) // as an improvement we could use first_element to show underground stuff? - rct_tile_element* tileElement = map_get_surface_element_at(c); + TileElement* tileElement = map_get_surface_element_at(c); do { switch (tileElement->GetType()) diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index 5e12aa3a65..dfb9cbca56 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -1632,7 +1632,7 @@ static rct_window* window_ride_open_station(int32_t rideIndex, int32_t stationIn return w; } -rct_window* window_ride_open_track(rct_tile_element* tileElement) +rct_window* window_ride_open_track(TileElement* tileElement) { assert( tileElement->GetType() == TILE_ELEMENT_TYPE_ENTRANCE || tileElement->GetType() == TILE_ELEMENT_TYPE_TRACK @@ -4259,7 +4259,7 @@ static int32_t window_ride_has_track_colour(Ride* ride, int32_t trackColour) static void window_ride_set_track_colour_scheme(rct_window* w, int32_t x, int32_t y) { - rct_tile_element* tileElement; + TileElement* tileElement; uint8_t newColourScheme; int32_t interactionType, z, direction; @@ -5352,7 +5352,7 @@ static void window_ride_measurements_update(rct_window* w) */ static void window_ride_measurements_tooldown(rct_window* w, rct_widgetindex widgetIndex, int32_t x, int32_t y) { - rct_tile_element* tileElement; + TileElement* tileElement; int16_t mapX, mapY; int32_t interactionType; @@ -5380,7 +5380,7 @@ static void window_ride_measurements_tooldrag(rct_window* w, rct_widgetindex wid _lastSceneryX = x; _lastSceneryY = y; - rct_tile_element* tileElement; + TileElement* tileElement; int16_t mapX, mapY; int32_t interactionType; diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index ab25b44991..f985214d55 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -1788,7 +1788,7 @@ static void window_ride_construction_construct(rct_window* w) static void window_ride_construction_mouseup_demolish(rct_window* w) { int32_t x, y, z, direction, type; - rct_tile_element* tileElement; + TileElement* tileElement; CoordsXYE inputElement, outputElement; track_begin_end trackBeginEnd; // bool gotoStartPlacementMode; @@ -2033,7 +2033,7 @@ static bool ride_get_place_position_from_screen_position(int32_t screenX, int32_ { int16_t mapX, mapY, mapZ; int32_t interactionType, direction; - rct_tile_element* tileElement; + TileElement* tileElement; rct_viewport* viewport; if (!_trackPlaceCtrlState) @@ -2070,7 +2070,7 @@ static bool ride_get_place_position_from_screen_position(int32_t screenX, int32_ { if (gInputPlaceObjectModifier & PLACE_OBJECT_MODIFIER_SHIFT_Z) { - constexpr uint16_t maxHeight = (std::numeric_limits::max() - 32) + constexpr uint16_t maxHeight = (std::numeric_limits::max() - 32) << MAX_ZOOM_LEVEL; _trackPlaceShiftZ = _trackPlaceShiftStartScreenY - screenY + 4; @@ -2317,9 +2317,9 @@ static void window_ride_construction_draw_track_piece( sub_6CBCE2(dpi, rideIndex, trackType, trackDirection, d, 4096, 4096, 1024); } -static rct_tile_element _tempTrackTileElement; -static rct_tile_element _tempSideTrackTileElement = { 0x80, 0x8F, 128, 128, 0, 0, 0, 0 }; -static rct_tile_element* _backupTileElementArrays[5]; +static TileElement _tempTrackTileElement; +static TileElement _tempSideTrackTileElement = { 0x80, 0x8F, 128, 128, 0, 0, 0, 0 }; +static TileElement* _backupTileElementArrays[5]; /** * @@ -2464,7 +2464,7 @@ static void sub_6CBCE2( void window_ride_construction_update_active_elements_impl() { rct_window* w; - rct_tile_element* tileElement; + TileElement* tileElement; window_ride_construction_update_enabled_track_pieces(); w = window_find_by_class(WC_RIDE_CONSTRUCTION); @@ -3426,7 +3426,7 @@ static void loc_6C7502(int32_t al) */ static void ride_construction_set_brakes_speed(int32_t brakesSpeed) { - rct_tile_element* tileElement; + TileElement* tileElement; int32_t x, y, z; x = _currentTrackBeginX; @@ -3594,7 +3594,7 @@ void ride_construction_toolupdate_construct(int32_t screenX, int32_t screenY) if (_autoRotatingShop && _rideConstructionState == RIDE_CONSTRUCTION_STATE_PLACE && ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_IS_SHOP)) { - rct_tile_element* pathsByDir[4]; + TileElement* pathsByDir[4]; constexpr sLocationXY8 DirOffsets[4] = { { -1, 0 }, { 0, 1 }, { 1, 0 }, { 0, -1 } }; bool keepOrientation = false; diff --git a/src/openrct2-ui/windows/Sign.cpp b/src/openrct2-ui/windows/Sign.cpp index 5e246be401..e0821e39a6 100644 --- a/src/openrct2-ui/windows/Sign.cpp +++ b/src/openrct2-ui/windows/Sign.cpp @@ -154,7 +154,7 @@ rct_window* window_sign_open(rct_windownumber number) int32_t view_x = gBanners[w->number].x << 5; int32_t view_y = gBanners[w->number].y << 5; - rct_tile_element* tile_element = map_get_first_element_at(view_x / 32, view_y / 32); + TileElement* tile_element = map_get_first_element_at(view_x / 32, view_y / 32); while (1) { @@ -206,7 +206,7 @@ static void window_sign_mouseup(rct_window* w, rct_widgetindex widgetIndex) rct_string_id string_id; - rct_tile_element* tile_element = map_get_first_element_at(x / 32, y / 32); + TileElement* tile_element = map_get_first_element_at(x / 32, y / 32); switch (widgetIndex) { @@ -404,7 +404,7 @@ rct_window* window_sign_small_open(rct_windownumber number) int32_t view_x = gBanners[w->number].x << 5; int32_t view_y = gBanners[w->number].y << 5; - rct_tile_element* tile_element = map_get_first_element_at(view_x / 32, view_y / 32); + TileElement* tile_element = map_get_first_element_at(view_x / 32, view_y / 32); while (1) { @@ -455,7 +455,7 @@ static void window_sign_small_mouseup(rct_window* w, rct_widgetindex widgetIndex rct_string_id string_id; - rct_tile_element* tile_element = map_get_first_element_at(x / 32, y / 32); + TileElement* tile_element = map_get_first_element_at(x / 32, y / 32); switch (widgetIndex) { diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp index f91b2b3dbc..9cabf549c4 100644 --- a/src/openrct2-ui/windows/Staff.cpp +++ b/src/openrct2-ui/windows/Staff.cpp @@ -1190,7 +1190,7 @@ void window_staff_overview_tool_down(rct_window* w, rct_widgetindex widgetIndex, if (widgetIndex == WIDX_PICKUP) { int32_t dest_x, dest_y; - rct_tile_element* tileElement; + TileElement* tileElement; footpath_get_coordinates_from_pos(x, y + 16, &dest_x, &dest_y, nullptr, &tileElement); if (dest_x == LOCATION_NULL) diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp index 6fb7a01a32..6209db8fcf 100644 --- a/src/openrct2-ui/windows/StaffList.cpp +++ b/src/openrct2-ui/windows/StaffList.cpp @@ -340,7 +340,7 @@ static void window_staff_list_tooldown(rct_window* w, rct_widgetindex widgetInde int32_t selectedPeepType = _windowStaffListSelectedTab; int32_t direction; - rct_tile_element* tileElement; + TileElement* tileElement; footpath_get_coordinates_from_pos(x, y, &x, &y, &direction, &tileElement); if (x == LOCATION_NULL) return; diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp index 491ce5f591..3216da1b3b 100644 --- a/src/openrct2-ui/windows/TileInspector.cpp +++ b/src/openrct2-ui/windows/TileInspector.cpp @@ -447,7 +447,7 @@ static int32_t windowTileInspectorToolMapX = 0; static int32_t windowTileInspectorToolMapY = 0; static bool windowTileInspectorApplyToAll = false; static bool windowTileInspectorElementCopied = false; -static rct_tile_element tileInspectorCopiedElement; +static TileElement tileInspectorCopiedElement; static void window_tile_inspector_mouseup(rct_window* w, rct_widgetindex widgetIndex); static void window_tile_inspector_resize(rct_window* w); @@ -569,7 +569,7 @@ void window_tile_inspector_clear_clipboard() windowTileInspectorElementCopied = false; } -static rct_tile_element* window_tile_inspector_get_selected_element(rct_window* w) +static TileElement* window_tile_inspector_get_selected_element(rct_window* w) { openrct2_assert( windowTileInspectorSelectedIndex >= 0 && windowTileInspectorSelectedIndex < windowTileInspectorElementCount, @@ -591,12 +591,12 @@ static void window_tile_inspector_select_element_from_list(rct_window* w, int32_ window_invalidate(w); } -static void window_tile_inspector_load_tile(rct_window* w, rct_tile_element* elementToSelect) +static void window_tile_inspector_load_tile(rct_window* w, TileElement* elementToSelect) { windowTileInspectorSelectedIndex = -1; w->scrolls[0].v_top = 0; - rct_tile_element* element = map_get_first_element_at(windowTileInspectorTileX, windowTileInspectorTileY); + TileElement* element = map_get_first_element_at(windowTileInspectorTileX, windowTileInspectorTileY); int16_t numItems = 0; do { @@ -834,7 +834,7 @@ static void window_tile_inspector_mouseup(rct_window* w, rct_widgetindex widgetI } // Get the selected map element - rct_tile_element* const tileElement = window_tile_inspector_get_selected_element(w); + TileElement* const tileElement = window_tile_inspector_get_selected_element(w); // Page widgets switch (w->page) @@ -1114,7 +1114,7 @@ static void window_tile_inspector_mousedown(rct_window* w, rct_widgetindex widge DROPDOWN_FLAG_STAY_OPEN, 3, widget->right - widget->left - 3); // Set current value as checked - rct_tile_element* const tileElement = window_tile_inspector_get_selected_element(w); + TileElement* const tileElement = window_tile_inspector_get_selected_element(w); dropdown_set_checked(tileElement->AsWall()->GetSlope(), true); break; } // switch widget index @@ -1178,7 +1178,7 @@ static void window_tile_inspector_dropdown(rct_window* w, rct_widgetindex widget } // Get selected element - rct_tile_element* const tileElement = window_tile_inspector_get_selected_element(w); + TileElement* const tileElement = window_tile_inspector_get_selected_element(w); switch (w->page) { @@ -1203,7 +1203,7 @@ static void window_tile_inspector_tool_update(rct_window* w, rct_widgetindex wid int16_t mapX = x; int16_t mapY = y; - rct_tile_element* clickedElement = nullptr; + TileElement* clickedElement = nullptr; if (input_test_place_object_modifier(PLACE_OBJECT_MODIFIER_COPY_Z)) { get_map_coordinates_from_pos(x, y, ViewportInteractionFlags, &mapX, &mapY, nullptr, &clickedElement, nullptr); @@ -1251,7 +1251,7 @@ static void window_tile_inspector_update_selected_tile(rct_window* w, int32_t x, int16_t mapX = x; int16_t mapY = y; - rct_tile_element* clickedElement = nullptr; + TileElement* clickedElement = nullptr; if (ctrlIsHeldDown) { get_map_coordinates_from_pos(x, y, ViewportInteractionFlags, &mapX, &mapY, nullptr, &clickedElement, nullptr); @@ -1448,7 +1448,7 @@ static void window_tile_inspector_invalidate(rct_window* w) // Using a switch, because I don't think giving each page their own callbacks is // needed here, as only the mouseup and invalidate functions are different. const int32_t propertiesAnchor = w->widgets[WIDX_GROUPBOX_PROPERTIES].top; - const rct_tile_element* const tileElement = window_tile_inspector_get_selected_element(w); + const TileElement* const tileElement = window_tile_inspector_get_selected_element(w); switch (w->page) { @@ -1745,7 +1745,7 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi) int32_t y = w->y + w->widgets[WIDX_GROUPBOX_DETAILS].top + 14; // Get map element - rct_tile_element* const tileElement = window_tile_inspector_get_selected_element(w); + TileElement* const tileElement = window_tile_inspector_get_selected_element(w); switch (w->page) { @@ -2105,7 +2105,7 @@ static void window_tile_inspector_scrollpaint(rct_window* w, rct_drawpixelinfo* if (!windowTileInspectorTileSelected) return; - const rct_tile_element* tileElement = map_get_first_element_at(windowTileInspectorTileX, windowTileInspectorTileY); + const TileElement* tileElement = map_get_first_element_at(windowTileInspectorTileX, windowTileInspectorTileY); gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; do diff --git a/src/openrct2-ui/windows/TitleCommandEditor.cpp b/src/openrct2-ui/windows/TitleCommandEditor.cpp index dcd20d47ce..194ed14e4d 100644 --- a/src/openrct2-ui/windows/TitleCommandEditor.cpp +++ b/src/openrct2-ui/windows/TitleCommandEditor.cpp @@ -194,7 +194,7 @@ static LocationXY16 get_location() if (w != nullptr) { int32_t interactionType; - rct_tile_element* tileElement; + TileElement* tileElement; get_map_coordinates_from_pos_window( w, w->viewport->view_width / 2, w->viewport->view_height / 2, VIEWPORT_INTERACTION_MASK_TERRAIN, &mapCoord.x, diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index b275dacd49..115aad53e1 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -972,7 +972,7 @@ static void repaint_scenery_tool_down(int16_t x, int16_t y, rct_widgetindex widg int16_t grid_x, grid_y; int32_t type; // edx - rct_tile_element* tile_element; + TileElement* tile_element; auto flags = VIEWPORT_INTERACTION_MASK_SCENERY & VIEWPORT_INTERACTION_MASK_WALL & VIEWPORT_INTERACTION_MASK_LARGE_SCENERY & VIEWPORT_INTERACTION_MASK_BANNER; // This is -2 as banner is 12 but flags are offset different @@ -1055,7 +1055,7 @@ static void scenery_eyedropper_tool_down(int16_t x, int16_t y, rct_widgetindex w int16_t gridX, gridY; int32_t type; - rct_tile_element* tileElement; + TileElement* tileElement; rct_viewport* viewport; get_map_coordinates_from_pos(x, y, flags, &gridX, &gridY, &type, &tileElement, &viewport); @@ -1168,7 +1168,7 @@ static void sub_6E1F34( } uint8_t scenery_type = selected_scenery >> 8; - uint16_t maxPossibleHeight = (std::numeric_limits::max() - 32) << MAX_ZOOM_LEVEL; + uint16_t maxPossibleHeight = (std::numeric_limits::max() - 32) << MAX_ZOOM_LEVEL; bool can_raise_item = false; if (scenery_type == SCENERY_TYPE_SMALL) @@ -1217,7 +1217,7 @@ static void sub_6E1F34( if (input_test_place_object_modifier(PLACE_OBJECT_MODIFIER_COPY_Z)) { // CTRL pressed - rct_tile_element* tile_element; + TileElement* tile_element; auto flags = VIEWPORT_INTERACTION_MASK_TERRAIN & VIEWPORT_INTERACTION_MASK_RIDE & VIEWPORT_INTERACTION_MASK_SCENERY & VIEWPORT_INTERACTION_MASK_FOOTPATH & VIEWPORT_INTERACTION_MASK_WALL & VIEWPORT_INTERACTION_MASK_LARGE_SCENERY; @@ -1299,7 +1299,7 @@ static void sub_6E1F34( // If SHIFT pressed if (gSceneryShiftPressed) { - rct_tile_element* tile_element = map_get_surface_element_at(*grid_x / 32, *grid_y / 32); + TileElement* tile_element = map_get_surface_element_at(*grid_x / 32, *grid_y / 32); if (tile_element == nullptr) { @@ -1363,7 +1363,7 @@ static void sub_6E1F34( { auto flags = VIEWPORT_INTERACTION_MASK_TERRAIN & VIEWPORT_INTERACTION_MASK_WATER; int32_t interaction_type = 0; - rct_tile_element* tile_element; + TileElement* tile_element; get_map_coordinates_from_pos(x, y, flags, grid_x, grid_y, &interaction_type, &tile_element, nullptr); @@ -1441,7 +1441,7 @@ static void sub_6E1F34( // Path bits auto flags = VIEWPORT_INTERACTION_MASK_FOOTPATH & VIEWPORT_INTERACTION_MASK_FOOTPATH_ITEM; int32_t interaction_type = 0; - rct_tile_element* tile_element; + TileElement* tile_element; get_map_coordinates_from_pos(x, y, flags, grid_x, grid_y, &interaction_type, &tile_element, nullptr); @@ -1480,7 +1480,7 @@ static void sub_6E1F34( // If SHIFT pressed if (gSceneryShiftPressed) { - rct_tile_element* tile_element = map_get_surface_element_at(*grid_x / 32, *grid_y / 32); + TileElement* tile_element = map_get_surface_element_at(*grid_x / 32, *grid_y / 32); if (tile_element == nullptr) { @@ -1539,7 +1539,7 @@ static void sub_6E1F34( // If SHIFT pressed if (gSceneryShiftPressed) { - rct_tile_element* tile_element = map_get_surface_element_at(*grid_x / 32, *grid_y / 32); + TileElement* tile_element = map_get_surface_element_at(*grid_x / 32, *grid_y / 32); if (tile_element == nullptr) { @@ -1591,7 +1591,7 @@ static void sub_6E1F34( // Banner auto flags = VIEWPORT_INTERACTION_MASK_FOOTPATH & VIEWPORT_INTERACTION_MASK_FOOTPATH_ITEM; int32_t interaction_type = 0; - rct_tile_element* tile_element; + TileElement* tile_element; get_map_coordinates_from_pos(x, y, flags, grid_x, grid_y, &interaction_type, &tile_element, nullptr); @@ -2396,7 +2396,7 @@ static money32 try_place_ghost_scenery( uint8_t scenery_type = (selected_tab & 0xFF00) >> 8; money32 cost = 0; - rct_tile_element* tileElement; + TileElement* tileElement; switch (scenery_type) { diff --git a/src/openrct2-ui/windows/TrackDesignPlace.cpp b/src/openrct2-ui/windows/TrackDesignPlace.cpp index 938d8acd87..e6815471bc 100644 --- a/src/openrct2-ui/windows/TrackDesignPlace.cpp +++ b/src/openrct2-ui/windows/TrackDesignPlace.cpp @@ -412,7 +412,7 @@ static void window_track_place_clear_provisional() */ static int32_t window_track_place_get_base_z(int32_t x, int32_t y) { - rct_tile_element* tileElement; + TileElement* tileElement; uint32_t z; tileElement = map_get_surface_element_at(x >> 5, y >> 5); diff --git a/src/openrct2-ui/windows/Window.h b/src/openrct2-ui/windows/Window.h index 85b0c94e26..f0fa872c50 100644 --- a/src/openrct2-ui/windows/Window.h +++ b/src/openrct2-ui/windows/Window.h @@ -17,7 +17,7 @@ using loadsave_callback = void (*)(int32_t result, const utf8* path); using scenarioselect_callback = void (*)(const utf8* path); struct rct_peep; -struct rct_tile_element; +struct TileElement; struct rct_vehicle; rct_window* window_about_open(); @@ -108,7 +108,7 @@ rct_window* window_ride_list_open(); void window_ride_list_refresh_list(rct_window* w); rct_window* window_ride_main_open(int32_t rideIndex); -rct_window* window_ride_open_track(rct_tile_element* tileElement); +rct_window* window_ride_open_track(TileElement* tileElement); rct_window* window_ride_open_vehicle(rct_vehicle* vehicle); void window_ride_measurements_design_cancel(); diff --git a/src/openrct2/Cheats.cpp b/src/openrct2/Cheats.cpp index 1f4ecd093c..e36f61b4a2 100644 --- a/src/openrct2/Cheats.cpp +++ b/src/openrct2/Cheats.cpp @@ -59,7 +59,7 @@ int32_t day_spinner_value = 1; static void cheat_set_grass_length(int32_t length) { int32_t x, y; - rct_tile_element* tileElement; + TileElement* tileElement; for (y = 0; y < MAXIMUM_MAP_SIZE_TECHNICAL; y++) { @@ -458,7 +458,7 @@ static void cheat_own_all_land() { for (coords.x = min; coords.x <= max; coords.x += 32) { - rct_tile_element* surfaceElement = map_get_surface_element_at(coords); + TileElement* surfaceElement = map_get_surface_element_at(coords); // Ignore already owned tiles. if (surfaceElement->AsSurface()->GetOwnership() & OWNERSHIP_OWNED) @@ -485,7 +485,7 @@ static void cheat_own_all_land() int32_t y = spawn.y; if (x != PEEP_SPAWN_UNDEFINED) { - rct_tile_element* surfaceElement = map_get_surface_element_at({ x, y }); + TileElement* surfaceElement = map_get_surface_element_at({ x, y }); surfaceElement->AsSurface()->SetOwnership(OWNERSHIP_UNOWNED); update_park_fences_around_tile({ x, y }); uint16_t baseHeight = surfaceElement->base_height * 8; diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp index cafe044620..1a96270c73 100644 --- a/src/openrct2/Game.cpp +++ b/src/openrct2/Game.cpp @@ -1066,7 +1066,7 @@ void game_fix_save_vars() { for (int32_t x = 0; x < MAXIMUM_MAP_SIZE_TECHNICAL; x++) { - rct_tile_element* tileElement = map_get_surface_element_at(x, y); + TileElement* tileElement = map_get_surface_element_at(x, y); if (tileElement == nullptr) { diff --git a/src/openrct2/actions/FootpathRemoveAction.hpp b/src/openrct2/actions/FootpathRemoveAction.hpp index 02650b54e8..9a10e1dbdb 100644 --- a/src/openrct2/actions/FootpathRemoveAction.hpp +++ b/src/openrct2/actions/FootpathRemoveAction.hpp @@ -61,7 +61,7 @@ public: return MakeResult(GA_ERROR::NOT_OWNED, STR_CANT_REMOVE_FOOTPATH_FROM_HERE, STR_LAND_NOT_OWNED_BY_PARK); } - rct_tile_element* footpathElement = GetFootpathElement(); + TileElement* footpathElement = GetFootpathElement(); res->Cost = GetRefundPrice(footpathElement); return res; @@ -80,7 +80,7 @@ public: footpath_remove_litter(_x, _y, _z * 8); } - rct_tile_element* footpathElement = GetFootpathElement(); + TileElement* footpathElement = GetFootpathElement(); if (footpathElement != nullptr) { footpath_queue_chain_reset(); @@ -97,12 +97,12 @@ public: } private: - rct_tile_element* GetFootpathElement() const + TileElement* GetFootpathElement() const { bool getGhostPath = GetFlags() & GAME_COMMAND_FLAG_GHOST; - rct_tile_element* tileElement = map_get_footpath_element(_x / 32, _y / 32, _z); - rct_tile_element* footpathElement = nullptr; + TileElement* tileElement = map_get_footpath_element(_x / 32, _y / 32, _z); + TileElement* footpathElement = nullptr; if (tileElement != nullptr) { if (getGhostPath && !tileElement->IsGhost()) @@ -126,7 +126,7 @@ private: return footpathElement; } - money32 GetRefundPrice(rct_tile_element* footpathElement) const + money32 GetRefundPrice(TileElement* footpathElement) const { money32 cost = -MONEY(10, 00); diff --git a/src/openrct2/actions/MazeSetTrackAction.hpp b/src/openrct2/actions/MazeSetTrackAction.hpp index 03f36d817b..11fdf4312d 100644 --- a/src/openrct2/actions/MazeSetTrackAction.hpp +++ b/src/openrct2/actions/MazeSetTrackAction.hpp @@ -113,7 +113,7 @@ public: return res; } - rct_tile_element* tileElement = map_get_surface_element_at(_x / 32, _y / 32); + TileElement* tileElement = map_get_surface_element_at(_x / 32, _y / 32); if (tileElement == nullptr) { res->Error = GA_ERROR::UNKNOWN; @@ -212,8 +212,7 @@ public: uint8_t baseHeight = _z >> 3; uint8_t clearanceHeight = (_z + 32) >> 3; - rct_tile_element* tileElement = map_get_track_element_at_of_type_from_ride( - _x, _y, baseHeight, TRACK_ELEM_MAZE, _rideIndex); + TileElement* tileElement = map_get_track_element_at_of_type_from_ride(_x, _y, baseHeight, TRACK_ELEM_MAZE, _rideIndex); if (tileElement == nullptr) { Ride* ride = get_ride(_rideIndex); @@ -272,7 +271,7 @@ public: uint16_t previousElementX = floor2(_x, 32) - CoordsDirectionDelta[_direction].x; uint16_t previousElementY = floor2(_y, 32) - CoordsDirectionDelta[_direction].y; - rct_tile_element* previousTileElement = map_get_track_element_at_of_type_from_ride( + TileElement* previousTileElement = map_get_track_element_at_of_type_from_ride( previousElementX, previousElementY, baseHeight, TRACK_ELEM_MAZE, _rideIndex); if (previousTileElement != nullptr) @@ -327,7 +326,7 @@ public: uint16_t nextElementX = floor2(previousSegmentX, 32) + CoordsDirectionDelta[direction1].x; uint16_t nextElementY = floor2(previousSegmentY, 32) + CoordsDirectionDelta[direction1].y; - rct_tile_element* tmp_tileElement = map_get_track_element_at_of_type_from_ride( + TileElement* tmp_tileElement = map_get_track_element_at_of_type_from_ride( nextElementX, nextElementY, baseHeight, TRACK_ELEM_MAZE, _rideIndex); if (tmp_tileElement != nullptr) diff --git a/src/openrct2/actions/PlaceParkEntranceAction.hpp b/src/openrct2/actions/PlaceParkEntranceAction.hpp index 9eb6a33a2e..4901220aed 100644 --- a/src/openrct2/actions/PlaceParkEntranceAction.hpp +++ b/src/openrct2/actions/PlaceParkEntranceAction.hpp @@ -181,7 +181,7 @@ public: surfaceElement->SetOwnership(OWNERSHIP_UNOWNED); } - rct_tile_element* newElement = tile_element_insert(entranceLoc.x / 32, entranceLoc.y / 32, zLow, 0xF); + TileElement* newElement = tile_element_insert(entranceLoc.x / 32, entranceLoc.y / 32, zLow, 0xF); Guard::Assert(newElement != nullptr); newElement->SetType(TILE_ELEMENT_TYPE_ENTRANCE); auto entranceElement = newElement->AsEntrance(); diff --git a/src/openrct2/actions/PlacePeepSpawnAction.hpp b/src/openrct2/actions/PlacePeepSpawnAction.hpp index d195991f01..30d8d9ffda 100644 --- a/src/openrct2/actions/PlacePeepSpawnAction.hpp +++ b/src/openrct2/actions/PlacePeepSpawnAction.hpp @@ -73,7 +73,7 @@ public: GA_ERROR::INVALID_PARAMETERS, STR_ERR_CANT_PLACE_PEEP_SPAWN_HERE, STR_OFF_EDGE_OF_MAP); } - rct_tile_element *mapElement, *surfaceMapElement; + TileElement *mapElement, *surfaceMapElement; // Verify footpath exists at location, and retrieve coordinates mapElement = map_get_path_element_at(_location.x >> 5, _location.y >> 5, _location.z / 8); if (mapElement == nullptr) diff --git a/src/openrct2/actions/WallRemoveAction.hpp b/src/openrct2/actions/WallRemoveAction.hpp index 38991a817a..c78e19d87b 100644 --- a/src/openrct2/actions/WallRemoveAction.hpp +++ b/src/openrct2/actions/WallRemoveAction.hpp @@ -57,7 +57,7 @@ public: return std::make_unique(GA_ERROR::NOT_OWNED, STR_CANT_REMOVE_THIS, STR_LAND_NOT_OWNED_BY_PARK); } - rct_tile_element* wallElement = GetFirstWallElementAt(_location, isGhost); + TileElement* wallElement = GetFirstWallElementAt(_location, isGhost); if (wallElement == nullptr) { return std::make_unique( @@ -76,7 +76,7 @@ public: const bool isGhost = GetFlags() & GAME_COMMAND_FLAG_GHOST; - rct_tile_element* wallElement = GetFirstWallElementAt(_location, isGhost); + TileElement* wallElement = GetFirstWallElementAt(_location, isGhost); if (wallElement == nullptr) { return std::make_unique( @@ -96,9 +96,9 @@ public: } private: - rct_tile_element* GetFirstWallElementAt(const TileCoordsXYZD& location, bool isGhost) const + TileElement* GetFirstWallElementAt(const TileCoordsXYZD& location, bool isGhost) const { - rct_tile_element* tileElement = map_get_first_element_at(location.x, location.y); + TileElement* tileElement = map_get_first_element_at(location.x, location.y); do { if (tileElement->GetType() != TILE_ELEMENT_TYPE_WALL) diff --git a/src/openrct2/audio/Audio.cpp b/src/openrct2/audio/Audio.cpp index fa5d782341..9fef052fa0 100644 --- a/src/openrct2/audio/Audio.cpp +++ b/src/openrct2/audio/Audio.cpp @@ -211,7 +211,7 @@ AudioParams audio_get_params_from_location(int32_t soundId, const LocationXYZ16* params.volume = 0; params.pan = 0; - rct_tile_element* element = map_get_surface_element_at({ location->x, location->y }); + TileElement* element = map_get_surface_element_at({ location->x, location->y }); if (element && (element->base_height * 8) - 5 > location->z) { volumeDown = 10; diff --git a/src/openrct2/drawing/LightFX.cpp b/src/openrct2/drawing/LightFX.cpp index 344d9c63f0..a1b2f6d2dc 100644 --- a/src/openrct2/drawing/LightFX.cpp +++ b/src/openrct2/drawing/LightFX.cpp @@ -293,7 +293,7 @@ void lightfx_prepare_light_list() { LocationXY16 mapCoord = {}; - rct_tile_element* tileElement = nullptr; + TileElement* tileElement = nullptr; int32_t interactionType = 0; @@ -327,7 +327,7 @@ void lightfx_prepare_light_list() mapCoord.x = _interactionMapX + tileOffsetX; mapCoord.y = _interactionMapY + tileOffsetY; interactionType = _interactionSpriteType; - tileElement = RCT2_GLOBAL(0x9AC150, rct_tile_element*); + tileElement = RCT2_GLOBAL(0x9AC150, TileElement*); # endif // LIGHTFX_UNKNOWN_PART_1 // RCT2_GLOBAL(0x9AC154, uint16_t) = VIEWPORT_INTERACTION_MASK_NONE; diff --git a/src/openrct2/interface/InteractiveConsole.cpp b/src/openrct2/interface/InteractiveConsole.cpp index cff55085d1..b8ca7fd8cc 100644 --- a/src/openrct2/interface/InteractiveConsole.cpp +++ b/src/openrct2/interface/InteractiveConsole.cpp @@ -583,7 +583,7 @@ static int32_t cc_get(InteractiveConsole& console, const utf8** argv, int32_t ar if (w != nullptr) { int32_t interactionType; - rct_tile_element* tileElement; + TileElement* tileElement; LocationXY16 mapCoord = {}; rct_viewport* viewport = window_get_viewport(w); get_map_coordinates_from_pos( diff --git a/src/openrct2/interface/Viewport.cpp b/src/openrct2/interface/Viewport.cpp index cf76d8d577..d057be1631 100644 --- a/src/openrct2/interface/Viewport.cpp +++ b/src/openrct2/interface/Viewport.cpp @@ -41,7 +41,7 @@ uint8_t gShowConstuctionRightsRefCount; rct_viewport g_viewport_list[MAX_VIEWPORT_COUNT]; rct_viewport* g_music_tracking_viewport; -static rct_tile_element* _interaction_element = nullptr; +static TileElement* _interaction_element = nullptr; int16_t gSavedViewX; int16_t gSavedViewY; @@ -1609,7 +1609,7 @@ static void sub_68862C(paint_session* session) */ void get_map_coordinates_from_pos( int32_t screenX, int32_t screenY, int32_t flags, int16_t* x, int16_t* y, int32_t* interactionType, - rct_tile_element** tileElement, rct_viewport** viewport) + TileElement** tileElement, rct_viewport** viewport) { rct_window* window = window_find_from_point(screenX, screenY); get_map_coordinates_from_pos_window(window, screenX, screenY, flags, x, y, interactionType, tileElement, viewport); @@ -1617,7 +1617,7 @@ void get_map_coordinates_from_pos( void get_map_coordinates_from_pos_window( rct_window* window, int32_t screenX, int32_t screenY, int32_t flags, int16_t* x, int16_t* y, int32_t* interactionType, - rct_tile_element** tileElement, rct_viewport** viewport) + TileElement** tileElement, rct_viewport** viewport) { _unk9AC154 = flags & 0xFFFF; _interactionSpriteType = 0; diff --git a/src/openrct2/interface/Viewport.h b/src/openrct2/interface/Viewport.h index f61b165417..2650d3dcc6 100644 --- a/src/openrct2/interface/Viewport.h +++ b/src/openrct2/interface/Viewport.h @@ -17,7 +17,7 @@ struct paint_session; struct paint_struct; struct rct_drawpixelinfo; struct rct_peep; -struct rct_tile_element; +struct TileElement; struct rct_vehicle; struct rct_window; union paint_entry; @@ -87,7 +87,7 @@ struct viewport_interaction_info int32_t y; union { - rct_tile_element* tileElement; + TileElement* tileElement; rct_sprite* sprite; rct_peep* peep; rct_vehicle* vehicle; @@ -147,10 +147,10 @@ void viewport_set_visibility(uint8_t mode); void get_map_coordinates_from_pos( int32_t screenX, int32_t screenY, int32_t flags, int16_t* x, int16_t* y, int32_t* interactionType, - rct_tile_element** tileElement, rct_viewport** viewport); + TileElement** tileElement, rct_viewport** viewport); void get_map_coordinates_from_pos_window( rct_window* window, int32_t screenX, int32_t screenY, int32_t flags, int16_t* x, int16_t* y, int32_t* interactionType, - rct_tile_element** tileElement, rct_viewport** viewport); + TileElement** tileElement, rct_viewport** viewport); int32_t viewport_interaction_get_item_left(int32_t x, int32_t y, viewport_interaction_info* info); int32_t viewport_interaction_left_over(int32_t x, int32_t y); @@ -159,7 +159,7 @@ int32_t viewport_interaction_get_item_right(int32_t x, int32_t y, viewport_inter int32_t viewport_interaction_right_over(int32_t x, int32_t y); int32_t viewport_interaction_right_click(int32_t x, int32_t y); -void sub_68A15E(int32_t screenX, int32_t screenY, int16_t* x, int16_t* y, int32_t* direction, rct_tile_element** tileElement); +void sub_68A15E(int32_t screenX, int32_t screenY, int16_t* x, int16_t* y, int32_t* direction, TileElement** tileElement); void sub_68B2B7(paint_session* session, int32_t x, int32_t y); void viewport_invalidate(rct_viewport* viewport, int32_t left, int32_t top, int32_t right, int32_t bottom); diff --git a/src/openrct2/paint/Paint.cpp b/src/openrct2/paint/Paint.cpp index 495cfc3d66..30cac36e36 100644 --- a/src/openrct2/paint/Paint.cpp +++ b/src/openrct2/paint/Paint.cpp @@ -180,7 +180,7 @@ static paint_struct* sub_9819_c( ps->var_29 = 0; ps->map_x = session->MapPosition.x; ps->map_y = session->MapPosition.y; - ps->tileElement = (rct_tile_element*)session->CurrentlyDrawnItem; + ps->tileElement = (TileElement*)session->CurrentlyDrawnItem; return ps; } @@ -864,7 +864,7 @@ paint_struct* sub_98196C( ps->var_29 = 0; ps->map_x = session->MapPosition.x; ps->map_y = session->MapPosition.y; - ps->tileElement = (rct_tile_element*)session->CurrentlyDrawnItem; + ps->tileElement = (TileElement*)session->CurrentlyDrawnItem; session->UnkF1AD28 = ps; diff --git a/src/openrct2/paint/Paint.h b/src/openrct2/paint/Paint.h index fe2c51e03c..58307bad0d 100644 --- a/src/openrct2/paint/Paint.h +++ b/src/openrct2/paint/Paint.h @@ -14,7 +14,7 @@ #include "../interface/Colour.h" #include "../world/Location.hpp" -struct rct_tile_element; +struct TileElement; #pragma pack(push, 1) /* size 0x12 */ @@ -77,9 +77,9 @@ struct paint_struct uint8_t sprite_type; // 0x28 uint8_t var_29; uint16_t pad_2A; - uint16_t map_x; // 0x2C - uint16_t map_y; // 0x2E - rct_tile_element* tileElement; // 0x30 (or sprite pointer) + uint16_t map_x; // 0x2C + uint16_t map_y; // 0x2E + TileElement* tileElement; // 0x30 (or sprite pointer) }; #ifdef PLATFORM_32BIT // TODO: drop packing from this when all rendering is done. @@ -165,9 +165,9 @@ struct paint_session tunnel_entry RightTunnels[TUNNEL_MAX_COUNT]; uint8_t RightTunnelCount; uint8_t VerticalTunnelHeight; - const rct_tile_element* SurfaceElement; - rct_tile_element* PathElementOnSameHeight; - rct_tile_element* TrackElementOnSameHeight; + const TileElement* SurfaceElement; + TileElement* PathElementOnSameHeight; + TileElement* TrackElementOnSameHeight; bool DidPassSurface; uint8_t Unk141E9DB; uint16_t WaterHeight; diff --git a/src/openrct2/paint/VirtualFloor.cpp b/src/openrct2/paint/VirtualFloor.cpp index d73a0ef4f5..a4b2c84195 100644 --- a/src/openrct2/paint/VirtualFloor.cpp +++ b/src/openrct2/paint/VirtualFloor.cpp @@ -242,7 +242,7 @@ static void virtual_floor_get_tile_properties( // * Surfaces, which may put us underground // * Walls / banners, which are displayed as occupied edges // * Ghost objects, which are displayed as lit squares - rct_tile_element* tileElement = map_get_first_element_at(x >> 5, y >> 5); + TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5); do { int32_t elementType = tileElement->GetType(); diff --git a/src/openrct2/paint/tile_element/Paint.Banner.cpp b/src/openrct2/paint/tile_element/Paint.Banner.cpp index df16842555..b55a419b9e 100644 --- a/src/openrct2/paint/tile_element/Paint.Banner.cpp +++ b/src/openrct2/paint/tile_element/Paint.Banner.cpp @@ -31,7 +31,7 @@ const LocationXY16 BannerBoundBoxes[][2] = { * * rct2: 0x006B9CC4 */ -void banner_paint(paint_session* session, uint8_t direction, int32_t height, const rct_tile_element* tile_element) +void banner_paint(paint_session* session, uint8_t direction, int32_t height, const TileElement* tile_element) { uint16_t boundBoxOffsetX, boundBoxOffsetY, boundBoxOffsetZ; rct_drawpixelinfo* dpi = session->DPI; diff --git a/src/openrct2/paint/tile_element/Paint.Entrance.cpp b/src/openrct2/paint/tile_element/Paint.Entrance.cpp index 87733df724..21d5cb7177 100644 --- a/src/openrct2/paint/tile_element/Paint.Entrance.cpp +++ b/src/openrct2/paint/tile_element/Paint.Entrance.cpp @@ -27,8 +27,7 @@ static uint32_t _unk9E32BC; * * rct2: 0x0066508C, 0x00665540 */ -static void ride_entrance_exit_paint( - paint_session* session, uint8_t direction, int32_t height, const rct_tile_element* tile_element) +static void ride_entrance_exit_paint(paint_session* session, uint8_t direction, int32_t height, const TileElement* tile_element) { uint8_t is_exit = tile_element->AsEntrance()->GetEntranceType() == ENTRANCE_TYPE_RIDE_EXIT; @@ -207,7 +206,7 @@ static void ride_entrance_exit_paint( * * rct2: 0x006658ED */ -static void park_entrance_paint(paint_session* session, uint8_t direction, int32_t height, const rct_tile_element* tile_element) +static void park_entrance_paint(paint_session* session, uint8_t direction, int32_t height, const TileElement* tile_element) { if (gTrackDesignSaveMode || (gCurrentViewportFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES)) return; @@ -327,7 +326,7 @@ static void park_entrance_paint(paint_session* session, uint8_t direction, int32 * * rct2: 0x00664FD4 */ -void entrance_paint(paint_session* session, uint8_t direction, int32_t height, const rct_tile_element* tile_element) +void entrance_paint(paint_session* session, uint8_t direction, int32_t height, const TileElement* tile_element) { session->InteractionType = VIEWPORT_INTERACTION_ITEM_LABEL; diff --git a/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp b/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp index 9eb12b2e2c..571f318212 100644 --- a/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp +++ b/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp @@ -25,7 +25,7 @@ // 6B8172: static void large_scenery_paint_supports( - paint_session* session, uint8_t direction, uint16_t height, const rct_tile_element* tileElement, uint32_t dword_F4387C, + paint_session* session, uint8_t direction, uint16_t height, const TileElement* tileElement, uint32_t dword_F4387C, rct_large_scenery_tile* tile) { if (tile->flags & LARGE_SCENERY_TILE_FLAG_NO_SUPPORTS) @@ -218,7 +218,7 @@ static constexpr const boundbox s98E3C4[] = { * * rct2: 0x006B7F0C */ -void large_scenery_paint(paint_session* session, uint8_t direction, uint16_t height, const rct_tile_element* tileElement) +void large_scenery_paint(paint_session* session, uint8_t direction, uint16_t height, const TileElement* tileElement) { if (gCurrentViewportFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES) { diff --git a/src/openrct2/paint/tile_element/Paint.Path.cpp b/src/openrct2/paint/tile_element/Paint.Path.cpp index 7589496c00..e156c3232c 100644 --- a/src/openrct2/paint/tile_element/Paint.Path.cpp +++ b/src/openrct2/paint/tile_element/Paint.Path.cpp @@ -78,15 +78,15 @@ static constexpr const uint8_t byte_98D8A4[] = { // clang-format on void path_paint_box_support( - paint_session* session, const rct_tile_element* tileElement, int32_t height, rct_footpath_entry* footpathEntry, - bool hasFences, uint32_t imageFlags, uint32_t sceneryImageFlags); + paint_session* session, const TileElement* tileElement, int32_t height, rct_footpath_entry* footpathEntry, bool hasFences, + uint32_t imageFlags, uint32_t sceneryImageFlags); void path_paint_pole_support( - paint_session* session, const rct_tile_element* tileElement, int16_t height, rct_footpath_entry* footpathEntry, - bool hasFences, uint32_t imageFlags, uint32_t sceneryImageFlags); + paint_session* session, const TileElement* tileElement, int16_t height, rct_footpath_entry* footpathEntry, bool hasFences, + uint32_t imageFlags, uint32_t sceneryImageFlags); /* rct2: 0x006A5AE5 */ static void path_bit_lights_paint( - paint_session* session, rct_scenery_entry* pathBitEntry, const rct_tile_element* tileElement, int32_t height, uint8_t edges, + paint_session* session, rct_scenery_entry* pathBitEntry, const TileElement* tileElement, int32_t height, uint8_t edges, uint32_t pathBitImageFlags) { if (tileElement->AsPath()->IsSloped()) @@ -144,7 +144,7 @@ static void path_bit_lights_paint( /* rct2: 0x006A5C94 */ static void path_bit_bins_paint( - paint_session* session, rct_scenery_entry* pathBitEntry, const rct_tile_element* tileElement, int32_t height, uint8_t edges, + paint_session* session, rct_scenery_entry* pathBitEntry, const TileElement* tileElement, int32_t height, uint8_t edges, uint32_t pathBitImageFlags) { if (tileElement->AsPath()->IsSloped()) @@ -243,7 +243,7 @@ static void path_bit_bins_paint( /* rct2: 0x006A5E81 */ static void path_bit_benches_paint( - paint_session* session, rct_scenery_entry* pathBitEntry, const rct_tile_element* tileElement, int32_t height, uint8_t edges, + paint_session* session, rct_scenery_entry* pathBitEntry, const TileElement* tileElement, int32_t height, uint8_t edges, uint32_t pathBitImageFlags) { uint32_t imageId; @@ -317,7 +317,7 @@ static void path_bit_jumping_fountains_paint( * @param tile_element (esi) */ static void sub_6A4101( - paint_session* session, const rct_tile_element* tile_element, uint16_t height, uint32_t ebp, bool word_F3F038, + paint_session* session, const TileElement* tile_element, uint16_t height, uint32_t ebp, bool word_F3F038, rct_footpath_entry* footpathEntry, uint32_t base_image_id, uint32_t imageFlags) { if (tile_element->AsPath()->IsQueue()) @@ -662,7 +662,7 @@ static void sub_6A4101( * @param sceneryImageFlags (0x00F3EF74) */ static void sub_6A3F61( - paint_session* session, const rct_tile_element* tile_element, uint16_t connectedEdges, uint16_t height, + paint_session* session, const TileElement* tile_element, uint16_t connectedEdges, uint16_t height, rct_footpath_entry* footpathEntry, uint32_t imageFlags, uint32_t sceneryImageFlags, bool word_F3F038) { // eax -- @@ -786,7 +786,7 @@ static void sub_6A3F61( /** * rct2: 0x0006A3590 */ -void path_paint(paint_session* session, uint16_t height, const rct_tile_element* tile_element) +void path_paint(paint_session* session, uint16_t height, const TileElement* tile_element) { session->InteractionType = VIEWPORT_INTERACTION_ITEM_FOOTPATH; @@ -842,7 +842,7 @@ void path_paint(paint_session* session, uint16_t height, const rct_tile_element* int16_t x = session->MapPosition.x, y = session->MapPosition.y; - rct_tile_element* surface = map_get_surface_element_at({ session->MapPosition.x, session->MapPosition.y }); + TileElement* surface = map_get_surface_element_at({ session->MapPosition.x, session->MapPosition.y }); uint16_t bl = height / 8; if (surface == nullptr) @@ -969,8 +969,8 @@ void path_paint(paint_session* session, uint16_t height, const rct_tile_element* } void path_paint_box_support( - paint_session* session, const rct_tile_element* tileElement, int32_t height, rct_footpath_entry* footpathEntry, - bool hasFences, uint32_t imageFlags, uint32_t sceneryImageFlags) + paint_session* session, const TileElement* tileElement, int32_t height, rct_footpath_entry* footpathEntry, bool hasFences, + uint32_t imageFlags, uint32_t sceneryImageFlags) { PathElement* pathElement = tileElement->AsPath(); @@ -1122,8 +1122,8 @@ void path_paint_box_support( } void path_paint_pole_support( - paint_session* session, const rct_tile_element* tileElement, int16_t height, rct_footpath_entry* footpathEntry, - bool hasFences, uint32_t imageFlags, uint32_t sceneryImageFlags) + paint_session* session, const TileElement* tileElement, int16_t height, rct_footpath_entry* footpathEntry, bool hasFences, + uint32_t imageFlags, uint32_t sceneryImageFlags) { PathElement* pathElement = tileElement->AsPath(); diff --git a/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp b/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp index 5d9515c1cd..aa391209b0 100644 --- a/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp +++ b/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp @@ -30,7 +30,7 @@ static constexpr const LocationXY16 lengths[] = { * * rct2: 0x006DFF47 */ -void scenery_paint(paint_session* session, uint8_t direction, int32_t height, const rct_tile_element* tileElement) +void scenery_paint(paint_session* session, uint8_t direction, int32_t height, const TileElement* tileElement) { if (gCurrentViewportFlags & VIEWPORT_FLAG_HIGHLIGHT_PATH_ISSUES) { diff --git a/src/openrct2/paint/tile_element/Paint.Surface.cpp b/src/openrct2/paint/tile_element/Paint.Surface.cpp index 7e2ba72b54..3b1f997969 100644 --- a/src/openrct2/paint/tile_element/Paint.Surface.cpp +++ b/src/openrct2/paint/tile_element/Paint.Surface.cpp @@ -420,7 +420,7 @@ static constexpr const uint32_t dword_97B898[][2] = struct tile_descriptor { TileCoordsXY tile_coords; - const rct_tile_element * tile_element; + const TileElement * tile_element; uint8_t terrain; uint8_t slope; corner_height corner_heights; @@ -505,7 +505,7 @@ static uint32_t get_tunnel_image(uint8_t index, uint8_t type) return _terrainEdgeTunnelSpriteIds[index][type]; } -static uint8_t viewport_surface_paint_setup_get_relative_slope(const rct_tile_element* tileElement, int32_t rotation) +static uint8_t viewport_surface_paint_setup_get_relative_slope(const TileElement* tileElement, int32_t rotation) { const uint8_t slope = tileElement->AsSurface()->GetSlope(); const uint8_t slopeHeight = slope & TILE_ELEMENT_SLOPE_DOUBLE_HEIGHT; @@ -1010,7 +1010,7 @@ static void viewport_surface_draw_water_side_top( /** * rct2: 0x0066062C */ -void surface_paint(paint_session* session, uint8_t direction, uint16_t height, const rct_tile_element* tileElement) +void surface_paint(paint_session* session, uint8_t direction, uint16_t height, const TileElement* tileElement) { rct_drawpixelinfo* dpi = session->DPI; session->InteractionType = VIEWPORT_INTERACTION_ITEM_TERRAIN; @@ -1056,7 +1056,7 @@ void surface_paint(paint_session* session, uint8_t direction, uint16_t height, c continue; } - rct_tile_element* surfaceElement = map_get_surface_element_at(position); + TileElement* surfaceElement = map_get_surface_element_at(position); if (surfaceElement == nullptr) { continue; diff --git a/src/openrct2/paint/tile_element/Paint.TileElement.cpp b/src/openrct2/paint/tile_element/Paint.TileElement.cpp index 16449dacae..843acba813 100644 --- a/src/openrct2/paint/tile_element/Paint.TileElement.cpp +++ b/src/openrct2/paint/tile_element/Paint.TileElement.cpp @@ -154,7 +154,7 @@ static void sub_68B3FB(paint_session* session, int32_t x, int32_t y) session->MapPosition.x = x; session->MapPosition.y = y; - rct_tile_element* tile_element = map_get_first_element_at(x >> 5, y >> 5); + TileElement* tile_element = map_get_first_element_at(x >> 5, y >> 5); uint8_t rotation = session->CurrentRotation; bool partOfVirtualFloor = false; @@ -206,7 +206,7 @@ static void sub_68B3FB(paint_session* session, int32_t x, int32_t y) if (bx <= dpi->y) return; - const rct_tile_element* element = tile_element; // push tile_element + const TileElement* element = tile_element; // push tile_element uint16_t max_height = 0; do @@ -258,7 +258,7 @@ static void sub_68B3FB(paint_session* session, int32_t x, int32_t y) previousHeight = height; session->PathElementOnSameHeight = nullptr; session->TrackElementOnSameHeight = nullptr; - rct_tile_element* tile_element_sub_iterator = tile_element; + TileElement* tile_element_sub_iterator = tile_element; while (!(tile_element_sub_iterator++)->IsLastForTile()) { if (tile_element_sub_iterator->base_height != tile_element->base_height) diff --git a/src/openrct2/paint/tile_element/Paint.TileElement.h b/src/openrct2/paint/tile_element/Paint.TileElement.h index 523e002048..97628c70a1 100644 --- a/src/openrct2/paint/tile_element/Paint.TileElement.h +++ b/src/openrct2/paint/tile_element/Paint.TileElement.h @@ -100,13 +100,13 @@ uint16_t paint_util_rotate_segments(uint16_t segments, uint8_t rotation); void tile_element_paint_setup(paint_session* session, int32_t x, int32_t y); -void entrance_paint(paint_session* session, uint8_t direction, int32_t height, const rct_tile_element* tile_element); -void banner_paint(paint_session* session, uint8_t direction, int32_t height, const rct_tile_element* tile_element); -void surface_paint(paint_session* session, uint8_t direction, uint16_t height, const rct_tile_element* tileElement); -void path_paint(paint_session* session, uint16_t height, const rct_tile_element* tileElement); -void scenery_paint(paint_session* session, uint8_t direction, int32_t height, const rct_tile_element* tileElement); -void fence_paint(paint_session* session, uint8_t direction, int32_t height, const rct_tile_element* tileElement); -void large_scenery_paint(paint_session* session, uint8_t direction, uint16_t height, const rct_tile_element* tileElement); -void track_paint(paint_session* session, uint8_t direction, int32_t height, const rct_tile_element* tileElement); +void entrance_paint(paint_session* session, uint8_t direction, int32_t height, const TileElement* tile_element); +void banner_paint(paint_session* session, uint8_t direction, int32_t height, const TileElement* tile_element); +void surface_paint(paint_session* session, uint8_t direction, uint16_t height, const TileElement* tileElement); +void path_paint(paint_session* session, uint16_t height, const TileElement* tileElement); +void scenery_paint(paint_session* session, uint8_t direction, int32_t height, const TileElement* tileElement); +void fence_paint(paint_session* session, uint8_t direction, int32_t height, const TileElement* tileElement); +void large_scenery_paint(paint_session* session, uint8_t direction, uint16_t height, const TileElement* tileElement); +void track_paint(paint_session* session, uint8_t direction, int32_t height, const TileElement* tileElement); #endif diff --git a/src/openrct2/paint/tile_element/Paint.Wall.cpp b/src/openrct2/paint/tile_element/Paint.Wall.cpp index 0a83a93c3f..2b369ebd18 100644 --- a/src/openrct2/paint/tile_element/Paint.Wall.cpp +++ b/src/openrct2/paint/tile_element/Paint.Wall.cpp @@ -154,7 +154,7 @@ static void fence_paint_wall( * @param height (dx) * @param tile_element (esi) */ -void fence_paint(paint_session* session, uint8_t direction, int32_t height, const rct_tile_element* tile_element) +void fence_paint(paint_session* session, uint8_t direction, int32_t height, const TileElement* tile_element) { session->InteractionType = VIEWPORT_INTERACTION_ITEM_WALL; diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp index 45e584e5d2..b8f50772fa 100644 --- a/src/openrct2/peep/Guest.cpp +++ b/src/openrct2/peep/Guest.cpp @@ -367,7 +367,7 @@ static void peep_decide_whether_to_leave_park(rct_peep* peep); static void peep_leave_park(rct_peep* peep); static void peep_head_for_nearest_ride_type(rct_peep* peep, int32_t rideType); static void peep_head_for_nearest_ride_with_flags(rct_peep* peep, int32_t rideTypeFlags); -bool loc_690FD0(rct_peep* peep, uint8_t* rideToView, uint8_t* rideSeatToView, rct_tile_element* tileElement); +bool loc_690FD0(rct_peep* peep, uint8_t* rideToView, uint8_t* rideSeatToView, TileElement* tileElement); void rct_peep::Tick128UpdateGuest(int32_t index) { @@ -630,7 +630,7 @@ void rct_peep::Tick128UpdateGuest(int32_t index) { /* Peep happiness is affected once the peep has been waiting * too long in a queue. */ - rct_tile_element* tileElement = map_get_first_element_at(next_x / 32, next_y / 32); + TileElement* tileElement = map_get_first_element_at(next_x / 32, next_y / 32); bool found = false; do { @@ -1617,7 +1617,7 @@ void rct_peep::PickRideToGoOn() { if (tileX >= 0 && tileY >= 0 && tileX < (256 * 32) && tileY < (256 * 32)) { - rct_tile_element* tileElement = map_get_first_element_at(tileX >> 5, tileY >> 5); + TileElement* tileElement = map_get_first_element_at(tileX >> 5, tileY >> 5); do { if (tileElement->GetType() != TILE_ELEMENT_TYPE_TRACK) @@ -2707,7 +2707,7 @@ static uint8_t peep_assess_surroundings(int16_t centre_x, int16_t centre_y, int1 { for (int16_t y = initial_y; y < final_y; y += 32) { - rct_tile_element* tileElement = map_get_first_element_at(x / 32, y / 32); + TileElement* tileElement = map_get_first_element_at(x / 32, y / 32); do { @@ -2950,7 +2950,7 @@ static void peep_head_for_nearest_ride_type(rct_peep* peep, int32_t rideType) { if (x >= 0 && y >= 0 && x < (256 * 32) && y < (256 * 32)) { - rct_tile_element* tileElement = map_get_first_element_at(x >> 5, y >> 5); + TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5); do { if (tileElement->GetType() != TILE_ELEMENT_TYPE_TRACK) @@ -3079,7 +3079,7 @@ static void peep_head_for_nearest_ride_with_flags(rct_peep* peep, int32_t rideTy { if (x >= 0 && y >= 0 && x < (256 * 32) && y < (256 * 32)) { - rct_tile_element* tileElement = map_get_first_element_at(x >> 5, y >> 5); + TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5); do { if (tileElement->GetType() != TILE_ELEMENT_TYPE_TRACK) @@ -3460,7 +3460,7 @@ static void peep_update_ride_leave_entrance_spiral_slide(rct_peep* peep, Ride* r entrance_loc.x = ride->station_starts[peep->current_ride_station].x * 32; entrance_loc.y = ride->station_starts[peep->current_ride_station].y * 32; - rct_tile_element* tile_element = ride_get_station_start_track_element(ride, peep->current_ride_station); + TileElement* tile_element = ride_get_station_start_track_element(ride, peep->current_ride_station); uint8_t direction_track = (tile_element == nullptr ? 0 : tile_element->GetDirection()); @@ -3516,7 +3516,7 @@ static void peep_update_ride_leave_entrance_waypoints(rct_peep* peep, Ride* ride waypoint.x = ride->station_starts[peep->current_ride_station].x * 32 + 16; waypoint.y = ride->station_starts[peep->current_ride_station].y * 32 + 16; - rct_tile_element* tile_element = ride_get_station_start_track_element(ride, peep->current_ride_station); + TileElement* tile_element = ride_get_station_start_track_element(ride, peep->current_ride_station); uint8_t direction_track = (tile_element == nullptr ? 0 : tile_element->GetDirection()); @@ -4036,7 +4036,7 @@ void rct_peep::UpdateRideLeaveVehicle() if (trackType == TRACK_ELEM_FLAT || trackType > TRACK_ELEM_MIDDLE_STATION) continue; - rct_tile_element* inner_map = map_get_first_element_at(vehicle->track_x / 32, vehicle->track_y / 32); + TileElement* inner_map = map_get_first_element_at(vehicle->track_x / 32, vehicle->track_y / 32); for (;; inner_map++) { if (inner_map->GetType() != TILE_ELEMENT_TYPE_TRACK) @@ -4122,7 +4122,7 @@ void rct_peep::UpdateRideLeaveVehicle() waypointLoc.x = ride->station_starts[current_ride_station].x * 32 + 16; waypointLoc.y = ride->station_starts[current_ride_station].y * 32 + 16; - rct_tile_element* trackElement = ride_get_station_start_track_element(ride, current_ride_station); + TileElement* trackElement = ride_get_station_start_track_element(ride, current_ride_station); uint8_t station_direction = (trackElement == nullptr ? 0 : trackElement->GetDirection()); @@ -4745,7 +4745,7 @@ void rct_peep::UpdateRideMazePathfinding() int16_t stationHeight = ride->station_heights[0]; // Find the station track element - rct_tile_element* tileElement = map_get_first_element_at(actionX / 32, actionY / 32); + TileElement* tileElement = map_get_first_element_at(actionX / 32, actionY / 32); do { if (tileElement->GetType() == TILE_ELEMENT_TYPE_TRACK && stationHeight == tileElement->base_height) @@ -4907,7 +4907,7 @@ void rct_peep::UpdateRideLeaveExit() actionY = y & 0xFFE0; // Find the station track element - rct_tile_element* tileElement = map_get_first_element_at(actionX / 32, actionY / 32); + TileElement* tileElement = map_get_first_element_at(actionX / 32, actionY / 32); do { if (tileElement->GetType() != TILE_ELEMENT_TYPE_PATH) @@ -5251,7 +5251,7 @@ void rct_peep::UpdateWalking() if (GetNextIsSurface()) { - rct_tile_element* tile_element = map_get_surface_element_at({ next_x, next_y }); + TileElement* tile_element = map_get_surface_element_at({ next_x, next_y }); int32_t water_height = tile_element->AsSurface()->GetWaterHeight(); if (water_height) @@ -5301,7 +5301,7 @@ void rct_peep::UpdateWalking() if (GetNextIsSurface() || GetNextIsSloped()) return; - rct_tile_element* tileElement = map_get_first_element_at(next_x / 32, next_y / 32); + TileElement* tileElement = map_get_first_element_at(next_x / 32, next_y / 32); for (;; tileElement++) { @@ -5734,7 +5734,7 @@ void rct_peep::UpdateUsingBin() return; } - rct_tile_element* tileElement = map_get_first_element_at(next_x / 32, next_y / 32); + TileElement* tileElement = map_get_first_element_at(next_x / 32, next_y / 32); for (;; tileElement++) { @@ -5907,7 +5907,7 @@ bool rct_peep::UpdateWalkingFindBench() if (!ShouldFindBench()) return false; - rct_tile_element* tileElement = map_get_first_element_at(next_x / 32, next_y / 32); + TileElement* tileElement = map_get_first_element_at(next_x / 32, next_y / 32); for (;; tileElement++) { @@ -6002,7 +6002,7 @@ bool rct_peep::UpdateWalkingFindBin() if (peep->GetNextIsSurface()) return false; - rct_tile_element* tileElement = map_get_first_element_at(peep->next_x / 32, peep->next_y / 32); + TileElement* tileElement = map_get_first_element_at(peep->next_x / 32, peep->next_y / 32); for (;; tileElement++) { @@ -6103,7 +6103,7 @@ static void peep_update_walking_break_scenery(rct_peep* peep) if (peep->GetNextIsSurface()) return; - rct_tile_element* tileElement = map_get_first_element_at(peep->next_x / 32, peep->next_y / 32); + TileElement* tileElement = map_get_first_element_at(peep->next_x / 32, peep->next_y / 32); for (;; tileElement++) { @@ -6181,7 +6181,7 @@ static void peep_update_walking_break_scenery(rct_peep* peep) * * @return (CF) */ -static bool peep_should_watch_ride(rct_tile_element* tileElement) +static bool peep_should_watch_ride(TileElement* tileElement) { Ride* ride = get_ride(tileElement->AsTrack()->GetRideIndex()); @@ -6236,7 +6236,7 @@ static bool peep_should_watch_ride(rct_tile_element* tileElement) return true; } -bool loc_690FD0(rct_peep* peep, uint8_t* rideToView, uint8_t* rideSeatToView, rct_tile_element* tileElement) +bool loc_690FD0(rct_peep* peep, uint8_t* rideToView, uint8_t* rideSeatToView, TileElement* tileElement) { Ride* ride = get_ride(tileElement->AsTrack()->GetRideIndex()); @@ -6283,7 +6283,7 @@ bool loc_690FD0(rct_peep* peep, uint8_t* rideToView, uint8_t* rideSeatToView, rc */ static bool peep_find_ride_to_look_at(rct_peep* peep, uint8_t edge, uint8_t* rideToView, uint8_t* rideSeatToView) { - rct_tile_element *tileElement, *surfaceElement; + TileElement *tileElement, *surfaceElement; surfaceElement = map_get_surface_element_at({ peep->next_x, peep->next_y }); @@ -6722,7 +6722,7 @@ void rct_peep::UpdateSpriteType() { if ((x & 0xFFE0) < 0x1FFF && (y & 0xFFE0) < 0x1FFF) { - rct_tile_element* tileElement = map_get_first_element_at(x / 32, y / 32); + TileElement* tileElement = map_get_first_element_at(x / 32, y / 32); while (true) { if ((z / 8) < tileElement->base_height) diff --git a/src/openrct2/peep/GuestPathfinding.cpp b/src/openrct2/peep/GuestPathfinding.cpp index 9df537e48a..64f67cce45 100644 --- a/src/openrct2/peep/GuestPathfinding.cpp +++ b/src/openrct2/peep/GuestPathfinding.cpp @@ -52,14 +52,14 @@ enum PATH_SEARCH_FAILED }; -static rct_tile_element* get_banner_on_path(rct_tile_element* path_element) +static TileElement* get_banner_on_path(TileElement* path_element) { // This is an improved version of original. // That only checked for one fence in the way. if (path_element->IsLastForTile()) return nullptr; - rct_tile_element* bannerElement = path_element + 1; + TileElement* bannerElement = path_element + 1; do { // Path on top, so no banners @@ -77,11 +77,11 @@ static rct_tile_element* get_banner_on_path(rct_tile_element* path_element) return nullptr; } -static int32_t banner_clear_path_edges(rct_tile_element* tileElement, int32_t edges) +static int32_t banner_clear_path_edges(TileElement* tileElement, int32_t edges) { if (_peepPathFindIsStaff) return edges; - rct_tile_element* bannerElement = get_banner_on_path(tileElement); + TileElement* bannerElement = get_banner_on_path(tileElement); if (bannerElement != nullptr) { do @@ -95,7 +95,7 @@ static int32_t banner_clear_path_edges(rct_tile_element* tileElement, int32_t ed /** * Gets the connected edges of a path that are permitted (i.e. no 'no entry' signs) */ -static int32_t path_get_permitted_edges(rct_tile_element* tileElement) +static int32_t path_get_permitted_edges(TileElement* tileElement) { return banner_clear_path_edges(tileElement, tileElement->AsPath()->GetEdgesAndCorners()) & 0x0F; } @@ -222,9 +222,9 @@ static int32_t guest_surface_path_finding(rct_peep* peep) * Returns the type of the next footpath tile a peep can get to from x,y,z / * inputTileElement in the given direction. */ -static uint8_t footpath_element_next_in_direction(TileCoordsXYZ loc, rct_tile_element* tileElement, uint8_t chosenDirection) +static uint8_t footpath_element_next_in_direction(TileCoordsXYZ loc, TileElement* tileElement, uint8_t chosenDirection) { - rct_tile_element* nextTileElement; + TileElement* nextTileElement; if (tileElement->AsPath()->IsSloped()) { @@ -275,10 +275,10 @@ static uint8_t footpath_element_next_in_direction(TileCoordsXYZ loc, rct_tile_el * This is the recursive portion of footpath_element_destination_in_direction(). */ static uint8_t footpath_element_dest_in_dir( - TileCoordsXYZ loc, [[maybe_unused]] rct_tile_element* inputTileElement, uint8_t chosenDirection, uint8_t* outRideIndex, + TileCoordsXYZ loc, [[maybe_unused]] TileElement* inputTileElement, uint8_t chosenDirection, uint8_t* outRideIndex, int32_t level) { - rct_tile_element* tileElement; + TileElement* tileElement; int32_t direction; if (level > 25) @@ -394,7 +394,7 @@ static uint8_t footpath_element_dest_in_dir( * width path, for example that leads from a ride exit back to the main path. */ static uint8_t footpath_element_destination_in_direction( - TileCoordsXYZ loc, rct_tile_element* inputTileElement, uint8_t chosenDirection, uint8_t* outRideIndex) + TileCoordsXYZ loc, TileElement* inputTileElement, uint8_t chosenDirection, uint8_t* outRideIndex) { if (inputTileElement->AsPath()->IsSloped()) { @@ -473,7 +473,7 @@ static uint8_t peep_pathfind_get_max_number_junctions(rct_peep* peep) * since entrances and ride queues coming off a path should not result in * the path being considered a junction. */ -static bool path_is_thin_junction(rct_tile_element* path, TileCoordsXYZ loc) +static bool path_is_thin_junction(TileElement* path, TileCoordsXYZ loc) { uint8_t edges = path->AsPath()->GetEdges(); @@ -582,9 +582,9 @@ static bool path_is_thin_junction(rct_tile_element* path, TileCoordsXYZ loc) * rct2: 0x0069A997 */ static void peep_pathfind_heuristic_search( - TileCoordsXYZ loc, rct_peep* peep, rct_tile_element* currentTileElement, bool inPatrolArea, uint8_t counter, - uint16_t* endScore, int32_t test_edge, uint8_t* endJunctions, TileCoordsXYZ junctionList[16], uint8_t directionList[16], - TileCoordsXYZ* endXYZ, uint8_t* endSteps) + TileCoordsXYZ loc, rct_peep* peep, TileElement* currentTileElement, bool inPatrolArea, uint8_t counter, uint16_t* endScore, + int32_t test_edge, uint8_t* endJunctions, TileCoordsXYZ junctionList[16], uint8_t directionList[16], TileCoordsXYZ* endXYZ, + uint8_t* endSteps) { uint8_t searchResult = PATH_SEARCH_FAILED; @@ -633,7 +633,7 @@ static void peep_pathfind_heuristic_search( /* Get the next map element of interest in the direction of test_edge. */ bool found = false; - rct_tile_element* tileElement = map_get_first_element_at(loc.x, loc.y); + TileElement* tileElement = map_get_first_element_at(loc.x, loc.y); if (tileElement == nullptr) { return; @@ -1184,7 +1184,7 @@ int32_t peep_pathfind_choose_direction(TileCoordsXYZ loc, rct_peep* peep) #endif // defined(DEBUG_LEVEL_1) && DEBUG_LEVEL_1 // Get the path element at this location - rct_tile_element* dest_tile_element = map_get_first_element_at(loc.x, loc.y); + TileElement* dest_tile_element = map_get_first_element_at(loc.x, loc.y); /* Where there are multiple matching map elements placed with zero * clearance, save the first one for later use to determine the path * slope - this maintains the original behaviour (which only processes @@ -1200,7 +1200,7 @@ int32_t peep_pathfind_choose_direction(TileCoordsXYZ loc, rct_peep* peep) * EXPECT to experience path finding irregularities due to those paths! * In particular common edges at different heights will not work * in a useful way. Simply do not do it! :-) */ - rct_tile_element* first_tile_element = nullptr; + TileElement* first_tile_element = nullptr; bool found = false; uint8_t permitted_edges = 0; @@ -1562,7 +1562,7 @@ static uint8_t get_nearest_park_entrance_index(uint16_t x, uint16_t y) * * rct2: 0x006952C0 */ -static int32_t guest_path_find_entering_park(rct_peep* peep, [[maybe_unused]] rct_tile_element* tile_element, uint8_t edges) +static int32_t guest_path_find_entering_park(rct_peep* peep, [[maybe_unused]] TileElement* tile_element, uint8_t edges) { // Send peeps to the nearest park entrance. uint8_t chosenEntrance = get_nearest_park_entrance_index(peep->next_x, peep->next_y); @@ -1617,7 +1617,7 @@ static uint8_t get_nearest_peep_spawn_index(uint16_t x, uint16_t y) * * rct2: 0x0069536C */ -static int32_t guest_path_find_leaving_park(rct_peep* peep, [[maybe_unused]] rct_tile_element* tile_element, uint8_t edges) +static int32_t guest_path_find_leaving_park(rct_peep* peep, [[maybe_unused]] TileElement* tile_element, uint8_t edges) { // Send peeps to the nearest spawn point. uint8_t chosenSpawn = get_nearest_peep_spawn_index(peep->next_x, peep->next_y); @@ -1652,7 +1652,7 @@ static int32_t guest_path_find_leaving_park(rct_peep* peep, [[maybe_unused]] rct * * rct2: 0x00695161 */ -static int32_t guest_path_find_park_entrance(rct_peep* peep, [[maybe_unused]] rct_tile_element* tile_element, uint8_t edges) +static int32_t guest_path_find_park_entrance(rct_peep* peep, [[maybe_unused]] TileElement* tile_element, uint8_t edges) { uint8_t entranceNum; @@ -1725,7 +1725,7 @@ static int32_t guest_path_find_park_entrance(rct_peep* peep, [[maybe_unused]] rc static void get_ride_queue_end(TileCoordsXYZ& loc) { TileCoordsXY queueEnd = { 0, 0 }; - rct_tile_element* tileElement = map_get_first_element_at(loc.x, loc.y); + TileElement* tileElement = map_get_first_element_at(loc.x, loc.y); if (tileElement == nullptr) { @@ -1749,8 +1749,8 @@ static void get_ride_queue_end(TileCoordsXYZ& loc) return; uint8_t direction = tileElement->GetDirectionWithOffset(2); - rct_tile_element* lastPathElement = nullptr; - rct_tile_element* firstPathElement = nullptr; + TileElement* lastPathElement = nullptr; + TileElement* firstPathElement = nullptr; int16_t baseZ = tileElement->base_height; TileCoordsXY nextTile = { loc.x, loc.y }; @@ -1878,7 +1878,7 @@ int32_t guest_path_finding(rct_peep* peep) TileCoordsXYZ loc = { peep->next_x / 32, peep->next_y / 32, peep->next_z }; - rct_tile_element* tileElement = map_get_path_element_at(loc.x, loc.y, loc.z); + TileElement* tileElement = map_get_path_element_at(loc.x, loc.y, loc.z); if (tileElement == nullptr) { return 1; diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index bcc6c10841..dc85b87707 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -74,7 +74,7 @@ uint8_t gPeepPathFindQueueRideIndex; // uint32_t gPeepPathFindAltStationNum; static uint8_t _unk_F1AEF0; -static rct_tile_element* _peepRideEntranceExitElement; +static TileElement* _peepRideEntranceExitElement; static void* _crowdSoundChannel = nullptr; @@ -484,7 +484,7 @@ bool rct_peep::CheckForPath() return true; } - rct_tile_element* tile_element = map_get_first_element_at(next_x / 32, next_y / 32); + TileElement* tile_element = map_get_first_element_at(next_x / 32, next_y / 32); uint8_t map_type = TILE_ELEMENT_TYPE_PATH; if (GetNextIsSurface()) @@ -774,7 +774,7 @@ void rct_peep::PickupAbort(int32_t old_x) // Returns true when a peep can be dropped at the given location. When apply is set to true the peep gets dropped. bool rct_peep::Place(TileCoordsXYZ location, bool apply) { - rct_tile_element* tileElement = map_get_path_element_at(location.x, location.y, location.z); + TileElement* tileElement = map_get_path_element_at(location.x, location.y, location.z); if (!tileElement) { @@ -1010,8 +1010,8 @@ void rct_peep::UpdateFalling() } // If not drowning then falling. Note: peeps 'fall' after leaving a ride/enter the park. - rct_tile_element* tile_element = map_get_first_element_at(x / 32, y / 32); - rct_tile_element* saved_map = nullptr; + TileElement* tile_element = map_get_first_element_at(x / 32, y / 32); + TileElement* saved_map = nullptr; int32_t saved_height = 0; if (tile_element != nullptr) @@ -2425,7 +2425,7 @@ static void peep_return_to_centre_of_tile(rct_peep* peep) * rct2: 0x00693f2C */ static void peep_interact_with_entrance( - rct_peep* peep, int16_t x, int16_t y, rct_tile_element* tile_element, uint8_t& pathing_result) + rct_peep* peep, int16_t x, int16_t y, TileElement* tile_element, uint8_t& pathing_result) { uint8_t entranceType = tile_element->AsEntrance()->GetEntranceType(); uint8_t rideIndex = tile_element->AsEntrance()->GetRideIndex(); @@ -2623,7 +2623,7 @@ static void peep_interact_with_entrance( // Make sure there is a path right behind the entrance, otherwise turn around bool found = false; - rct_tile_element* nextTileElement = map_get_first_element_at(next_x / 32, next_y / 32); + TileElement* nextTileElement = map_get_first_element_at(next_x / 32, next_y / 32); do { if (nextTileElement->GetType() != TILE_ELEMENT_TYPE_PATH) @@ -2726,7 +2726,7 @@ static void peep_interact_with_entrance( * * rct2: 0x006946D8 */ -static void peep_footpath_move_forward(rct_peep* peep, int16_t x, int16_t y, rct_tile_element* tile_element, bool vandalism) +static void peep_footpath_move_forward(rct_peep* peep, int16_t x, int16_t y, TileElement* tile_element, bool vandalism) { peep->next_x = (x & 0xFFE0); peep->next_y = (y & 0xFFE0); @@ -2872,7 +2872,7 @@ static void peep_footpath_move_forward(rct_peep* peep, int16_t x, int16_t y, rct * * rct2: 0x0069455E */ -static void peep_interact_with_path(rct_peep* peep, int16_t x, int16_t y, rct_tile_element* tile_element) +static void peep_interact_with_path(rct_peep* peep, int16_t x, int16_t y, TileElement* tile_element) { // 0x00F1AEE2 bool vandalism_present = false; @@ -2998,7 +2998,7 @@ static void peep_interact_with_path(rct_peep* peep, int16_t x, int16_t y, rct_ti * * rct2: 0x00693F70 */ -static bool peep_interact_with_shop(rct_peep* peep, int16_t x, int16_t y, rct_tile_element* tile_element) +static bool peep_interact_with_shop(rct_peep* peep, int16_t x, int16_t y, TileElement* tile_element) { uint8_t rideIndex = tile_element->AsTrack()->GetRideIndex(); Ride* ride = get_ride(rideIndex); @@ -3089,7 +3089,7 @@ static bool peep_interact_with_shop(rct_peep* peep, int16_t x, int16_t y, rct_ti return true; } -bool is_valid_path_z_and_direction(rct_tile_element* tileElement, int32_t currentZ, int32_t currentDirection) +bool is_valid_path_z_and_direction(TileElement* tileElement, int32_t currentZ, int32_t currentDirection) { if (tileElement->AsPath()->IsSloped()) { @@ -3118,7 +3118,7 @@ bool is_valid_path_z_and_direction(rct_tile_element* tileElement, int32_t curren void rct_peep::PerformNextAction(uint8_t& pathing_result) { - rct_tile_element* tmpTile; + TileElement* tmpTile; PerformNextAction(pathing_result, tmpTile); } @@ -3126,7 +3126,7 @@ void rct_peep::PerformNextAction(uint8_t& pathing_result) * * rct2: 0x00693C9E */ -void rct_peep::PerformNextAction(uint8_t& pathing_result, rct_tile_element*& tile_result) +void rct_peep::PerformNextAction(uint8_t& pathing_result, TileElement*& tile_result) { pathing_result = 0; uint8_t previousAction = action; @@ -3180,7 +3180,7 @@ void rct_peep::PerformNextAction(uint8_t& pathing_result, rct_tile_element*& til return; } - rct_tile_element* tileElement = map_get_first_element_at(actionX / 32, actionY / 32); + TileElement* tileElement = map_get_first_element_at(actionX / 32, actionY / 32); int16_t base_z = std::max(0, (z / 8) - 2); int16_t top_z = (z / 8) + 1; diff --git a/src/openrct2/peep/Peep.h b/src/openrct2/peep/Peep.h index 4d82eb8c11..4687e5cf7d 100644 --- a/src/openrct2/peep/Peep.h +++ b/src/openrct2/peep/Peep.h @@ -31,7 +31,7 @@ #define PEEP_MAX_ENERGY 128 #define PEEP_MAX_ENERGY_TARGET 255 // Oddly, this differs from max energy! -struct rct_tile_element; +struct TileElement; struct Ride; enum PEEP_TYPE @@ -802,7 +802,7 @@ private: // Staff update public: // Peep bool CheckForPath(); void PerformNextAction(uint8_t& pathing_result); - void PerformNextAction(uint8_t& pathing_result, rct_tile_element*& tile_result); + void PerformNextAction(uint8_t& pathing_result, TileElement*& tile_result); int32_t GetZOnSlope(int32_t tile_x, int32_t tile_y); void SwitchNextActionSpriteType(); uint8_t GetActionSpriteType(); @@ -982,7 +982,7 @@ void game_command_set_guest_name( int32_t peep_pathfind_choose_direction(TileCoordsXYZ loc, rct_peep* peep); void peep_reset_pathfind_goal(rct_peep* peep); -bool is_valid_path_z_and_direction(rct_tile_element* tileElement, int32_t currentZ, int32_t currentDirection); +bool is_valid_path_z_and_direction(TileElement* tileElement, int32_t currentZ, int32_t currentDirection); int32_t guest_path_finding(rct_peep* peep); #if defined(DEBUG_LEVEL_1) && DEBUG_LEVEL_1 diff --git a/src/openrct2/peep/Staff.cpp b/src/openrct2/peep/Staff.cpp index 90ecd93842..6c10b9b9f5 100644 --- a/src/openrct2/peep/Staff.cpp +++ b/src/openrct2/peep/Staff.cpp @@ -88,7 +88,7 @@ static inline void staff_autoposition_new_staff_member(rct_peep* newPeep) uint32_t count = 0; uint16_t sprite_index; rct_peep* guest = nullptr; - rct_tile_element* guest_tile = nullptr; + TileElement* guest_tile = nullptr; // Count number of walking guests FOR_ALL_GUESTS (sprite_index, guest) @@ -647,7 +647,7 @@ bool staff_is_location_on_patrol_edge(rct_peep* mechanic, int32_t x, int32_t y) return onZoneEdge; } -bool staff_can_ignore_wide_flag(rct_peep* staff, int32_t x, int32_t y, uint8_t z, rct_tile_element* path) +bool staff_can_ignore_wide_flag(rct_peep* staff, int32_t x, int32_t y, uint8_t z, TileElement* path) { /* Wide flags can potentially wall off parts of a staff patrol zone * for the heuristic search. @@ -716,7 +716,7 @@ bool staff_can_ignore_wide_flag(rct_peep* staff, int32_t x, int32_t y, uint8_t z } /* Search through all adjacent map elements */ - rct_tile_element* test_element = map_get_first_element_at(adjac_x / 32, adjac_y / 32); + TileElement* test_element = map_get_first_element_at(adjac_x / 32, adjac_y / 32); bool pathfound = false; bool widefound = false; do @@ -922,7 +922,7 @@ static uint8_t staff_handyman_direction_to_nearest_litter(rct_peep* peep) int16_t nextZ = ((peep->z + 8) & 0xFFF0) / 8; - rct_tile_element* tileElement = map_get_first_element_at(nextTile.x / 32, nextTile.y / 32); + TileElement* tileElement = map_get_first_element_at(nextTile.x / 32, nextTile.y / 32); do { @@ -960,7 +960,7 @@ static uint8_t staff_handyman_direction_to_uncut_grass(rct_peep* peep, uint8_t v { if (!(peep->GetNextIsSurface())) { - rct_tile_element* tileElement = map_get_surface_element_at({ peep->next_x, peep->next_y }); + TileElement* tileElement = map_get_surface_element_at({ peep->next_x, peep->next_y }); if (peep->next_z != tileElement->base_height) return 0xFF; @@ -990,7 +990,7 @@ static uint8_t staff_handyman_direction_to_uncut_grass(rct_peep* peep, uint8_t v if (chosenTile.x > 0x1FFF || chosenTile.y > 0x1FFF) continue; - rct_tile_element* tileElement = map_get_surface_element_at(chosenTile); + TileElement* tileElement = map_get_surface_element_at(chosenTile); if (tileElement->AsSurface()->GetSurfaceStyle() != TERRAIN_GRASS) continue; @@ -1064,7 +1064,7 @@ static bool staff_path_finding_handyman(rct_peep* peep) } else { - rct_tile_element* tileElement = map_get_path_element_at(peep->next_x / 32, peep->next_y / 32, peep->next_z); + TileElement* tileElement = map_get_path_element_at(peep->next_x / 32, peep->next_y / 32, peep->next_z); if (tileElement == nullptr) return true; @@ -1230,7 +1230,7 @@ static uint8_t staff_mechanic_direction_path_rand(rct_peep* peep, uint8_t pathDi * * rct2: 0x006C0121 */ -static uint8_t staff_mechanic_direction_path(rct_peep* peep, uint8_t validDirections, rct_tile_element* pathElement) +static uint8_t staff_mechanic_direction_path(rct_peep* peep, uint8_t validDirections, TileElement* pathElement) { uint8_t direction = 0xFF; uint8_t pathDirections = pathElement->AsPath()->GetEdges(); @@ -1332,7 +1332,7 @@ static bool staff_path_finding_mechanic(rct_peep* peep) } else { - rct_tile_element* pathElement = map_get_path_element_at(peep->next_x / 32, peep->next_y / 32, peep->next_z); + TileElement* pathElement = map_get_path_element_at(peep->next_x / 32, peep->next_y / 32, peep->next_z); if (pathElement == nullptr) return true; @@ -1364,7 +1364,7 @@ static bool staff_path_finding_mechanic(rct_peep* peep) * * rct2: 0x006C050B */ -static uint8_t staff_direction_path(rct_peep* peep, uint8_t validDirections, rct_tile_element* pathElement) +static uint8_t staff_direction_path(rct_peep* peep, uint8_t validDirections, TileElement* pathElement) { uint8_t direction = 0xFF; uint8_t pathDirections = pathElement->AsPath()->GetEdges(); @@ -1420,7 +1420,7 @@ static bool staff_path_finding_misc(rct_peep* peep) } else { - rct_tile_element* pathElement = map_get_path_element_at(peep->next_x / 32, peep->next_y / 32, peep->next_z); + TileElement* pathElement = map_get_path_element_at(peep->next_x / 32, peep->next_y / 32, peep->next_z); if (pathElement == nullptr) return true; @@ -1674,7 +1674,7 @@ void rct_peep::UpdateMowing() if (var_37 != 7) continue; - rct_tile_element* tile_element = map_get_first_element_at(next_x / 32, next_y / 32); + TileElement* tile_element = map_get_first_element_at(next_x / 32, next_y / 32); for (; (tile_element->GetType() != TILE_ELEMENT_TYPE_SURFACE); tile_element++) ; @@ -1727,7 +1727,7 @@ void rct_peep::UpdateWatering() int32_t actionX = next_x + CoordsDirectionDelta[var_37].x; int32_t actionY = next_y + CoordsDirectionDelta[var_37].y; - rct_tile_element* tile_element = map_get_first_element_at(actionX / 32, actionY / 32); + TileElement* tile_element = map_get_first_element_at(actionX / 32, actionY / 32); do { @@ -1794,7 +1794,7 @@ void rct_peep::UpdateEmptyingBin() if (action_frame != 11) return; - rct_tile_element* tile_element = map_get_first_element_at(next_x / 32, next_y / 32); + TileElement* tile_element = map_get_first_element_at(next_x / 32, next_y / 32); for (;; tile_element++) { @@ -1928,7 +1928,7 @@ void rct_peep::UpdateHeadingToInspect() return; uint8_t pathingResult; - rct_tile_element* rideEntranceExitElement; + TileElement* rideEntranceExitElement; PerformNextAction(pathingResult, rideEntranceExitElement); if (!(pathingResult & PATHING_RIDE_EXIT) && !(pathingResult & PATHING_RIDE_ENTRANCE)) @@ -2046,7 +2046,7 @@ void rct_peep::UpdateAnswering() return; uint8_t pathingResult; - rct_tile_element* rideEntranceExitElement; + TileElement* rideEntranceExitElement; PerformNextAction(pathingResult, rideEntranceExitElement); if (!(pathingResult & PATHING_RIDE_EXIT) && !(pathingResult & PATHING_RIDE_ENTRANCE)) @@ -2130,7 +2130,7 @@ static int32_t peep_update_patrolling_find_watering(rct_peep* peep) int32_t x = peep->next_x + CoordsDirectionDelta[chosen_position].x; int32_t y = peep->next_y + CoordsDirectionDelta[chosen_position].y; - rct_tile_element* tile_element = map_get_first_element_at(x / 32, y / 32); + TileElement* tile_element = map_get_first_element_at(x / 32, y / 32); // This seems to happen in some SV4 files. if (tile_element == nullptr) @@ -2198,7 +2198,7 @@ static int32_t peep_update_patrolling_find_bin(rct_peep* peep) if (peep->GetNextIsSurface()) return 0; - rct_tile_element* tileElement = map_get_first_element_at(peep->next_x / 32, peep->next_y / 32); + TileElement* tileElement = map_get_first_element_at(peep->next_x / 32, peep->next_y / 32); if (tileElement == nullptr) return 0; @@ -2264,7 +2264,7 @@ static int32_t peep_update_patrolling_find_grass(rct_peep* peep) if (!(peep->GetNextIsSurface())) return 0; - rct_tile_element* tile_element = map_get_surface_element_at({ peep->next_x, peep->next_y }); + TileElement* tile_element = map_get_surface_element_at({ peep->next_x, peep->next_y }); if ((tile_element->AsSurface()->GetSurfaceStyle()) != TERRAIN_GRASS) return 0; @@ -2364,7 +2364,7 @@ void rct_peep::UpdatePatrolling() if (GetNextIsSurface()) { - rct_tile_element* tile_element = map_get_surface_element_at({ next_x, next_y }); + TileElement* tile_element = map_get_surface_element_at({ next_x, next_y }); if (tile_element != nullptr) { @@ -2798,7 +2798,7 @@ bool rct_peep::UpdateFixingMoveToStationEnd(bool firstRun, Ride* ride) uint16_t stationX = stationPosition.x * 32; uint16_t stationY = stationPosition.y * 32; - rct_tile_element* tileElement = map_get_track_element_at(stationX, stationY, stationZ); + TileElement* tileElement = map_get_track_element_at(stationX, stationY, stationZ); if (tileElement == nullptr) { log_error("Couldn't find tile_element"); diff --git a/src/openrct2/peep/Staff.h b/src/openrct2/peep/Staff.h index 4c9854f13a..585f0ddb2b 100644 --- a/src/openrct2/peep/Staff.h +++ b/src/openrct2/peep/Staff.h @@ -92,7 +92,7 @@ uint16_t hire_new_staff_member(uint8_t staffType); void staff_update_greyed_patrol_areas(); bool staff_is_location_in_patrol(rct_peep* mechanic, int32_t x, int32_t y); bool staff_is_location_on_patrol_edge(rct_peep* mechanic, int32_t x, int32_t y); -bool staff_can_ignore_wide_flag(rct_peep* mechanic, int32_t x, int32_t y, uint8_t z, rct_tile_element* path); +bool staff_can_ignore_wide_flag(rct_peep* mechanic, int32_t x, int32_t y, uint8_t z, TileElement* path); int32_t staff_path_finding(rct_peep* peep); void staff_reset_stats(); bool staff_is_patrol_area_set(int32_t staffIndex, int32_t x, int32_t y); diff --git a/src/openrct2/rct1/RCT1.h b/src/openrct2/rct1/RCT1.h index 1238d3d587..70ad36076e 100644 --- a/src/openrct2/rct1/RCT1.h +++ b/src/openrct2/rct1/RCT1.h @@ -610,7 +610,7 @@ struct rct1_s4 uint32_t ticks; uint32_t random_a; uint32_t random_b; - rct_tile_element tile_elements[RCT1_MAX_TILE_ELEMENTS]; + TileElement tile_elements[RCT1_MAX_TILE_ELEMENTS]; uint32_t unk_counter; rct1_sprite sprites[RCT1_MAX_SPRITES]; uint16_t next_sprite_index; diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index c5c4d4281b..79ff894c23 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -470,7 +470,7 @@ private: { size_t maxTiles = 128 * 128; size_t tileIndex = 0; - rct_tile_element* tileElement = _s4.tile_elements; + TileElement* tileElement = _s4.tile_elements; while (tileIndex < maxTiles) { @@ -2378,15 +2378,15 @@ private: std::fill(std::begin(gTileElementTilePointers), std::end(gTileElementTilePointers), nullptr); // Get the first free map element - rct_tile_element* nextFreeTileElement = gTileElements; + TileElement* nextFreeTileElement = gTileElements; for (size_t i = 0; i < RCT1_MAX_MAP_SIZE * RCT1_MAX_MAP_SIZE; i++) { while (!(nextFreeTileElement++)->IsLastForTile()) ; } - rct_tile_element* tileElement = gTileElements; - rct_tile_element** tilePointer = gTileElementTilePointers; + TileElement* tileElement = gTileElements; + TileElement** tilePointer = gTileElementTilePointers; // 128 rows of map data from RCT1 map for (int32_t x = 0; x < RCT1_MAX_MAP_SIZE; x++) @@ -2432,7 +2432,7 @@ private: void FixSceneryColours() { colour_t colour; - rct_tile_element* tileElement = gTileElements; + TileElement* tileElement = gTileElements; while (tileElement < gNextFreeTileElement) { if (tileElement->base_height != 255) @@ -2476,7 +2476,7 @@ private: void FixTileElementZ() { - rct_tile_element* tileElement = gTileElements; + TileElement* tileElement = gTileElements; while (tileElement < gNextFreeTileElement) { if (tileElement->base_height != 255) @@ -2491,7 +2491,7 @@ private: void FixPaths() { - rct_tile_element* tileElement = gTileElements; + TileElement* tileElement = gTileElements; while (tileElement < gNextFreeTileElement) { switch (tileElement->GetType()) @@ -2555,12 +2555,12 @@ private: { for (int32_t y = 0; y < RCT1_MAX_MAP_SIZE; y++) { - rct_tile_element* tileElement = map_get_first_element_at(x, y); + TileElement* tileElement = map_get_first_element_at(x, y); do { if (tileElement->GetType() == TILE_ELEMENT_TYPE_WALL) { - rct_tile_element originalTileElement = *tileElement; + TileElement originalTileElement = *tileElement; tile_element_remove(tileElement); for (int32_t edge = 0; edge < 4; edge++) @@ -2633,7 +2633,7 @@ private: { for (int32_t y = 0; y < RCT1_MAX_MAP_SIZE; y++) { - rct_tile_element* tileElement = map_get_first_element_at(x, y); + TileElement* tileElement = map_get_first_element_at(x, y); do { if (tileElement->GetType() == TILE_ELEMENT_TYPE_BANNER) @@ -2674,7 +2674,7 @@ private: tile_element_iterator_begin(&it); while (tile_element_iterator_next(&it)) { - rct_tile_element* element = it.element; + TileElement* element = it.element; if (element->GetType() == TILE_ELEMENT_TYPE_SURFACE) { element->AsSurface()->SetSurfaceStyle(RCT1::GetTerrain(element->AsSurface()->GetSurfaceStyle())); @@ -2696,7 +2696,7 @@ private: tile_element_iterator_begin(&it); while (tile_element_iterator_next(&it) && entranceIndex < RCT12_MAX_PARK_ENTRANCES) { - rct_tile_element* element = it.element; + TileElement* element = it.element; if (element->GetType() != TILE_ELEMENT_TYPE_ENTRANCE) continue; @@ -2719,7 +2719,7 @@ private: tile_element_iterator_begin(&it); while (tile_element_iterator_next(&it)) { - rct_tile_element* tileElement = it.element; + TileElement* tileElement = it.element; switch (tileElement->GetType()) { case TILE_ELEMENT_TYPE_SMALL_SCENERY: @@ -2824,7 +2824,7 @@ private: { for (int32_t y = 0; y < RCT1_MAX_MAP_SIZE; y++) { - rct_tile_element* tileElement = map_get_first_element_at(x, y); + TileElement* tileElement = map_get_first_element_at(x, y); do { if (tileElement->GetType() == TILE_ELEMENT_TYPE_TRACK) diff --git a/src/openrct2/ride/CableLift.cpp b/src/openrct2/ride/CableLift.cpp index 733f0240d3..8b89e23a69 100644 --- a/src/openrct2/ride/CableLift.cpp +++ b/src/openrct2/ride/CableLift.cpp @@ -241,7 +241,7 @@ static bool sub_6DF01A_loop(rct_vehicle* vehicle) { _vehicleVAngleEndF64E36 = TrackDefinitions[trackType].vangle_end; _vehicleBankEndF64E37 = TrackDefinitions[trackType].bank_end; - rct_tile_element* trackElement = map_get_track_element_at_of_type_seq( + TileElement* trackElement = map_get_track_element_at_of_type_seq( vehicle->track_x, vehicle->track_y, vehicle->track_z / 8, trackType, 0); CoordsXYE input; @@ -316,7 +316,7 @@ static bool sub_6DF21B_loop(rct_vehicle* vehicle) _vehicleVAngleEndF64E36 = TrackDefinitions[trackType].vangle_start; _vehicleBankEndF64E37 = TrackDefinitions[trackType].bank_start; - rct_tile_element* trackElement = map_get_track_element_at_of_type_seq( + TileElement* trackElement = map_get_track_element_at_of_type_seq( vehicle->track_x, vehicle->track_y, vehicle->track_z / 8, trackType, 0); CoordsXYE input; diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index d3c1456d57..61c7a1ad1a 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -218,7 +218,7 @@ static void ride_shop_connected(Ride* ride, int32_t ride_idx); static void ride_spiral_slide_update(Ride* ride); static void ride_update(int32_t rideIndex); static void ride_update_vehicle_colours(int32_t rideIndex); -void loc_6DDF9C(Ride* ride, rct_tile_element* tileElement); +void loc_6DDF9C(Ride* ride, TileElement* tileElement); Ride* get_ride(int32_t index) { @@ -481,7 +481,7 @@ static money32 ride_calculate_income_per_hour(Ride* ride) */ bool ride_try_get_origin_element(int32_t rideIndex, CoordsXYE* output) { - rct_tile_element* resultTileElement = nullptr; + TileElement* resultTileElement = nullptr; tile_element_iterator it; tile_element_iterator_begin(&it); @@ -542,7 +542,7 @@ bool track_block_get_next_from_zero( y += CoordsDirectionDelta[direction_start].y; } - rct_tile_element* tileElement = map_get_first_element_at(x / 32, y / 32); + TileElement* tileElement = map_get_first_element_at(x / 32, y / 32); if (tileElement == nullptr) { output->element = nullptr; @@ -677,7 +677,7 @@ bool track_block_get_previous_from_zero( y += CoordsDirectionDelta[direction].y; } - rct_tile_element* tileElement = map_get_first_element_at(x / 32, y / 32); + TileElement* tileElement = map_get_first_element_at(x / 32, y / 32); if (tileElement == nullptr) { outTrackBeginEnd->end_x = x; @@ -765,7 +765,7 @@ bool track_block_get_previous_from_zero( * higher two bytes of ecx and edx where as outTrackBeginEnd.end_x and * outTrackBeginEnd.end_y will be in the lower two bytes (cx and dx). */ -bool track_block_get_previous(int32_t x, int32_t y, rct_tile_element* tileElement, track_begin_end* outTrackBeginEnd) +bool track_block_get_previous(int32_t x, int32_t y, TileElement* tileElement, track_begin_end* outTrackBeginEnd) { uint8_t rideIndex = tileElement->AsTrack()->GetRideIndex(); Ride* ride = get_ride(rideIndex); @@ -1272,11 +1272,11 @@ void ride_clear_blocked_tiles(int32_t rideIndex) * bp : flags */ int32_t sub_6C683D( - int32_t* x, int32_t* y, int32_t* z, int32_t direction, int32_t type, uint16_t extra_params, - rct_tile_element** output_element, uint16_t flags) + int32_t* x, int32_t* y, int32_t* z, int32_t direction, int32_t type, uint16_t extra_params, TileElement** output_element, + uint16_t flags) { - rct_tile_element* tileElement = map_get_first_element_at(*x / 32, *y / 32); - rct_tile_element* successTileElement = nullptr; + TileElement* tileElement = map_get_first_element_at(*x / 32, *y / 32); + TileElement* successTileElement = nullptr; do { @@ -1577,7 +1577,7 @@ void ride_construction_set_default_next_piece() Ride* ride; track_begin_end trackBeginEnd; CoordsXYE xyElement; - rct_tile_element* tileElement; + TileElement* tileElement; _currentTrackPrice = MONEY32_UNDEFINED; switch (_rideConstructionState) @@ -1741,7 +1741,7 @@ void ride_select_next_section() int32_t z = _currentTrackBeginZ; int32_t direction = _currentTrackPieceDirection; int32_t type = _currentTrackPieceType; - rct_tile_element* tileElement; + TileElement* tileElement; if (sub_6C683D(&x, &y, &z, direction & 3, type, 0, &tileElement, 0)) { _rideConstructionState = RIDE_CONSTRUCTION_STATE_0; @@ -1814,7 +1814,7 @@ void ride_select_previous_section() int32_t z = _currentTrackBeginZ; int32_t direction = _currentTrackPieceDirection; int32_t type = _currentTrackPieceType; - rct_tile_element* tileElement; + TileElement* tileElement; if (sub_6C683D(&x, &y, &z, direction & 3, type, 0, &tileElement, 0)) { _rideConstructionState = RIDE_CONSTRUCTION_STATE_0; @@ -1869,7 +1869,7 @@ void ride_select_previous_section() * * rct2: 0x006CC2CA */ -static int32_t ride_modify_entrance_or_exit(rct_tile_element* tileElement, int32_t x, int32_t y) +static int32_t ride_modify_entrance_or_exit(TileElement* tileElement, int32_t x, int32_t y) { int32_t rideIndex, entranceType; rct_window* constructionWindow; @@ -1935,7 +1935,7 @@ static int32_t ride_modify_entrance_or_exit(rct_tile_element* tileElement, int32 * * rct2: 0x006CC287 */ -static int32_t ride_modify_maze(rct_tile_element* tileElement, int32_t x, int32_t y) +static int32_t ride_modify_maze(TileElement* tileElement, int32_t x, int32_t y) { _currentRideIndex = tileElement->AsTrack()->GetRideIndex(); _rideConstructionState = RIDE_CONSTRUCTION_STATE_MAZE_BUILD; @@ -2344,7 +2344,7 @@ static void ride_spiral_slide_update(Ride* ride) int32_t x = ride->station_starts[i].x; int32_t y = ride->station_starts[i].y; - rct_tile_element* tileElement = ride_get_station_start_track_element(ride, i); + TileElement* tileElement = ride_get_station_start_track_element(ride, i); if (tileElement == nullptr) continue; @@ -2820,7 +2820,7 @@ rct_peep* ride_find_closest_mechanic(Ride* ride, int32_t forInspection) { int32_t x, y, z, stationIndex; TileCoordsXYZD location; - rct_tile_element* tileElement; + TileElement* tileElement; // Get either exit position or entrance position if there is no exit stationIndex = ride->inspection_station; @@ -3455,7 +3455,7 @@ static void ride_entrance_exit_connected(Ride* ride, int32_t ride_idx) static void ride_shop_connected(Ride* ride, int32_t ride_idx) { int32_t x, y, count; - rct_tile_element* tileElement; + TileElement* tileElement; LocationXY8 coordinates = ride->station_starts[0]; if (coordinates.xy == RCT_XY8_UNDEFINED) @@ -3533,7 +3533,7 @@ static void ride_shop_connected(Ride* ride, int32_t ride_idx) #pragma region Interface -static void ride_track_set_map_tooltip(rct_tile_element* tileElement) +static void ride_track_set_map_tooltip(TileElement* tileElement) { int32_t rideIndex; Ride* ride; @@ -3552,7 +3552,7 @@ static void ride_track_set_map_tooltip(rct_tile_element* tileElement) set_map_tooltip_format_arg(10, uint32_t, arg1); } -static void ride_queue_banner_set_map_tooltip(rct_tile_element* tileElement) +static void ride_queue_banner_set_map_tooltip(TileElement* tileElement) { int32_t rideIndex; Ride* ride; @@ -3571,7 +3571,7 @@ static void ride_queue_banner_set_map_tooltip(rct_tile_element* tileElement) set_map_tooltip_format_arg(10, uint32_t, arg1); } -static void ride_station_set_map_tooltip(rct_tile_element* tileElement) +static void ride_station_set_map_tooltip(TileElement* tileElement) { int32_t i, rideIndex, stationIndex; Ride* ride; @@ -3598,7 +3598,7 @@ static void ride_station_set_map_tooltip(rct_tile_element* tileElement) set_map_tooltip_format_arg(16, uint32_t, arg1); } -static void ride_entrance_set_map_tooltip(rct_tile_element* tileElement) +static void ride_entrance_set_map_tooltip(TileElement* tileElement) { int32_t i, rideIndex, stationIndex; Ride* ride; @@ -3653,7 +3653,7 @@ static void ride_entrance_set_map_tooltip(rct_tile_element* tileElement) } } -void ride_set_map_tooltip(rct_tile_element* tileElement) +void ride_set_map_tooltip(TileElement* tileElement) { if (tileElement->GetType() == TILE_ELEMENT_TYPE_ENTRANCE) { @@ -4394,7 +4394,7 @@ static void sub_6B5952(int32_t rideIndex) // This will fire for every entrance on this x, y and z, regardless whether that actually belongs to // the ride or not. - rct_tile_element* tileElement = map_get_first_element_at(location.x, location.y); + TileElement* tileElement = map_get_first_element_at(location.x, location.y); do { if (tileElement->GetType() != TILE_ELEMENT_TYPE_ENTRANCE) @@ -4667,7 +4667,7 @@ static void ride_set_boat_hire_return_point(Ride* ride, CoordsXYE* startElement) int32_t returnY = startElement->y; int32_t startX = returnX; int32_t startY = returnY; - rct_tile_element* returnTrackElement = startElement->element; + TileElement* returnTrackElement = startElement->element; track_begin_end trackBeginEnd; while (track_block_get_previous(returnX, returnY, returnTrackElement, &trackBeginEnd)) { @@ -4726,7 +4726,7 @@ static void ride_set_maze_entrance_exit_points(Ride* ride) int32_t y = (*position).y << 5; int32_t z = (*position).z; - rct_tile_element* tileElement = map_get_first_element_at((*position).x, (*position).y); + TileElement* tileElement = map_get_first_element_at((*position).x, (*position).y); do { if (tileElement->GetType() != TILE_ELEMENT_TYPE_ENTRANCE) @@ -4832,7 +4832,7 @@ static constexpr const LocationXY16 word_9A2A60[] = { */ static rct_vehicle* vehicle_create_car( int32_t rideIndex, int32_t vehicleEntryIndex, int32_t carIndex, int32_t vehicleIndex, int32_t x, int32_t y, int32_t z, - int32_t* remainingDistance, rct_tile_element* tileElement) + int32_t* remainingDistance, TileElement* tileElement) { Ride* ride = get_ride(rideIndex); rct_ride_entry* rideEntry = get_ride_entry(ride->subtype); @@ -5027,7 +5027,7 @@ static rct_vehicle* vehicle_create_car( */ static train_ref vehicle_create_train( int32_t rideIndex, int32_t x, int32_t y, int32_t z, int32_t vehicleIndex, int32_t* remainingDistance, - rct_tile_element* tileElement) + TileElement* tileElement) { Ride* ride = get_ride(rideIndex); @@ -5053,7 +5053,7 @@ static train_ref vehicle_create_train( return train; } -static void vehicle_create_trains(int32_t rideIndex, int32_t x, int32_t y, int32_t z, rct_tile_element* tileElement) +static void vehicle_create_trains(int32_t rideIndex, int32_t x, int32_t y, int32_t z, TileElement* tileElement) { Ride* ride = get_ride(rideIndex); train_ref firstTrain = {}; @@ -5123,13 +5123,13 @@ static void ride_create_vehicles_find_first_block(Ride* ride, CoordsXYE* outXYEl int32_t firstX = vehicle->track_x; int32_t firstY = vehicle->track_y; int32_t firstZ = vehicle->track_z; - rct_tile_element* firstElement = map_get_track_element_at(firstX, firstY, firstZ / 8); + TileElement* firstElement = map_get_track_element_at(firstX, firstY, firstZ / 8); assert(firstElement != nullptr); int32_t x = firstX; int32_t y = firstY; - rct_tile_element* trackElement = firstElement; + TileElement* trackElement = firstElement; track_begin_end trackBeginEnd; while (track_block_get_previous(x, y, trackElement, &trackBeginEnd)) { @@ -5158,8 +5158,7 @@ static void ride_create_vehicles_find_first_block(Ride* ride, CoordsXYE* outXYEl case TRACK_ELEM_DIAG_60_DEG_UP_TO_FLAT: if (trackElement->AsTrack()->HasChain()) { - rct_tile_element* tileElement = map_get_first_element_at( - trackBeginEnd.begin_x >> 5, trackBeginEnd.begin_y >> 5); + TileElement* tileElement = map_get_first_element_at(trackBeginEnd.begin_x >> 5, trackBeginEnd.begin_y >> 5); do { if (tileElement->GetType() != TILE_ELEMENT_TYPE_TRACK) @@ -5217,7 +5216,7 @@ static bool ride_create_vehicles(Ride* ride, int32_t rideIndex, CoordsXYE* eleme return true; } - rct_tile_element* tileElement = element->element; + TileElement* tileElement = element->element; int32_t x = element->x; int32_t y = element->y; int32_t z = element->element->base_height; @@ -5288,7 +5287,7 @@ static bool ride_create_vehicles(Ride* ride, int32_t rideIndex, CoordsXYE* eleme * * rct2: 0x006DDF9C */ -void loc_6DDF9C(Ride* ride, rct_tile_element* tileElement) +void loc_6DDF9C(Ride* ride, TileElement* tileElement) { rct_vehicle *train, *car; @@ -5371,7 +5370,7 @@ static bool ride_initialise_cable_lift_track(Ride* ride, bool isApplying) int32_t z = ride->station_heights[stationIndex]; bool success = false; - rct_tile_element* tileElement = map_get_first_element_at(location.x, location.y); + TileElement* tileElement = map_get_first_element_at(location.x, location.y); do { if (tileElement->GetType() != TILE_ELEMENT_TYPE_TRACK) @@ -5491,7 +5490,7 @@ static bool ride_create_cable_lift(int32_t rideIndex, bool isApplying) int32_t x = ride->cable_lift_x; int32_t y = ride->cable_lift_y; int32_t z = ride->cable_lift_z; - rct_tile_element* tileElement = map_get_first_element_at(x >> 5, y >> 5); + TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5); do { if (tileElement->GetType() != TILE_ELEMENT_TYPE_TRACK) @@ -5617,10 +5616,10 @@ static void ride_scroll_to_track_error(CoordsXYE* trackElement) * * rct2: 0x006B4F6B */ -static rct_tile_element* loc_6B4F6B(int32_t rideIndex, int32_t x, int32_t y) +static TileElement* loc_6B4F6B(int32_t rideIndex, int32_t x, int32_t y) { Ride* ride = get_ride(rideIndex); - rct_tile_element* tileElement = map_get_first_element_at(x / 32, y / 32); + TileElement* tileElement = map_get_first_element_at(x / 32, y / 32); do { if (tileElement->GetType() != TILE_ELEMENT_TYPE_TRACK) @@ -5927,7 +5926,7 @@ void ride_get_start_of_track(CoordsXYE* output) CoordsXYE trackElement = *output; if (track_block_get_previous(trackElement.x, trackElement.y, trackElement.element, &trackBeginEnd)) { - rct_tile_element* initial_map = trackElement.element; + TileElement* initial_map = trackElement.element; track_begin_end slowIt = trackBeginEnd; bool moveSlowIt = true; do @@ -5982,7 +5981,7 @@ int32_t ride_get_refund_price(int32_t ride_id) // Used in the following loop to know when we have // completed all of the elements and are back at the // start. - rct_tile_element* initial_map = trackElement.element; + TileElement* initial_map = trackElement.element; CoordsXYE slowIt = trackElement; bool moveSlowIt = true; @@ -7091,7 +7090,7 @@ void ride_get_entrance_or_exit_position_from_screen_position( int16_t mapX, mapY; int16_t entranceMinX, entranceMinY, entranceMaxX, entranceMaxY, word_F4418C, word_F4418E; int32_t interactionType, direction, stationHeight, stationDirection; - rct_tile_element* tileElement; + TileElement* tileElement; rct_viewport* viewport; Ride* ride; @@ -7553,7 +7552,7 @@ static int32_t ride_get_smallest_station_length(Ride* ride) static int32_t ride_get_track_length(Ride* ride) { rct_window* w; - rct_tile_element* tileElement = nullptr; + TileElement* tileElement = nullptr; track_circuit_iterator it, slowIt; int32_t x = 0, y = 0, z, trackType, rideIndex, result; bool foundTrack = false; @@ -8016,7 +8015,7 @@ void sub_6CB945(int32_t rideIndex) uint8_t direction = 0xFF; bool specialTrack = false; - rct_tile_element* tileElement = nullptr; + TileElement* tileElement = nullptr; while (true) { @@ -8140,7 +8139,7 @@ void sub_6CB945(int32_t rideIndex) CoordsXY location = { (*locationList).x * 32, (*locationList).y * 32 }; - rct_tile_element* tileElement = map_get_first_element_at(location.x >> 5, location.y >> 5); + TileElement* tileElement = map_get_first_element_at(location.x >> 5, location.y >> 5); do { if (tileElement->GetType() != TILE_ELEMENT_TYPE_ENTRANCE) @@ -8155,7 +8154,7 @@ void sub_6CB945(int32_t rideIndex) nextLocation.y += CoordsDirectionDelta[tileElement->GetDirection()].y; bool shouldRemove = true; - rct_tile_element* trackElement = map_get_first_element_at(nextLocation.x >> 5, nextLocation.y >> 5); + TileElement* trackElement = map_get_first_element_at(nextLocation.x >> 5, nextLocation.y >> 5); do { if (trackElement->GetType() != TILE_ELEMENT_TYPE_TRACK) @@ -8410,10 +8409,10 @@ money16 ride_get_price(Ride* ride) * Return the tile_element of an adjacent station at x,y,z(+-2). * Returns nullptr if no suitable tile_element is found. */ -rct_tile_element* get_station_platform(int32_t x, int32_t y, int32_t z, int32_t z_tolerance) +TileElement* get_station_platform(int32_t x, int32_t y, int32_t z, int32_t z_tolerance) { bool foundTileElement = false; - rct_tile_element* tileElement = map_get_first_element_at(x >> 5, y >> 5); + TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5); if (tileElement != nullptr) { do @@ -8455,7 +8454,7 @@ static bool check_for_adjacent_station(int32_t x, int32_t y, int32_t z, uint8_t { adjX += CoordsDirectionDelta[direction].x; adjY += CoordsDirectionDelta[direction].y; - rct_tile_element* stationElement = get_station_platform(adjX, adjY, z, 2); + TileElement* stationElement = get_station_platform(adjX, adjY, z, 2); if (stationElement != nullptr) { int32_t rideIndex = stationElement->AsTrack()->GetRideIndex(); @@ -8487,7 +8486,7 @@ bool ride_has_adjacent_station(Ride* ride) uint16_t stationY = ride->station_starts[stationNum].y * 32; uint8_t stationZ = ride->station_heights[stationNum]; - rct_tile_element* stationElement = get_station_platform(stationX, stationY, stationZ, 0); + TileElement* stationElement = get_station_platform(stationX, stationY, stationZ, 0); if (stationElement == nullptr) { continue; @@ -8841,7 +8840,7 @@ void determine_ride_entrance_and_exit_locations() { for (uint8_t y = 1; y < MAXIMUM_MAP_SIZE_TECHNICAL - 1; y++) { - rct_tile_element* tileElement = map_get_first_element_at(x, y); + TileElement* tileElement = map_get_first_element_at(x, y); if (tileElement != nullptr) { diff --git a/src/openrct2/ride/Ride.h b/src/openrct2/ride/Ride.h index 8b1c7ac99a..3d937374be 100644 --- a/src/openrct2/ride/Ride.h +++ b/src/openrct2/ride/Ride.h @@ -371,11 +371,11 @@ struct track_begin_end int32_t begin_y; int32_t begin_z; int32_t begin_direction; - rct_tile_element* begin_element; + TileElement* begin_element; int32_t end_x; int32_t end_y; int32_t end_direction; - rct_tile_element* end_element; + TileElement* end_element; }; #ifdef PLATFORM_32BIT assert_struct_size(track_begin_end, 36); @@ -1045,15 +1045,15 @@ int32_t ride_is_valid_for_test(int32_t rideIndex, int32_t goingToBeOpen, int32_t int32_t ride_initialise_construction_window(int32_t rideIndex); void ride_construction_invalidate_current_track(); int32_t sub_6C683D( - int32_t* x, int32_t* y, int32_t* z, int32_t direction, int32_t type, uint16_t extra_params, - rct_tile_element** output_element, uint16_t flags); -void ride_set_map_tooltip(rct_tile_element* tileElement); + int32_t* x, int32_t* y, int32_t* z, int32_t direction, int32_t type, uint16_t extra_params, TileElement** output_element, + uint16_t flags); +void ride_set_map_tooltip(TileElement* tileElement); int32_t ride_music_params_update( int16_t x, int16_t y, int16_t z, uint8_t rideIndex, uint16_t sampleRate, uint32_t position, uint8_t* tuneId); void ride_music_update_final(); void ride_prepare_breakdown(int32_t rideIndex, int32_t breakdownReason); -rct_tile_element* ride_get_station_start_track_element(Ride* ride, int32_t stationIndex); -rct_tile_element* ride_get_station_exit_element(int32_t x, int32_t y, int32_t z); +TileElement* ride_get_station_start_track_element(Ride* ride, int32_t stationIndex); +TileElement* ride_get_station_exit_element(int32_t x, int32_t y, int32_t z); void ride_set_status(int32_t rideIndex, int32_t status); void game_command_set_ride_status( int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, int32_t* esi, int32_t* edi, int32_t* ebp); @@ -1127,7 +1127,7 @@ bool track_block_get_next_from_zero( int16_t x, int16_t y, int16_t z_start, uint8_t rideIndex, uint8_t direction_start, CoordsXYE* output, int32_t* z, int32_t* direction, bool isGhost); -bool track_block_get_previous(int32_t x, int32_t y, rct_tile_element* tileElement, track_begin_end* outTrackBeginEnd); +bool track_block_get_previous(int32_t x, int32_t y, TileElement* tileElement, track_begin_end* outTrackBeginEnd); bool track_block_get_previous_from_zero( int16_t x, int16_t y, int16_t z, uint8_t rideIndex, uint8_t direction, track_begin_end* outTrackBeginEnd); @@ -1190,7 +1190,7 @@ void ride_delete(uint8_t rideIndex); void ride_renew(Ride* ride); money16 ride_get_price(Ride* ride); -rct_tile_element* get_station_platform(int32_t x, int32_t y, int32_t z, int32_t z_tolerance); +TileElement* get_station_platform(int32_t x, int32_t y, int32_t z, int32_t z_tolerance); bool ride_has_adjacent_station(Ride* ride); bool ride_has_ratings(const Ride* ride); diff --git a/src/openrct2/ride/RideRatings.cpp b/src/openrct2/ride/RideRatings.cpp index 55f4be3f80..70ea40663c 100644 --- a/src/openrct2/ride/RideRatings.cpp +++ b/src/openrct2/ride/RideRatings.cpp @@ -81,7 +81,7 @@ static void ride_ratings_update_state_5(); static void ride_ratings_begin_proximity_loop(); static void ride_ratings_calculate(Ride* ride); static void ride_ratings_calculate_value(Ride* ride); -static void ride_ratings_score_close_proximity(rct_tile_element* inputTileElement); +static void ride_ratings_score_close_proximity(TileElement* inputTileElement); static void ride_ratings_add(rating_tuple* rating, int32_t excitement, int32_t intensity, int32_t nausea); @@ -201,7 +201,7 @@ static void ride_ratings_update_state_2() int32_t z = gRideRatingsCalcData.proximity_z / 8; int32_t trackType = gRideRatingsCalcData.proximity_track_type; - rct_tile_element* tileElement = map_get_first_element_at(x, y); + TileElement* tileElement = map_get_first_element_at(x, y); do { if (tileElement->GetType() != TILE_ELEMENT_TYPE_TRACK) @@ -305,7 +305,7 @@ static void ride_ratings_update_state_5() int32_t z = gRideRatingsCalcData.proximity_z / 8; int32_t trackType = gRideRatingsCalcData.proximity_track_type; - rct_tile_element* tileElement = map_get_first_element_at(x, y); + TileElement* tileElement = map_get_first_element_at(x, y); do { if (tileElement->GetType() != TILE_ELEMENT_TYPE_TRACK) @@ -403,14 +403,14 @@ static void proximity_score_increment(int32_t type) * * rct2: 0x006B6207 */ -static void ride_ratings_score_close_proximity_in_direction(rct_tile_element* inputTileElement, int32_t direction) +static void ride_ratings_score_close_proximity_in_direction(TileElement* inputTileElement, int32_t direction) { int32_t x = gRideRatingsCalcData.proximity_x + CoordsDirectionDelta[direction].x; int32_t y = gRideRatingsCalcData.proximity_y + CoordsDirectionDelta[direction].y; if (x < 0 || y < 0 || x >= (32 * 256) || y >= (32 * 256)) return; - rct_tile_element* tileElement = map_get_first_element_at(x >> 5, y >> 5); + TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5); do { switch (tileElement->GetType()) @@ -457,9 +457,9 @@ static void ride_ratings_score_close_proximity_in_direction(rct_tile_element* in } while (!(tileElement++)->IsLastForTile()); } -static void ride_ratings_score_close_proximity_loops_helper(rct_tile_element* inputTileElement, int32_t x, int32_t y) +static void ride_ratings_score_close_proximity_loops_helper(TileElement* inputTileElement, int32_t x, int32_t y) { - rct_tile_element* tileElement = map_get_first_element_at(x >> 5, y >> 5); + TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5); do { switch (tileElement->GetType()) @@ -500,7 +500,7 @@ static void ride_ratings_score_close_proximity_loops_helper(rct_tile_element* in * * rct2: 0x006B62DA */ -static void ride_ratings_score_close_proximity_loops(rct_tile_element* inputTileElement) +static void ride_ratings_score_close_proximity_loops(TileElement* inputTileElement) { int32_t trackType = inputTileElement->AsTrack()->GetTrackType(); if (trackType == TRACK_ELEM_LEFT_VERTICAL_LOOP || trackType == TRACK_ELEM_RIGHT_VERTICAL_LOOP) @@ -520,7 +520,7 @@ static void ride_ratings_score_close_proximity_loops(rct_tile_element* inputTile * * rct2: 0x006B5F9D */ -static void ride_ratings_score_close_proximity(rct_tile_element* inputTileElement) +static void ride_ratings_score_close_proximity(TileElement* inputTileElement) { if (gRideRatingsCalcData.station_flags & RIDE_RATING_STATION_FLAG_NO_ENTRANCE) { @@ -530,7 +530,7 @@ static void ride_ratings_score_close_proximity(rct_tile_element* inputTileElemen gRideRatingsCalcData.proximity_total++; int32_t x = gRideRatingsCalcData.proximity_x; int32_t y = gRideRatingsCalcData.proximity_y; - rct_tile_element* tileElement = map_get_first_element_at(x >> 5, y >> 5); + TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5); do { int32_t waterHeight; @@ -1423,7 +1423,7 @@ static int32_t ride_ratings_get_scenery_score(Ride* ride) for (int32_t xx = std::max(x - 5, 0); xx <= std::min(x + 5, 255); xx++) { // Count scenery items on this tile - rct_tile_element* tileElement = map_get_first_element_at(xx, yy); + TileElement* tileElement = map_get_first_element_at(xx, yy); do { if (tileElement->flags & (1 << 4)) diff --git a/src/openrct2/ride/Station.cpp b/src/openrct2/ride/Station.cpp index ec242b60b3..7802bc000e 100644 --- a/src/openrct2/ride/Station.cpp +++ b/src/openrct2/ride/Station.cpp @@ -54,7 +54,7 @@ void ride_update_station(Ride* ride, int32_t stationIndex) */ static void ride_update_station_blocksection(Ride* ride, int32_t stationIndex) { - rct_tile_element* tileElement = ride_get_station_start_track_element(ride, stationIndex); + TileElement* tileElement = ride_get_station_start_track_element(ride, stationIndex); if ((ride->status == RIDE_STATUS_CLOSED && ride->num_riders == 0) || (tileElement != nullptr && tileElement->flags & 0x20)) { @@ -292,7 +292,7 @@ static void ride_invalidate_station_start(Ride* ride, int32_t stationIndex, bool { int32_t x = ride->station_starts[stationIndex].x * 32; int32_t y = ride->station_starts[stationIndex].y * 32; - rct_tile_element* tileElement = ride_get_station_start_track_element(ride, stationIndex); + TileElement* tileElement = ride_get_station_start_track_element(ride, stationIndex); // If no station track found return if (tileElement == nullptr) @@ -304,14 +304,14 @@ static void ride_invalidate_station_start(Ride* ride, int32_t stationIndex, bool map_invalidate_tile_zoom1(x, y, tileElement->base_height * 8, tileElement->clearance_height * 8); } -rct_tile_element* ride_get_station_start_track_element(Ride* ride, int32_t stationIndex) +TileElement* ride_get_station_start_track_element(Ride* ride, int32_t stationIndex) { int32_t x = ride->station_starts[stationIndex].x; int32_t y = ride->station_starts[stationIndex].y; int32_t z = ride->station_heights[stationIndex]; // Find the station track element - rct_tile_element* tileElement = map_get_first_element_at(x, y); + TileElement* tileElement = map_get_first_element_at(x, y); do { if (tileElement->GetType() == TILE_ELEMENT_TYPE_TRACK && z == tileElement->base_height) @@ -322,10 +322,10 @@ rct_tile_element* ride_get_station_start_track_element(Ride* ride, int32_t stati return nullptr; } -rct_tile_element* ride_get_station_exit_element(int32_t x, int32_t y, int32_t z) +TileElement* ride_get_station_exit_element(int32_t x, int32_t y, int32_t z) { // Find the station track element - rct_tile_element* tileElement = map_get_first_element_at(x, y); + TileElement* tileElement = map_get_first_element_at(x, y); do { if (tileElement->GetType() == TILE_ELEMENT_TYPE_ENTRANCE && z == tileElement->base_height) diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp index b7d4dbabc1..70f9e4eaef 100644 --- a/src/openrct2/ride/Track.cpp +++ b/src/openrct2/ride/Track.cpp @@ -565,7 +565,7 @@ const rct_trackdefinition FlatRideTrackDefinitions[256] = /** * Helper method to determine if a connects to b by its bank and angle, not location. */ -int32_t track_is_connected_by_shape(rct_tile_element* a, rct_tile_element* b) +int32_t track_is_connected_by_shape(TileElement* a, TileElement* b) { int32_t trackType, aBank, aAngle, bBank, bAngle; @@ -598,9 +598,9 @@ const rct_preview_track* get_track_def_from_ride_index(int32_t rideIndex, int32_ return get_track_def_from_ride(get_ride(rideIndex), trackType); } -static rct_tile_element* find_station_element(int32_t x, int32_t y, int32_t z, int32_t direction, int32_t rideIndex) +static TileElement* find_station_element(int32_t x, int32_t y, int32_t z, int32_t direction, int32_t rideIndex) { - rct_tile_element* tileElement = map_get_first_element_at(x >> 5, y >> 5); + TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5); do { if (z != tileElement->base_height) @@ -667,7 +667,7 @@ static bool track_add_station_element(int32_t x, int32_t y, int32_t z, int32_t d return true; } - rct_tile_element* stationElement; + TileElement* stationElement; // Search backwards for more station x = stationX0; @@ -801,7 +801,7 @@ static bool track_remove_station_element(int32_t x, int32_t y, int32_t z, int32_ Ride* ride = get_ride(rideIndex); if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_3)) { - rct_tile_element* tileElement = map_get_track_element_at_with_direction_from_ride(x, y, z, direction, rideIndex); + TileElement* tileElement = map_get_track_element_at_with_direction_from_ride(x, y, z, direction, rideIndex); if (tileElement != nullptr) { if (flags & GAME_COMMAND_FLAG_APPLY) @@ -812,7 +812,7 @@ static bool track_remove_station_element(int32_t x, int32_t y, int32_t z, int32_ return true; } - rct_tile_element* stationElement; + TileElement* stationElement; // Search backwards for more station x = stationX0; @@ -967,7 +967,7 @@ static money32 track_place( log_warning("Invalid ride type for track placement, rideIndex = %d", rideIndex); return MONEY32_UNDEFINED; } - rct_tile_element* tileElement; + TileElement* tileElement; gCommandExpenditureType = RCT_EXPENDITURE_TYPE_RIDE_CONSTRUCTION; gCommandPosition.x = originX + 16; @@ -1515,7 +1515,7 @@ static money32 track_place( if (rideTypeFlags & RIDE_TYPE_FLAG_TRACK_MUST_BE_ON_WATER) { - rct_tile_element* surfaceElement = map_get_surface_element_at({ x, y }); + TileElement* surfaceElement = map_get_surface_element_at({ x, y }); surfaceElement->AsSurface()->SetHasTrackThatNeedsWater(true); tileElement = surfaceElement; } @@ -1590,7 +1590,7 @@ static money32 track_remove( bool found = false; bool isGhost = flags & GAME_COMMAND_FLAG_GHOST; - rct_tile_element* tileElement = map_get_first_element_at(originX / 32, originY / 32); + TileElement* tileElement = map_get_first_element_at(originX / 32, originY / 32); if (tileElement == nullptr) { log_warning("Invalid coordinates for track removal. x = %d, y = %d", originX, originY); @@ -1757,7 +1757,7 @@ static money32 track_remove( } } - rct_tile_element* surfaceElement = map_get_surface_element_at({ x, y }); + TileElement* surfaceElement = map_get_surface_element_at({ x, y }); if (surfaceElement == nullptr) { return MONEY32_UNDEFINED; @@ -1908,7 +1908,7 @@ void game_command_set_brakes_speed( return; } - rct_tile_element* tileElement = map_get_first_element_at(x >> 5, y >> 5); + TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5); if (tileElement == nullptr) { log_warning("Invalid game command for setting brakes speed. x = %d, y = %d", x, y); @@ -2076,7 +2076,7 @@ void TrackElement::SetHasChain(bool on) * A beginning of a block can be the end of a station, the end of a lift hill, * or a block brake. */ -bool track_element_is_block_start(rct_tile_element* trackElement) +bool track_element_is_block_start(TileElement* trackElement) { switch (trackElement->AsTrack()->GetTrackType()) { @@ -2097,7 +2097,7 @@ bool track_element_is_block_start(rct_tile_element* trackElement) return false; } -int32_t track_get_actual_bank(rct_tile_element* tileElement, int32_t bank) +int32_t track_get_actual_bank(TileElement* tileElement, int32_t bank) { Ride* ride = get_ride(tileElement->AsTrack()->GetRideIndex()); bool isInverted = tileElement->AsTrack()->IsInverted(); @@ -2123,7 +2123,7 @@ int32_t track_get_actual_bank_2(int32_t rideType, bool isInverted, int32_t bank) return bank; } -int32_t track_get_actual_bank_3(rct_vehicle* vehicle, rct_tile_element* tileElement) +int32_t track_get_actual_bank_3(rct_vehicle* vehicle, TileElement* tileElement) { bool isInverted = ((vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES) > 0) ^ tileElement->AsTrack()->IsInverted(); @@ -2133,7 +2133,7 @@ int32_t track_get_actual_bank_3(rct_vehicle* vehicle, rct_tile_element* tileElem return track_get_actual_bank_2(rideType, isInverted, bankStart); } -bool track_element_is_station(rct_tile_element* trackElement) +bool track_element_is_station(TileElement* trackElement) { switch (trackElement->AsTrack()->GetTrackType()) { diff --git a/src/openrct2/ride/Track.h b/src/openrct2/ride/Track.h index 65017bc652..3ed098060b 100644 --- a/src/openrct2/ride/Track.h +++ b/src/openrct2/ride/Track.h @@ -513,7 +513,7 @@ struct track_circuit_iterator CoordsXYE current; int32_t currentZ; int32_t currentDirection; - rct_tile_element* first; + TileElement* first; bool firstIteration; bool looped; }; @@ -523,7 +523,7 @@ extern const rct_trackdefinition TrackDefinitions[256]; extern uint8_t gTrackGroundFlags; -int32_t track_is_connected_by_shape(rct_tile_element* a, rct_tile_element* b); +int32_t track_is_connected_by_shape(TileElement* a, TileElement* b); const rct_preview_track* get_track_def_from_ride(Ride* ride, int32_t trackType); const rct_preview_track* get_track_def_from_ride_index(int32_t rideIndex, int32_t trackType); @@ -537,13 +537,13 @@ bool track_circuit_iterators_match(const track_circuit_iterator* firstIt, const void track_get_back(CoordsXYE* input, CoordsXYE* output); void track_get_front(CoordsXYE* input, CoordsXYE* output); -bool track_element_is_block_start(rct_tile_element* trackElement); +bool track_element_is_block_start(TileElement* trackElement); bool track_element_is_covered(int32_t trackElementType); -bool track_element_is_station(rct_tile_element* trackElement); +bool track_element_is_station(TileElement* trackElement); -int32_t track_get_actual_bank(rct_tile_element* tileElement, int32_t bank); +int32_t track_get_actual_bank(TileElement* tileElement, int32_t bank); int32_t track_get_actual_bank_2(int32_t rideType, bool isInverted, int32_t bank); -int32_t track_get_actual_bank_3(rct_vehicle* vehicle, rct_tile_element* tileElement); +int32_t track_get_actual_bank_3(rct_vehicle* vehicle, TileElement* tileElement); void game_command_place_track(int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, int32_t* esi, int32_t* edi, int32_t* ebp); void game_command_remove_track( diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp index 4346c27ac9..3b3bce5e90 100644 --- a/src/openrct2/ride/TrackDesign.cpp +++ b/src/openrct2/ride/TrackDesign.cpp @@ -44,9 +44,9 @@ struct map_backup { - rct_tile_element tile_elements[MAX_TILE_ELEMENTS]; - rct_tile_element* tile_pointers[MAX_TILE_TILE_ELEMENT_POINTERS]; - rct_tile_element* next_free_tile_element; + TileElement tile_elements[MAX_TILE_ELEMENTS]; + TileElement* tile_pointers[MAX_TILE_TILE_ELEMENT_POINTERS]; + TileElement* next_free_tile_element; uint16_t map_size_units; uint16_t map_size_units_minus_2; uint16_t map_size; @@ -1091,7 +1091,7 @@ static int32_t track_design_place_scenery( continue; } - rct_tile_element* tile_element = map_get_path_element_at(mapCoord.x / 32, mapCoord.y / 32, z); + TileElement* tile_element = map_get_path_element_at(mapCoord.x / 32, mapCoord.y / 32, z); if (tile_element == nullptr) { @@ -1309,7 +1309,7 @@ static int32_t track_design_place_maze(rct_track_td6* td6, int16_t x, int16_t y, continue; } - rct_tile_element* tile_element = map_get_surface_element_at(mapCoord); + TileElement* tile_element = map_get_surface_element_at(mapCoord); int16_t map_height = tile_element->base_height * 8; if (tile_element->AsSurface()->GetSlope() & TILE_ELEMENT_SLOPE_ALL_CORNERS_UP) { @@ -1471,7 +1471,7 @@ static bool track_design_place_ride(rct_track_td6* td6, int16_t x, int16_t y, in continue; } - rct_tile_element* tileElement = map_get_surface_element_at(tile); + TileElement* tileElement = map_get_surface_element_at(tile); if (tileElement == nullptr) { return false; @@ -1555,7 +1555,7 @@ static bool track_design_place_ride(rct_track_td6* td6, int16_t x, int16_t y, in (int16_t)(x + CoordsDirectionDelta[rotation].x), (int16_t)(y + CoordsDirectionDelta[rotation].y), }; - rct_tile_element* tile_element = map_get_first_element_at(tile.x >> 5, tile.y >> 5); + TileElement* tile_element = map_get_first_element_at(tile.x >> 5, tile.y >> 5); z = gTrackPreviewOrigin.z / 8; z += (entrance->z == (int8_t)(uint8_t)0x80) ? -1 : entrance->z; @@ -2041,7 +2041,7 @@ static money32 place_maze_design(uint8_t flags, uint8_t rideIndex, uint16_t maze // Check support height if (!gCheatsDisableSupportLimits) { - rct_tile_element* tileElement = map_get_surface_element_at({ x, y }); + TileElement* tileElement = map_get_surface_element_at({ x, y }); uint8_t supportZ = (z + 32) >> 3; if (supportZ > tileElement->base_height) { @@ -2110,7 +2110,7 @@ static money32 place_maze_design(uint8_t flags, uint8_t rideIndex, uint16_t maze int32_t fx = floor2(x, 32); int32_t fy = floor2(y, 32); int32_t fz = z >> 3; - rct_tile_element* tileElement = tile_element_insert(fx >> 5, fy >> 5, fz, 15); + TileElement* tileElement = tile_element_insert(fx >> 5, fy >> 5, fz, 15); tileElement->clearance_height = fz + 4; tileElement->SetType(TILE_ELEMENT_TYPE_TRACK); tileElement->AsTrack()->SetTrackType(TRACK_ELEM_MAZE); @@ -2332,7 +2332,7 @@ static void track_design_preview_clear_map() for (int32_t i = 0; i < MAX_TILE_TILE_ELEMENT_POINTERS; i++) { - rct_tile_element* tile_element = &gTileElements[i]; + TileElement* tile_element = &gTileElements[i]; tile_element->ClearAs(TILE_ELEMENT_TYPE_SURFACE); tile_element->flags = TILE_ELEMENT_FLAG_LAST_TILE; tile_element->AsSurface()->SetSlope(TILE_ELEMENT_SLOPE_FLAT); diff --git a/src/openrct2/ride/TrackDesign.h b/src/openrct2/ride/TrackDesign.h index ad4b41af78..3afa66f720 100644 --- a/src/openrct2/ride/TrackDesign.h +++ b/src/openrct2/ride/TrackDesign.h @@ -245,10 +245,10 @@ void track_design_draw_preview(rct_track_td6* td6, uint8_t* pixels); /////////////////////////////////////////////////////////////////////////////// void track_design_save_init(); void track_design_save_reset_scenery(); -bool track_design_save_contains_tile_element(const rct_tile_element* tileElement); +bool track_design_save_contains_tile_element(const TileElement* tileElement); void track_design_save_select_nearby_scenery(int32_t rideIndex); void track_design_save_select_tile_element( - int32_t interactionType, int32_t x, int32_t y, rct_tile_element* tileElement, bool collect); + int32_t interactionType, int32_t x, int32_t y, TileElement* tileElement, bool collect); bool track_design_save(uint8_t rideIndex); bool track_design_save_to_file(const utf8* path); diff --git a/src/openrct2/ride/TrackDesignSave.cpp b/src/openrct2/ride/TrackDesignSave.cpp index 4a26d46031..6b14c9ffc7 100644 --- a/src/openrct2/ride/TrackDesignSave.cpp +++ b/src/openrct2/ride/TrackDesignSave.cpp @@ -40,7 +40,7 @@ bool gTrackDesignSaveMode = false; uint8_t gTrackDesignSaveRideIndex = 255; static size_t _trackSavedTileElementsCount; -static rct_tile_element* _trackSavedTileElements[TRACK_MAX_SAVED_TILE_ELEMENTS]; +static TileElement* _trackSavedTileElements[TRACK_MAX_SAVED_TILE_ELEMENTS]; static size_t _trackSavedTileElementsDescCount; static rct_td6_scenery_element _trackSavedTileElementsDesc[TRACK_MAX_SAVED_TILE_ELEMENTS]; @@ -48,10 +48,10 @@ static rct_td6_scenery_element _trackSavedTileElementsDesc[TRACK_MAX_SAVED_TILE_ static rct_track_td6* _trackDesign; static uint8_t _trackSaveDirection; -static bool track_design_save_should_select_scenery_around(int32_t rideIndex, rct_tile_element* tileElement); +static bool track_design_save_should_select_scenery_around(int32_t rideIndex, TileElement* tileElement); static void track_design_save_select_nearby_scenery_for_tile(int32_t rideIndex, int32_t cx, int32_t cy); -static bool track_design_save_add_tile_element(int32_t interactionType, int32_t x, int32_t y, rct_tile_element* tileElement); -static void track_design_save_remove_tile_element(int32_t interactionType, int32_t x, int32_t y, rct_tile_element* tileElement); +static bool track_design_save_add_tile_element(int32_t interactionType, int32_t x, int32_t y, TileElement* tileElement); +static void track_design_save_remove_tile_element(int32_t interactionType, int32_t x, int32_t y, TileElement* tileElement); static bool track_design_save_copy_scenery_to_td6(rct_track_td6* td6); static rct_track_td6* track_design_save_to_td6(uint8_t rideIndex); static bool track_design_save_to_td6_for_maze(uint8_t rideIndex, rct_track_td6* td6); @@ -71,7 +71,7 @@ void track_design_save_init() * rct2: 0x006D2B07 */ void track_design_save_select_tile_element( - int32_t interactionType, int32_t x, int32_t y, rct_tile_element* tileElement, bool collect) + int32_t interactionType, int32_t x, int32_t y, TileElement* tileElement, bool collect) { if (track_design_save_contains_tile_element(tileElement)) { @@ -100,7 +100,7 @@ void track_design_save_select_tile_element( */ void track_design_save_select_nearby_scenery(int32_t rideIndex) { - rct_tile_element* tileElement; + TileElement* tileElement; for (int32_t y = 0; y < MAXIMUM_MAP_SIZE_TECHNICAL; y++) { @@ -194,7 +194,7 @@ bool track_design_save(uint8_t rideIndex) return true; } -bool track_design_save_contains_tile_element(const rct_tile_element* tileElement) +bool track_design_save_contains_tile_element(const TileElement* tileElement) { for (size_t i = 0; i < _trackSavedTileElementsCount; i++) { @@ -206,7 +206,7 @@ bool track_design_save_contains_tile_element(const rct_tile_element* tileElement return false; } -static int32_t tile_element_get_total_element_count(rct_tile_element* tileElement) +static int32_t tile_element_get_total_element_count(TileElement* tileElement) { int32_t elementCount; rct_scenery_entry* sceneryEntry; @@ -239,7 +239,7 @@ static int32_t tile_element_get_total_element_count(rct_tile_element* tileElemen * * rct2: 0x006D2ED2 */ -static bool track_design_save_can_add_tile_element(rct_tile_element* tileElement) +static bool track_design_save_can_add_tile_element(TileElement* tileElement) { size_t newElementCount = tile_element_get_total_element_count(tileElement); if (newElementCount == 0) @@ -262,7 +262,7 @@ static bool track_design_save_can_add_tile_element(rct_tile_element* tileElement * * rct2: 0x006D2F4C */ -static void track_design_save_push_tile_element(int32_t x, int32_t y, rct_tile_element* tileElement) +static void track_design_save_push_tile_element(int32_t x, int32_t y, TileElement* tileElement) { if (_trackSavedTileElementsCount < TRACK_MAX_SAVED_TILE_ELEMENTS) { @@ -289,7 +289,7 @@ static void track_design_save_push_tile_element_desc( item->secondary_colour = secondaryColour; } -static void track_design_save_add_scenery(int32_t x, int32_t y, rct_tile_element* tileElement) +static void track_design_save_add_scenery(int32_t x, int32_t y, TileElement* tileElement) { SmallSceneryElement* sceneryElement = tileElement->AsSmallScenery(); int32_t entryType = sceneryElement->GetEntryIndex(); @@ -306,7 +306,7 @@ static void track_design_save_add_scenery(int32_t x, int32_t y, rct_tile_element track_design_save_push_tile_element_desc(entry, x, y, tileElement->base_height, flags, primaryColour, secondaryColour); } -static void track_design_save_add_large_scenery(int32_t x, int32_t y, rct_tile_element* tileElement) +static void track_design_save_add_large_scenery(int32_t x, int32_t y, TileElement* tileElement) { rct_large_scenery_tile *sceneryTiles, *tile; int32_t x0, y0, z0, z; @@ -352,7 +352,7 @@ static void track_design_save_add_large_scenery(int32_t x, int32_t y, rct_tile_e } } -static void track_design_save_add_wall(int32_t x, int32_t y, rct_tile_element* tileElement) +static void track_design_save_add_wall(int32_t x, int32_t y, TileElement* tileElement) { int32_t entryType = tileElement->AsWall()->GetEntryIndex(); auto entry = object_entry_get_entry(OBJECT_TYPE_WALLS, entryType); @@ -368,7 +368,7 @@ static void track_design_save_add_wall(int32_t x, int32_t y, rct_tile_element* t track_design_save_push_tile_element_desc(entry, x, y, tileElement->base_height, flags, primaryColour, secondaryColour); } -static void track_design_save_add_footpath(int32_t x, int32_t y, rct_tile_element* tileElement) +static void track_design_save_add_footpath(int32_t x, int32_t y, TileElement* tileElement) { int32_t entryType = tileElement->AsPath()->GetEntryIndex(); auto entry = object_entry_get_entry(OBJECT_TYPE_PATHS, entryType); @@ -389,7 +389,7 @@ static void track_design_save_add_footpath(int32_t x, int32_t y, rct_tile_elemen * * rct2: 0x006D2B3C */ -static bool track_design_save_add_tile_element(int32_t interactionType, int32_t x, int32_t y, rct_tile_element* tileElement) +static bool track_design_save_add_tile_element(int32_t interactionType, int32_t x, int32_t y, TileElement* tileElement) { if (!track_design_save_can_add_tile_element(tileElement)) { @@ -419,7 +419,7 @@ static bool track_design_save_add_tile_element(int32_t interactionType, int32_t * * rct2: 0x006D2F78 */ -static void track_design_save_pop_tile_element(int32_t x, int32_t y, rct_tile_element* tileElement) +static void track_design_save_pop_tile_element(int32_t x, int32_t y, TileElement* tileElement) { map_invalidate_tile_full(x, y); @@ -441,7 +441,7 @@ static void track_design_save_pop_tile_element(int32_t x, int32_t y, rct_tile_el { memmove( &_trackSavedTileElements[removeIndex], &_trackSavedTileElements[removeIndex + 1], - remainingNumItems * sizeof(rct_tile_element*)); + remainingNumItems * sizeof(TileElement*)); } _trackSavedTileElementsCount--; _trackSavedTileElements[_trackSavedTileElementsCount] = nullptr; @@ -486,7 +486,7 @@ static void track_design_save_pop_tile_element_desc( } } -static void track_design_save_remove_scenery(int32_t x, int32_t y, rct_tile_element* tileElement) +static void track_design_save_remove_scenery(int32_t x, int32_t y, TileElement* tileElement) { int32_t entryType = tileElement->AsSmallScenery()->GetEntryIndex(); auto entry = object_entry_get_entry(OBJECT_TYPE_SMALL_SCENERY, entryType); @@ -499,7 +499,7 @@ static void track_design_save_remove_scenery(int32_t x, int32_t y, rct_tile_elem track_design_save_pop_tile_element_desc(entry, x, y, tileElement->base_height, flags); } -static void track_design_save_remove_large_scenery(int32_t x, int32_t y, rct_tile_element* tileElement) +static void track_design_save_remove_large_scenery(int32_t x, int32_t y, TileElement* tileElement) { rct_large_scenery_tile *sceneryTiles, *tile; int32_t x0, y0, z0, z; @@ -542,7 +542,7 @@ static void track_design_save_remove_large_scenery(int32_t x, int32_t y, rct_til } } -static void track_design_save_remove_wall(int32_t x, int32_t y, rct_tile_element* tileElement) +static void track_design_save_remove_wall(int32_t x, int32_t y, TileElement* tileElement) { int32_t entryType = tileElement->AsWall()->GetEntryIndex(); auto entry = object_entry_get_entry(OBJECT_TYPE_WALLS, entryType); @@ -555,7 +555,7 @@ static void track_design_save_remove_wall(int32_t x, int32_t y, rct_tile_element track_design_save_pop_tile_element_desc(entry, x, y, tileElement->base_height, flags); } -static void track_design_save_remove_footpath(int32_t x, int32_t y, rct_tile_element* tileElement) +static void track_design_save_remove_footpath(int32_t x, int32_t y, TileElement* tileElement) { int32_t entryType = tileElement->AsPath()->GetEntryIndex(); auto entry = object_entry_get_entry(OBJECT_TYPE_PATHS, entryType); @@ -576,7 +576,7 @@ static void track_design_save_remove_footpath(int32_t x, int32_t y, rct_tile_ele * * rct2: 0x006D2B3C */ -static void track_design_save_remove_tile_element(int32_t interactionType, int32_t x, int32_t y, rct_tile_element* tileElement) +static void track_design_save_remove_tile_element(int32_t interactionType, int32_t x, int32_t y, TileElement* tileElement) { switch (interactionType) { @@ -595,7 +595,7 @@ static void track_design_save_remove_tile_element(int32_t interactionType, int32 } } -static bool track_design_save_should_select_scenery_around(int32_t rideIndex, rct_tile_element* tileElement) +static bool track_design_save_should_select_scenery_around(int32_t rideIndex, TileElement* tileElement) { switch (tileElement->GetType()) { @@ -622,7 +622,7 @@ static bool track_design_save_should_select_scenery_around(int32_t rideIndex, rc static void track_design_save_select_nearby_scenery_for_tile(int32_t rideIndex, int32_t cx, int32_t cy) { - rct_tile_element* tileElement; + TileElement* tileElement; for (int32_t y = cy - TRACK_NEARBY_SCENERY_DISTANCE; y <= cy + TRACK_NEARBY_SCENERY_DISTANCE; y++) { @@ -839,7 +839,7 @@ static rct_track_td6* track_design_save_to_td6(uint8_t rideIndex) */ static bool track_design_save_to_td6_for_maze(uint8_t rideIndex, rct_track_td6* td6) { - rct_tile_element* tileElement = nullptr; + TileElement* tileElement = nullptr; bool mapFound = false; int16_t startX = 0; int16_t startY = 0; @@ -1031,7 +1031,7 @@ static bool track_design_save_to_td6_for_tracked_ride(uint8_t rideIndex, rct_tra // Used in the following loop to know when we have // completed all of the elements and are back at the // start. - rct_tile_element* initialMap = trackElement.element; + TileElement* initialMap = trackElement.element; int16_t start_x = trackElement.x; int16_t start_y = trackElement.y; @@ -1127,7 +1127,7 @@ static bool track_design_save_to_td6_for_tracked_ride(uint8_t rideIndex, rct_tra int16_t x = location.x * 32; int16_t y = location.y * 32; - rct_tile_element* tile_element = map_get_first_element_at(x >> 5, y >> 5); + TileElement* tile_element = map_get_first_element_at(x >> 5, y >> 5); do { if (tile_element->GetType() != TILE_ELEMENT_TYPE_ENTRANCE) diff --git a/src/openrct2/ride/TrackPaint.cpp b/src/openrct2/ride/TrackPaint.cpp index 27ffaf36ef..80eceedc5a 100644 --- a/src/openrct2/ride/TrackPaint.cpp +++ b/src/openrct2/ride/TrackPaint.cpp @@ -201,7 +201,7 @@ enum // clang-format on bool track_paint_util_has_fence( - enum edge_t edge, LocationXY16 position, const rct_tile_element* tileElement, Ride* ride, uint8_t rotation) + enum edge_t edge, LocationXY16 position, const TileElement* tileElement, Ride* ride, uint8_t rotation) { LocationXY16 offset = { 0, 0 }; switch (edge) @@ -256,7 +256,7 @@ void track_paint_util_paint_floor( } void track_paint_util_paint_fences( - paint_session* session, uint8_t edges, LocationXY16 position, const rct_tile_element* tileElement, Ride* ride, + paint_session* session, uint8_t edges, LocationXY16 position, const TileElement* tileElement, Ride* ride, uint32_t colourFlags, uint16_t height, const uint32_t fenceSprites[4], uint8_t rotation) { uint32_t imageId; @@ -297,16 +297,16 @@ bool track_paint_util_should_paint_supports(LocationXY16 position) static void track_paint_util_draw_station_impl( paint_session* session, uint8_t rideIndex, uint8_t direction, uint16_t height, uint16_t coverHeight, - const rct_tile_element* tileElement, int32_t fenceOffsetA, int32_t fenceOffsetB); + const TileElement* tileElement, int32_t fenceOffsetA, int32_t fenceOffsetB); void track_paint_util_draw_station( - paint_session* session, uint8_t rideIndex, uint8_t direction, uint16_t height, const rct_tile_element* tileElement) + paint_session* session, uint8_t rideIndex, uint8_t direction, uint16_t height, const TileElement* tileElement) { track_paint_util_draw_station_impl(session, rideIndex, direction, height, height, tileElement, 5, 7); } void track_paint_util_draw_station_2( - paint_session* session, uint8_t rideIndex, uint8_t direction, uint16_t height, const rct_tile_element* tileElement, + paint_session* session, uint8_t rideIndex, uint8_t direction, uint16_t height, const TileElement* tileElement, int32_t fenceOffsetA, int32_t fenceOffsetB) { track_paint_util_draw_station_impl(session, rideIndex, direction, height, height, tileElement, fenceOffsetA, fenceOffsetB); @@ -314,14 +314,14 @@ void track_paint_util_draw_station_2( void track_paint_util_draw_station_3( paint_session* session, uint8_t rideIndex, uint8_t direction, uint16_t height, uint16_t coverHeight, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_draw_station_impl(session, rideIndex, direction, height, coverHeight, tileElement, 5, 7); } static void track_paint_util_draw_station_impl( paint_session* session, uint8_t rideIndex, uint8_t direction, uint16_t height, uint16_t coverHeight, - const rct_tile_element* tileElement, int32_t fenceOffsetA, int32_t fenceOffsetB) + const TileElement* tileElement, int32_t fenceOffsetA, int32_t fenceOffsetB) { LocationXY16 position = session->MapPosition; Ride* ride = get_ride(rideIndex); @@ -525,7 +525,7 @@ static void track_paint_util_draw_station_impl( } void track_paint_util_draw_station_inverted( - paint_session* session, uint8_t rideIndex, uint8_t direction, int32_t height, const rct_tile_element* tileElement, + paint_session* session, uint8_t rideIndex, uint8_t direction, int32_t height, const TileElement* tileElement, uint8_t stationVariant) { LocationXY16 position = session->MapPosition; @@ -820,7 +820,7 @@ bool track_paint_util_draw_station_covers_2( } void track_paint_util_draw_station_platform( - paint_session* session, Ride* ride, uint8_t direction, int32_t height, int32_t zOffset, const rct_tile_element* tileElement) + paint_session* session, Ride* ride, uint8_t direction, int32_t height, int32_t zOffset, const TileElement* tileElement) { LocationXY16 position = session->MapPosition; const rct_ride_entrance_definition* entranceStyle = &RideEntranceDefinitions[ride->entrance_style]; @@ -866,7 +866,7 @@ void track_paint_util_draw_station_platform( void track_paint_util_draw_pier( paint_session* session, Ride* ride, const rct_ride_entrance_definition* entranceStyle, LocationXY16 position, - uint8_t direction, int32_t height, const rct_tile_element* tileElement, uint8_t rotation) + uint8_t direction, int32_t height, const TileElement* tileElement, uint8_t rotation) { bool hasFence; uint32_t imageId; @@ -2017,7 +2017,7 @@ void track_paint_util_spinning_tunnel_paint(paint_session* session, int8_t thick } void track_paint_util_onride_photo_small_paint( - paint_session* session, uint8_t direction, int32_t height, const rct_tile_element* tileElement) + paint_session* session, uint8_t direction, int32_t height, const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][3] = { { SPR_ON_RIDE_PHOTO_SIGN_SMALL_SW_NE, SPR_ON_RIDE_PHOTO_CAMERA_SMALL_S, SPR_ON_RIDE_PHOTO_CAMERA_FLASH_SMALL_S }, @@ -2055,7 +2055,7 @@ void track_paint_util_onride_photo_small_paint( } void track_paint_util_onride_photo_paint( - paint_session* session, uint8_t direction, int32_t height, const rct_tile_element* tileElement) + paint_session* session, uint8_t direction, int32_t height, const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][3] = { { SPR_ON_RIDE_PHOTO_SIGN_SW_NE, SPR_ON_RIDE_PHOTO_CAMERA_S, SPR_ON_RIDE_PHOTO_CAMERA_FLASH_S }, @@ -2139,7 +2139,7 @@ void track_paint_util_left_corkscrew_up_supports(paint_session* session, uint8_t * * rct2: 0x006C4794 */ -void track_paint(paint_session* session, uint8_t direction, int32_t height, const rct_tile_element* tileElement) +void track_paint(paint_session* session, uint8_t direction, int32_t height, const TileElement* tileElement) { int32_t rideIndex = tileElement->AsTrack()->GetRideIndex(); Ride* ride = get_ride(rideIndex); diff --git a/src/openrct2/ride/TrackPaint.h b/src/openrct2/ride/TrackPaint.h index d6450617ea..24d2dc5b26 100644 --- a/src/openrct2/ride/TrackPaint.h +++ b/src/openrct2/ride/TrackPaint.h @@ -277,11 +277,11 @@ extern const uint8_t mapLeftEighthTurnToOrthogonal[5]; extern const size_t mini_golf_peep_animation_lengths[]; bool track_paint_util_has_fence( - enum edge_t edge, LocationXY16 position, const rct_tile_element* tileElement, Ride* ride, uint8_t rotation); + enum edge_t edge, LocationXY16 position, const TileElement* tileElement, Ride* ride, uint8_t rotation); void track_paint_util_paint_floor( paint_session* session, uint8_t edges, uint32_t colourFlags, uint16_t height, const uint32_t floorSprites[4]); void track_paint_util_paint_fences( - paint_session* session, uint8_t edges, LocationXY16 position, const rct_tile_element* tileElement, Ride* ride, + paint_session* session, uint8_t edges, LocationXY16 position, const TileElement* tileElement, Ride* ride, uint32_t colourFlags, uint16_t height, const uint32_t fenceSprites[4], uint8_t rotation); bool track_paint_util_draw_station_covers( paint_session* session, enum edge_t edge, bool hasFence, const rct_ride_entrance_definition* entranceStyle, @@ -290,23 +290,22 @@ bool track_paint_util_draw_station_covers_2( paint_session* session, enum edge_t edge, bool hasFence, const rct_ride_entrance_definition* entranceStyle, uint16_t height, uint8_t stationVariant); void track_paint_util_draw_station_platform( - paint_session* session, Ride* ride, uint8_t direction, int32_t height, int32_t zOffset, - const rct_tile_element* tileElement); + paint_session* session, Ride* ride, uint8_t direction, int32_t height, int32_t zOffset, const TileElement* tileElement); void track_paint_util_draw_station( - paint_session* session, uint8_t rideIndex, uint8_t direction, uint16_t height, const rct_tile_element* tileElement); + paint_session* session, uint8_t rideIndex, uint8_t direction, uint16_t height, const TileElement* tileElement); void track_paint_util_draw_station_2( - paint_session* session, uint8_t rideIndex, uint8_t direction, uint16_t height, const rct_tile_element* tileElement, + paint_session* session, uint8_t rideIndex, uint8_t direction, uint16_t height, const TileElement* tileElement, int32_t fenceOffsetA, int32_t fenceOffsetB); void track_paint_util_draw_station_3( paint_session* session, uint8_t rideIndex, uint8_t direction, uint16_t height, uint16_t coverHeight, - const rct_tile_element* tileElement); + const TileElement* tileElement); void track_paint_util_draw_station_inverted( - paint_session* session, uint8_t rideIndex, uint8_t direction, int32_t height, const rct_tile_element* tileElement, + paint_session* session, uint8_t rideIndex, uint8_t direction, int32_t height, const TileElement* tileElement, uint8_t stationVariant); bool track_paint_util_should_paint_supports(LocationXY16 position); void track_paint_util_draw_pier( paint_session* session, Ride* ride, const rct_ride_entrance_definition* entranceStyle, LocationXY16 position, - uint8_t direction, int32_t height, const rct_tile_element* tileElement, uint8_t rotation); + uint8_t direction, int32_t height, const TileElement* tileElement, uint8_t rotation); void track_paint_util_draw_station_metal_supports(paint_session* session, uint8_t direction, uint16_t height, uint32_t colour); void track_paint_util_draw_station_metal_supports_2( paint_session* session, uint8_t direction, uint16_t height, uint32_t colour, uint8_t type); @@ -360,9 +359,9 @@ void track_paint_util_left_quarter_turn_1_tile_paint( const uint32_t* sprites); void track_paint_util_spinning_tunnel_paint(paint_session* session, int8_t thickness, int16_t height, uint8_t direction); void track_paint_util_onride_photo_small_paint( - paint_session* session, uint8_t direction, int32_t height, const rct_tile_element* tileElement); + paint_session* session, uint8_t direction, int32_t height, const TileElement* tileElement); void track_paint_util_onride_photo_paint( - paint_session* session, uint8_t direction, int32_t height, const rct_tile_element* tileElement); + paint_session* session, uint8_t direction, int32_t height, const TileElement* tileElement); void track_paint_util_right_helix_up_small_quarter_tiles_paint( paint_session* session, const int8_t thickness[2], int16_t height, int32_t direction, uint8_t trackSequence, uint32_t colourFlags, const uint32_t sprites[4][3][2], const LocationXY16 offsets[4][3][2], @@ -393,7 +392,7 @@ void track_paint_util_left_corkscrew_up_supports(paint_session* session, uint8_t using TRACK_PAINT_FUNCTION = void (*)( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement); + const TileElement* tileElement); using TRACK_PAINT_FUNCTION_GETTER = TRACK_PAINT_FUNCTION (*)(int32_t trackType, int32_t direction); TRACK_PAINT_FUNCTION get_track_paint_function_stand_up_rc(int32_t trackType, int32_t direction); diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index 7aff34bfb7..b7feecbe52 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -972,7 +972,7 @@ static void vehicle_update_sound_params(rct_vehicle* vehicle) if (vehicle->x != LOCATION_NULL) { - rct_tile_element* tile_element = map_get_surface_element_at({ vehicle->x, vehicle->y }); + TileElement* tile_element = map_get_surface_element_at({ vehicle->x, vehicle->y }); // vehicle underground if (tile_element != nullptr && tile_element->base_height * 8 > vehicle->z) @@ -1812,7 +1812,7 @@ static void vehicle_update_measurements(rct_vehicle* vehicle) return; } - rct_tile_element* tile_element = map_get_surface_element_at({ x, y }); + TileElement* tile_element = map_get_surface_element_at({ x, y }); // If vehicle above ground. if (tile_element->base_height * 8 <= z) { @@ -2732,7 +2732,7 @@ static bool try_add_synchronised_station(int32_t x, int32_t y, int32_t z) return false; } - rct_tile_element* tileElement = get_station_platform(x, y, z, 2); + TileElement* tileElement = get_station_platform(x, y, z, 2); if (tileElement == nullptr) { /* No station platform element found, @@ -2832,7 +2832,7 @@ static bool vehicle_can_depart_synchronised(rct_vehicle* vehicle) int32_t y = location.y * 32; int32_t z = ride->station_heights[station]; - rct_tile_element* tileElement = map_get_track_element_at(x, y, z); + TileElement* tileElement = map_get_track_element_at(x, y, z); if (tileElement == nullptr) { return false; @@ -3116,7 +3116,7 @@ void vehicle_test_reset(rct_vehicle* vehicle) static bool vehicle_next_tower_element_is_top(rct_vehicle* vehicle) { - rct_tile_element* tileElement = map_get_track_element_at_of_type( + TileElement* tileElement = map_get_track_element_at_of_type( vehicle->track_x, vehicle->track_y, vehicle->track_z / 8, vehicle->track_type >> 2); if (tileElement->flags & TILE_ELEMENT_FLAG_LAST_TILE) @@ -4004,7 +4004,7 @@ loc_6D8E36: return; } - rct_tile_element* tileElement = map_get_track_element_at(vehicle->track_x, vehicle->track_y, vehicle->track_z / 8); + TileElement* tileElement = map_get_track_element_at(vehicle->track_x, vehicle->track_y, vehicle->track_z / 8); if (tileElement == nullptr) { @@ -4285,7 +4285,7 @@ static void loc_6DA9F9(rct_vehicle* vehicle, int32_t x, int32_t y, int32_t bx, i vehicle->track_x = bx; vehicle->track_y = dx; - rct_tile_element* tileElement = map_get_track_element_at(vehicle->track_x, vehicle->track_y, vehicle->track_z >> 3); + TileElement* tileElement = map_get_track_element_at(vehicle->track_x, vehicle->track_y, vehicle->track_z >> 3); Ride* ride = get_ride(vehicle->ride); vehicle->track_type = (tileElement->AsTrack()->GetTrackType() << 2) | (ride->boat_hire_return_direction & 3); @@ -4668,7 +4668,7 @@ static void vehicle_update_boat_location(rct_vehicle* vehicle) */ static bool vehicle_boat_is_location_accessible(const TileCoordsXYZ& location) { - rct_tile_element* tileElement = map_get_first_element_at(location.x, location.y); + TileElement* tileElement = map_get_first_element_at(location.x, location.y); do { if (tileElement->GetType() == TILE_ELEMENT_TYPE_SURFACE) @@ -5166,9 +5166,9 @@ static void vehicle_update_doing_circus_show(rct_vehicle* vehicle) * rct2: 0x0068B8BD * @returns the map element that the vehicle will collide with or NULL if no collisions. */ -static rct_tile_element* vehicle_check_collision(int16_t x, int16_t y, int16_t z) +static TileElement* vehicle_check_collision(int16_t x, int16_t y, int16_t z) { - rct_tile_element* tileElement = map_get_first_element_at(x / 32, y / 32); + TileElement* tileElement = map_get_first_element_at(x / 32, y / 32); if (tileElement == nullptr) { return nullptr; @@ -5416,7 +5416,7 @@ static void vehicle_update_crash(rct_vehicle* vehicle) continue; } - rct_tile_element* collideElement = vehicle_check_collision(curVehicle->x, curVehicle->y, curVehicle->z); + TileElement* collideElement = vehicle_check_collision(curVehicle->x, curVehicle->y, curVehicle->z); if (collideElement == nullptr) { curVehicle->sub_state = 1; @@ -6667,7 +6667,7 @@ static void check_and_apply_block_section_stop_site(rct_vehicle* vehicle) int32_t trackType = vehicle->track_type >> 2; - rct_tile_element* trackElement = map_get_track_element_at_of_type( + TileElement* trackElement = map_get_track_element_at_of_type( vehicle->track_x, vehicle->track_y, vehicle->track_z >> 3, trackType); if (trackElement == nullptr) @@ -6738,13 +6738,13 @@ static void update_velocity(rct_vehicle* vehicle) _vehicleVelocityF64E0C = (nextVelocity >> 10) * 42; } -static void vehicle_update_block_brakes_open_previous_section(rct_vehicle* vehicle, rct_tile_element* tileElement) +static void vehicle_update_block_brakes_open_previous_section(rct_vehicle* vehicle, TileElement* tileElement) { int32_t x = vehicle->track_x; int32_t y = vehicle->track_y; int32_t z = vehicle->track_z; track_begin_end trackBeginEnd, slowTrackBeginEnd; - rct_tile_element slowTileElement = *tileElement; + TileElement slowTileElement = *tileElement; bool counter = true; int32_t slowX = x; int32_t slowY = y; @@ -7234,7 +7234,7 @@ static void vehicle_update_spinning_car(rct_vehicle* vehicle) */ static void steam_particle_create(int16_t x, int16_t y, int16_t z) { - rct_tile_element* tileElement = map_get_surface_element_at({ x, y }); + TileElement* tileElement = map_get_surface_element_at({ x, y }); if (tileElement != nullptr && z > tileElement->base_height * 8) { rct_steam_particle* steam = (rct_steam_particle*)create_sprite(2); @@ -7405,7 +7405,7 @@ static void vehicle_update_additional_animation(rct_vehicle* vehicle) * * rct2: 0x006DEDB1 */ -static void vehicle_play_scenery_door_open_sound(rct_vehicle* vehicle, rct_tile_element* tileElement) +static void vehicle_play_scenery_door_open_sound(rct_vehicle* vehicle, TileElement* tileElement) { rct_scenery_entry* wallEntry = tileElement->AsWall()->GetEntry(); int32_t doorSoundType = wall_entry_get_door_sound(wallEntry); @@ -7423,7 +7423,7 @@ static void vehicle_play_scenery_door_open_sound(rct_vehicle* vehicle, rct_tile_ * * rct2: 0x006DED7A */ -static void vehicle_play_scenery_door_close_sound(rct_vehicle* vehicle, rct_tile_element* tileElement) +static void vehicle_play_scenery_door_close_sound(rct_vehicle* vehicle, TileElement* tileElement) { rct_scenery_entry* wallEntry = tileElement->AsWall()->GetEntry(); int32_t doorSoundType = wall_entry_get_door_sound(wallEntry); @@ -7455,7 +7455,7 @@ static void vehicle_update_scenery_door(rct_vehicle* vehicle) int32_t z = (vehicle->track_z - trackBlock->z + trackCoordinates->z_end) >> 3; int32_t direction = (vehicle->track_direction + trackCoordinates->rotation_end) & 3; - rct_tile_element* tileElement = map_get_wall_element_at(x, y, z, direction); + TileElement* tileElement = map_get_wall_element_at(x, y, z, direction); if (tileElement == nullptr) { return; @@ -7480,7 +7480,7 @@ static void vehicle_update_scenery_door(rct_vehicle* vehicle) * * rct2: 0x006DB38B */ -static bool loc_6DB38B(rct_vehicle* vehicle, rct_tile_element* tileElement) +static bool loc_6DB38B(rct_vehicle* vehicle, TileElement* tileElement) { // Get bank int32_t bankStart = track_get_actual_bank_3(vehicle, tileElement); @@ -7513,7 +7513,7 @@ static void loc_6DB481(rct_vehicle* vehicle) * * rct2: 0x006DB545 */ -static void vehicle_trigger_on_ride_photo(rct_vehicle* vehicle, rct_tile_element* tileElement) +static void vehicle_trigger_on_ride_photo(rct_vehicle* vehicle, TileElement* tileElement) { tileElement->AsTrack()->SetPhotoTimeout(); @@ -7535,7 +7535,7 @@ static void vehicle_update_handle_scenery_door(rct_vehicle* vehicle) int32_t direction = (vehicle->track_direction + trackCoordinates->rotation_begin) & 3; direction ^= 2; - rct_tile_element* tileElement = map_get_wall_element_at(x, y, z, direction); + TileElement* tileElement = map_get_wall_element_at(x, y, z, direction); if (tileElement == nullptr) { return; @@ -7877,7 +7877,7 @@ static void sub_6DBF3E(rct_vehicle* vehicle) _vehicleMotionTrackFlags |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_3; - rct_tile_element* tileElement = nullptr; + TileElement* tileElement = nullptr; if (map_is_location_valid({ vehicle->track_x, vehicle->track_y })) { tileElement = map_get_track_element_at_of_type_seq( @@ -7959,7 +7959,7 @@ static bool vehicle_update_track_motion_forwards_get_new_track( _vehicleVAngleEndF64E36 = TrackDefinitions[trackType].vangle_end; _vehicleBankEndF64E37 = TrackDefinitions[trackType].bank_end; - rct_tile_element* tileElement = map_get_track_element_at_of_type_seq( + TileElement* tileElement = map_get_track_element_at_of_type_seq( vehicle->track_x, vehicle->track_y, vehicle->track_z >> 3, trackType, 0); if (tileElement == nullptr) @@ -8396,7 +8396,7 @@ static bool vehicle_update_track_motion_backwards_get_new_track( { _vehicleVAngleEndF64E36 = TrackDefinitions[trackType].vangle_start; _vehicleBankEndF64E37 = TrackDefinitions[trackType].bank_start; - rct_tile_element* tileElement = map_get_track_element_at_of_type_seq( + TileElement* tileElement = map_get_track_element_at_of_type_seq( vehicle->track_x, vehicle->track_y, vehicle->track_z >> 3, trackType, 0); if (tileElement == nullptr) @@ -8725,7 +8725,7 @@ static int32_t vehicle_update_track_motion_mini_golf(rct_vehicle* vehicle, int32 rct_ride_entry* rideEntry = get_ride_entry(vehicle->ride_subtype); rct_ride_entry_vehicle* vehicleEntry = vehicle_get_vehicle_entry(vehicle); - rct_tile_element* tileElement = nullptr; + TileElement* tileElement = nullptr; gCurrentVehicle = vehicle; _vehicleMotionTrackFlags = 0; @@ -9929,7 +9929,7 @@ void vehicle_update_crossings(const rct_vehicle* vehicle) while (true) { - rct_tile_element* tileElement = map_get_path_element_at( + TileElement* tileElement = map_get_path_element_at( xyElement.x / 32, xyElement.y / 32, xyElement.element->base_height); if (tileElement) @@ -10002,7 +10002,7 @@ void vehicle_update_crossings(const rct_vehicle* vehicle) } } - rct_tile_element* tileElement = map_get_path_element_at( + TileElement* tileElement = map_get_path_element_at( xyElement.x / 32, xyElement.y / 32, xyElement.element->base_height); if (tileElement) { diff --git a/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp b/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp index b014558296..eac2b38295 100644 --- a/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp +++ b/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp @@ -176,7 +176,7 @@ static uint32_t air_powered_vertical_rc_get_support_colour(paint_session* sessio /** rct2: 0x008AFAD4 */ static void air_powered_vertical_rc_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4] = { SPR_AIR_POWERED_VERTICAL_RC_FLAT_SW_NE, @@ -198,7 +198,7 @@ static void air_powered_vertical_rc_track_flat( static void air_powered_vertical_rc_track_station( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_AIR_POWERED_VERTICAL_RC_STATION_SW_NE, SPR_STATION_BASE_B_SW_NE }, @@ -227,7 +227,7 @@ static void air_powered_vertical_rc_track_station( static void air_powered_vertical_rc_track_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const sprite_bb imageIds[4][5] = { { @@ -310,7 +310,7 @@ static void air_powered_vertical_rc_track_right_quarter_turn_5( static void air_powered_vertical_rc_track_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; air_powered_vertical_rc_track_right_quarter_turn_5( @@ -320,7 +320,7 @@ static void air_powered_vertical_rc_track_left_quarter_turn_5( /** rct2: 0x008AFB74 */ static void air_powered_vertical_rc_track_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t 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 }, @@ -349,7 +349,7 @@ static void air_powered_vertical_rc_track_flat_to_left_bank( /** rct2: 0x008AFB84 */ static void air_powered_vertical_rc_track_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t 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 }, @@ -377,7 +377,7 @@ static void air_powered_vertical_rc_track_flat_to_right_bank( static void air_powered_vertical_rc_track_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { air_powered_vertical_rc_track_flat_to_right_bank( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -386,7 +386,7 @@ static void air_powered_vertical_rc_track_left_bank_to_flat( /** rct2: 0x008AFBA4 */ static void air_powered_vertical_rc_track_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { air_powered_vertical_rc_track_flat_to_left_bank( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -394,7 +394,7 @@ static void air_powered_vertical_rc_track_right_bank_to_flat( static void air_powered_vertical_rc_track_banked_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const sprite_bb imageIds[4][5] = { { @@ -491,7 +491,7 @@ static void air_powered_vertical_rc_track_banked_right_quarter_turn_5( static void air_powered_vertical_rc_track_banked_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; air_powered_vertical_rc_track_banked_right_quarter_turn_5( @@ -501,7 +501,7 @@ static void air_powered_vertical_rc_track_banked_left_quarter_turn_5( /** rct2: 0x008AFBD4 */ static void air_powered_vertical_rc_track_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4] = { SPR_AIR_POWERED_VERTICAL_RC_LEFT_BANK_SW_NE, @@ -530,14 +530,14 @@ static void air_powered_vertical_rc_track_left_bank( static void air_powered_vertical_rc_track_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { air_powered_vertical_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } static void air_powered_vertical_rc_track_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4] = { SPR_AIR_POWERED_VERTICAL_RC_BRAKES_NW_SE, @@ -559,7 +559,7 @@ static void air_powered_vertical_rc_track_brakes( static void air_powered_vertical_rc_track_vertical_slope_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t trackImageIds[7][4] = { { @@ -763,7 +763,7 @@ static void air_powered_vertical_rc_track_vertical_slope_up( static void air_powered_vertical_rc_track_vertical_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t 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 }, @@ -800,7 +800,7 @@ static void air_powered_vertical_rc_track_vertical_up( static void air_powered_vertical_rc_track_vertical_top( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (direction == 2 || direction == 3) { @@ -883,14 +883,14 @@ static void air_powered_vertical_rc_track_vertical_top( static void air_powered_vertical_rc_track_vertical_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { air_powered_vertical_rc_track_vertical_up(session, rideIndex, trackSequence ^ 1, (direction + 2) & 3, height, tileElement); } static void air_powered_vertical_rc_track_vertical_slope_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { air_powered_vertical_rc_track_vertical_slope_up( session, rideIndex, 6 - trackSequence, (direction + 2) & 3, height, tileElement); diff --git a/src/openrct2/ride/coaster/BobsleighCoaster.cpp b/src/openrct2/ride/coaster/BobsleighCoaster.cpp index 312c771946..a7de56070b 100644 --- a/src/openrct2/ride/coaster/BobsleighCoaster.cpp +++ b/src/openrct2/ride/coaster/BobsleighCoaster.cpp @@ -22,7 +22,7 @@ /** rct2: 0x006FE5B4 */ static void bobsleigh_rc_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -80,7 +80,7 @@ static void bobsleigh_rc_track_flat( static void bobsleigh_rc_track_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { 14580, SPR_STATION_BASE_B_SW_NE }, @@ -104,7 +104,7 @@ static void bobsleigh_rc_track_station( /** rct2: 0x006FE5C4 */ static void bobsleigh_rc_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -190,7 +190,7 @@ static void bobsleigh_rc_track_25_deg_up( /** rct2: 0x006FE5D4 */ static void bobsleigh_rc_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -276,7 +276,7 @@ static void bobsleigh_rc_track_flat_to_25_deg_up( /** rct2: 0x006FE5E4 */ static void bobsleigh_rc_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -362,7 +362,7 @@ static void bobsleigh_rc_track_25_deg_up_to_flat( /** rct2: 0x006FE5F4 */ static void bobsleigh_rc_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bobsleigh_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -370,7 +370,7 @@ static void bobsleigh_rc_track_25_deg_down( /** rct2: 0x006FE604 */ static void bobsleigh_rc_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bobsleigh_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -378,7 +378,7 @@ static void bobsleigh_rc_track_flat_to_25_deg_down( /** rct2: 0x006FE614 */ static void bobsleigh_rc_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bobsleigh_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -386,7 +386,7 @@ static void bobsleigh_rc_track_25_deg_down_to_flat( /** rct2: 0x006FE624 */ static void bobsleigh_rc_track_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -610,7 +610,7 @@ static void bobsleigh_rc_track_left_quarter_turn_5( /** rct2: 0x006FE634 */ static void bobsleigh_rc_track_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; bobsleigh_rc_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -619,7 +619,7 @@ static void bobsleigh_rc_track_right_quarter_turn_5( /** rct2: 0x006FE644 */ static void bobsleigh_rc_track_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -661,7 +661,7 @@ static void bobsleigh_rc_track_flat_to_left_bank( /** rct2: 0x006FE654 */ static void bobsleigh_rc_track_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -703,7 +703,7 @@ static void bobsleigh_rc_track_flat_to_right_bank( /** rct2: 0x006FE664 */ static void bobsleigh_rc_track_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -745,7 +745,7 @@ static void bobsleigh_rc_track_left_bank_to_flat( /** rct2: 0x006FE674 */ static void bobsleigh_rc_track_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -787,7 +787,7 @@ static void bobsleigh_rc_track_right_bank_to_flat( /** rct2: 0x006FE684 */ static void bobsleigh_rc_track_banked_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1011,7 +1011,7 @@ static void bobsleigh_rc_track_banked_left_quarter_turn_5( /** rct2: 0x006FE694 */ static void bobsleigh_rc_track_banked_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; bobsleigh_rc_track_banked_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -1020,7 +1020,7 @@ static void bobsleigh_rc_track_banked_right_quarter_turn_5( /** rct2: 0x006FE6A4 */ static void bobsleigh_rc_track_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1069,7 +1069,7 @@ static void bobsleigh_rc_track_left_bank_to_25_deg_up( /** rct2: 0x006FE6B4 */ static void bobsleigh_rc_track_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1118,7 +1118,7 @@ static void bobsleigh_rc_track_right_bank_to_25_deg_up( /** rct2: 0x006FE6C4 */ static void bobsleigh_rc_track_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1167,7 +1167,7 @@ static void bobsleigh_rc_track_25_deg_up_to_left_bank( /** rct2: 0x006FE6D4 */ static void bobsleigh_rc_track_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1216,7 +1216,7 @@ static void bobsleigh_rc_track_25_deg_up_to_right_bank( /** rct2: 0x006FE6E4 */ static void bobsleigh_rc_track_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bobsleigh_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1224,7 +1224,7 @@ static void bobsleigh_rc_track_left_bank_to_25_deg_down( /** rct2: 0x006FE6F4 */ static void bobsleigh_rc_track_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bobsleigh_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1232,7 +1232,7 @@ static void bobsleigh_rc_track_right_bank_to_25_deg_down( /** rct2: 0x006FE704 */ static void bobsleigh_rc_track_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bobsleigh_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1240,7 +1240,7 @@ static void bobsleigh_rc_track_25_deg_down_to_left_bank( /** rct2: 0x006FE714 */ static void bobsleigh_rc_track_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bobsleigh_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1248,7 +1248,7 @@ static void bobsleigh_rc_track_25_deg_down_to_right_bank( /** rct2: 0x006FE724 */ static void bobsleigh_rc_track_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1290,7 +1290,7 @@ static void bobsleigh_rc_track_left_bank( /** rct2: 0x006FE734 */ static void bobsleigh_rc_track_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bobsleigh_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1298,7 +1298,7 @@ static void bobsleigh_rc_track_right_bank( /** rct2: 0x006FE744 */ static void bobsleigh_rc_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1481,7 +1481,7 @@ static void bobsleigh_rc_track_s_bend_left( /** rct2: 0x006FE754 */ static void bobsleigh_rc_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1664,7 +1664,7 @@ static void bobsleigh_rc_track_s_bend_right( /** rct2: 0x006FE794 */ static void bobsleigh_rc_track_left_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1803,7 +1803,7 @@ static void bobsleigh_rc_track_left_quarter_turn_3( /** rct2: 0x006FE7A4 */ static void bobsleigh_rc_track_right_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; bobsleigh_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -1812,7 +1812,7 @@ static void bobsleigh_rc_track_right_quarter_turn_3( /** rct2: 0x006FE7B4 */ static void bobsleigh_rc_track_left_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1951,7 +1951,7 @@ static void bobsleigh_rc_track_left_quarter_turn_3_bank( /** rct2: 0x006FE7C4 */ static void bobsleigh_rc_track_right_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; bobsleigh_rc_track_left_quarter_turn_3_bank(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -1960,7 +1960,7 @@ static void bobsleigh_rc_track_right_quarter_turn_3_bank( /** rct2: 0x006FE7D4 */ static void bobsleigh_rc_track_left_half_banked_helix_up_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2232,7 +2232,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_small( /** rct2: 0x006FE7E4 */ static void bobsleigh_rc_track_right_half_banked_helix_up_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2504,7 +2504,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_small( /** rct2: 0x006FE7F4 */ static void bobsleigh_rc_track_left_half_banked_helix_down_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 4) { @@ -2519,7 +2519,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_down_small( /** rct2: 0x006FE804 */ static void bobsleigh_rc_track_right_half_banked_helix_down_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 4) { @@ -2534,7 +2534,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_down_small( /** rct2: 0x006FE814 */ static void bobsleigh_rc_track_left_half_banked_helix_up_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2976,7 +2976,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large( /** rct2: 0x006FE824 */ static void bobsleigh_rc_track_right_half_banked_helix_up_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3418,7 +3418,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large( /** rct2: 0x006FE834 */ static void bobsleigh_rc_track_left_half_banked_helix_down_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 7) { @@ -3433,7 +3433,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_down_large( /** rct2: 0x006FE844 */ static void bobsleigh_rc_track_right_half_banked_helix_down_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 7) { @@ -3448,7 +3448,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_down_large( /** rct2: 0x006FE854 */ static void bobsleigh_rc_track_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -3480,7 +3480,7 @@ static void bobsleigh_rc_track_brakes( /** rct2: 0x006FE864 */ static void bobsleigh_rc_track_block_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -3511,7 +3511,7 @@ static void bobsleigh_rc_track_block_brakes( static void bobsleigh_rc_track_on_ride_photo( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { diff --git a/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp b/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp index 0d4d5d7ad7..a646fe771b 100644 --- a/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp +++ b/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp @@ -23,7 +23,7 @@ void bolliger_mabillard_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { if (tileElement->AsTrack()->HasChain()) { @@ -79,7 +79,7 @@ void bolliger_mabillard_track_flat( void bolliger_mabillard_track_station( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { static constexpr const uint32_t imageIds[4][3] = { { 17154, 17150, SPR_STATION_BASE_A_SW_NE }, @@ -115,7 +115,7 @@ void bolliger_mabillard_track_station( void bolliger_mabillard_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { if (tileElement->AsTrack()->HasChain()) { @@ -184,7 +184,7 @@ void bolliger_mabillard_track_25_deg_up( void bolliger_mabillard_track_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { if (tileElement->AsTrack()->HasChain()) { @@ -253,7 +253,7 @@ void bolliger_mabillard_track_60_deg_up( void bolliger_mabillard_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { if (tileElement->AsTrack()->HasChain()) { @@ -322,7 +322,7 @@ void bolliger_mabillard_track_flat_to_25_deg_up( void bolliger_mabillard_track_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { if (tileElement->AsTrack()->HasChain()) { @@ -399,7 +399,7 @@ void bolliger_mabillard_track_25_deg_up_to_60_deg_up( void bolliger_mabillard_track_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { if (tileElement->AsTrack()->HasChain()) { @@ -476,7 +476,7 @@ void bolliger_mabillard_track_60_deg_up_to_25_deg_up( void bolliger_mabillard_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { if (tileElement->AsTrack()->HasChain()) { @@ -545,7 +545,7 @@ void bolliger_mabillard_track_25_deg_up_to_flat( void bolliger_mabillard_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -553,7 +553,7 @@ void bolliger_mabillard_track_25_deg_down( void bolliger_mabillard_track_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_60_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -561,7 +561,7 @@ void bolliger_mabillard_track_60_deg_down( void bolliger_mabillard_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_25_deg_up_to_flat( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -569,7 +569,7 @@ void bolliger_mabillard_track_flat_to_25_deg_down( void bolliger_mabillard_track_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_60_deg_up_to_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -577,7 +577,7 @@ void bolliger_mabillard_track_25_deg_down_to_60_deg_down( void bolliger_mabillard_track_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_25_deg_up_to_60_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -585,7 +585,7 @@ void bolliger_mabillard_track_60_deg_down_to_25_deg_down( void bolliger_mabillard_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_flat_to_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -593,7 +593,7 @@ void bolliger_mabillard_track_25_deg_down_to_flat( void bolliger_mabillard_track_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -756,7 +756,7 @@ void bolliger_mabillard_track_left_quarter_turn_5( void bolliger_mabillard_track_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; bolliger_mabillard_track_left_quarter_turn_5( @@ -765,7 +765,7 @@ void bolliger_mabillard_track_right_quarter_turn_5( void bolliger_mabillard_track_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (direction) { @@ -802,7 +802,7 @@ void bolliger_mabillard_track_flat_to_left_bank( void bolliger_mabillard_track_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (direction) { @@ -839,7 +839,7 @@ void bolliger_mabillard_track_flat_to_right_bank( void bolliger_mabillard_track_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (direction) { @@ -876,7 +876,7 @@ void bolliger_mabillard_track_left_bank_to_flat( void bolliger_mabillard_track_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (direction) { @@ -913,7 +913,7 @@ void bolliger_mabillard_track_right_bank_to_flat( void bolliger_mabillard_track_banked_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -1089,7 +1089,7 @@ void bolliger_mabillard_track_banked_left_quarter_turn_5( void bolliger_mabillard_track_banked_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; bolliger_mabillard_track_banked_left_quarter_turn_5( @@ -1098,7 +1098,7 @@ void bolliger_mabillard_track_banked_right_quarter_turn_5( void bolliger_mabillard_track_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (direction) { @@ -1142,7 +1142,7 @@ void bolliger_mabillard_track_left_bank_to_25_deg_up( void bolliger_mabillard_track_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (direction) { @@ -1186,7 +1186,7 @@ void bolliger_mabillard_track_right_bank_to_25_deg_up( void bolliger_mabillard_track_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (direction) { @@ -1230,7 +1230,7 @@ void bolliger_mabillard_track_25_deg_up_to_left_bank( void bolliger_mabillard_track_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (direction) { @@ -1274,7 +1274,7 @@ void bolliger_mabillard_track_25_deg_up_to_right_bank( void bolliger_mabillard_track_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_25_deg_up_to_right_bank( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -1282,7 +1282,7 @@ void bolliger_mabillard_track_left_bank_to_25_deg_down( void bolliger_mabillard_track_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_25_deg_up_to_left_bank( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -1290,7 +1290,7 @@ void bolliger_mabillard_track_right_bank_to_25_deg_down( void bolliger_mabillard_track_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_right_bank_to_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -1298,7 +1298,7 @@ void bolliger_mabillard_track_25_deg_down_to_left_bank( void bolliger_mabillard_track_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_left_bank_to_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -1306,7 +1306,7 @@ void bolliger_mabillard_track_25_deg_down_to_right_bank( void bolliger_mabillard_track_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (direction) { @@ -1339,7 +1339,7 @@ void bolliger_mabillard_track_left_bank( void bolliger_mabillard_track_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_left_bank( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -1347,7 +1347,7 @@ void bolliger_mabillard_track_right_bank( void bolliger_mabillard_track_left_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -1510,7 +1510,7 @@ void bolliger_mabillard_track_left_quarter_turn_5_25_deg_up( void bolliger_mabillard_track_right_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -1673,7 +1673,7 @@ void bolliger_mabillard_track_right_quarter_turn_5_25_deg_up( void bolliger_mabillard_track_left_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; bolliger_mabillard_track_right_quarter_turn_5_25_deg_up( @@ -1682,7 +1682,7 @@ void bolliger_mabillard_track_left_quarter_turn_5_25_deg_down( void bolliger_mabillard_track_right_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; bolliger_mabillard_track_left_quarter_turn_5_25_deg_up( @@ -1691,7 +1691,7 @@ void bolliger_mabillard_track_right_quarter_turn_5_25_deg_down( void bolliger_mabillard_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -1821,7 +1821,7 @@ void bolliger_mabillard_track_s_bend_left( void bolliger_mabillard_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -1951,7 +1951,7 @@ void bolliger_mabillard_track_s_bend_right( void bolliger_mabillard_track_left_vertical_loop( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -2213,7 +2213,7 @@ void bolliger_mabillard_track_left_vertical_loop( void bolliger_mabillard_track_right_vertical_loop( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -2437,7 +2437,7 @@ void bolliger_mabillard_track_right_vertical_loop( void bolliger_mabillard_track_left_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -2539,7 +2539,7 @@ void bolliger_mabillard_track_left_quarter_turn_3( void bolliger_mabillard_track_right_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; bolliger_mabillard_track_left_quarter_turn_3( @@ -2548,7 +2548,7 @@ void bolliger_mabillard_track_right_quarter_turn_3( void bolliger_mabillard_track_left_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -2659,7 +2659,7 @@ void bolliger_mabillard_track_left_quarter_turn_3_bank( void bolliger_mabillard_track_right_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; bolliger_mabillard_track_left_quarter_turn_3_bank( @@ -2668,7 +2668,7 @@ void bolliger_mabillard_track_right_quarter_turn_3_bank( void bolliger_mabillard_track_left_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -2746,7 +2746,7 @@ void bolliger_mabillard_track_left_quarter_turn_3_25_deg_up( void bolliger_mabillard_track_right_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -2827,7 +2827,7 @@ void bolliger_mabillard_track_right_quarter_turn_3_25_deg_up( void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; bolliger_mabillard_track_right_quarter_turn_3_25_deg_up( @@ -2836,7 +2836,7 @@ void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down( void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; bolliger_mabillard_track_left_quarter_turn_3_25_deg_up( @@ -2845,7 +2845,7 @@ void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down( void bolliger_mabillard_track_left_half_banked_helix_up_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -3062,7 +3062,7 @@ void bolliger_mabillard_track_left_half_banked_helix_up_small( void bolliger_mabillard_track_right_half_banked_helix_up_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -3279,7 +3279,7 @@ void bolliger_mabillard_track_right_half_banked_helix_up_small( void bolliger_mabillard_track_left_half_banked_helix_down_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { if (trackSequence >= 4) { @@ -3293,7 +3293,7 @@ void bolliger_mabillard_track_left_half_banked_helix_down_small( void bolliger_mabillard_track_right_half_banked_helix_down_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { if (trackSequence >= 4) { @@ -3307,7 +3307,7 @@ void bolliger_mabillard_track_right_half_banked_helix_down_small( void bolliger_mabillard_track_left_half_banked_helix_up_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -3648,7 +3648,7 @@ void bolliger_mabillard_track_left_half_banked_helix_up_large( void bolliger_mabillard_track_right_half_banked_helix_up_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -3995,7 +3995,7 @@ void bolliger_mabillard_track_right_half_banked_helix_up_large( void bolliger_mabillard_track_left_half_banked_helix_down_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { if (trackSequence >= 7) { @@ -4009,7 +4009,7 @@ void bolliger_mabillard_track_left_half_banked_helix_down_large( void bolliger_mabillard_track_right_half_banked_helix_down_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { if (trackSequence >= 7) { @@ -4023,7 +4023,7 @@ void bolliger_mabillard_track_right_half_banked_helix_down_large( void bolliger_mabillard_track_left_quarter_turn_1_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (direction) { @@ -4059,7 +4059,7 @@ void bolliger_mabillard_track_left_quarter_turn_1_60_deg_up( void bolliger_mabillard_track_right_quarter_turn_1_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (direction) { @@ -4095,7 +4095,7 @@ void bolliger_mabillard_track_right_quarter_turn_1_60_deg_up( void bolliger_mabillard_track_left_quarter_turn_1_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_right_quarter_turn_1_60_deg_up( session, rideIndex, trackSequence, (direction + 1) & 3, height, tileElement, supportType); @@ -4103,7 +4103,7 @@ void bolliger_mabillard_track_left_quarter_turn_1_60_deg_down( void bolliger_mabillard_track_right_quarter_turn_1_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_left_quarter_turn_1_60_deg_up( session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement, supportType); @@ -4111,7 +4111,7 @@ void bolliger_mabillard_track_right_quarter_turn_1_60_deg_down( void bolliger_mabillard_track_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (direction) { @@ -4138,7 +4138,7 @@ void bolliger_mabillard_track_brakes( void bolliger_mabillard_track_25_deg_up_left_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (direction) { @@ -4178,7 +4178,7 @@ void bolliger_mabillard_track_25_deg_up_left_banked( void bolliger_mabillard_track_25_deg_up_right_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (direction) { @@ -4218,7 +4218,7 @@ void bolliger_mabillard_track_25_deg_up_right_banked( void bolliger_mabillard_track_on_ride_photo( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (direction) { @@ -4259,7 +4259,7 @@ void bolliger_mabillard_track_on_ride_photo( void bolliger_mabillard_track_25_deg_down_left_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_25_deg_up_right_banked( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -4267,7 +4267,7 @@ void bolliger_mabillard_track_25_deg_down_left_banked( void bolliger_mabillard_track_25_deg_down_right_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_25_deg_up_left_banked( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -4275,7 +4275,7 @@ void bolliger_mabillard_track_25_deg_down_right_banked( void bolliger_mabillard_track_90_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -4315,7 +4315,7 @@ void bolliger_mabillard_track_90_deg_up( void bolliger_mabillard_track_90_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_90_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -4323,7 +4323,7 @@ void bolliger_mabillard_track_90_deg_down( void bolliger_mabillard_track_60_deg_up_to_90_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -4365,7 +4365,7 @@ void bolliger_mabillard_track_60_deg_up_to_90_deg_up( void bolliger_mabillard_track_90_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_60_deg_up_to_90_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -4373,7 +4373,7 @@ void bolliger_mabillard_track_90_deg_down_to_60_deg_down( void bolliger_mabillard_track_90_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (direction) { @@ -4410,7 +4410,7 @@ void bolliger_mabillard_track_90_deg_up_to_60_deg_up( void bolliger_mabillard_track_60_deg_down_to_90_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -4453,7 +4453,7 @@ void bolliger_mabillard_track_60_deg_down_to_90_deg_down( void bolliger_mabillard_track_left_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -4587,7 +4587,7 @@ void bolliger_mabillard_track_left_eighth_to_diag( void bolliger_mabillard_track_right_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -4720,7 +4720,7 @@ void bolliger_mabillard_track_right_eighth_to_diag( void bolliger_mabillard_track_left_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; bolliger_mabillard_track_right_eighth_to_diag( @@ -4729,7 +4729,7 @@ void bolliger_mabillard_track_left_eighth_to_orthogonal( void bolliger_mabillard_track_right_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; bolliger_mabillard_track_left_eighth_to_diag( @@ -4738,7 +4738,7 @@ void bolliger_mabillard_track_right_eighth_to_orthogonal( void bolliger_mabillard_track_left_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -4875,7 +4875,7 @@ void bolliger_mabillard_track_left_eighth_bank_to_diag( void bolliger_mabillard_track_right_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -5012,7 +5012,7 @@ void bolliger_mabillard_track_right_eighth_bank_to_diag( void bolliger_mabillard_track_left_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; bolliger_mabillard_track_right_eighth_bank_to_diag( @@ -5021,7 +5021,7 @@ void bolliger_mabillard_track_left_eighth_bank_to_orthogonal( void bolliger_mabillard_track_right_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; bolliger_mabillard_track_left_eighth_bank_to_diag( @@ -5030,7 +5030,7 @@ void bolliger_mabillard_track_right_eighth_bank_to_orthogonal( void bolliger_mabillard_track_diag_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -5175,7 +5175,7 @@ void bolliger_mabillard_track_diag_flat( void bolliger_mabillard_track_diag_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -5320,7 +5320,7 @@ void bolliger_mabillard_track_diag_25_deg_up( void bolliger_mabillard_track_diag_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -5465,7 +5465,7 @@ void bolliger_mabillard_track_diag_60_deg_up( void bolliger_mabillard_track_diag_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -5610,7 +5610,7 @@ void bolliger_mabillard_track_diag_flat_to_25_deg_up( void bolliger_mabillard_track_diag_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -5755,7 +5755,7 @@ void bolliger_mabillard_track_diag_25_deg_up_to_60_deg_up( void bolliger_mabillard_track_diag_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -5900,7 +5900,7 @@ void bolliger_mabillard_track_diag_60_deg_up_to_25_deg_up( void bolliger_mabillard_track_diag_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -6045,7 +6045,7 @@ void bolliger_mabillard_track_diag_25_deg_up_to_flat( void bolliger_mabillard_track_diag_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -6190,7 +6190,7 @@ void bolliger_mabillard_track_diag_25_deg_down( void bolliger_mabillard_track_diag_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -6335,7 +6335,7 @@ void bolliger_mabillard_track_diag_60_deg_down( void bolliger_mabillard_track_diag_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -6478,7 +6478,7 @@ void bolliger_mabillard_track_diag_flat_to_25_deg_down( void bolliger_mabillard_track_diag_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -6623,7 +6623,7 @@ void bolliger_mabillard_track_diag_25_deg_down_to_60_deg_down( void bolliger_mabillard_track_diag_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -6768,7 +6768,7 @@ void bolliger_mabillard_track_diag_60_deg_down_to_25_deg_down( void bolliger_mabillard_track_diag_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -6913,7 +6913,7 @@ void bolliger_mabillard_track_diag_25_deg_down_to_flat( void bolliger_mabillard_track_diag_flat_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -7058,7 +7058,7 @@ void bolliger_mabillard_track_diag_flat_to_60_deg_up( void bolliger_mabillard_track_diag_60_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -7203,7 +7203,7 @@ void bolliger_mabillard_track_diag_60_deg_up_to_flat( void bolliger_mabillard_track_diag_flat_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -7348,7 +7348,7 @@ void bolliger_mabillard_track_diag_flat_to_60_deg_down( void bolliger_mabillard_track_diag_60_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -7493,7 +7493,7 @@ void bolliger_mabillard_track_diag_60_deg_down_to_flat( void bolliger_mabillard_track_diag_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -7567,7 +7567,7 @@ void bolliger_mabillard_track_diag_flat_to_left_bank( void bolliger_mabillard_track_diag_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -7641,7 +7641,7 @@ void bolliger_mabillard_track_diag_flat_to_right_bank( void bolliger_mabillard_track_diag_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -7715,7 +7715,7 @@ void bolliger_mabillard_track_diag_left_bank_to_flat( void bolliger_mabillard_track_diag_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -7789,7 +7789,7 @@ void bolliger_mabillard_track_diag_right_bank_to_flat( void bolliger_mabillard_track_diag_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -7863,7 +7863,7 @@ void bolliger_mabillard_track_diag_left_bank_to_25_deg_up( void bolliger_mabillard_track_diag_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -7937,7 +7937,7 @@ void bolliger_mabillard_track_diag_right_bank_to_25_deg_up( void bolliger_mabillard_track_diag_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -8011,7 +8011,7 @@ void bolliger_mabillard_track_diag_25_deg_up_to_left_bank( void bolliger_mabillard_track_diag_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -8085,7 +8085,7 @@ void bolliger_mabillard_track_diag_25_deg_up_to_right_bank( void bolliger_mabillard_track_diag_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -8157,7 +8157,7 @@ void bolliger_mabillard_track_diag_left_bank_to_25_deg_down( void bolliger_mabillard_track_diag_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -8229,7 +8229,7 @@ void bolliger_mabillard_track_diag_right_bank_to_25_deg_down( void bolliger_mabillard_track_diag_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -8303,7 +8303,7 @@ void bolliger_mabillard_track_diag_25_deg_down_to_left_bank( void bolliger_mabillard_track_diag_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -8377,7 +8377,7 @@ void bolliger_mabillard_track_diag_25_deg_down_to_right_bank( void bolliger_mabillard_track_diag_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -8448,7 +8448,7 @@ void bolliger_mabillard_track_diag_left_bank( void bolliger_mabillard_track_diag_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -8519,7 +8519,7 @@ void bolliger_mabillard_track_diag_right_bank( void bolliger_mabillard_track_left_bank_to_left_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -8600,7 +8600,7 @@ void bolliger_mabillard_track_left_bank_to_left_quarter_turn_3_25_deg_up( void bolliger_mabillard_track_right_bank_to_right_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -8684,7 +8684,7 @@ void bolliger_mabillard_track_right_bank_to_right_quarter_turn_3_25_deg_up( void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -8768,7 +8768,7 @@ void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down_to_left_bank( void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -8849,7 +8849,7 @@ void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down_to_right_bank( void bolliger_mabillard_track_block_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (direction) { @@ -8876,7 +8876,7 @@ void bolliger_mabillard_track_block_brakes( void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -8957,7 +8957,7 @@ void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up( void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -9041,7 +9041,7 @@ void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up( void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up( @@ -9050,7 +9050,7 @@ void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_down( void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up( @@ -9059,7 +9059,7 @@ void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_down( void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -9228,7 +9228,7 @@ void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up( void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -9397,7 +9397,7 @@ void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up( void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up( @@ -9406,7 +9406,7 @@ void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_down( void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up( @@ -9415,7 +9415,7 @@ void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_down( void bolliger_mabillard_track_25_deg_up_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (direction) { @@ -9457,7 +9457,7 @@ void bolliger_mabillard_track_25_deg_up_to_left_banked_25_deg_up( void bolliger_mabillard_track_25_deg_up_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (direction) { @@ -9499,7 +9499,7 @@ void bolliger_mabillard_track_25_deg_up_to_right_banked_25_deg_up( void bolliger_mabillard_track_left_banked_25_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (direction) { @@ -9541,7 +9541,7 @@ void bolliger_mabillard_track_left_banked_25_deg_up_to_25_deg_up( void bolliger_mabillard_track_right_banked_25_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (direction) { @@ -9583,7 +9583,7 @@ void bolliger_mabillard_track_right_banked_25_deg_up_to_25_deg_up( void bolliger_mabillard_track_25_deg_down_to_left_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_right_banked_25_deg_up_to_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -9591,7 +9591,7 @@ void bolliger_mabillard_track_25_deg_down_to_left_banked_25_deg_down( void bolliger_mabillard_track_25_deg_down_to_right_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_left_banked_25_deg_up_to_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -9599,7 +9599,7 @@ void bolliger_mabillard_track_25_deg_down_to_right_banked_25_deg_down( void bolliger_mabillard_track_left_banked_25_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_25_deg_up_to_right_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -9607,7 +9607,7 @@ void bolliger_mabillard_track_left_banked_25_deg_down_to_25_deg_down( void bolliger_mabillard_track_right_banked_25_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_25_deg_up_to_left_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -9615,7 +9615,7 @@ void bolliger_mabillard_track_right_banked_25_deg_down_to_25_deg_down( void bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (direction) { @@ -9655,7 +9655,7 @@ void bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_up( void bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (direction) { @@ -9695,7 +9695,7 @@ void bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_up( void bolliger_mabillard_track_left_banked_25_deg_up_to_left_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (direction) { @@ -9735,7 +9735,7 @@ void bolliger_mabillard_track_left_banked_25_deg_up_to_left_banked_flat( void bolliger_mabillard_track_right_banked_25_deg_up_to_right_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (direction) { @@ -9775,7 +9775,7 @@ void bolliger_mabillard_track_right_banked_25_deg_up_to_right_banked_flat( void bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_right_banked_25_deg_up_to_right_banked_flat( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -9783,7 +9783,7 @@ void bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_down( void bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_left_banked_25_deg_up_to_left_banked_flat( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -9791,7 +9791,7 @@ void bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_down( void bolliger_mabillard_track_left_banked_25_deg_down_to_left_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -9799,7 +9799,7 @@ void bolliger_mabillard_track_left_banked_25_deg_down_to_left_banked_flat( void bolliger_mabillard_track_right_banked_25_deg_down_to_right_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -9807,7 +9807,7 @@ void bolliger_mabillard_track_right_banked_25_deg_down_to_right_banked_flat( void bolliger_mabillard_track_flat_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (direction) { @@ -9849,7 +9849,7 @@ void bolliger_mabillard_track_flat_to_left_banked_25_deg_up( void bolliger_mabillard_track_flat_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (direction) { @@ -9891,7 +9891,7 @@ void bolliger_mabillard_track_flat_to_right_banked_25_deg_up( void bolliger_mabillard_track_left_banked_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (direction) { @@ -9933,7 +9933,7 @@ void bolliger_mabillard_track_left_banked_25_deg_up_to_flat( void bolliger_mabillard_track_right_banked_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (direction) { @@ -9975,7 +9975,7 @@ void bolliger_mabillard_track_right_banked_25_deg_up_to_flat( void bolliger_mabillard_track_flat_to_left_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_right_banked_25_deg_up_to_flat( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -9983,7 +9983,7 @@ void bolliger_mabillard_track_flat_to_left_banked_25_deg_down( void bolliger_mabillard_track_flat_to_right_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_left_banked_25_deg_up_to_flat( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -9991,7 +9991,7 @@ void bolliger_mabillard_track_flat_to_right_banked_25_deg_down( void bolliger_mabillard_track_left_banked_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_flat_to_right_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -9999,7 +9999,7 @@ void bolliger_mabillard_track_left_banked_25_deg_down_to_flat( void bolliger_mabillard_track_right_banked_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_flat_to_left_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -10007,7 +10007,7 @@ void bolliger_mabillard_track_right_banked_25_deg_down_to_flat( void bolliger_mabillard_track_left_quarter_turn_1_90_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -10053,7 +10053,7 @@ void bolliger_mabillard_track_left_quarter_turn_1_90_deg_up( void bolliger_mabillard_track_right_quarter_turn_1_90_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -10099,7 +10099,7 @@ void bolliger_mabillard_track_right_quarter_turn_1_90_deg_up( void bolliger_mabillard_track_left_quarter_turn_1_90_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_right_quarter_turn_1_90_deg_up( session, rideIndex, trackSequence, (direction + 1) & 3, height, tileElement, supportType); @@ -10107,7 +10107,7 @@ void bolliger_mabillard_track_left_quarter_turn_1_90_deg_down( void bolliger_mabillard_track_right_quarter_turn_1_90_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_left_quarter_turn_1_90_deg_up( session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement, supportType); @@ -10116,7 +10116,7 @@ void bolliger_mabillard_track_right_quarter_turn_1_90_deg_down( /* The following track elements used to be specific to the Vertical Roller Coaster */ void bolliger_mabillard_track_flat_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { if (tileElement->AsTrack()->HasChain()) { @@ -10191,7 +10191,7 @@ void bolliger_mabillard_track_flat_to_60_deg_up( void bolliger_mabillard_track_60_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { if (tileElement->AsTrack()->HasChain()) { @@ -10266,7 +10266,7 @@ void bolliger_mabillard_track_60_deg_up_to_flat( void bolliger_mabillard_track_flat_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_60_deg_up_to_flat( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -10274,7 +10274,7 @@ void bolliger_mabillard_track_flat_to_60_deg_down( void bolliger_mabillard_track_60_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_flat_to_60_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -10282,7 +10282,7 @@ void bolliger_mabillard_track_60_deg_down_to_flat( void bolliger_mabillard_track_brake_for_drop( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (direction) { @@ -10324,7 +10324,7 @@ void bolliger_mabillard_track_brake_for_drop( /* The following track elements used to be specific to the Steel Twister */ void bolliger_mabillard_track_half_loop_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -10448,14 +10448,14 @@ void bolliger_mabillard_track_half_loop_up( void bolliger_mabillard_track_half_loop_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_half_loop_up(session, rideIndex, 3 - trackSequence, direction, height, tileElement, supportType); } void bolliger_mabillard_track_left_corkscrew_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -10565,7 +10565,7 @@ void bolliger_mabillard_track_left_corkscrew_up( void bolliger_mabillard_track_right_corkscrew_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -10676,7 +10676,7 @@ void bolliger_mabillard_track_right_corkscrew_up( void bolliger_mabillard_track_left_corkscrew_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_right_corkscrew_up( session, rideIndex, 2 - trackSequence, (direction + 1) & 3, height, tileElement, supportType); @@ -10684,7 +10684,7 @@ void bolliger_mabillard_track_left_corkscrew_down( void bolliger_mabillard_track_right_corkscrew_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_left_corkscrew_up( session, rideIndex, 2 - trackSequence, (direction - 1) & 3, height, tileElement, supportType); @@ -10692,7 +10692,7 @@ void bolliger_mabillard_track_right_corkscrew_down( void bolliger_mabillard_track_flat_to_60_deg_up_long_base( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -10829,7 +10829,7 @@ void bolliger_mabillard_track_flat_to_60_deg_up_long_base( /** rct2: 0x008AC104 */ void bolliger_mabillard_track_60_deg_up_to_flat_long_base( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -10965,7 +10965,7 @@ void bolliger_mabillard_track_60_deg_up_to_flat_long_base( void bolliger_mabillard_track_flat_to_60_deg_down_long_base( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_flat_to_60_deg_up_long_base( session, rideIndex, 3 - trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -10973,7 +10973,7 @@ void bolliger_mabillard_track_flat_to_60_deg_down_long_base( void bolliger_mabillard_track_60_deg_up_to_flat_long_base122( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_60_deg_up_to_flat_long_base( session, rideIndex, 3 - trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -10981,7 +10981,7 @@ void bolliger_mabillard_track_60_deg_up_to_flat_long_base122( void bolliger_mabillard_track_left_barrel_roll_up_to_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -11120,7 +11120,7 @@ void bolliger_mabillard_track_left_barrel_roll_up_to_down( void bolliger_mabillard_track_right_barrel_roll_up_to_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -11259,7 +11259,7 @@ void bolliger_mabillard_track_right_barrel_roll_up_to_down( void bolliger_mabillard_track_left_barrel_roll_down_to_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_left_barrel_roll_up_to_down( session, rideIndex, 2 - trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -11267,7 +11267,7 @@ void bolliger_mabillard_track_left_barrel_roll_down_to_up( void bolliger_mabillard_track_right_barrel_roll_down_to_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_right_barrel_roll_up_to_down( session, rideIndex, 2 - trackSequence, (direction + 2) & 3, height, tileElement, supportType); @@ -11275,7 +11275,7 @@ void bolliger_mabillard_track_right_barrel_roll_down_to_up( void bolliger_mabillard_track_powered_lift( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (direction) { @@ -11312,7 +11312,7 @@ void bolliger_mabillard_track_powered_lift( void bolliger_mabillard_track_left_large_half_loop_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -11532,7 +11532,7 @@ void bolliger_mabillard_track_left_large_half_loop_up( void bolliger_mabillard_track_right_large_half_loop_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -11752,7 +11752,7 @@ void bolliger_mabillard_track_right_large_half_loop_up( void bolliger_mabillard_track_right_large_half_loop_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_right_large_half_loop_up( session, rideIndex, 6 - trackSequence, direction, height, tileElement, supportType); @@ -11760,7 +11760,7 @@ void bolliger_mabillard_track_right_large_half_loop_down( void bolliger_mabillard_track_left_large_half_loop_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_left_large_half_loop_up( session, rideIndex, 6 - trackSequence, direction, height, tileElement, supportType); @@ -11768,7 +11768,7 @@ void bolliger_mabillard_track_left_large_half_loop_down( void bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { switch (trackSequence) { @@ -11865,7 +11865,7 @@ void bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up( void bolliger_mabillard_track_inverted_flat_to_90_deg_quarter_loop_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up( session, rideIndex, 2 - trackSequence, direction, height, tileElement, supportType); @@ -11873,7 +11873,7 @@ void bolliger_mabillard_track_inverted_flat_to_90_deg_quarter_loop_down( void bolliger_mabillard_track_booster( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType) + const TileElement* tileElement, int32_t supportType) { // These offsets could be moved to the g2.dat file when that supports offsets. int8_t ne_sw_offsetX = 8; diff --git a/src/openrct2/ride/coaster/BolligerMabillardTrack.h b/src/openrct2/ride/coaster/BolligerMabillardTrack.h index fbdfeb1555..bc88b9d645 100644 --- a/src/openrct2/ride/coaster/BolligerMabillardTrack.h +++ b/src/openrct2/ride/coaster/BolligerMabillardTrack.h @@ -12,547 +12,547 @@ #include "../../common.h" struct paint_session; -struct rct_tile_element; +struct TileElement; void bolliger_mabillard_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_station( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_banked_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_banked_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_vertical_loop( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_vertical_loop( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_half_banked_helix_up_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_half_banked_helix_up_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_half_banked_helix_down_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_half_banked_helix_down_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_half_banked_helix_up_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_half_banked_helix_up_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_half_banked_helix_down_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_half_banked_helix_down_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_quarter_turn_1_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_quarter_turn_1_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_quarter_turn_1_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_quarter_turn_1_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_25_deg_up_left_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_25_deg_up_right_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_on_ride_photo( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_25_deg_down_left_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_25_deg_down_right_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_90_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_90_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_60_deg_up_to_90_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_90_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_90_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_60_deg_down_to_90_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_diag_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_diag_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_diag_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_diag_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_diag_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_diag_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_diag_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_diag_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_diag_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_diag_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_diag_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_diag_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_diag_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_diag_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_diag_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_diag_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_diag_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_diag_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_diag_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_diag_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_diag_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_diag_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_diag_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_diag_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_diag_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_diag_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_diag_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_bank_to_left_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_bank_to_right_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_block_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_25_deg_up_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_25_deg_up_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_banked_25_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_banked_25_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_25_deg_down_to_left_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_25_deg_down_to_right_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_banked_25_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_banked_25_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_banked_25_deg_up_to_left_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_banked_25_deg_up_to_right_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_banked_25_deg_down_to_left_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_banked_25_deg_down_to_right_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_flat_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_flat_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_banked_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_banked_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_flat_to_left_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_flat_to_right_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_banked_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_banked_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_quarter_turn_1_90_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_quarter_turn_1_90_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_quarter_turn_1_90_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_quarter_turn_1_90_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); /* Previously specific to the Vertical RC */ void bolliger_mabillard_track_flat_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_60_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_flat_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_60_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_brake_for_drop( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_diag_flat_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_diag_60_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_diag_flat_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_diag_60_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); /* Previously specific to the Steel Twister */ void bolliger_mabillard_track_half_loop_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_half_loop_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_corkscrew_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_corkscrew_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_corkscrew_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_corkscrew_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_flat_to_60_deg_up_long_base( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_60_deg_up_to_flat_long_base( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_flat_to_60_deg_down_long_base( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_60_deg_up_to_flat_long_base122( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_barrel_roll_up_to_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_barrel_roll_up_to_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_barrel_roll_down_to_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_barrel_roll_down_to_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_powered_lift( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_large_half_loop_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_large_half_loop_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_right_large_half_loop_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_left_large_half_loop_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_inverted_flat_to_90_deg_quarter_loop_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); void bolliger_mabillard_track_booster( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement, int32_t supportType); + const TileElement* tileElement, int32_t supportType); diff --git a/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp b/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp index 66d0aa71c9..ce44c11975 100644 --- a/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp +++ b/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp @@ -22,7 +22,7 @@ /** rct2: 0x008AE6E0 */ static void compact_inverted_rc_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -76,7 +76,7 @@ static void compact_inverted_rc_track_flat( /** rct2: 0x008AE950, 0x008AE960, 0x008AE970 */ static void compact_inverted_rc_track_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][3] = { { SPR_STATION_BASE_C_SW_NE, 26557, SPR_STATION_INVERTED_BAR_A_SW_NE }, @@ -103,7 +103,7 @@ static void compact_inverted_rc_track_station( /** rct2: 0x008AE6F0 */ static void compact_inverted_rc_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -197,7 +197,7 @@ static void compact_inverted_rc_track_25_deg_up( /** rct2: 0x008AE700 */ static void compact_inverted_rc_track_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -267,7 +267,7 @@ static void compact_inverted_rc_track_60_deg_up( /** rct2: 0x008AE710 */ static void compact_inverted_rc_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -361,7 +361,7 @@ static void compact_inverted_rc_track_flat_to_25_deg_up( /** rct2: 0x008AE720 */ static void compact_inverted_rc_track_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -443,7 +443,7 @@ static void compact_inverted_rc_track_25_deg_up_to_60_deg_up( /** rct2: 0x008AE730 */ static void compact_inverted_rc_track_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -549,7 +549,7 @@ static void compact_inverted_rc_track_60_deg_up_to_25_deg_up( /** rct2: 0x008AE740 */ static void compact_inverted_rc_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -643,7 +643,7 @@ static void compact_inverted_rc_track_25_deg_up_to_flat( /** rct2: 0x008AE750 */ static void compact_inverted_rc_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { compact_inverted_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -651,7 +651,7 @@ static void compact_inverted_rc_track_25_deg_down( /** rct2: 0x008AE760 */ static void compact_inverted_rc_track_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { compact_inverted_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -659,7 +659,7 @@ static void compact_inverted_rc_track_60_deg_down( /** rct2: 0x008AE770 */ static void compact_inverted_rc_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { compact_inverted_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -667,7 +667,7 @@ static void compact_inverted_rc_track_flat_to_25_deg_down( /** rct2: 0x008AE780 */ static void compact_inverted_rc_track_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { compact_inverted_rc_track_60_deg_up_to_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -676,7 +676,7 @@ static void compact_inverted_rc_track_25_deg_down_to_60_deg_down( /** rct2: 0x008AE790 */ static void compact_inverted_rc_track_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { compact_inverted_rc_track_25_deg_up_to_60_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -685,7 +685,7 @@ static void compact_inverted_rc_track_60_deg_down_to_25_deg_down( /** rct2: 0x008AE7A0 */ static void compact_inverted_rc_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { compact_inverted_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -693,7 +693,7 @@ static void compact_inverted_rc_track_25_deg_down_to_flat( /** rct2: 0x008AE7B0 */ static void compact_inverted_rc_track_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -873,7 +873,7 @@ static void compact_inverted_rc_track_left_quarter_turn_5( /** rct2: 0x008AE7C0 */ static void compact_inverted_rc_track_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; compact_inverted_rc_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -882,7 +882,7 @@ static void compact_inverted_rc_track_right_quarter_turn_5( /** rct2: 0x008AE7D0 */ static void compact_inverted_rc_track_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -925,7 +925,7 @@ static void compact_inverted_rc_track_flat_to_left_bank( /** rct2: 0x008AE7E0 */ static void compact_inverted_rc_track_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -968,7 +968,7 @@ static void compact_inverted_rc_track_flat_to_right_bank( /** rct2: 0x008AE7F0 */ static void compact_inverted_rc_track_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1011,7 +1011,7 @@ static void compact_inverted_rc_track_left_bank_to_flat( /** rct2: 0x008AE800 */ static void compact_inverted_rc_track_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1054,7 +1054,7 @@ static void compact_inverted_rc_track_right_bank_to_flat( /** rct2: 0x008AE810 */ static void compact_inverted_rc_track_banked_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1234,7 +1234,7 @@ static void compact_inverted_rc_track_banked_left_quarter_turn_5( /** rct2: 0x008AE820 */ static void compact_inverted_rc_track_banked_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; compact_inverted_rc_track_banked_left_quarter_turn_5( @@ -1244,7 +1244,7 @@ static void compact_inverted_rc_track_banked_right_quarter_turn_5( /** rct2: 0x008AE830 */ static void compact_inverted_rc_track_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1311,7 +1311,7 @@ static void compact_inverted_rc_track_left_bank_to_25_deg_up( /** rct2: 0x008AE840 */ static void compact_inverted_rc_track_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1378,7 +1378,7 @@ static void compact_inverted_rc_track_right_bank_to_25_deg_up( /** rct2: 0x008AE850 */ static void compact_inverted_rc_track_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1445,7 +1445,7 @@ static void compact_inverted_rc_track_25_deg_up_to_left_bank( /** rct2: 0x008AE860 */ static void compact_inverted_rc_track_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1512,7 +1512,7 @@ static void compact_inverted_rc_track_25_deg_up_to_right_bank( /** rct2: 0x008AE870 */ static void compact_inverted_rc_track_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { compact_inverted_rc_track_25_deg_up_to_right_bank( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -1521,7 +1521,7 @@ static void compact_inverted_rc_track_left_bank_to_25_deg_down( /** rct2: 0x008AE880 */ static void compact_inverted_rc_track_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { compact_inverted_rc_track_25_deg_up_to_left_bank( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -1530,7 +1530,7 @@ static void compact_inverted_rc_track_right_bank_to_25_deg_down( /** rct2: 0x008AE890 */ static void compact_inverted_rc_track_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { compact_inverted_rc_track_right_bank_to_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -1539,7 +1539,7 @@ static void compact_inverted_rc_track_25_deg_down_to_left_bank( /** rct2: 0x008AE8A0 */ static void compact_inverted_rc_track_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { compact_inverted_rc_track_left_bank_to_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -1548,7 +1548,7 @@ static void compact_inverted_rc_track_25_deg_down_to_right_bank( /** rct2: 0x008AE8B0 */ static void compact_inverted_rc_track_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1591,7 +1591,7 @@ static void compact_inverted_rc_track_left_bank( /** rct2: 0x008AE8C0 */ static void compact_inverted_rc_track_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { compact_inverted_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1599,7 +1599,7 @@ static void compact_inverted_rc_track_right_bank( /** rct2: 0x008AE8D0 */ static void compact_inverted_rc_track_left_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1764,7 +1764,7 @@ static void compact_inverted_rc_track_left_quarter_turn_5_25_deg_up( /** rct2: 0x008AE8E0 */ static void compact_inverted_rc_track_right_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1929,7 +1929,7 @@ static void compact_inverted_rc_track_right_quarter_turn_5_25_deg_up( /** rct2: 0x008AE8F0 */ static void compact_inverted_rc_track_left_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; compact_inverted_rc_track_right_quarter_turn_5_25_deg_up( @@ -1939,7 +1939,7 @@ static void compact_inverted_rc_track_left_quarter_turn_5_25_deg_down( /** rct2: 0x008AE900 */ static void compact_inverted_rc_track_right_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; compact_inverted_rc_track_left_quarter_turn_5_25_deg_up( @@ -1949,7 +1949,7 @@ static void compact_inverted_rc_track_right_quarter_turn_5_25_deg_down( /** rct2: 0x008AE910 */ static void compact_inverted_rc_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2120,7 +2120,7 @@ static void compact_inverted_rc_track_s_bend_left( /** rct2: 0x008AE920 */ static void compact_inverted_rc_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2291,7 +2291,7 @@ static void compact_inverted_rc_track_s_bend_right( /** rct2: 0x008AE930 */ static void compact_inverted_rc_track_left_vertical_loop( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2598,7 +2598,7 @@ static void compact_inverted_rc_track_left_vertical_loop( /** rct2: 0x008AE940 */ static void compact_inverted_rc_track_right_vertical_loop( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2905,7 +2905,7 @@ static void compact_inverted_rc_track_right_vertical_loop( /** rct2: 0x008AE980 */ static void compact_inverted_rc_track_left_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3024,7 +3024,7 @@ static void compact_inverted_rc_track_left_quarter_turn_3( /** rct2: 0x008AE990 */ static void compact_inverted_rc_track_right_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; compact_inverted_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -3033,7 +3033,7 @@ static void compact_inverted_rc_track_right_quarter_turn_3( /** rct2: 0x008AE9A0 */ static void compact_inverted_rc_track_left_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3153,7 +3153,7 @@ static void compact_inverted_rc_track_left_quarter_turn_3_bank( /** rct2: 0x008AE9B0 */ static void compact_inverted_rc_track_right_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; compact_inverted_rc_track_left_quarter_turn_3_bank( @@ -3163,7 +3163,7 @@ static void compact_inverted_rc_track_right_quarter_turn_3_bank( /** rct2: 0x008AE9C0 */ static void compact_inverted_rc_track_left_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3250,7 +3250,7 @@ static void compact_inverted_rc_track_left_quarter_turn_3_25_deg_up( /** rct2: 0x008AE9D0 */ static void compact_inverted_rc_track_right_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3337,7 +3337,7 @@ static void compact_inverted_rc_track_right_quarter_turn_3_25_deg_up( /** rct2: 0x008AE9E0 */ static void compact_inverted_rc_track_left_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; compact_inverted_rc_track_right_quarter_turn_3_25_deg_up( @@ -3347,7 +3347,7 @@ static void compact_inverted_rc_track_left_quarter_turn_3_25_deg_down( /** rct2: 0x008AE9F0 */ static void compact_inverted_rc_track_right_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; compact_inverted_rc_track_left_quarter_turn_3_25_deg_up( @@ -3357,7 +3357,7 @@ static void compact_inverted_rc_track_right_quarter_turn_3_25_deg_down( /** rct2: 0x008AEA00 */ static void compact_inverted_rc_track_left_twist_down_to_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3467,7 +3467,7 @@ static void compact_inverted_rc_track_left_twist_down_to_up( /** rct2: 0x008AEA10 */ static void compact_inverted_rc_track_right_twist_down_to_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3577,7 +3577,7 @@ static void compact_inverted_rc_track_right_twist_down_to_up( /** rct2: 0x008AEA20 */ static void compact_inverted_rc_track_left_twist_up_to_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3687,7 +3687,7 @@ static void compact_inverted_rc_track_left_twist_up_to_down( /** rct2: 0x008AEA30 */ static void compact_inverted_rc_track_right_twist_up_to_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3797,7 +3797,7 @@ static void compact_inverted_rc_track_right_twist_up_to_down( /** rct2: 0x008AEA40 */ static void compact_inverted_rc_track_half_loop_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3950,7 +3950,7 @@ static void compact_inverted_rc_track_half_loop_up( /** rct2: 0x008AEA50 */ static void compact_inverted_rc_track_half_loop_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { compact_inverted_rc_track_half_loop_up(session, rideIndex, 3 - trackSequence, direction, height, tileElement); } @@ -3958,7 +3958,7 @@ static void compact_inverted_rc_track_half_loop_down( /** rct2: 0x008AEA60 */ static void compact_inverted_rc_track_left_corkscrew_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4076,7 +4076,7 @@ static void compact_inverted_rc_track_left_corkscrew_up( /** rct2: 0x008AEA70 */ static void compact_inverted_rc_track_right_corkscrew_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4194,7 +4194,7 @@ static void compact_inverted_rc_track_right_corkscrew_up( /** rct2: 0x008AEA80 */ static void compact_inverted_rc_track_left_corkscrew_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { compact_inverted_rc_track_right_corkscrew_up( session, rideIndex, 2 - trackSequence, (direction + 1) & 3, height, tileElement); @@ -4203,7 +4203,7 @@ static void compact_inverted_rc_track_left_corkscrew_down( /** rct2: 0x008AEA90 */ static void compact_inverted_rc_track_right_corkscrew_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { compact_inverted_rc_track_left_corkscrew_up( session, rideIndex, 2 - trackSequence, (direction - 1) & 3, height, tileElement); @@ -4212,7 +4212,7 @@ static void compact_inverted_rc_track_right_corkscrew_down( /** rct2: 0x008AEAD0 */ static void compact_inverted_rc_track_left_quarter_turn_1_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -4253,7 +4253,7 @@ static void compact_inverted_rc_track_left_quarter_turn_1_60_deg_up( /** rct2: 0x008AEAB0 */ static void compact_inverted_rc_track_right_quarter_turn_1_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -4294,7 +4294,7 @@ static void compact_inverted_rc_track_right_quarter_turn_1_60_deg_up( /** rct2: 0x008AEAC0 */ static void compact_inverted_rc_track_left_quarter_turn_1_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { compact_inverted_rc_track_right_quarter_turn_1_60_deg_up( session, rideIndex, trackSequence, (direction + 1) & 3, height, tileElement); @@ -4303,7 +4303,7 @@ static void compact_inverted_rc_track_left_quarter_turn_1_60_deg_down( /** rct2: 0x008AEAE0 */ static void compact_inverted_rc_track_right_quarter_turn_1_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { compact_inverted_rc_track_left_quarter_turn_1_60_deg_up( session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -4312,7 +4312,7 @@ static void compact_inverted_rc_track_right_quarter_turn_1_60_deg_down( /** rct2: 0x008AEAA0 */ static void compact_inverted_rc_track_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -4345,7 +4345,7 @@ static void compact_inverted_rc_track_brakes( /** rct2: 0x008AEAF0 */ static void compact_inverted_rc_track_left_quarter_banked_helix_large_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4530,7 +4530,7 @@ static void compact_inverted_rc_track_left_quarter_banked_helix_large_up( /** rct2: 0x008AEB00 */ static void compact_inverted_rc_track_right_quarter_banked_helix_large_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4715,7 +4715,7 @@ static void compact_inverted_rc_track_right_quarter_banked_helix_large_up( /** rct2: 0x008AEB10 */ static void compact_inverted_rc_track_left_quarter_banked_helix_large_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4900,7 +4900,7 @@ static void compact_inverted_rc_track_left_quarter_banked_helix_large_down( /** rct2: 0x008AEB20 */ static void compact_inverted_rc_track_right_quarter_banked_helix_large_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5085,7 +5085,7 @@ static void compact_inverted_rc_track_right_quarter_banked_helix_large_down( /** rct2: 0x008AEB30 */ static void compact_inverted_rc_track_on_ride_photo( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -5139,7 +5139,7 @@ static void compact_inverted_rc_track_on_ride_photo( /** rct2: 0x008AEDB0 */ static void compact_inverted_rc_track_90_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5209,7 +5209,7 @@ static void compact_inverted_rc_track_90_deg_up( /** rct2: 0x008AEDC0 */ static void compact_inverted_rc_track_90_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { compact_inverted_rc_track_90_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -5217,7 +5217,7 @@ static void compact_inverted_rc_track_90_deg_down( /** rct2: 0x008AED70 */ static void compact_inverted_rc_track_60_deg_up_to_90_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5291,7 +5291,7 @@ static void compact_inverted_rc_track_60_deg_up_to_90_deg_up( /** rct2: 0x008AED80 */ static void compact_inverted_rc_track_90_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { compact_inverted_rc_track_60_deg_up_to_90_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -5300,7 +5300,7 @@ static void compact_inverted_rc_track_90_deg_down_to_60_deg_down( /** rct2: 0x008AED90 */ static void compact_inverted_rc_track_90_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -5371,7 +5371,7 @@ static void compact_inverted_rc_track_90_deg_up_to_60_deg_up( /** rct2: 0x008AEDA0 */ static void compact_inverted_rc_track_60_deg_down_to_90_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5444,7 +5444,7 @@ static void compact_inverted_rc_track_60_deg_down_to_90_deg_down( /** rct2: 0x008AEB40 */ static void compact_inverted_rc_track_left_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5607,7 +5607,7 @@ static void compact_inverted_rc_track_left_eighth_to_diag( /** rct2: 0x008AEB50 */ static void compact_inverted_rc_track_right_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5770,7 +5770,7 @@ static void compact_inverted_rc_track_right_eighth_to_diag( /** rct2: 0x008AEB60 */ static void compact_inverted_rc_track_left_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; compact_inverted_rc_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -5779,7 +5779,7 @@ static void compact_inverted_rc_track_left_eighth_to_orthogonal( /** rct2: 0x008AEB70 */ static void compact_inverted_rc_track_right_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; compact_inverted_rc_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, tileElement); @@ -5788,7 +5788,7 @@ static void compact_inverted_rc_track_right_eighth_to_orthogonal( /** rct2: 0x008AED30 */ static void compact_inverted_rc_track_left_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5951,7 +5951,7 @@ static void compact_inverted_rc_track_left_eighth_bank_to_diag( /** rct2: 0x008AED40 */ static void compact_inverted_rc_track_right_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6114,7 +6114,7 @@ static void compact_inverted_rc_track_right_eighth_bank_to_diag( /** rct2: 0x008AED50 */ static void compact_inverted_rc_track_left_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; compact_inverted_rc_track_right_eighth_bank_to_diag( @@ -6124,7 +6124,7 @@ static void compact_inverted_rc_track_left_eighth_bank_to_orthogonal( /** rct2: 0x008AED60 */ static void compact_inverted_rc_track_right_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; compact_inverted_rc_track_left_eighth_bank_to_diag( @@ -6134,7 +6134,7 @@ static void compact_inverted_rc_track_right_eighth_bank_to_orthogonal( /** rct2: 0x008AEB80 */ static void compact_inverted_rc_track_diag_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6273,7 +6273,7 @@ static void compact_inverted_rc_track_diag_flat( /** rct2: 0x008AEBB0 */ static void compact_inverted_rc_track_diag_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6412,7 +6412,7 @@ static void compact_inverted_rc_track_diag_25_deg_up( /** rct2: 0x008AEC10 */ static void compact_inverted_rc_track_diag_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6495,7 +6495,7 @@ static void compact_inverted_rc_track_diag_60_deg_up( /** rct2: 0x008AEB90 */ static void compact_inverted_rc_track_diag_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6634,7 +6634,7 @@ static void compact_inverted_rc_track_diag_flat_to_25_deg_up( /** rct2: 0x008AEBF0 */ static void compact_inverted_rc_track_diag_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6717,7 +6717,7 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_60_deg_up( /** rct2: 0x008AEC00 */ static void compact_inverted_rc_track_diag_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6800,7 +6800,7 @@ static void compact_inverted_rc_track_diag_60_deg_up_to_25_deg_up( /** rct2: 0x008AEBA0 */ static void compact_inverted_rc_track_diag_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6939,7 +6939,7 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_flat( /** rct2: 0x008AEBE0 */ static void compact_inverted_rc_track_diag_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7078,7 +7078,7 @@ static void compact_inverted_rc_track_diag_25_deg_down( /** rct2: 0x008AEC40 */ static void compact_inverted_rc_track_diag_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7161,7 +7161,7 @@ static void compact_inverted_rc_track_diag_60_deg_down( /** rct2: 0x008AEBC0 */ static void compact_inverted_rc_track_diag_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7297,7 +7297,7 @@ static void compact_inverted_rc_track_diag_flat_to_25_deg_down( /** rct2: 0x008AEC20 */ static void compact_inverted_rc_track_diag_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7380,7 +7380,7 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_60_deg_down( /** rct2: 0x008AEC30 */ static void compact_inverted_rc_track_diag_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7463,7 +7463,7 @@ static void compact_inverted_rc_track_diag_60_deg_down_to_25_deg_down( /** rct2: 0x008AEBD0 */ static void compact_inverted_rc_track_diag_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7602,7 +7602,7 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_flat( /** rct2: 0x008AEC70 */ static void compact_inverted_rc_track_diag_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7686,7 +7686,7 @@ static void compact_inverted_rc_track_diag_flat_to_left_bank( /** rct2: 0x008AEC80 */ static void compact_inverted_rc_track_diag_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7770,7 +7770,7 @@ static void compact_inverted_rc_track_diag_flat_to_right_bank( /** rct2: 0x008AEC90 */ static void compact_inverted_rc_track_diag_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7854,7 +7854,7 @@ static void compact_inverted_rc_track_diag_left_bank_to_flat( /** rct2: 0x008AECA0 */ static void compact_inverted_rc_track_diag_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7938,7 +7938,7 @@ static void compact_inverted_rc_track_diag_right_bank_to_flat( /** rct2: 0x008AECD0 */ static void compact_inverted_rc_track_diag_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8021,7 +8021,7 @@ static void compact_inverted_rc_track_diag_left_bank_to_25_deg_up( /** rct2: 0x008AECE0 */ static void compact_inverted_rc_track_diag_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8104,7 +8104,7 @@ static void compact_inverted_rc_track_diag_right_bank_to_25_deg_up( /** rct2: 0x008AECB0 */ static void compact_inverted_rc_track_diag_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8187,7 +8187,7 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_left_bank( /** rct2: 0x008AECC0 */ static void compact_inverted_rc_track_diag_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8270,7 +8270,7 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_right_bank( /** rct2: 0x008AECF0 */ static void compact_inverted_rc_track_diag_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8350,7 +8350,7 @@ static void compact_inverted_rc_track_diag_left_bank_to_25_deg_down( /** rct2: 0x008AED00 */ static void compact_inverted_rc_track_diag_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8430,7 +8430,7 @@ static void compact_inverted_rc_track_diag_right_bank_to_25_deg_down( /** rct2: 0x008AED10 */ static void compact_inverted_rc_track_diag_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8513,7 +8513,7 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_left_bank( /** rct2: 0x008AED20 */ static void compact_inverted_rc_track_diag_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8596,7 +8596,7 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_right_bank( /** rct2: 0x008AEC50 */ static void compact_inverted_rc_track_diag_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8680,7 +8680,7 @@ static void compact_inverted_rc_track_diag_left_bank( /** rct2: 0x008AEC60 */ static void compact_inverted_rc_track_diag_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8764,7 +8764,7 @@ static void compact_inverted_rc_track_diag_right_bank( /** rct2: 0x008AEAA0 */ static void compact_inverted_rc_track_block_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { diff --git a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp index 9a9ed43150..ea2a0a31e6 100644 --- a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp @@ -22,7 +22,7 @@ /** rct2: 0x008A7AF8 */ static void corkscrew_rc_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -79,7 +79,7 @@ static void corkscrew_rc_track_flat( /** rct2: 0x008A7D68, 0x008A7D78, 0x008A7D88 */ static void corkscrew_rc_track_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][3] = { { 16236, 16232, SPR_STATION_BASE_A_SW_NE }, @@ -112,7 +112,7 @@ static void corkscrew_rc_track_station( /** rct2: 0x008A7B08 */ static void corkscrew_rc_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -182,7 +182,7 @@ static void corkscrew_rc_track_25_deg_up( /** rct2: 0x008A7B18 */ static void corkscrew_rc_track_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -252,7 +252,7 @@ static void corkscrew_rc_track_60_deg_up( /** rct2: 0x008A7B28 */ static void corkscrew_rc_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -322,7 +322,7 @@ static void corkscrew_rc_track_flat_to_25_deg_up( /** rct2: 0x008A7B38 */ static void corkscrew_rc_track_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -400,7 +400,7 @@ static void corkscrew_rc_track_25_deg_up_to_60_deg_up( /** rct2: 0x008A7B48 */ static void corkscrew_rc_track_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -478,7 +478,7 @@ static void corkscrew_rc_track_60_deg_up_to_25_deg_up( /** rct2: 0x008A7B58 */ static void corkscrew_rc_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -548,7 +548,7 @@ static void corkscrew_rc_track_25_deg_up_to_flat( /** rct2: 0x008A7B68 */ static void corkscrew_rc_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { corkscrew_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -556,7 +556,7 @@ static void corkscrew_rc_track_25_deg_down( /** rct2: 0x008A7B78 */ static void corkscrew_rc_track_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { corkscrew_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -564,7 +564,7 @@ static void corkscrew_rc_track_60_deg_down( /** rct2: 0x008A7B88 */ static void corkscrew_rc_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { corkscrew_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -572,7 +572,7 @@ static void corkscrew_rc_track_flat_to_25_deg_down( /** rct2: 0x008A7B98 */ static void corkscrew_rc_track_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { corkscrew_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -580,7 +580,7 @@ static void corkscrew_rc_track_25_deg_down_to_60_deg_down( /** rct2: 0x008A7BA8 */ static void corkscrew_rc_track_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { corkscrew_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -588,7 +588,7 @@ static void corkscrew_rc_track_60_deg_down_to_25_deg_down( /** rct2: 0x008A7BB8 */ static void corkscrew_rc_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { corkscrew_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -596,7 +596,7 @@ static void corkscrew_rc_track_25_deg_down_to_flat( /** rct2: 0x008A7BC8 */ static void corkscrew_rc_track_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -760,7 +760,7 @@ static void corkscrew_rc_track_left_quarter_turn_5( /** rct2: 0x008A7BD8 */ static void corkscrew_rc_track_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; corkscrew_rc_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -769,7 +769,7 @@ static void corkscrew_rc_track_right_quarter_turn_5( /** rct2: 0x008A7BE8 */ static void corkscrew_rc_track_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -807,7 +807,7 @@ static void corkscrew_rc_track_flat_to_left_bank( /** rct2: 0x008A7BF8 */ static void corkscrew_rc_track_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -845,7 +845,7 @@ static void corkscrew_rc_track_flat_to_right_bank( /** rct2: 0x008A7C08 */ static void corkscrew_rc_track_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -883,7 +883,7 @@ static void corkscrew_rc_track_left_bank_to_flat( /** rct2: 0x008A7C18 */ static void corkscrew_rc_track_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -921,7 +921,7 @@ static void corkscrew_rc_track_right_bank_to_flat( /** rct2: 0x008A7C28 */ static void corkscrew_rc_track_banked_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1095,7 +1095,7 @@ static void corkscrew_rc_track_banked_left_quarter_turn_5( /** rct2: 0x008A7C38 */ static void corkscrew_rc_track_banked_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; corkscrew_rc_track_banked_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -1104,7 +1104,7 @@ static void corkscrew_rc_track_banked_right_quarter_turn_5( /** rct2: 0x008A7C48 */ static void corkscrew_rc_track_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1149,7 +1149,7 @@ static void corkscrew_rc_track_left_bank_to_25_deg_up( /** rct2: 0x008A7C58 */ static void corkscrew_rc_track_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1194,7 +1194,7 @@ static void corkscrew_rc_track_right_bank_to_25_deg_up( /** rct2: 0x008A7C68 */ static void corkscrew_rc_track_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1239,7 +1239,7 @@ static void corkscrew_rc_track_25_deg_up_to_left_bank( /** rct2: 0x008A7C78 */ static void corkscrew_rc_track_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1284,7 +1284,7 @@ static void corkscrew_rc_track_25_deg_up_to_right_bank( /** rct2: 0x008A7C88 */ static void corkscrew_rc_track_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { corkscrew_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1292,7 +1292,7 @@ static void corkscrew_rc_track_left_bank_to_25_deg_down( /** rct2: 0x008A7C98 */ static void corkscrew_rc_track_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { corkscrew_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1300,7 +1300,7 @@ static void corkscrew_rc_track_right_bank_to_25_deg_down( /** rct2: 0x008A7CA8 */ static void corkscrew_rc_track_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { corkscrew_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1308,7 +1308,7 @@ static void corkscrew_rc_track_25_deg_down_to_left_bank( /** rct2: 0x008A7CB8 */ static void corkscrew_rc_track_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { corkscrew_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1316,7 +1316,7 @@ static void corkscrew_rc_track_25_deg_down_to_right_bank( /** rct2: 0x008A7CC8 */ static void corkscrew_rc_track_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1350,7 +1350,7 @@ static void corkscrew_rc_track_left_bank( /** rct2: 0x008A7CD8 */ static void corkscrew_rc_track_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { corkscrew_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1358,7 +1358,7 @@ static void corkscrew_rc_track_right_bank( /** rct2: 0x008A7CE8 */ static void corkscrew_rc_track_left_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1522,7 +1522,7 @@ static void corkscrew_rc_track_left_quarter_turn_5_25_deg_up( /** rct2: 0x008A7CF8 */ static void corkscrew_rc_track_right_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1686,7 +1686,7 @@ static void corkscrew_rc_track_right_quarter_turn_5_25_deg_up( /** rct2: 0x008A7D08 */ static void corkscrew_rc_track_left_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; corkscrew_rc_track_right_quarter_turn_5_25_deg_up( @@ -1696,7 +1696,7 @@ static void corkscrew_rc_track_left_quarter_turn_5_25_deg_down( /** rct2: 0x008A7D18 */ static void corkscrew_rc_track_right_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; corkscrew_rc_track_left_quarter_turn_5_25_deg_up( @@ -1706,7 +1706,7 @@ static void corkscrew_rc_track_right_quarter_turn_5_25_deg_down( /** rct2: 0x008A7D28 */ static void corkscrew_rc_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1841,7 +1841,7 @@ static void corkscrew_rc_track_s_bend_left( /** rct2: 0x008A7D38 */ static void corkscrew_rc_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1976,7 +1976,7 @@ static void corkscrew_rc_track_s_bend_right( /** rct2: 0x008A7D48 */ static void corkscrew_rc_track_left_vertical_loop( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2255,7 +2255,7 @@ static void corkscrew_rc_track_left_vertical_loop( /** rct2: 0x008A7D58 */ static void corkscrew_rc_track_right_vertical_loop( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2488,7 +2488,7 @@ static void corkscrew_rc_track_right_vertical_loop( /** rct2: 0x008A7D98 */ static void corkscrew_rc_track_left_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2591,7 +2591,7 @@ static void corkscrew_rc_track_left_quarter_turn_3( /** rct2: 0x008A7DA8 */ static void corkscrew_rc_track_right_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; corkscrew_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -2600,7 +2600,7 @@ static void corkscrew_rc_track_right_quarter_turn_3( /** rct2: 0x008A7DB8 */ static void corkscrew_rc_track_left_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2712,7 +2712,7 @@ static void corkscrew_rc_track_left_quarter_turn_3_bank( /** rct2: 0x008A7DC8 */ static void corkscrew_rc_track_right_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; corkscrew_rc_track_left_quarter_turn_3_bank(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -2721,7 +2721,7 @@ static void corkscrew_rc_track_right_quarter_turn_3_bank( /** rct2: 0x008A7DD8 */ static void corkscrew_rc_track_left_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2800,7 +2800,7 @@ static void corkscrew_rc_track_left_quarter_turn_3_25_deg_up( /** rct2: 0x008A7DE8 */ static void corkscrew_rc_track_right_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2886,7 +2886,7 @@ static void corkscrew_rc_track_right_quarter_turn_3_25_deg_up( /** rct2: 0x008A7DF8 */ static void corkscrew_rc_track_left_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; corkscrew_rc_track_right_quarter_turn_3_25_deg_up( @@ -2896,7 +2896,7 @@ static void corkscrew_rc_track_left_quarter_turn_3_25_deg_down( /** rct2: 0x008A7E08 */ static void corkscrew_rc_track_right_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; corkscrew_rc_track_left_quarter_turn_3_25_deg_up( @@ -2906,7 +2906,7 @@ static void corkscrew_rc_track_right_quarter_turn_3_25_deg_down( /** rct2: 0x008A7E18 */ static void corkscrew_rc_track_half_loop_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3035,7 +3035,7 @@ static void corkscrew_rc_track_half_loop_up( /** rct2: 0x008A7E28 */ static void corkscrew_rc_track_half_loop_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { corkscrew_rc_track_half_loop_up(session, rideIndex, 3 - trackSequence, direction, height, tileElement); } @@ -3043,7 +3043,7 @@ static void corkscrew_rc_track_half_loop_down( /** rct2: 0x008A7E38 */ static void corkscrew_rc_track_left_corkscrew_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3155,7 +3155,7 @@ static void corkscrew_rc_track_left_corkscrew_up( /** rct2: 0x008A7E48 */ static void corkscrew_rc_track_right_corkscrew_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3268,7 +3268,7 @@ static void corkscrew_rc_track_right_corkscrew_up( /** rct2: 0x008A7E58 */ static void corkscrew_rc_track_left_corkscrew_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { corkscrew_rc_track_right_corkscrew_up(session, rideIndex, 2 - trackSequence, (direction + 1) & 3, height, tileElement); } @@ -3276,7 +3276,7 @@ static void corkscrew_rc_track_left_corkscrew_down( /** rct2: 0x008A7E68 */ static void corkscrew_rc_track_right_corkscrew_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { corkscrew_rc_track_left_corkscrew_up(session, rideIndex, 2 - trackSequence, (direction - 1) & 3, height, tileElement); } @@ -3284,7 +3284,7 @@ static void corkscrew_rc_track_right_corkscrew_down( /** rct2: 0x008A7E78 */ static void corkscrew_rc_track_left_half_banked_helix_up_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3502,7 +3502,7 @@ static void corkscrew_rc_track_left_half_banked_helix_up_small( /** rct2: 0x008A7E88 */ static void corkscrew_rc_track_right_half_banked_helix_up_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3720,7 +3720,7 @@ static void corkscrew_rc_track_right_half_banked_helix_up_small( /** rct2: 0x008A7E98 */ static void corkscrew_rc_track_left_half_banked_helix_down_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 4) { @@ -3735,7 +3735,7 @@ static void corkscrew_rc_track_left_half_banked_helix_down_small( /** rct2: 0x008A7EA8 */ static void corkscrew_rc_track_right_half_banked_helix_down_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 4) { @@ -3750,7 +3750,7 @@ static void corkscrew_rc_track_right_half_banked_helix_down_small( /** rct2: 0x008A7EB8 */ static void corkscrew_rc_track_left_half_banked_helix_up_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4092,7 +4092,7 @@ static void corkscrew_rc_track_left_half_banked_helix_up_large( /** rct2: 0x008A7EC8 */ static void corkscrew_rc_track_right_half_banked_helix_up_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4434,7 +4434,7 @@ static void corkscrew_rc_track_right_half_banked_helix_up_large( /** rct2: 0x008A7ED8 */ static void corkscrew_rc_track_left_half_banked_helix_down_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 7) { @@ -4449,7 +4449,7 @@ static void corkscrew_rc_track_left_half_banked_helix_down_large( /** rct2: 0x008A7EE8 */ static void corkscrew_rc_track_right_half_banked_helix_down_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 7) { @@ -4464,7 +4464,7 @@ static void corkscrew_rc_track_right_half_banked_helix_down_large( /** rct2: 0x008A7F18 */ static void corkscrew_rc_track_left_quarter_turn_1_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -4501,7 +4501,7 @@ static void corkscrew_rc_track_left_quarter_turn_1_60_deg_up( /** rct2: 0x008A7EF8 */ static void corkscrew_rc_track_right_quarter_turn_1_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -4538,7 +4538,7 @@ static void corkscrew_rc_track_right_quarter_turn_1_60_deg_up( /** rct2: 0x008A7F08 */ static void corkscrew_rc_track_left_quarter_turn_1_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { corkscrew_rc_track_right_quarter_turn_1_60_deg_up( session, rideIndex, trackSequence, (direction + 1) & 3, height, tileElement); @@ -4547,7 +4547,7 @@ static void corkscrew_rc_track_left_quarter_turn_1_60_deg_down( /** rct2: 0x008A7F28 */ static void corkscrew_rc_track_right_quarter_turn_1_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { corkscrew_rc_track_left_quarter_turn_1_60_deg_up( session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -4556,7 +4556,7 @@ static void corkscrew_rc_track_right_quarter_turn_1_60_deg_down( /** rct2: 0x008A7F38 */ static void corkscrew_rc_track_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -4584,7 +4584,7 @@ static void corkscrew_rc_track_brakes( /** rct2: 0x008A7F48 */ static void corkscrew_rc_track_on_ride_photo( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -4626,7 +4626,7 @@ static void corkscrew_rc_track_on_ride_photo( /** rct2: 0x008A8198 */ static void corkscrew_rc_track_flat_to_60_deg_up_long_base( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4767,7 +4767,7 @@ static void corkscrew_rc_track_flat_to_60_deg_up_long_base( /** rct2: 0x008A81A8 */ static void corkscrew_rc_track_60_deg_up_to_flat_long_base( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4908,7 +4908,7 @@ static void corkscrew_rc_track_60_deg_up_to_flat_long_base( /** rct2: 0x008A81B8 */ static void corkscrew_rc_track_flat_to_60_deg_down_long_base( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { corkscrew_rc_track_flat_to_60_deg_up_long_base( session, rideIndex, 3 - trackSequence, (direction + 2) & 3, height, tileElement); @@ -4917,7 +4917,7 @@ static void corkscrew_rc_track_flat_to_60_deg_down_long_base( /** rct2: 0x008A81C8 */ static void corkscrew_rc_track_60_deg_up_to_flat_long_base122( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { corkscrew_rc_track_60_deg_up_to_flat_long_base( session, rideIndex, 3 - trackSequence, (direction + 2) & 3, height, tileElement); @@ -4926,7 +4926,7 @@ static void corkscrew_rc_track_60_deg_up_to_flat_long_base122( /** rct2: 0x008A7F68 */ static void corkscrew_rc_track_left_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5065,7 +5065,7 @@ static void corkscrew_rc_track_left_eighth_to_diag( /** rct2: 0x008A7F78 */ static void corkscrew_rc_track_right_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5203,7 +5203,7 @@ static void corkscrew_rc_track_right_eighth_to_diag( /** rct2: 0x008A7F88 */ static void corkscrew_rc_track_left_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; corkscrew_rc_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -5212,7 +5212,7 @@ static void corkscrew_rc_track_left_eighth_to_orthogonal( /** rct2: 0x008A7F98 */ static void corkscrew_rc_track_right_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; corkscrew_rc_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, tileElement); @@ -5221,7 +5221,7 @@ static void corkscrew_rc_track_right_eighth_to_orthogonal( /** rct2: 0x008A7FA8 */ static void corkscrew_rc_track_left_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5363,7 +5363,7 @@ static void corkscrew_rc_track_left_eighth_bank_to_diag( /** rct2: 0x008A7FB8 */ static void corkscrew_rc_track_right_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5504,7 +5504,7 @@ static void corkscrew_rc_track_right_eighth_bank_to_diag( /** rct2: 0x008A7FC8 */ static void corkscrew_rc_track_left_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; corkscrew_rc_track_right_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -5513,7 +5513,7 @@ static void corkscrew_rc_track_left_eighth_bank_to_orthogonal( /** rct2: 0x008A7FD8 */ static void corkscrew_rc_track_right_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; corkscrew_rc_track_left_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, tileElement); @@ -5522,7 +5522,7 @@ static void corkscrew_rc_track_right_eighth_bank_to_orthogonal( /** rct2: 0x008A7F58 */ static void corkscrew_rc_track_diag_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5668,7 +5668,7 @@ static void corkscrew_rc_track_diag_flat( /** rct2: 0x008A8008 */ static void corkscrew_rc_track_diag_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5814,7 +5814,7 @@ static void corkscrew_rc_track_diag_25_deg_up( /** rct2: 0x008A8068 */ static void corkscrew_rc_track_diag_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5960,7 +5960,7 @@ static void corkscrew_rc_track_diag_60_deg_up( /** rct2: 0x008A7FE8 */ static void corkscrew_rc_track_diag_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6106,7 +6106,7 @@ static void corkscrew_rc_track_diag_flat_to_25_deg_up( /** rct2: 0x008A8048 */ static void corkscrew_rc_track_diag_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6252,7 +6252,7 @@ static void corkscrew_rc_track_diag_25_deg_up_to_60_deg_up( /** rct2: 0x008A8058 */ static void corkscrew_rc_track_diag_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6398,7 +6398,7 @@ static void corkscrew_rc_track_diag_60_deg_up_to_25_deg_up( /** rct2: 0x008A7FF8 */ static void corkscrew_rc_track_diag_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6544,7 +6544,7 @@ static void corkscrew_rc_track_diag_25_deg_up_to_flat( /** rct2: 0x008A8038 */ static void corkscrew_rc_track_diag_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6690,7 +6690,7 @@ static void corkscrew_rc_track_diag_25_deg_down( /** rct2: 0x008A8098 */ static void corkscrew_rc_track_diag_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6836,7 +6836,7 @@ static void corkscrew_rc_track_diag_60_deg_down( /** rct2: 0x008A8018 */ static void corkscrew_rc_track_diag_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6980,7 +6980,7 @@ static void corkscrew_rc_track_diag_flat_to_25_deg_down( /** rct2: 0x008A8078 */ static void corkscrew_rc_track_diag_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7126,7 +7126,7 @@ static void corkscrew_rc_track_diag_25_deg_down_to_60_deg_down( /** rct2: 0x008A8088 */ static void corkscrew_rc_track_diag_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7272,7 +7272,7 @@ static void corkscrew_rc_track_diag_60_deg_down_to_25_deg_down( /** rct2: 0x008A8028 */ static void corkscrew_rc_track_diag_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7418,7 +7418,7 @@ static void corkscrew_rc_track_diag_25_deg_down_to_flat( /** rct2: 0x008A80C8 */ static void corkscrew_rc_track_diag_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7497,7 +7497,7 @@ static void corkscrew_rc_track_diag_flat_to_left_bank( /** rct2: 0x008A80D8 */ static void corkscrew_rc_track_diag_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7576,7 +7576,7 @@ static void corkscrew_rc_track_diag_flat_to_right_bank( /** rct2: 0x008A80E8 */ static void corkscrew_rc_track_diag_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7655,7 +7655,7 @@ static void corkscrew_rc_track_diag_left_bank_to_flat( /** rct2: 0x008A80F8 */ static void corkscrew_rc_track_diag_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7734,7 +7734,7 @@ static void corkscrew_rc_track_diag_right_bank_to_flat( /** rct2: 0x008A8128 */ static void corkscrew_rc_track_diag_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7813,7 +7813,7 @@ static void corkscrew_rc_track_diag_left_bank_to_25_deg_up( /** rct2: 0x008A8138 */ static void corkscrew_rc_track_diag_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7892,7 +7892,7 @@ static void corkscrew_rc_track_diag_right_bank_to_25_deg_up( /** rct2: 0x008A8108 */ static void corkscrew_rc_track_diag_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7971,7 +7971,7 @@ static void corkscrew_rc_track_diag_25_deg_up_to_left_bank( /** rct2: 0x008A8118 */ static void corkscrew_rc_track_diag_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8050,7 +8050,7 @@ static void corkscrew_rc_track_diag_25_deg_up_to_right_bank( /** rct2: 0x008A8148 */ static void corkscrew_rc_track_diag_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8127,7 +8127,7 @@ static void corkscrew_rc_track_diag_left_bank_to_25_deg_down( /** rct2: 0x008A8158 */ static void corkscrew_rc_track_diag_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8204,7 +8204,7 @@ static void corkscrew_rc_track_diag_right_bank_to_25_deg_down( /** rct2: 0x008A8168 */ static void corkscrew_rc_track_diag_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8283,7 +8283,7 @@ static void corkscrew_rc_track_diag_25_deg_down_to_left_bank( /** rct2: 0x008A8178 */ static void corkscrew_rc_track_diag_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8362,7 +8362,7 @@ static void corkscrew_rc_track_diag_25_deg_down_to_right_bank( /** rct2: 0x008A80A8 */ static void corkscrew_rc_track_diag_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8438,7 +8438,7 @@ static void corkscrew_rc_track_diag_left_bank( /** rct2: 0x008A80B8 */ static void corkscrew_rc_track_diag_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8514,7 +8514,7 @@ static void corkscrew_rc_track_diag_right_bank( /** rct2: 0x008A8188 */ static void corkscrew_rc_track_block_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8538,7 +8538,7 @@ static void corkscrew_rc_track_block_brakes( static void corkscrew_rc_track_booster( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!is_csg_loaded()) { diff --git a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp index 7224166ec8..f6885f8508 100644 --- a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp @@ -22,7 +22,7 @@ /** rct2: 0x007C6FF4 */ static void flying_rc_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -134,7 +134,7 @@ static void flying_rc_track_flat( /** rct2: 0x007C7244, 0x007C7254, 0x007C7264 */ static void flying_rc_track_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->IsInverted()) { @@ -191,7 +191,7 @@ static void flying_rc_track_station( /** rct2: 0x007C7004 */ static void flying_rc_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -326,7 +326,7 @@ static void flying_rc_track_25_deg_up( /** rct2: 0x007C7014 */ static void flying_rc_track_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -408,7 +408,7 @@ static void flying_rc_track_60_deg_up( /** rct2: 0x007C7024 */ static void flying_rc_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -543,7 +543,7 @@ static void flying_rc_track_flat_to_25_deg_up( /** rct2: 0x007C7034 */ static void flying_rc_track_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -635,7 +635,7 @@ static void flying_rc_track_25_deg_up_to_60_deg_up( /** rct2: 0x007C7044 */ static void flying_rc_track_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -751,7 +751,7 @@ static void flying_rc_track_60_deg_up_to_25_deg_up( /** rct2: 0x007C7054 */ static void flying_rc_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -886,7 +886,7 @@ static void flying_rc_track_25_deg_up_to_flat( /** rct2: 0x007C7064 */ static void flying_rc_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { flying_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -894,7 +894,7 @@ static void flying_rc_track_25_deg_down( /** rct2: 0x007C7074 */ static void flying_rc_track_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { flying_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -902,7 +902,7 @@ static void flying_rc_track_60_deg_down( /** rct2: 0x007C7084 */ static void flying_rc_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { flying_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -910,7 +910,7 @@ static void flying_rc_track_flat_to_25_deg_down( /** rct2: 0x007C7094 */ static void flying_rc_track_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { flying_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -918,7 +918,7 @@ static void flying_rc_track_25_deg_down_to_60_deg_down( /** rct2: 0x007C70A4 */ static void flying_rc_track_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { flying_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -926,7 +926,7 @@ static void flying_rc_track_60_deg_down_to_25_deg_down( /** rct2: 0x007C70B4 */ static void flying_rc_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { flying_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -934,7 +934,7 @@ static void flying_rc_track_25_deg_down_to_flat( /** rct2: 0x007C70C4 */ static void flying_rc_track_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -1303,7 +1303,7 @@ static void flying_rc_track_left_quarter_turn_5( /** rct2: 0x007C70D4 */ static void flying_rc_track_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; flying_rc_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -1312,7 +1312,7 @@ static void flying_rc_track_right_quarter_turn_5( /** rct2: 0x007C70E4 */ static void flying_rc_track_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -1393,7 +1393,7 @@ static void flying_rc_track_flat_to_left_bank( /** rct2: 0x007C70F4 */ static void flying_rc_track_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -1474,7 +1474,7 @@ static void flying_rc_track_flat_to_right_bank( /** rct2: 0x007C7104 */ static void flying_rc_track_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -1555,7 +1555,7 @@ static void flying_rc_track_left_bank_to_flat( /** rct2: 0x007C7114 */ static void flying_rc_track_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -1636,7 +1636,7 @@ static void flying_rc_track_right_bank_to_flat( /** rct2: 0x007C7124 */ static void flying_rc_track_banked_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -2006,7 +2006,7 @@ static void flying_rc_track_banked_left_quarter_turn_5( /** rct2: 0x007C7134 */ static void flying_rc_track_banked_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; flying_rc_track_banked_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -2015,7 +2015,7 @@ static void flying_rc_track_banked_right_quarter_turn_5( /** rct2: 0x007C7144 */ static void flying_rc_track_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -2127,7 +2127,7 @@ static void flying_rc_track_left_bank_to_25_deg_up( /** rct2: 0x007C7154 */ static void flying_rc_track_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -2239,7 +2239,7 @@ static void flying_rc_track_right_bank_to_25_deg_up( /** rct2: 0x007C7164 */ static void flying_rc_track_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -2351,7 +2351,7 @@ static void flying_rc_track_25_deg_up_to_left_bank( /** rct2: 0x007C7174 */ static void flying_rc_track_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -2463,7 +2463,7 @@ static void flying_rc_track_25_deg_up_to_right_bank( /** rct2: 0x007C7184 */ static void flying_rc_track_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { flying_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -2471,7 +2471,7 @@ static void flying_rc_track_left_bank_to_25_deg_down( /** rct2: 0x007C7194 */ static void flying_rc_track_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { flying_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -2479,7 +2479,7 @@ static void flying_rc_track_right_bank_to_25_deg_down( /** rct2: 0x007C71A4 */ static void flying_rc_track_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { flying_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -2487,7 +2487,7 @@ static void flying_rc_track_25_deg_down_to_left_bank( /** rct2: 0x007C71B4 */ static void flying_rc_track_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { flying_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -2495,7 +2495,7 @@ static void flying_rc_track_25_deg_down_to_right_bank( /** rct2: 0x007C71C4 */ static void flying_rc_track_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -2572,7 +2572,7 @@ static void flying_rc_track_left_bank( /** rct2: 0x007C71D4 */ static void flying_rc_track_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { flying_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -2580,7 +2580,7 @@ static void flying_rc_track_right_bank( /** rct2: 0x007C71E4 */ static void flying_rc_track_left_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -2924,7 +2924,7 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up( /** rct2: 0x007C71F4 */ static void flying_rc_track_right_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -3268,7 +3268,7 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up( /** rct2: 0x007C7204 */ static void flying_rc_track_left_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; flying_rc_track_right_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, tileElement); @@ -3277,7 +3277,7 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_down( /** rct2: 0x007C7214 */ static void flying_rc_track_right_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; flying_rc_track_left_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -3286,7 +3286,7 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_down( /** rct2: 0x007C7224 */ static void flying_rc_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -3613,7 +3613,7 @@ static void flying_rc_track_s_bend_left( /** rct2: 0x007C7234 */ static void flying_rc_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -3940,7 +3940,7 @@ static void flying_rc_track_s_bend_right( /** rct2: 0x007C7274 */ static void flying_rc_track_left_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -4179,7 +4179,7 @@ static void flying_rc_track_left_quarter_turn_3( /** rct2: 0x007C7284 */ static void flying_rc_track_right_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; flying_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -4188,7 +4188,7 @@ static void flying_rc_track_right_quarter_turn_3( /** rct2: 0x007C7294 */ static void flying_rc_track_left_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -4433,7 +4433,7 @@ static void flying_rc_track_left_quarter_turn_3_bank( /** rct2: 0x007C72A4 */ static void flying_rc_track_right_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; flying_rc_track_left_quarter_turn_3_bank(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -4442,7 +4442,7 @@ static void flying_rc_track_right_quarter_turn_3_bank( /** rct2: 0x007C72B4 */ static void flying_rc_track_left_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -4613,7 +4613,7 @@ static void flying_rc_track_left_quarter_turn_3_25_deg_up( /** rct2: 0x007C72C4 */ static void flying_rc_track_right_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -4790,7 +4790,7 @@ static void flying_rc_track_right_quarter_turn_3_25_deg_up( /** rct2: 0x007C72D4 */ static void flying_rc_track_left_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; flying_rc_track_right_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, tileElement); @@ -4799,7 +4799,7 @@ static void flying_rc_track_left_quarter_turn_3_25_deg_down( /** rct2: 0x007C72E4 */ static void flying_rc_track_right_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; flying_rc_track_left_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -4808,7 +4808,7 @@ static void flying_rc_track_right_quarter_turn_3_25_deg_down( /** rct2: 0x007C7314 */ static void flying_rc_track_left_half_banked_helix_up_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5030,7 +5030,7 @@ static void flying_rc_track_left_half_banked_helix_up_small( /** rct2: 0x007C7324 */ static void flying_rc_track_right_half_banked_helix_up_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5252,7 +5252,7 @@ static void flying_rc_track_right_half_banked_helix_up_small( /** rct2: 0x007C7334 */ static void flying_rc_track_left_half_banked_helix_down_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 4) { @@ -5267,7 +5267,7 @@ static void flying_rc_track_left_half_banked_helix_down_small( /** rct2: 0x007C7344 */ static void flying_rc_track_right_half_banked_helix_down_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 4) { @@ -5282,7 +5282,7 @@ static void flying_rc_track_right_half_banked_helix_down_small( /** rct2: 0x007C7354 */ static void flying_rc_track_left_half_banked_helix_up_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5628,7 +5628,7 @@ static void flying_rc_track_left_half_banked_helix_up_large( /** rct2: 0x007C7364 */ static void flying_rc_track_right_half_banked_helix_up_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5974,7 +5974,7 @@ static void flying_rc_track_right_half_banked_helix_up_large( /** rct2: 0x007C7374 */ static void flying_rc_track_left_half_banked_helix_down_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 7) { @@ -5989,7 +5989,7 @@ static void flying_rc_track_left_half_banked_helix_down_large( /** rct2: 0x007C7384 */ static void flying_rc_track_right_half_banked_helix_down_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 7) { @@ -6004,7 +6004,7 @@ static void flying_rc_track_right_half_banked_helix_down_large( /** rct2: 0x007C73B4 */ static void flying_rc_track_left_quarter_turn_1_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -6087,7 +6087,7 @@ static void flying_rc_track_left_quarter_turn_1_60_deg_up( /** rct2: 0x007C7394 */ static void flying_rc_track_right_quarter_turn_1_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -6169,7 +6169,7 @@ static void flying_rc_track_right_quarter_turn_1_60_deg_up( /** rct2: 0x007C73A4 */ static void flying_rc_track_left_quarter_turn_1_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { flying_rc_track_right_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, tileElement); } @@ -6177,7 +6177,7 @@ static void flying_rc_track_left_quarter_turn_1_60_deg_down( /** rct2: 0x007C73C4 */ static void flying_rc_track_right_quarter_turn_1_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { flying_rc_track_left_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); } @@ -6185,7 +6185,7 @@ static void flying_rc_track_right_quarter_turn_1_60_deg_down( /** rct2: 0x007C73D4 */ static void flying_rc_track_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -6246,7 +6246,7 @@ static void flying_rc_track_brakes( /** rct2: 0x007C7674 */ static void flying_rc_track_left_quarter_banked_helix_large_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6431,7 +6431,7 @@ static void flying_rc_track_left_quarter_banked_helix_large_up( /** rct2: 0x007C7684 */ static void flying_rc_track_right_quarter_banked_helix_large_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6616,7 +6616,7 @@ static void flying_rc_track_right_quarter_banked_helix_large_up( /** rct2: 0x007C7694 */ static void flying_rc_track_left_quarter_banked_helix_large_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6801,7 +6801,7 @@ static void flying_rc_track_left_quarter_banked_helix_large_down( /** rct2: 0x007C76A4 */ static void flying_rc_track_right_quarter_banked_helix_large_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6986,7 +6986,7 @@ static void flying_rc_track_right_quarter_banked_helix_large_down( /** rct2: 0x007C78B4 */ static void flying_rc_track_25_deg_up_left_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -7092,7 +7092,7 @@ static void flying_rc_track_25_deg_up_left_banked( /** rct2: 0x007C78C4 */ static void flying_rc_track_25_deg_up_right_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -7198,7 +7198,7 @@ static void flying_rc_track_25_deg_up_right_banked( /** rct2: 0x007C73E4 */ static void flying_rc_track_on_ride_photo( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -7301,7 +7301,7 @@ static void flying_rc_track_on_ride_photo( /** rct2: 0x007C78D4 */ static void flying_rc_track_25_deg_down_left_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { flying_rc_track_25_deg_up_right_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -7309,7 +7309,7 @@ static void flying_rc_track_25_deg_down_left_banked( /** rct2: 0x007C78E4 */ static void flying_rc_track_25_deg_down_right_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { flying_rc_track_25_deg_up_left_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -7317,7 +7317,7 @@ static void flying_rc_track_25_deg_down_right_banked( /** rct2: 0x007C7404 */ static void flying_rc_track_left_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -7631,7 +7631,7 @@ static void flying_rc_track_left_eighth_to_diag( /** rct2: 0x007C7414 */ static void flying_rc_track_right_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -7945,7 +7945,7 @@ static void flying_rc_track_right_eighth_to_diag( /** rct2: 0x007C7424 */ static void flying_rc_track_left_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; flying_rc_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -7954,7 +7954,7 @@ static void flying_rc_track_left_eighth_to_orthogonal( /** rct2: 0x007C7434 */ static void flying_rc_track_right_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; flying_rc_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, tileElement); @@ -7963,7 +7963,7 @@ static void flying_rc_track_right_eighth_to_orthogonal( /** rct2: 0x007C7444 */ static void flying_rc_track_left_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -8278,7 +8278,7 @@ static void flying_rc_track_left_eighth_bank_to_diag( /** rct2: 0x007C7454 */ static void flying_rc_track_right_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -8593,7 +8593,7 @@ static void flying_rc_track_right_eighth_bank_to_diag( /** rct2: 0x007C7464 */ static void flying_rc_track_left_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; flying_rc_track_right_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -8602,7 +8602,7 @@ static void flying_rc_track_left_eighth_bank_to_orthogonal( /** rct2: 0x007C7474 */ static void flying_rc_track_right_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; flying_rc_track_left_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, tileElement); @@ -8611,7 +8611,7 @@ static void flying_rc_track_right_eighth_bank_to_orthogonal( /** rct2: 0x007C73F4 */ static void flying_rc_track_diag_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -8903,7 +8903,7 @@ static void flying_rc_track_diag_flat( /** rct2: 0x007C74A4 */ static void flying_rc_track_diag_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -9195,7 +9195,7 @@ static void flying_rc_track_diag_25_deg_up( /** rct2: 0x007C7504 */ static void flying_rc_track_diag_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -9431,7 +9431,7 @@ static void flying_rc_track_diag_60_deg_up( /** rct2: 0x007C7484 */ static void flying_rc_track_diag_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -9723,7 +9723,7 @@ static void flying_rc_track_diag_flat_to_25_deg_up( /** rct2: 0x007C74E4 */ static void flying_rc_track_diag_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -9959,7 +9959,7 @@ static void flying_rc_track_diag_25_deg_up_to_60_deg_up( /** rct2: 0x007C74F4 */ static void flying_rc_track_diag_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -10195,7 +10195,7 @@ static void flying_rc_track_diag_60_deg_up_to_25_deg_up( /** rct2: 0x007C7494 */ static void flying_rc_track_diag_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -10487,7 +10487,7 @@ static void flying_rc_track_diag_25_deg_up_to_flat( /** rct2: 0x007C74D4 */ static void flying_rc_track_diag_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -10723,7 +10723,7 @@ static void flying_rc_track_diag_25_deg_down( /** rct2: 0x007C7534 */ static void flying_rc_track_diag_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -10959,7 +10959,7 @@ static void flying_rc_track_diag_60_deg_down( /** rct2: 0x007C74B4 */ static void flying_rc_track_diag_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -11188,7 +11188,7 @@ static void flying_rc_track_diag_flat_to_25_deg_down( /** rct2: 0x007C7514 */ static void flying_rc_track_diag_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -11424,7 +11424,7 @@ static void flying_rc_track_diag_25_deg_down_to_60_deg_down( /** rct2: 0x007C7524 */ static void flying_rc_track_diag_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -11660,7 +11660,7 @@ static void flying_rc_track_diag_60_deg_down_to_25_deg_down( /** rct2: 0x007C74C4 */ static void flying_rc_track_diag_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -11896,7 +11896,7 @@ static void flying_rc_track_diag_25_deg_down_to_flat( /** rct2: 0x007C7564 */ static void flying_rc_track_diag_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -12066,7 +12066,7 @@ static void flying_rc_track_diag_flat_to_left_bank( /** rct2: 0x007C7574 */ static void flying_rc_track_diag_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -12236,7 +12236,7 @@ static void flying_rc_track_diag_flat_to_right_bank( /** rct2: 0x007C7584 */ static void flying_rc_track_diag_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -12406,7 +12406,7 @@ static void flying_rc_track_diag_left_bank_to_flat( /** rct2: 0x007C7594 */ static void flying_rc_track_diag_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -12576,7 +12576,7 @@ static void flying_rc_track_diag_right_bank_to_flat( /** rct2: 0x007C75C4 */ static void flying_rc_track_diag_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -12745,7 +12745,7 @@ static void flying_rc_track_diag_left_bank_to_25_deg_up( /** rct2: 0x007C75D4 */ static void flying_rc_track_diag_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -12914,7 +12914,7 @@ static void flying_rc_track_diag_right_bank_to_25_deg_up( /** rct2: 0x007C75A4 */ static void flying_rc_track_diag_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -13083,7 +13083,7 @@ static void flying_rc_track_diag_25_deg_up_to_left_bank( /** rct2: 0x007C75B4 */ static void flying_rc_track_diag_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -13252,7 +13252,7 @@ static void flying_rc_track_diag_25_deg_up_to_right_bank( /** rct2: 0x007C75E4 */ static void flying_rc_track_diag_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -13414,7 +13414,7 @@ static void flying_rc_track_diag_left_bank_to_25_deg_down( /** rct2: 0x007C75F4 */ static void flying_rc_track_diag_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -13576,7 +13576,7 @@ static void flying_rc_track_diag_right_bank_to_25_deg_down( /** rct2: 0x007C7604 */ static void flying_rc_track_diag_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -13745,7 +13745,7 @@ static void flying_rc_track_diag_25_deg_down_to_left_bank( /** rct2: 0x007C7614 */ static void flying_rc_track_diag_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -13914,7 +13914,7 @@ static void flying_rc_track_diag_25_deg_down_to_right_bank( /** rct2: 0x007C7544 */ static void flying_rc_track_diag_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -14081,7 +14081,7 @@ static void flying_rc_track_diag_left_bank( /** rct2: 0x007C7554 */ static void flying_rc_track_diag_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -14248,7 +14248,7 @@ static void flying_rc_track_diag_right_bank( /** rct2: 0x007C7624 */ static void flying_rc_track_left_flyer_twist_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -14360,7 +14360,7 @@ static void flying_rc_track_left_flyer_twist_up( /** rct2: 0x007C7634 */ static void flying_rc_track_right_flyer_twist_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -14470,7 +14470,7 @@ static void flying_rc_track_right_flyer_twist_up( /** rct2: 0x007C7644 */ static void flying_rc_track_left_flyer_twist_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -14582,7 +14582,7 @@ static void flying_rc_track_left_flyer_twist_down( /** rct2: 0x007C7654 */ static void flying_rc_track_right_flyer_twist_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -14692,7 +14692,7 @@ static void flying_rc_track_right_flyer_twist_down( /** rct2: 0x007C72F4 */ static void flying_rc_track_flyer_half_loop_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -14822,7 +14822,7 @@ static void flying_rc_track_flyer_half_loop_up( /** rct2: 0x007C7304 */ static void flying_rc_track_flyer_half_loop_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -14952,7 +14952,7 @@ static void flying_rc_track_flyer_half_loop_down( /** rct2: 0x007C7664 */ static void flying_rc_track_block_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -15010,7 +15010,7 @@ static void flying_rc_track_block_brakes( /** rct2: 0x007C76B4 */ static void flying_rc_track_left_banked_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -15184,7 +15184,7 @@ static void flying_rc_track_left_banked_quarter_turn_3_25_deg_up( /** rct2: 0x007C76C4 */ static void flying_rc_track_right_banked_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -15364,7 +15364,7 @@ static void flying_rc_track_right_banked_quarter_turn_3_25_deg_up( /** rct2: 0x007C76D4 */ static void flying_rc_track_left_banked_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; flying_rc_track_right_banked_quarter_turn_3_25_deg_up( @@ -15374,7 +15374,7 @@ static void flying_rc_track_left_banked_quarter_turn_3_25_deg_down( /** rct2: 0x007C76E4 */ static void flying_rc_track_right_banked_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; flying_rc_track_left_banked_quarter_turn_3_25_deg_up( @@ -15384,7 +15384,7 @@ static void flying_rc_track_right_banked_quarter_turn_3_25_deg_down( /** rct2: 0x007C76F4 */ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -15731,7 +15731,7 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up( /** rct2: 0x007C7704 */ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -16078,7 +16078,7 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up( /** rct2: 0x007C7714 */ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; flying_rc_track_right_banked_quarter_turn_5_25_deg_up( @@ -16088,7 +16088,7 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_down( /** rct2: 0x007C7724 */ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; flying_rc_track_left_banked_quarter_turn_5_25_deg_up( @@ -16098,7 +16098,7 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_down( /** rct2: 0x007C7734 */ static void flying_rc_track_25_deg_up_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -16206,7 +16206,7 @@ static void flying_rc_track_25_deg_up_to_left_banked_25_deg_up( /** rct2: 0x007C7744 */ static void flying_rc_track_25_deg_up_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -16314,7 +16314,7 @@ static void flying_rc_track_25_deg_up_to_right_banked_25_deg_up( /** rct2: 0x007C7754 */ static void flying_rc_track_left_banked_25_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -16422,7 +16422,7 @@ static void flying_rc_track_left_banked_25_deg_up_to_25_deg_up( /** rct2: 0x007C7764 */ static void flying_rc_track_right_banked_25_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -16530,7 +16530,7 @@ static void flying_rc_track_right_banked_25_deg_up_to_25_deg_up( /** rct2: 0x007C7774 */ static void flying_rc_track_25_deg_down_to_left_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { flying_rc_track_right_banked_25_deg_up_to_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -16539,7 +16539,7 @@ static void flying_rc_track_25_deg_down_to_left_banked_25_deg_down( /** rct2: 0x007C7784 */ static void flying_rc_track_25_deg_down_to_right_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { flying_rc_track_left_banked_25_deg_up_to_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -16548,7 +16548,7 @@ static void flying_rc_track_25_deg_down_to_right_banked_25_deg_down( /** rct2: 0x007C7794 */ static void flying_rc_track_left_banked_25_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { flying_rc_track_25_deg_up_to_right_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -16557,7 +16557,7 @@ static void flying_rc_track_left_banked_25_deg_down_to_25_deg_down( /** rct2: 0x007C77A4 */ static void flying_rc_track_right_banked_25_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { flying_rc_track_25_deg_up_to_left_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -16566,7 +16566,7 @@ static void flying_rc_track_right_banked_25_deg_down_to_25_deg_down( /** rct2: 0x007C77B4 */ static void flying_rc_track_left_banked_flat_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -16672,7 +16672,7 @@ static void flying_rc_track_left_banked_flat_to_left_banked_25_deg_up( /** rct2: 0x007C77C4 */ static void flying_rc_track_right_banked_flat_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -16778,7 +16778,7 @@ static void flying_rc_track_right_banked_flat_to_right_banked_25_deg_up( /** rct2: 0x007C77F4 */ static void flying_rc_track_left_banked_25_deg_up_to_left_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -16884,7 +16884,7 @@ static void flying_rc_track_left_banked_25_deg_up_to_left_banked_flat( /** rct2: 0x007C7804 */ static void flying_rc_track_right_banked_25_deg_up_to_right_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -16990,7 +16990,7 @@ static void flying_rc_track_right_banked_25_deg_up_to_right_banked_flat( /** rct2: 0x007C7814 */ static void flying_rc_track_left_banked_flat_to_left_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { flying_rc_track_right_banked_25_deg_up_to_right_banked_flat( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -16999,7 +16999,7 @@ static void flying_rc_track_left_banked_flat_to_left_banked_25_deg_down( /** rct2: 0x007C7824 */ static void flying_rc_track_right_banked_flat_to_right_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { flying_rc_track_left_banked_25_deg_up_to_left_banked_flat( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -17008,7 +17008,7 @@ static void flying_rc_track_right_banked_flat_to_right_banked_25_deg_down( /** rct2: 0x007C77D4 */ static void flying_rc_track_left_banked_25_deg_down_to_left_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { flying_rc_track_right_banked_flat_to_right_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -17017,7 +17017,7 @@ static void flying_rc_track_left_banked_25_deg_down_to_left_banked_flat( /** rct2: 0x007C77E4 */ static void flying_rc_track_right_banked_25_deg_down_to_right_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { flying_rc_track_left_banked_flat_to_left_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -17026,7 +17026,7 @@ static void flying_rc_track_right_banked_25_deg_down_to_right_banked_flat( /** rct2: 0x007C7834 */ static void flying_rc_track_flat_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -17134,7 +17134,7 @@ static void flying_rc_track_flat_to_left_banked_25_deg_up( /** rct2: 0x007C7844 */ static void flying_rc_track_flat_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -17242,7 +17242,7 @@ static void flying_rc_track_flat_to_right_banked_25_deg_up( /** rct2: 0x007C7854 */ static void flying_rc_track_left_banked_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -17350,7 +17350,7 @@ static void flying_rc_track_left_banked_25_deg_up_to_flat( /** rct2: 0x007C7864 */ static void flying_rc_track_right_banked_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -17458,7 +17458,7 @@ static void flying_rc_track_right_banked_25_deg_up_to_flat( /** rct2: 0x007C7874 */ static void flying_rc_track_flat_to_left_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { flying_rc_track_right_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -17466,7 +17466,7 @@ static void flying_rc_track_flat_to_left_banked_25_deg_down( /** rct2: 0x007C7884 */ static void flying_rc_track_flat_to_right_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { flying_rc_track_left_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -17474,7 +17474,7 @@ static void flying_rc_track_flat_to_right_banked_25_deg_down( /** rct2: 0x007C7894 */ static void flying_rc_track_left_banked_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { flying_rc_track_flat_to_right_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -17482,7 +17482,7 @@ static void flying_rc_track_left_banked_25_deg_down_to_flat( /** rct2: 0x007C78A4 */ static void flying_rc_track_right_banked_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { flying_rc_track_flat_to_left_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } diff --git a/src/openrct2/ride/coaster/GigaCoaster.cpp b/src/openrct2/ride/coaster/GigaCoaster.cpp index 9db9668dd1..225a5d9db2 100644 --- a/src/openrct2/ride/coaster/GigaCoaster.cpp +++ b/src/openrct2/ride/coaster/GigaCoaster.cpp @@ -22,7 +22,7 @@ /** rct2: 0x008AD674 */ static void giga_rc_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasCableLift()) { @@ -98,7 +98,7 @@ static void giga_rc_track_flat( static void giga_rc_track_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][3] = { { 18084, 18076, SPR_STATION_BASE_A_SW_NE }, @@ -131,7 +131,7 @@ static void giga_rc_track_station( /** rct2: 0x008AD684 */ static void giga_rc_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasCableLift()) { @@ -227,7 +227,7 @@ static void giga_rc_track_25_deg_up( /** rct2: 0x008AD694 */ static void giga_rc_track_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasCableLift()) { @@ -297,7 +297,7 @@ static void giga_rc_track_60_deg_up( /** rct2: 0x008AD6A4 */ static void giga_rc_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasCableLift()) { @@ -393,7 +393,7 @@ static void giga_rc_track_flat_to_25_deg_up( /** rct2: 0x008AD6B4 */ static void giga_rc_track_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasCableLift()) { @@ -471,7 +471,7 @@ static void giga_rc_track_25_deg_up_to_60_deg_up( /** rct2: 0x008AD6C4 */ static void giga_rc_track_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasCableLift()) { @@ -549,7 +549,7 @@ static void giga_rc_track_60_deg_up_to_25_deg_up( /** rct2: 0x008AD6D4 */ static void giga_rc_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasCableLift()) { @@ -645,7 +645,7 @@ static void giga_rc_track_25_deg_up_to_flat( /** rct2: 0x008AD6E4 */ static void giga_rc_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { giga_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -653,7 +653,7 @@ static void giga_rc_track_25_deg_down( /** rct2: 0x008AD6F4 */ static void giga_rc_track_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { giga_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -661,7 +661,7 @@ static void giga_rc_track_60_deg_down( /** rct2: 0x008AD704 */ static void giga_rc_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { giga_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -669,7 +669,7 @@ static void giga_rc_track_flat_to_25_deg_down( /** rct2: 0x008AD714 */ static void giga_rc_track_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { giga_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -677,7 +677,7 @@ static void giga_rc_track_25_deg_down_to_60_deg_down( /** rct2: 0x008AD724 */ static void giga_rc_track_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { giga_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -685,7 +685,7 @@ static void giga_rc_track_60_deg_down_to_25_deg_down( /** rct2: 0x008AD734 */ static void giga_rc_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { giga_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -693,7 +693,7 @@ static void giga_rc_track_25_deg_down_to_flat( /** rct2: 0x008AD744 */ static void giga_rc_track_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -857,7 +857,7 @@ static void giga_rc_track_left_quarter_turn_5( /** rct2: 0x008AD754 */ static void giga_rc_track_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; giga_rc_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -866,7 +866,7 @@ static void giga_rc_track_right_quarter_turn_5( /** rct2: 0x008AD764 */ static void giga_rc_track_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -904,7 +904,7 @@ static void giga_rc_track_flat_to_left_bank( /** rct2: 0x008AD774 */ static void giga_rc_track_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -942,7 +942,7 @@ static void giga_rc_track_flat_to_right_bank( /** rct2: 0x008AD784 */ static void giga_rc_track_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -980,7 +980,7 @@ static void giga_rc_track_left_bank_to_flat( /** rct2: 0x008AD794 */ static void giga_rc_track_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1018,7 +1018,7 @@ static void giga_rc_track_right_bank_to_flat( /** rct2: 0x008AD7A4 */ static void giga_rc_track_banked_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1192,7 +1192,7 @@ static void giga_rc_track_banked_left_quarter_turn_5( /** rct2: 0x008AD7B4 */ static void giga_rc_track_banked_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; giga_rc_track_banked_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -1201,7 +1201,7 @@ static void giga_rc_track_banked_right_quarter_turn_5( /** rct2: 0x008AD7C4 */ static void giga_rc_track_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1246,7 +1246,7 @@ static void giga_rc_track_left_bank_to_25_deg_up( /** rct2: 0x008AD7D4 */ static void giga_rc_track_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1291,7 +1291,7 @@ static void giga_rc_track_right_bank_to_25_deg_up( /** rct2: 0x008AD7E4 */ static void giga_rc_track_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1336,7 +1336,7 @@ static void giga_rc_track_25_deg_up_to_left_bank( /** rct2: 0x008AD7F4 */ static void giga_rc_track_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1381,7 +1381,7 @@ static void giga_rc_track_25_deg_up_to_right_bank( /** rct2: 0x008AD804 */ static void giga_rc_track_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { giga_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1389,7 +1389,7 @@ static void giga_rc_track_left_bank_to_25_deg_down( /** rct2: 0x008AD814 */ static void giga_rc_track_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { giga_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1397,7 +1397,7 @@ static void giga_rc_track_right_bank_to_25_deg_down( /** rct2: 0x008AD824 */ static void giga_rc_track_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { giga_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1405,7 +1405,7 @@ static void giga_rc_track_25_deg_down_to_left_bank( /** rct2: 0x008AD834 */ static void giga_rc_track_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { giga_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1413,7 +1413,7 @@ static void giga_rc_track_25_deg_down_to_right_bank( /** rct2: 0x008AD844 */ static void giga_rc_track_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1447,7 +1447,7 @@ static void giga_rc_track_left_bank( /** rct2: 0x008AD854 */ static void giga_rc_track_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { giga_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1455,7 +1455,7 @@ static void giga_rc_track_right_bank( /** rct2: 0x008AD864 */ static void giga_rc_track_left_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1619,7 +1619,7 @@ static void giga_rc_track_left_quarter_turn_5_25_deg_up( /** rct2: 0x008AD874 */ static void giga_rc_track_right_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1783,7 +1783,7 @@ static void giga_rc_track_right_quarter_turn_5_25_deg_up( /** rct2: 0x008AD884 */ static void giga_rc_track_left_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; giga_rc_track_right_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, tileElement); @@ -1792,7 +1792,7 @@ static void giga_rc_track_left_quarter_turn_5_25_deg_down( /** rct2: 0x008AD894 */ static void giga_rc_track_right_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; giga_rc_track_left_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -1801,7 +1801,7 @@ static void giga_rc_track_right_quarter_turn_5_25_deg_down( /** rct2: 0x008AD8A4 */ static void giga_rc_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1936,7 +1936,7 @@ static void giga_rc_track_s_bend_left( /** rct2: 0x008AD8B4 */ static void giga_rc_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2071,7 +2071,7 @@ static void giga_rc_track_s_bend_right( /** rct2: 0x008AD8F4 */ static void giga_rc_track_left_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2174,7 +2174,7 @@ static void giga_rc_track_left_quarter_turn_3( /** rct2: 0x008AD904 */ static void giga_rc_track_right_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; giga_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -2183,7 +2183,7 @@ static void giga_rc_track_right_quarter_turn_3( /** rct2: 0x008AD914 */ static void giga_rc_track_left_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2295,7 +2295,7 @@ static void giga_rc_track_left_quarter_turn_3_bank( /** rct2: 0x008AD924 */ static void giga_rc_track_right_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; giga_rc_track_left_quarter_turn_3_bank(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -2304,7 +2304,7 @@ static void giga_rc_track_right_quarter_turn_3_bank( /** rct2: 0x008AD934 */ static void giga_rc_track_left_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2383,7 +2383,7 @@ static void giga_rc_track_left_quarter_turn_3_25_deg_up( /** rct2: 0x008AD944 */ static void giga_rc_track_right_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2469,7 +2469,7 @@ static void giga_rc_track_right_quarter_turn_3_25_deg_up( /** rct2: 0x008AD954 */ static void giga_rc_track_left_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; giga_rc_track_right_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, tileElement); @@ -2478,7 +2478,7 @@ static void giga_rc_track_left_quarter_turn_3_25_deg_down( /** rct2: 0x008AD964 */ static void giga_rc_track_right_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; giga_rc_track_left_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -2487,7 +2487,7 @@ static void giga_rc_track_right_quarter_turn_3_25_deg_down( /** rct2: 0x008AD974 */ static void giga_rc_track_left_half_banked_helix_up_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2705,7 +2705,7 @@ static void giga_rc_track_left_half_banked_helix_up_small( /** rct2: 0x008AD984 */ static void giga_rc_track_right_half_banked_helix_up_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2923,7 +2923,7 @@ static void giga_rc_track_right_half_banked_helix_up_small( /** rct2: 0x008AD994 */ static void giga_rc_track_left_half_banked_helix_down_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 4) { @@ -2937,7 +2937,7 @@ static void giga_rc_track_left_half_banked_helix_down_small( /** rct2: 0x008AD9A4 */ static void giga_rc_track_right_half_banked_helix_down_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 4) { @@ -2951,7 +2951,7 @@ static void giga_rc_track_right_half_banked_helix_down_small( /** rct2: 0x008AD9B4 */ static void giga_rc_track_left_half_banked_helix_up_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3293,7 +3293,7 @@ static void giga_rc_track_left_half_banked_helix_up_large( /** rct2: 0x008AD9C4 */ static void giga_rc_track_right_half_banked_helix_up_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3649,7 +3649,7 @@ static void giga_rc_track_right_half_banked_helix_up_large( /** rct2: 0x008AD9D4 */ static void giga_rc_track_left_half_banked_helix_down_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 7) { @@ -3663,7 +3663,7 @@ static void giga_rc_track_left_half_banked_helix_down_large( /** rct2: 0x008AD9E4 */ static void giga_rc_track_right_half_banked_helix_down_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 7) { @@ -3677,7 +3677,7 @@ static void giga_rc_track_right_half_banked_helix_down_large( /** rct2: 0x008ADA14 */ static void giga_rc_track_left_quarter_turn_1_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -3714,7 +3714,7 @@ static void giga_rc_track_left_quarter_turn_1_60_deg_up( /** rct2: 0x008AD9F4 */ static void giga_rc_track_right_quarter_turn_1_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -3751,7 +3751,7 @@ static void giga_rc_track_right_quarter_turn_1_60_deg_up( /** rct2: 0x008ADA04 */ static void giga_rc_track_left_quarter_turn_1_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { giga_rc_track_right_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, tileElement); } @@ -3759,7 +3759,7 @@ static void giga_rc_track_left_quarter_turn_1_60_deg_down( /** rct2: 0x008ADA24 */ static void giga_rc_track_right_quarter_turn_1_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { giga_rc_track_left_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); } @@ -3767,7 +3767,7 @@ static void giga_rc_track_right_quarter_turn_1_60_deg_down( /** rct2: 0x008ADA34 */ static void giga_rc_track_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -3799,7 +3799,7 @@ static void giga_rc_track_brakes( /** rct2: 0x008ADC84 */ static void giga_rc_track_25_deg_up_left_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -3840,7 +3840,7 @@ static void giga_rc_track_25_deg_up_left_banked( /** rct2: 0x008ADC94 */ static void giga_rc_track_25_deg_up_right_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -3881,7 +3881,7 @@ static void giga_rc_track_25_deg_up_right_banked( /** rct2: 0x008ADA44 */ static void giga_rc_track_on_ride_photo( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -3923,7 +3923,7 @@ static void giga_rc_track_on_ride_photo( /** rct2: 0x008ADCA4 */ static void giga_rc_track_25_deg_down_left_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { giga_rc_track_25_deg_up_right_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -3931,7 +3931,7 @@ static void giga_rc_track_25_deg_down_left_banked( /** rct2: 0x008ADCB4 */ static void giga_rc_track_25_deg_down_right_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { giga_rc_track_25_deg_up_left_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -3939,7 +3939,7 @@ static void giga_rc_track_25_deg_down_right_banked( /** rct2: 0x008ADED4 */ static void giga_rc_track_flat_to_60_deg_up_long_base( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4230,7 +4230,7 @@ static void giga_rc_track_flat_to_60_deg_up_long_base( /** rct2: 0x008ADEE4 */ static void giga_rc_track_60_deg_up_to_flat_long_base( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4371,7 +4371,7 @@ static void giga_rc_track_60_deg_up_to_flat_long_base( /** rct2: 0x008ADEF4 */ static void giga_rc_track_flat_to_60_deg_down_long_base( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { giga_rc_track_flat_to_60_deg_up_long_base(session, rideIndex, 3 - trackSequence, (direction + 2) & 3, height, tileElement); } @@ -4379,7 +4379,7 @@ static void giga_rc_track_flat_to_60_deg_down_long_base( /** rct2: 0x008ADF04 */ static void giga_rc_track_60_deg_up_to_flat_long_base122( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { giga_rc_track_60_deg_up_to_flat_long_base(session, rideIndex, 3 - trackSequence, (direction + 2) & 3, height, tileElement); } @@ -4387,7 +4387,7 @@ static void giga_rc_track_60_deg_up_to_flat_long_base122( /** rct2: 0x008ADF14 */ static void giga_rc_track_cable_lift_hill( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4553,7 +4553,7 @@ static void giga_rc_track_cable_lift_hill( /** rct2: 0x008ADA64 */ static void giga_rc_track_left_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4692,7 +4692,7 @@ static void giga_rc_track_left_eighth_to_diag( /** rct2: 0x008ADA74 */ static void giga_rc_track_right_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4830,7 +4830,7 @@ static void giga_rc_track_right_eighth_to_diag( /** rct2: 0x008ADA84 */ static void giga_rc_track_left_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; giga_rc_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -4839,7 +4839,7 @@ static void giga_rc_track_left_eighth_to_orthogonal( /** rct2: 0x008ADA94 */ static void giga_rc_track_right_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; giga_rc_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, tileElement); @@ -4848,7 +4848,7 @@ static void giga_rc_track_right_eighth_to_orthogonal( /** rct2: 0x008ADAA4 */ static void giga_rc_track_left_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4990,7 +4990,7 @@ static void giga_rc_track_left_eighth_bank_to_diag( /** rct2: 0x008ADAB4 */ static void giga_rc_track_right_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5132,7 +5132,7 @@ static void giga_rc_track_right_eighth_bank_to_diag( /** rct2: 0x008ADAC4 */ static void giga_rc_track_left_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; giga_rc_track_right_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -5141,7 +5141,7 @@ static void giga_rc_track_left_eighth_bank_to_orthogonal( /** rct2: 0x008ADAD4 */ static void giga_rc_track_right_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; giga_rc_track_left_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, tileElement); @@ -5150,7 +5150,7 @@ static void giga_rc_track_right_eighth_bank_to_orthogonal( /** rct2: 0x008ADA54 */ static void giga_rc_track_diag_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5296,7 +5296,7 @@ static void giga_rc_track_diag_flat( /** rct2: 0x008ADB04 */ static void giga_rc_track_diag_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5442,7 +5442,7 @@ static void giga_rc_track_diag_25_deg_up( /** rct2: 0x008ADB64 */ static void giga_rc_track_diag_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5518,7 +5518,7 @@ static void giga_rc_track_diag_60_deg_up( /** rct2: 0x008ADAE4 */ static void giga_rc_track_diag_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5664,7 +5664,7 @@ static void giga_rc_track_diag_flat_to_25_deg_up( /** rct2: 0x008ADB44 */ static void giga_rc_track_diag_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5740,7 +5740,7 @@ static void giga_rc_track_diag_25_deg_up_to_60_deg_up( /** rct2: 0x008ADB54 */ static void giga_rc_track_diag_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5816,7 +5816,7 @@ static void giga_rc_track_diag_60_deg_up_to_25_deg_up( /** rct2: 0x008ADAF4 */ static void giga_rc_track_diag_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5962,7 +5962,7 @@ static void giga_rc_track_diag_25_deg_up_to_flat( /** rct2: 0x008ADB34 */ static void giga_rc_track_diag_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6108,7 +6108,7 @@ static void giga_rc_track_diag_25_deg_down( /** rct2: 0x008ADB94 */ static void giga_rc_track_diag_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6184,7 +6184,7 @@ static void giga_rc_track_diag_60_deg_down( /** rct2: 0x008ADB14 */ static void giga_rc_track_diag_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6328,7 +6328,7 @@ static void giga_rc_track_diag_flat_to_25_deg_down( /** rct2: 0x008ADB74 */ static void giga_rc_track_diag_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6404,7 +6404,7 @@ static void giga_rc_track_diag_25_deg_down_to_60_deg_down( /** rct2: 0x008ADB84 */ static void giga_rc_track_diag_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6480,7 +6480,7 @@ static void giga_rc_track_diag_60_deg_down_to_25_deg_down( /** rct2: 0x008ADB24 */ static void giga_rc_track_diag_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6626,7 +6626,7 @@ static void giga_rc_track_diag_25_deg_down_to_flat( /** rct2: 0x008ADBC4 */ static void giga_rc_track_diag_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6705,7 +6705,7 @@ static void giga_rc_track_diag_flat_to_left_bank( /** rct2: 0x008ADBD4 */ static void giga_rc_track_diag_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6784,7 +6784,7 @@ static void giga_rc_track_diag_flat_to_right_bank( /** rct2: 0x008ADBE4 */ static void giga_rc_track_diag_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6863,7 +6863,7 @@ static void giga_rc_track_diag_left_bank_to_flat( /** rct2: 0x008ADBF4 */ static void giga_rc_track_diag_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6942,7 +6942,7 @@ static void giga_rc_track_diag_right_bank_to_flat( /** rct2: 0x008ADC24 */ static void giga_rc_track_diag_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7021,7 +7021,7 @@ static void giga_rc_track_diag_left_bank_to_25_deg_up( /** rct2: 0x008ADC34 */ static void giga_rc_track_diag_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7100,7 +7100,7 @@ static void giga_rc_track_diag_right_bank_to_25_deg_up( /** rct2: 0x008ADC04 */ static void giga_rc_track_diag_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7179,7 +7179,7 @@ static void giga_rc_track_diag_25_deg_up_to_left_bank( /** rct2: 0x008ADC14 */ static void giga_rc_track_diag_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7258,7 +7258,7 @@ static void giga_rc_track_diag_25_deg_up_to_right_bank( /** rct2: 0x008ADC44 */ static void giga_rc_track_diag_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7335,7 +7335,7 @@ static void giga_rc_track_diag_left_bank_to_25_deg_down( /** rct2: 0x008ADC54 */ static void giga_rc_track_diag_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7412,7 +7412,7 @@ static void giga_rc_track_diag_right_bank_to_25_deg_down( /** rct2: 0x008ADC64 */ static void giga_rc_track_diag_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7491,7 +7491,7 @@ static void giga_rc_track_diag_25_deg_down_to_left_bank( /** rct2: 0x008ADC74 */ static void giga_rc_track_diag_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7570,7 +7570,7 @@ static void giga_rc_track_diag_25_deg_down_to_right_bank( /** rct2: 0x008ADBA4 */ static void giga_rc_track_diag_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7646,7 +7646,7 @@ static void giga_rc_track_diag_left_bank( /** rct2: 0x008ADBB4 */ static void giga_rc_track_diag_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7722,7 +7722,7 @@ static void giga_rc_track_diag_right_bank( /** rct2: 0x008ADEC4 */ static void giga_rc_track_block_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -7754,7 +7754,7 @@ static void giga_rc_track_block_brakes( /** rct2: 0x008ADCC4 */ static void giga_rc_track_left_banked_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7836,7 +7836,7 @@ static void giga_rc_track_left_banked_quarter_turn_3_25_deg_up( /** rct2: 0x008ADCD4 */ static void giga_rc_track_right_banked_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7925,7 +7925,7 @@ static void giga_rc_track_right_banked_quarter_turn_3_25_deg_up( /** rct2: 0x008ADCE4 */ static void giga_rc_track_left_banked_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; giga_rc_track_right_banked_quarter_turn_3_25_deg_up( @@ -7935,7 +7935,7 @@ static void giga_rc_track_left_banked_quarter_turn_3_25_deg_down( /** rct2: 0x008ADCF4 */ static void giga_rc_track_right_banked_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; giga_rc_track_left_banked_quarter_turn_3_25_deg_up( @@ -7945,7 +7945,7 @@ static void giga_rc_track_right_banked_quarter_turn_3_25_deg_down( /** rct2: 0x008ADD04 */ static void giga_rc_track_left_banked_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8115,7 +8115,7 @@ static void giga_rc_track_left_banked_quarter_turn_5_25_deg_up( /** rct2: 0x008ADD14 */ static void giga_rc_track_right_banked_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8285,7 +8285,7 @@ static void giga_rc_track_right_banked_quarter_turn_5_25_deg_up( /** rct2: 0x008ADD24 */ static void giga_rc_track_left_banked_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; giga_rc_track_right_banked_quarter_turn_5_25_deg_up( @@ -8295,7 +8295,7 @@ static void giga_rc_track_left_banked_quarter_turn_5_25_deg_down( /** rct2: 0x008ADD34 */ static void giga_rc_track_right_banked_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; giga_rc_track_left_banked_quarter_turn_5_25_deg_up( @@ -8305,7 +8305,7 @@ static void giga_rc_track_right_banked_quarter_turn_5_25_deg_down( /** rct2: 0x008ADD44 */ static void giga_rc_track_25_deg_up_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8348,7 +8348,7 @@ static void giga_rc_track_25_deg_up_to_left_banked_25_deg_up( /** rct2: 0x008ADD54 */ static void giga_rc_track_25_deg_up_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8391,7 +8391,7 @@ static void giga_rc_track_25_deg_up_to_right_banked_25_deg_up( /** rct2: 0x008ADD64 */ static void giga_rc_track_left_banked_25_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8434,7 +8434,7 @@ static void giga_rc_track_left_banked_25_deg_up_to_25_deg_up( /** rct2: 0x008ADD74 */ static void giga_rc_track_right_banked_25_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8477,7 +8477,7 @@ static void giga_rc_track_right_banked_25_deg_up_to_25_deg_up( /** rct2: 0x008ADD84 */ static void giga_rc_track_25_deg_down_to_left_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { giga_rc_track_right_banked_25_deg_up_to_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -8486,7 +8486,7 @@ static void giga_rc_track_25_deg_down_to_left_banked_25_deg_down( /** rct2: 0x008ADD94 */ static void giga_rc_track_25_deg_down_to_right_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { giga_rc_track_left_banked_25_deg_up_to_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -8495,7 +8495,7 @@ static void giga_rc_track_25_deg_down_to_right_banked_25_deg_down( /** rct2: 0x008ADDA4 */ static void giga_rc_track_left_banked_25_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { giga_rc_track_25_deg_up_to_right_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -8504,7 +8504,7 @@ static void giga_rc_track_left_banked_25_deg_down_to_25_deg_down( /** rct2: 0x008ADDB4 */ static void giga_rc_track_right_banked_25_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { giga_rc_track_25_deg_up_to_left_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -8513,7 +8513,7 @@ static void giga_rc_track_right_banked_25_deg_down_to_25_deg_down( /** rct2: 0x008ADDC4 */ static void giga_rc_track_left_banked_flat_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8554,7 +8554,7 @@ static void giga_rc_track_left_banked_flat_to_left_banked_25_deg_up( /** rct2: 0x008ADDD4 */ static void giga_rc_track_right_banked_flat_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8595,7 +8595,7 @@ static void giga_rc_track_right_banked_flat_to_right_banked_25_deg_up( /** rct2: 0x008ADE04 */ static void giga_rc_track_left_banked_25_deg_up_to_left_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8636,7 +8636,7 @@ static void giga_rc_track_left_banked_25_deg_up_to_left_banked_flat( /** rct2: 0x008ADE14 */ static void giga_rc_track_right_banked_25_deg_up_to_right_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8677,7 +8677,7 @@ static void giga_rc_track_right_banked_25_deg_up_to_right_banked_flat( /** rct2: 0x008ADE24 */ static void giga_rc_track_left_banked_flat_to_left_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { giga_rc_track_right_banked_25_deg_up_to_right_banked_flat( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -8686,7 +8686,7 @@ static void giga_rc_track_left_banked_flat_to_left_banked_25_deg_down( /** rct2: 0x008ADE34 */ static void giga_rc_track_right_banked_flat_to_right_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { giga_rc_track_left_banked_25_deg_up_to_left_banked_flat( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -8695,7 +8695,7 @@ static void giga_rc_track_right_banked_flat_to_right_banked_25_deg_down( /** rct2: 0x008ADDE4 */ static void giga_rc_track_left_banked_25_deg_down_to_left_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { giga_rc_track_right_banked_flat_to_right_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -8704,7 +8704,7 @@ static void giga_rc_track_left_banked_25_deg_down_to_left_banked_flat( /** rct2: 0x008ADDF4 */ static void giga_rc_track_right_banked_25_deg_down_to_right_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { giga_rc_track_left_banked_flat_to_left_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -8713,7 +8713,7 @@ static void giga_rc_track_right_banked_25_deg_down_to_right_banked_flat( /** rct2: 0x008ADE44 */ static void giga_rc_track_flat_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8756,7 +8756,7 @@ static void giga_rc_track_flat_to_left_banked_25_deg_up( /** rct2: 0x008ADE54 */ static void giga_rc_track_flat_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8799,7 +8799,7 @@ static void giga_rc_track_flat_to_right_banked_25_deg_up( /** rct2: 0x008ADE64 */ static void giga_rc_track_left_banked_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8842,7 +8842,7 @@ static void giga_rc_track_left_banked_25_deg_up_to_flat( /** rct2: 0x008ADE74 */ static void giga_rc_track_right_banked_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8885,7 +8885,7 @@ static void giga_rc_track_right_banked_25_deg_up_to_flat( /** rct2: 0x008ADE84 */ static void giga_rc_track_flat_to_left_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { giga_rc_track_right_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -8893,7 +8893,7 @@ static void giga_rc_track_flat_to_left_banked_25_deg_down( /** rct2: 0x008ADE94 */ static void giga_rc_track_flat_to_right_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { giga_rc_track_left_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -8901,7 +8901,7 @@ static void giga_rc_track_flat_to_right_banked_25_deg_down( /** rct2: 0x008ADEA4 */ static void giga_rc_track_left_banked_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { giga_rc_track_flat_to_right_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -8909,14 +8909,14 @@ static void giga_rc_track_left_banked_25_deg_down_to_flat( /** rct2: 0x008ADEB4 */ static void giga_rc_track_right_banked_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { giga_rc_track_flat_to_left_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } static void giga_rc_track_booster( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { // These offsets could be moved to the g2.dat file when that supports offsets. int8_t ne_sw_offsetX = 7; diff --git a/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp b/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp index 1889405d5e..54dc0f7fa3 100644 --- a/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp +++ b/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp @@ -22,7 +22,7 @@ /** rct2: 0x0087694C */ static void heartline_twister_rc_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -87,7 +87,7 @@ static void heartline_twister_rc_track_flat( static void heartline_twister_rc_track_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][3] = { { 19732, SPR_STATION_BASE_B_SW_NE }, @@ -111,7 +111,7 @@ static void heartline_twister_rc_track_station( /** rct2: 0x0087695C */ static void heartline_twister_rc_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -196,7 +196,7 @@ static void heartline_twister_rc_track_25_deg_up( /** rct2: 0x008769FC */ static void heartline_twister_rc_track_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -281,7 +281,7 @@ static void heartline_twister_rc_track_60_deg_up( /** rct2: 0x0087696C */ static void heartline_twister_rc_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -366,7 +366,7 @@ static void heartline_twister_rc_track_flat_to_25_deg_up( /** rct2: 0x008769BC */ static void heartline_twister_rc_track_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -451,7 +451,7 @@ static void heartline_twister_rc_track_25_deg_up_to_60_deg_up( /** rct2: 0x008769CC */ static void heartline_twister_rc_track_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -536,7 +536,7 @@ static void heartline_twister_rc_track_60_deg_up_to_25_deg_up( /** rct2: 0x0087697C */ static void heartline_twister_rc_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -621,7 +621,7 @@ static void heartline_twister_rc_track_25_deg_up_to_flat( /** rct2: 0x0087698C */ static void heartline_twister_rc_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { heartline_twister_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -629,7 +629,7 @@ static void heartline_twister_rc_track_25_deg_down( /** rct2: 0x00876A0C */ static void heartline_twister_rc_track_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { heartline_twister_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -637,7 +637,7 @@ static void heartline_twister_rc_track_60_deg_down( /** rct2: 0x0087699C */ static void heartline_twister_rc_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { heartline_twister_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -645,7 +645,7 @@ static void heartline_twister_rc_track_flat_to_25_deg_down( /** rct2: 0x008769DC */ static void heartline_twister_rc_track_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { heartline_twister_rc_track_60_deg_up_to_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -654,7 +654,7 @@ static void heartline_twister_rc_track_25_deg_down_to_60_deg_down( /** rct2: 0x008769EC */ static void heartline_twister_rc_track_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { heartline_twister_rc_track_25_deg_up_to_60_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -663,7 +663,7 @@ static void heartline_twister_rc_track_60_deg_down_to_25_deg_down( /** rct2: 0x008769AC */ static void heartline_twister_rc_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { heartline_twister_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -671,7 +671,7 @@ static void heartline_twister_rc_track_25_deg_down_to_flat( /** rct2: 0x00876A6C */ static void heartline_twister_rc_track_heartline_transfer_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -881,7 +881,7 @@ static void heartline_twister_rc_track_heartline_transfer_up( /** rct2: 0x00876A7C */ static void heartline_twister_rc_track_heartline_transfer_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1091,7 +1091,7 @@ static void heartline_twister_rc_track_heartline_transfer_down( /** rct2: 0x00876A4C */ static void heartline_twister_rc_track_left_heartline_roll( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1337,7 +1337,7 @@ static void heartline_twister_rc_track_left_heartline_roll( /** rct2: 0x00876A5C */ static void heartline_twister_rc_track_right_heartline_roll( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { diff --git a/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp b/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp index 152e33edae..5e1b90f98a 100644 --- a/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp @@ -22,7 +22,7 @@ /** rct2: 0x00890CB4 */ static void inverted_hairpin_rc_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -84,7 +84,7 @@ static void inverted_hairpin_rc_track_flat( /** rct2: 0x00890D84, 0x00890D94, 0x00890DA4 */ static void inverted_hairpin_rc_track_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][3] = { { SPR_STATION_BASE_C_SW_NE, 17028, SPR_STATION_INVERTED_BAR_0_SW_NE }, @@ -111,7 +111,7 @@ static void inverted_hairpin_rc_track_station( /** rct2: 0x00890CC4 */ static void inverted_hairpin_rc_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -205,7 +205,7 @@ static void inverted_hairpin_rc_track_25_deg_up( /** rct2: 0x00890CD4 */ static void inverted_hairpin_rc_track_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -275,7 +275,7 @@ static void inverted_hairpin_rc_track_60_deg_up( /** rct2: 0x00890CE4 */ static void inverted_hairpin_rc_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -369,7 +369,7 @@ static void inverted_hairpin_rc_track_flat_to_25_deg_up( /** rct2: 0x00890CF4 */ static void inverted_hairpin_rc_track_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -451,7 +451,7 @@ static void inverted_hairpin_rc_track_25_deg_up_to_60_deg_up( /** rct2: 0x00890D04 */ static void inverted_hairpin_rc_track_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -557,7 +557,7 @@ static void inverted_hairpin_rc_track_60_deg_up_to_25_deg_up( /** rct2: 0x00890D14 */ static void inverted_hairpin_rc_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -651,7 +651,7 @@ static void inverted_hairpin_rc_track_25_deg_up_to_flat( /** rct2: 0x00890D24 */ static void inverted_hairpin_rc_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_hairpin_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -659,7 +659,7 @@ static void inverted_hairpin_rc_track_25_deg_down( /** rct2: 0x00890D34 */ static void inverted_hairpin_rc_track_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_hairpin_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -667,7 +667,7 @@ static void inverted_hairpin_rc_track_60_deg_down( /** rct2: 0x00890D44 */ static void inverted_hairpin_rc_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_hairpin_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -675,7 +675,7 @@ static void inverted_hairpin_rc_track_flat_to_25_deg_down( /** rct2: 0x00890D54 */ static void inverted_hairpin_rc_track_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_hairpin_rc_track_60_deg_up_to_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -684,7 +684,7 @@ static void inverted_hairpin_rc_track_25_deg_down_to_60_deg_down( /** rct2: 0x00890D64 */ static void inverted_hairpin_rc_track_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_hairpin_rc_track_25_deg_up_to_60_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -693,7 +693,7 @@ static void inverted_hairpin_rc_track_60_deg_down_to_25_deg_down( /** rct2: 0x00890D74 */ static void inverted_hairpin_rc_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_hairpin_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -701,7 +701,7 @@ static void inverted_hairpin_rc_track_25_deg_down_to_flat( /** rct2: 0x00890DB4 */ static void inverted_hairpin_rc_track_left_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -821,7 +821,7 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3( /** rct2: 0x00890DC4 */ static void inverted_hairpin_rc_track_right_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; inverted_hairpin_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -830,7 +830,7 @@ static void inverted_hairpin_rc_track_right_quarter_turn_3( /** rct2: 0x00890DD4 */ static void inverted_hairpin_rc_track_left_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -917,7 +917,7 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3_25_deg_up( /** rct2: 0x00890DE4 */ static void inverted_hairpin_rc_track_right_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1004,7 +1004,7 @@ static void inverted_hairpin_rc_track_right_quarter_turn_3_25_deg_up( /** rct2: 0x00890DF4 */ static void inverted_hairpin_rc_track_left_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; inverted_hairpin_rc_track_right_quarter_turn_3_25_deg_up( @@ -1014,7 +1014,7 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3_25_deg_down( /** rct2: 0x00890E04 */ static void inverted_hairpin_rc_track_right_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; inverted_hairpin_rc_track_left_quarter_turn_3_25_deg_up( @@ -1024,7 +1024,7 @@ static void inverted_hairpin_rc_track_right_quarter_turn_3_25_deg_down( /** rct2: 0x00890E64 */ static void inverted_hairpin_rc_track_left_quarter_turn_1( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1074,7 +1074,7 @@ static void inverted_hairpin_rc_track_left_quarter_turn_1( /** rct2: 0x00890E74 */ static void inverted_hairpin_rc_track_right_quarter_turn_1( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_hairpin_rc_track_left_quarter_turn_1(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); } @@ -1082,7 +1082,7 @@ static void inverted_hairpin_rc_track_right_quarter_turn_1( /** rct2: 0x00890E24 */ static void inverted_hairpin_rc_track_flat_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -1164,7 +1164,7 @@ static void inverted_hairpin_rc_track_flat_to_60_deg_up( /** rct2: 0x00890E34 */ static void inverted_hairpin_rc_track_60_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -1267,7 +1267,7 @@ static void inverted_hairpin_rc_track_60_deg_up_to_flat( /** rct2: 0x00890E44 */ static void inverted_hairpin_rc_track_flat_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_hairpin_rc_track_60_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1275,7 +1275,7 @@ static void inverted_hairpin_rc_track_flat_to_60_deg_down( /** rct2: 0x00890E54 */ static void inverted_hairpin_rc_track_60_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_hairpin_rc_track_flat_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1283,7 +1283,7 @@ static void inverted_hairpin_rc_track_60_deg_down_to_flat( /** rct2: 0x00890E14 */ static void inverted_hairpin_rc_track_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1316,7 +1316,7 @@ static void inverted_hairpin_rc_track_brakes( /** rct2: 0x00890E84 */ static void inverted_hairpin_rc_track_block_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { diff --git a/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp b/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp index fa55b58660..cfaeab48cd 100644 --- a/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp @@ -22,7 +22,7 @@ /** rct2: 0x008B0460 */ static void inverted_impulse_rc_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -55,7 +55,7 @@ static void inverted_impulse_rc_track_flat( /** rct2: 0x008B0470, 0x008B0480, 0x008B0490 */ static void inverted_impulse_rc_track_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][3] = { { SPR_STATION_BASE_C_SW_NE, 19662, SPR_STATION_INVERTED_BAR_B_SW_NE }, @@ -82,7 +82,7 @@ static void inverted_impulse_rc_track_station( /** rct2: 0x008B04A0 */ static void inverted_impulse_rc_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -147,7 +147,7 @@ static void inverted_impulse_rc_track_25_deg_up( /** rct2: 0x008B04B0 */ static void inverted_impulse_rc_track_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -188,7 +188,7 @@ static void inverted_impulse_rc_track_60_deg_up( /** rct2: 0x008B04C0 */ static void inverted_impulse_rc_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -250,7 +250,7 @@ static void inverted_impulse_rc_track_flat_to_25_deg_up( /** rct2: 0x008B04D0 */ static void inverted_impulse_rc_track_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -297,7 +297,7 @@ static void inverted_impulse_rc_track_25_deg_up_to_60_deg_up( /** rct2: 0x008B04E0 */ static void inverted_impulse_rc_track_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -344,7 +344,7 @@ static void inverted_impulse_rc_track_60_deg_up_to_25_deg_up( /** rct2: 0x008B04F0 */ static void inverted_impulse_rc_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -406,7 +406,7 @@ static void inverted_impulse_rc_track_25_deg_up_to_flat( /** rct2: 0x008B0500 */ static void inverted_impulse_rc_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_impulse_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -414,7 +414,7 @@ static void inverted_impulse_rc_track_25_deg_down( /** rct2: 0x008B0510 */ static void inverted_impulse_rc_track_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_impulse_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -422,7 +422,7 @@ static void inverted_impulse_rc_track_60_deg_down( /** rct2: 0x008B0520 */ static void inverted_impulse_rc_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_impulse_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -430,7 +430,7 @@ static void inverted_impulse_rc_track_flat_to_25_deg_down( /** rct2: 0x008B0530 */ static void inverted_impulse_rc_track_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_impulse_rc_track_60_deg_up_to_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -439,7 +439,7 @@ static void inverted_impulse_rc_track_25_deg_down_to_60_deg_down( /** rct2: 0x008B0540 */ static void inverted_impulse_rc_track_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_impulse_rc_track_25_deg_up_to_60_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -448,7 +448,7 @@ static void inverted_impulse_rc_track_60_deg_down_to_25_deg_down( /** rct2: 0x008B0550 */ static void inverted_impulse_rc_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_impulse_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -456,7 +456,7 @@ static void inverted_impulse_rc_track_25_deg_down_to_flat( /** rct2: 0x008B05A0 */ static void inverted_impulse_rc_track_90_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -497,7 +497,7 @@ static void inverted_impulse_rc_track_90_deg_up( /** rct2: 0x008B05B0 */ static void inverted_impulse_rc_track_90_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_impulse_rc_track_90_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -505,7 +505,7 @@ static void inverted_impulse_rc_track_90_deg_down( /** rct2: 0x008B0560 */ static void inverted_impulse_rc_track_60_deg_up_to_90_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -550,7 +550,7 @@ static void inverted_impulse_rc_track_60_deg_up_to_90_deg_up( /** rct2: 0x008B0570 */ static void inverted_impulse_rc_track_90_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_impulse_rc_track_60_deg_up_to_90_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -559,7 +559,7 @@ static void inverted_impulse_rc_track_90_deg_down_to_60_deg_down( /** rct2: 0x008B0580 */ static void inverted_impulse_rc_track_90_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -601,7 +601,7 @@ static void inverted_impulse_rc_track_90_deg_up_to_60_deg_up( /** rct2: 0x008B0590 */ static void inverted_impulse_rc_track_60_deg_down_to_90_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -645,7 +645,7 @@ static void inverted_impulse_rc_track_60_deg_down_to_90_deg_down( /** rct2: 0x008B05C0 */ static void inverted_impulse_rc_track_left_quarter_turn_1_90_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -695,7 +695,7 @@ static void inverted_impulse_rc_track_left_quarter_turn_1_90_deg_up( /** rct2: 0x008B05D0 */ static void inverted_impulse_rc_track_right_quarter_turn_1_90_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -745,7 +745,7 @@ static void inverted_impulse_rc_track_right_quarter_turn_1_90_deg_up( /** rct2: 0x008B05E0 */ static void inverted_impulse_rc_track_left_quarter_turn_1_90_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_impulse_rc_track_right_quarter_turn_1_90_deg_up( session, rideIndex, trackSequence, (direction + 1) & 3, height, tileElement); @@ -754,7 +754,7 @@ static void inverted_impulse_rc_track_left_quarter_turn_1_90_deg_down( /** rct2: 0x008B05F0 */ static void inverted_impulse_rc_track_right_quarter_turn_1_90_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_impulse_rc_track_left_quarter_turn_1_90_deg_up( session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); diff --git a/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp b/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp index 3f2c90e601..78e40229bb 100644 --- a/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp @@ -22,7 +22,7 @@ /** rct2: 0x008A92E8 */ static void inverted_rc_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -75,7 +75,7 @@ static void inverted_rc_track_flat( /** rct2: 0x008A9558, 0x008A9568, 0x008A9578 */ static void inverted_rc_track_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][3] = { { SPR_STATION_BASE_C_SW_NE, 27131, SPR_STATION_INVERTED_BAR_C_SW_NE }, @@ -102,7 +102,7 @@ static void inverted_rc_track_station( /** rct2: 0x008A92F8 */ static void inverted_rc_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -196,7 +196,7 @@ static void inverted_rc_track_25_deg_up( /** rct2: 0x008A9308 */ static void inverted_rc_track_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -237,7 +237,7 @@ static void inverted_rc_track_60_deg_up( /** rct2: 0x008A9318 */ static void inverted_rc_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -331,7 +331,7 @@ static void inverted_rc_track_flat_to_25_deg_up( /** rct2: 0x008A9328 */ static void inverted_rc_track_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -378,7 +378,7 @@ static void inverted_rc_track_25_deg_up_to_60_deg_up( /** rct2: 0x008A9338 */ static void inverted_rc_track_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -449,7 +449,7 @@ static void inverted_rc_track_60_deg_up_to_25_deg_up( /** rct2: 0x008A9348 */ static void inverted_rc_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -543,7 +543,7 @@ static void inverted_rc_track_25_deg_up_to_flat( /** rct2: 0x008A9358 */ static void inverted_rc_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -551,7 +551,7 @@ static void inverted_rc_track_25_deg_down( /** rct2: 0x008A9368 */ static void inverted_rc_track_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -559,7 +559,7 @@ static void inverted_rc_track_60_deg_down( /** rct2: 0x008A9378 */ static void inverted_rc_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -567,7 +567,7 @@ static void inverted_rc_track_flat_to_25_deg_down( /** rct2: 0x008A9388 */ static void inverted_rc_track_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -575,7 +575,7 @@ static void inverted_rc_track_25_deg_down_to_60_deg_down( /** rct2: 0x008A9398 */ static void inverted_rc_track_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -583,7 +583,7 @@ static void inverted_rc_track_60_deg_down_to_25_deg_down( /** rct2: 0x008A93A8 */ static void inverted_rc_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -591,7 +591,7 @@ static void inverted_rc_track_25_deg_down_to_flat( /** rct2: 0x008A93B8 */ static void inverted_rc_track_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -771,7 +771,7 @@ static void inverted_rc_track_left_quarter_turn_5( /** rct2: 0x008A93C8 */ static void inverted_rc_track_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; inverted_rc_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -780,7 +780,7 @@ static void inverted_rc_track_right_quarter_turn_5( /** rct2: 0x008A93D8 */ static void inverted_rc_track_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -822,7 +822,7 @@ static void inverted_rc_track_flat_to_left_bank( /** rct2: 0x008A93E8 */ static void inverted_rc_track_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -864,7 +864,7 @@ static void inverted_rc_track_flat_to_right_bank( /** rct2: 0x008A93F8 */ static void inverted_rc_track_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -906,7 +906,7 @@ static void inverted_rc_track_left_bank_to_flat( /** rct2: 0x008A9408 */ static void inverted_rc_track_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -948,7 +948,7 @@ static void inverted_rc_track_right_bank_to_flat( /** rct2: 0x008A9418 */ static void inverted_rc_track_banked_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1128,7 +1128,7 @@ static void inverted_rc_track_banked_left_quarter_turn_5( /** rct2: 0x008A9428 */ static void inverted_rc_track_banked_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; inverted_rc_track_banked_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -1137,7 +1137,7 @@ static void inverted_rc_track_banked_right_quarter_turn_5( /** rct2: 0x008A9438 */ static void inverted_rc_track_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1204,7 +1204,7 @@ static void inverted_rc_track_left_bank_to_25_deg_up( /** rct2: 0x008A9448 */ static void inverted_rc_track_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1271,7 +1271,7 @@ static void inverted_rc_track_right_bank_to_25_deg_up( /** rct2: 0x008A9458 */ static void inverted_rc_track_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1338,7 +1338,7 @@ static void inverted_rc_track_25_deg_up_to_left_bank( /** rct2: 0x008A9468 */ static void inverted_rc_track_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1405,7 +1405,7 @@ static void inverted_rc_track_25_deg_up_to_right_bank( /** rct2: 0x008A9478 */ static void inverted_rc_track_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1413,7 +1413,7 @@ static void inverted_rc_track_left_bank_to_25_deg_down( /** rct2: 0x008A9488 */ static void inverted_rc_track_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1421,7 +1421,7 @@ static void inverted_rc_track_right_bank_to_25_deg_down( /** rct2: 0x008A9498 */ static void inverted_rc_track_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1429,7 +1429,7 @@ static void inverted_rc_track_25_deg_down_to_left_bank( /** rct2: 0x008A94A8 */ static void inverted_rc_track_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1437,7 +1437,7 @@ static void inverted_rc_track_25_deg_down_to_right_bank( /** rct2: 0x008A94B8 */ static void inverted_rc_track_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1479,7 +1479,7 @@ static void inverted_rc_track_left_bank( /** rct2: 0x008A94C8 */ static void inverted_rc_track_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1487,7 +1487,7 @@ static void inverted_rc_track_right_bank( /** rct2: 0x008A94D8 */ static void inverted_rc_track_left_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1652,7 +1652,7 @@ static void inverted_rc_track_left_quarter_turn_5_25_deg_up( /** rct2: 0x008A94E8 */ static void inverted_rc_track_right_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1817,7 +1817,7 @@ static void inverted_rc_track_right_quarter_turn_5_25_deg_up( /** rct2: 0x008A94F8 */ static void inverted_rc_track_left_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; inverted_rc_track_right_quarter_turn_5_25_deg_up( @@ -1827,7 +1827,7 @@ static void inverted_rc_track_left_quarter_turn_5_25_deg_down( /** rct2: 0x008A9508 */ static void inverted_rc_track_right_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; inverted_rc_track_left_quarter_turn_5_25_deg_up( @@ -1837,7 +1837,7 @@ static void inverted_rc_track_right_quarter_turn_5_25_deg_down( /** rct2: 0x008A9518 */ static void inverted_rc_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2008,7 +2008,7 @@ static void inverted_rc_track_s_bend_left( /** rct2: 0x008A9528 */ static void inverted_rc_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2179,7 +2179,7 @@ static void inverted_rc_track_s_bend_right( /** rct2: 0x008A9538 */ static void inverted_rc_track_left_vertical_loop( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2486,7 +2486,7 @@ static void inverted_rc_track_left_vertical_loop( /** rct2: 0x008A9548 */ static void inverted_rc_track_right_vertical_loop( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2793,7 +2793,7 @@ static void inverted_rc_track_right_vertical_loop( /** rct2: 0x008A9588 */ static void inverted_rc_track_left_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2912,7 +2912,7 @@ static void inverted_rc_track_left_quarter_turn_3( /** rct2: 0x008A9598 */ static void inverted_rc_track_right_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; inverted_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -2921,7 +2921,7 @@ static void inverted_rc_track_right_quarter_turn_3( /** rct2: 0x008A95A8 */ static void inverted_rc_track_left_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3041,7 +3041,7 @@ static void inverted_rc_track_left_quarter_turn_3_bank( /** rct2: 0x008A95B8 */ static void inverted_rc_track_right_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; inverted_rc_track_left_quarter_turn_3_bank(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -3050,7 +3050,7 @@ static void inverted_rc_track_right_quarter_turn_3_bank( /** rct2: 0x008A95C8 */ static void inverted_rc_track_left_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3137,7 +3137,7 @@ static void inverted_rc_track_left_quarter_turn_3_25_deg_up( /** rct2: 0x008A95D8 */ static void inverted_rc_track_right_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3224,7 +3224,7 @@ static void inverted_rc_track_right_quarter_turn_3_25_deg_up( /** rct2: 0x008A95E8 */ static void inverted_rc_track_left_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; inverted_rc_track_right_quarter_turn_3_25_deg_up( @@ -3234,7 +3234,7 @@ static void inverted_rc_track_left_quarter_turn_3_25_deg_down( /** rct2: 0x008A95F8 */ static void inverted_rc_track_right_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; inverted_rc_track_left_quarter_turn_3_25_deg_up( @@ -3244,7 +3244,7 @@ static void inverted_rc_track_right_quarter_turn_3_25_deg_down( /** rct2: 0x008A9608 */ static void inverted_rc_track_left_twist_down_to_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3353,7 +3353,7 @@ static void inverted_rc_track_left_twist_down_to_up( /** rct2: 0x008A9618 */ static void inverted_rc_track_right_twist_down_to_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3462,7 +3462,7 @@ static void inverted_rc_track_right_twist_down_to_up( /** rct2: 0x008A9628 */ static void inverted_rc_track_left_twist_up_to_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3571,7 +3571,7 @@ static void inverted_rc_track_left_twist_up_to_down( /** rct2: 0x008A9638 */ static void inverted_rc_track_right_twist_up_to_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3680,7 +3680,7 @@ static void inverted_rc_track_right_twist_up_to_down( /** rct2: 0x008A9648 */ static void inverted_rc_track_half_loop_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3833,7 +3833,7 @@ static void inverted_rc_track_half_loop_up( /** rct2: 0x008A9658 */ static void inverted_rc_track_half_loop_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_rc_track_half_loop_up(session, rideIndex, 3 - trackSequence, direction, height, tileElement); } @@ -3841,7 +3841,7 @@ static void inverted_rc_track_half_loop_down( /** rct2: 0x008A9668 */ static void inverted_rc_track_left_corkscrew_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3959,7 +3959,7 @@ static void inverted_rc_track_left_corkscrew_up( /** rct2: 0x008A9678 */ static void inverted_rc_track_right_corkscrew_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4077,7 +4077,7 @@ static void inverted_rc_track_right_corkscrew_up( /** rct2: 0x008A9688 */ static void inverted_rc_track_left_corkscrew_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_rc_track_right_corkscrew_up(session, rideIndex, 2 - trackSequence, (direction + 1) & 3, height, tileElement); } @@ -4085,7 +4085,7 @@ static void inverted_rc_track_left_corkscrew_down( /** rct2: 0x008A9698 */ static void inverted_rc_track_right_corkscrew_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_rc_track_left_corkscrew_up(session, rideIndex, 2 - trackSequence, (direction - 1) & 3, height, tileElement); } @@ -4093,7 +4093,7 @@ static void inverted_rc_track_right_corkscrew_down( /** rct2: 0x008A96D8 */ static void inverted_rc_track_left_quarter_turn_1_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -4130,7 +4130,7 @@ static void inverted_rc_track_left_quarter_turn_1_60_deg_up( /** rct2: 0x008A96B8 */ static void inverted_rc_track_right_quarter_turn_1_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -4167,7 +4167,7 @@ static void inverted_rc_track_right_quarter_turn_1_60_deg_up( /** rct2: 0x008A96C8 */ static void inverted_rc_track_left_quarter_turn_1_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_rc_track_right_quarter_turn_1_60_deg_up( session, rideIndex, trackSequence, (direction + 1) & 3, height, tileElement); @@ -4176,7 +4176,7 @@ static void inverted_rc_track_left_quarter_turn_1_60_deg_down( /** rct2: 0x008A96E8 */ static void inverted_rc_track_right_quarter_turn_1_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_rc_track_left_quarter_turn_1_60_deg_up( session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -4185,7 +4185,7 @@ static void inverted_rc_track_right_quarter_turn_1_60_deg_down( /** rct2: 0x008A96A8 */ static void inverted_rc_track_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -4217,7 +4217,7 @@ static void inverted_rc_track_brakes( /** rct2: 0x008A96F8 */ static void inverted_rc_track_left_quarter_banked_helix_large_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4402,7 +4402,7 @@ static void inverted_rc_track_left_quarter_banked_helix_large_up( /** rct2: 0x008A9708 */ static void inverted_rc_track_right_quarter_banked_helix_large_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4587,7 +4587,7 @@ static void inverted_rc_track_right_quarter_banked_helix_large_up( /** rct2: 0x008A9718 */ static void inverted_rc_track_left_quarter_banked_helix_large_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4772,7 +4772,7 @@ static void inverted_rc_track_left_quarter_banked_helix_large_down( /** rct2: 0x008A9728 */ static void inverted_rc_track_right_quarter_banked_helix_large_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4957,7 +4957,7 @@ static void inverted_rc_track_right_quarter_banked_helix_large_down( /** rct2: 0x008A9A38 */ static void inverted_rc_track_25_deg_up_left_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -5022,7 +5022,7 @@ static void inverted_rc_track_25_deg_up_left_banked( /** rct2: 0x008A9A48 */ static void inverted_rc_track_25_deg_up_right_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -5087,7 +5087,7 @@ static void inverted_rc_track_25_deg_up_right_banked( /** rct2: 0x008A9738 */ static void inverted_rc_track_on_ride_photo( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -5133,7 +5133,7 @@ static void inverted_rc_track_on_ride_photo( /** rct2: 0x008A9A58 */ static void inverted_rc_track_25_deg_down_left_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_rc_track_25_deg_up_right_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -5141,7 +5141,7 @@ static void inverted_rc_track_25_deg_down_left_banked( /** rct2: 0x008A9A68 */ static void inverted_rc_track_25_deg_down_right_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_rc_track_25_deg_up_left_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -5149,7 +5149,7 @@ static void inverted_rc_track_25_deg_down_right_banked( /** rct2: 0x008A9748 */ static void inverted_rc_track_left_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5312,7 +5312,7 @@ static void inverted_rc_track_left_eighth_to_diag( /** rct2: 0x008A9758 */ static void inverted_rc_track_right_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5475,7 +5475,7 @@ static void inverted_rc_track_right_eighth_to_diag( /** rct2: 0x008A9768 */ static void inverted_rc_track_left_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; inverted_rc_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -5484,7 +5484,7 @@ static void inverted_rc_track_left_eighth_to_orthogonal( /** rct2: 0x008A9778 */ static void inverted_rc_track_right_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; inverted_rc_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, tileElement); @@ -5493,7 +5493,7 @@ static void inverted_rc_track_right_eighth_to_orthogonal( /** rct2: 0x008A9938 */ static void inverted_rc_track_left_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5656,7 +5656,7 @@ static void inverted_rc_track_left_eighth_bank_to_diag( /** rct2: 0x008A9948 */ static void inverted_rc_track_right_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5819,7 +5819,7 @@ static void inverted_rc_track_right_eighth_bank_to_diag( /** rct2: 0x008A9958 */ static void inverted_rc_track_left_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; inverted_rc_track_right_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -5828,7 +5828,7 @@ static void inverted_rc_track_left_eighth_bank_to_orthogonal( /** rct2: 0x008A9968 */ static void inverted_rc_track_right_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; inverted_rc_track_left_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, tileElement); @@ -5837,7 +5837,7 @@ static void inverted_rc_track_right_eighth_bank_to_orthogonal( /** rct2: 0x008A9788 */ static void inverted_rc_track_diag_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5976,7 +5976,7 @@ static void inverted_rc_track_diag_flat( /** rct2: 0x008A97B8 */ static void inverted_rc_track_diag_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6115,7 +6115,7 @@ static void inverted_rc_track_diag_25_deg_up( /** rct2: 0x008A9818 */ static void inverted_rc_track_diag_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6198,7 +6198,7 @@ static void inverted_rc_track_diag_60_deg_up( /** rct2: 0x008A9798 */ static void inverted_rc_track_diag_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6337,7 +6337,7 @@ static void inverted_rc_track_diag_flat_to_25_deg_up( /** rct2: 0x008A97F8 */ static void inverted_rc_track_diag_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6420,7 +6420,7 @@ static void inverted_rc_track_diag_25_deg_up_to_60_deg_up( /** rct2: 0x008A9808 */ static void inverted_rc_track_diag_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6503,7 +6503,7 @@ static void inverted_rc_track_diag_60_deg_up_to_25_deg_up( /** rct2: 0x008A97A8 */ static void inverted_rc_track_diag_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6642,7 +6642,7 @@ static void inverted_rc_track_diag_25_deg_up_to_flat( /** rct2: 0x008A97E8 */ static void inverted_rc_track_diag_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6781,7 +6781,7 @@ static void inverted_rc_track_diag_25_deg_down( /** rct2: 0x008A9848 */ static void inverted_rc_track_diag_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6864,7 +6864,7 @@ static void inverted_rc_track_diag_60_deg_down( /** rct2: 0x008A97C8 */ static void inverted_rc_track_diag_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7000,7 +7000,7 @@ static void inverted_rc_track_diag_flat_to_25_deg_down( /** rct2: 0x008A9828 */ static void inverted_rc_track_diag_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7083,7 +7083,7 @@ static void inverted_rc_track_diag_25_deg_down_to_60_deg_down( /** rct2: 0x008A9838 */ static void inverted_rc_track_diag_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7166,7 +7166,7 @@ static void inverted_rc_track_diag_60_deg_down_to_25_deg_down( /** rct2: 0x008A97D8 */ static void inverted_rc_track_diag_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7305,7 +7305,7 @@ static void inverted_rc_track_diag_25_deg_down_to_flat( /** rct2: 0x008A9878 */ static void inverted_rc_track_diag_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7389,7 +7389,7 @@ static void inverted_rc_track_diag_flat_to_left_bank( /** rct2: 0x008A9888 */ static void inverted_rc_track_diag_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7473,7 +7473,7 @@ static void inverted_rc_track_diag_flat_to_right_bank( /** rct2: 0x008A9898 */ static void inverted_rc_track_diag_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7557,7 +7557,7 @@ static void inverted_rc_track_diag_left_bank_to_flat( /** rct2: 0x008A98A8 */ static void inverted_rc_track_diag_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7641,7 +7641,7 @@ static void inverted_rc_track_diag_right_bank_to_flat( /** rct2: 0x008A98D8 */ static void inverted_rc_track_diag_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7724,7 +7724,7 @@ static void inverted_rc_track_diag_left_bank_to_25_deg_up( /** rct2: 0x008A98E8 */ static void inverted_rc_track_diag_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7807,7 +7807,7 @@ static void inverted_rc_track_diag_right_bank_to_25_deg_up( /** rct2: 0x008A98B8 */ static void inverted_rc_track_diag_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7890,7 +7890,7 @@ static void inverted_rc_track_diag_25_deg_up_to_left_bank( /** rct2: 0x008A98C8 */ static void inverted_rc_track_diag_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7973,7 +7973,7 @@ static void inverted_rc_track_diag_25_deg_up_to_right_bank( /** rct2: 0x008A98F8 */ static void inverted_rc_track_diag_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8053,7 +8053,7 @@ static void inverted_rc_track_diag_left_bank_to_25_deg_down( /** rct2: 0x008A9908 */ static void inverted_rc_track_diag_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8133,7 +8133,7 @@ static void inverted_rc_track_diag_right_bank_to_25_deg_down( /** rct2: 0x008A9918 */ static void inverted_rc_track_diag_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8216,7 +8216,7 @@ static void inverted_rc_track_diag_25_deg_down_to_left_bank( /** rct2: 0x008A9928 */ static void inverted_rc_track_diag_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8299,7 +8299,7 @@ static void inverted_rc_track_diag_25_deg_down_to_right_bank( /** rct2: 0x008A9858 */ static void inverted_rc_track_diag_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8383,7 +8383,7 @@ static void inverted_rc_track_diag_left_bank( /** rct2: 0x008A9868 */ static void inverted_rc_track_diag_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8467,7 +8467,7 @@ static void inverted_rc_track_diag_right_bank( /** rct2: 0x008A9978 */ static void inverted_rc_track_left_large_half_loop_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8696,7 +8696,7 @@ static void inverted_rc_track_left_large_half_loop_up( /** rct2: 0x008A9988 */ static void inverted_rc_track_right_large_half_loop_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8925,7 +8925,7 @@ static void inverted_rc_track_right_large_half_loop_up( /** rct2: 0x008A9998 */ static void inverted_rc_track_right_large_half_loop_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_rc_track_right_large_half_loop_up(session, rideIndex, 6 - trackSequence, direction, height, tileElement); } @@ -8933,7 +8933,7 @@ static void inverted_rc_track_right_large_half_loop_down( /** rct2: 0x008A99A8 */ static void inverted_rc_track_left_large_half_loop_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_rc_track_left_large_half_loop_up(session, rideIndex, 6 - trackSequence, direction, height, tileElement); } @@ -8941,7 +8941,7 @@ static void inverted_rc_track_left_large_half_loop_down( /** rct2: 0x008A96A8 */ static void inverted_rc_track_block_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8973,7 +8973,7 @@ static void inverted_rc_track_block_brakes( /** rct2: 0x008A9A78 */ static void inverted_rc_track_left_banked_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -9060,7 +9060,7 @@ static void inverted_rc_track_left_banked_quarter_turn_3_25_deg_up( /** rct2: 0x008A9A88 */ static void inverted_rc_track_right_banked_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -9147,7 +9147,7 @@ static void inverted_rc_track_right_banked_quarter_turn_3_25_deg_up( /** rct2: 0x008A9A98 */ static void inverted_rc_track_left_banked_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; inverted_rc_track_right_banked_quarter_turn_3_25_deg_up( @@ -9157,7 +9157,7 @@ static void inverted_rc_track_left_banked_quarter_turn_3_25_deg_down( /** rct2: 0x008A9AA8 */ static void inverted_rc_track_right_banked_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; inverted_rc_track_left_banked_quarter_turn_3_25_deg_up( @@ -9167,7 +9167,7 @@ static void inverted_rc_track_right_banked_quarter_turn_3_25_deg_down( /** rct2: 0x008A9BB8 */ static void inverted_rc_track_left_banked_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -9332,7 +9332,7 @@ static void inverted_rc_track_left_banked_quarter_turn_5_25_deg_up( /** rct2: 0x008A9BC8 */ static void inverted_rc_track_right_banked_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -9497,7 +9497,7 @@ static void inverted_rc_track_right_banked_quarter_turn_5_25_deg_up( /** rct2: 0x008A9BD8 */ static void inverted_rc_track_left_banked_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; inverted_rc_track_right_banked_quarter_turn_5_25_deg_up( @@ -9507,7 +9507,7 @@ static void inverted_rc_track_left_banked_quarter_turn_5_25_deg_down( /** rct2: 0x008A9BE8 */ static void inverted_rc_track_right_banked_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; inverted_rc_track_left_banked_quarter_turn_5_25_deg_up( @@ -9517,7 +9517,7 @@ static void inverted_rc_track_right_banked_quarter_turn_5_25_deg_down( /** rct2: 0x008A9AB8 */ static void inverted_rc_track_25_deg_up_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -9582,7 +9582,7 @@ static void inverted_rc_track_25_deg_up_to_left_banked_25_deg_up( /** rct2: 0x008A9AC8 */ static void inverted_rc_track_25_deg_up_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -9647,7 +9647,7 @@ static void inverted_rc_track_25_deg_up_to_right_banked_25_deg_up( /** rct2: 0x008A9AD8 */ static void inverted_rc_track_left_banked_25_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -9712,7 +9712,7 @@ static void inverted_rc_track_left_banked_25_deg_up_to_25_deg_up( /** rct2: 0x008A9AE8 */ static void inverted_rc_track_right_banked_25_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -9777,7 +9777,7 @@ static void inverted_rc_track_right_banked_25_deg_up_to_25_deg_up( /** rct2: 0x008A9AF8 */ static void inverted_rc_track_25_deg_down_to_left_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_rc_track_right_banked_25_deg_up_to_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -9786,7 +9786,7 @@ static void inverted_rc_track_25_deg_down_to_left_banked_25_deg_down( /** rct2: 0x008A9B08 */ static void inverted_rc_track_25_deg_down_to_right_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_rc_track_left_banked_25_deg_up_to_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -9795,7 +9795,7 @@ static void inverted_rc_track_25_deg_down_to_right_banked_25_deg_down( /** rct2: 0x008A9B18 */ static void inverted_rc_track_left_banked_25_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_rc_track_25_deg_up_to_right_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -9804,7 +9804,7 @@ static void inverted_rc_track_left_banked_25_deg_down_to_25_deg_down( /** rct2: 0x008A9B28 */ static void inverted_rc_track_right_banked_25_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_rc_track_25_deg_up_to_left_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -9813,7 +9813,7 @@ static void inverted_rc_track_right_banked_25_deg_down_to_25_deg_down( /** rct2: 0x008A9B38 */ static void inverted_rc_track_left_banked_flat_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -9878,7 +9878,7 @@ static void inverted_rc_track_left_banked_flat_to_left_banked_25_deg_up( /** rct2: 0x008A9B48 */ static void inverted_rc_track_right_banked_flat_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -9943,7 +9943,7 @@ static void inverted_rc_track_right_banked_flat_to_right_banked_25_deg_up( /** rct2: 0x008A9B58 */ static void inverted_rc_track_left_banked_25_deg_up_to_left_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -10008,7 +10008,7 @@ static void inverted_rc_track_left_banked_25_deg_up_to_left_banked_flat( /** rct2: 0x008A9B68 */ static void inverted_rc_track_right_banked_25_deg_up_to_right_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -10073,7 +10073,7 @@ static void inverted_rc_track_right_banked_25_deg_up_to_right_banked_flat( /** rct2: 0x008A9B78 */ static void inverted_rc_track_left_banked_flat_to_left_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_rc_track_right_banked_25_deg_up_to_right_banked_flat( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -10082,7 +10082,7 @@ static void inverted_rc_track_left_banked_flat_to_left_banked_25_deg_down( /** rct2: 0x008A9B88 */ static void inverted_rc_track_right_banked_flat_to_right_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_rc_track_left_banked_25_deg_up_to_left_banked_flat( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -10091,7 +10091,7 @@ static void inverted_rc_track_right_banked_flat_to_right_banked_25_deg_down( /** rct2: 0x008A9B98 */ static void inverted_rc_track_left_banked_25_deg_down_to_left_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_rc_track_right_banked_flat_to_right_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -10100,7 +10100,7 @@ static void inverted_rc_track_left_banked_25_deg_down_to_left_banked_flat( /** rct2: 0x008A9BA8 */ static void inverted_rc_track_right_banked_25_deg_down_to_right_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_rc_track_left_banked_flat_to_left_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -10109,7 +10109,7 @@ static void inverted_rc_track_right_banked_25_deg_down_to_right_banked_flat( /** rct2: 0x008A99B8 */ static void inverted_rc_track_flat_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -10174,7 +10174,7 @@ static void inverted_rc_track_flat_to_left_banked_25_deg_up( /** rct2: 0x008A99C8 */ static void inverted_rc_track_flat_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -10239,7 +10239,7 @@ static void inverted_rc_track_flat_to_right_banked_25_deg_up( /** rct2: 0x008A99D8 */ static void inverted_rc_track_left_banked_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -10304,7 +10304,7 @@ static void inverted_rc_track_left_banked_25_deg_up_to_flat( /** rct2: 0x008A99E8 */ static void inverted_rc_track_right_banked_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -10369,7 +10369,7 @@ static void inverted_rc_track_right_banked_25_deg_up_to_flat( /** rct2: 0x008A99F8 */ static void inverted_rc_track_flat_to_left_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_rc_track_right_banked_25_deg_up_to_flat( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -10378,7 +10378,7 @@ static void inverted_rc_track_flat_to_left_banked_25_deg_down( /** rct2: 0x008A9A08 */ static void inverted_rc_track_flat_to_right_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_rc_track_left_banked_25_deg_up_to_flat( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -10387,7 +10387,7 @@ static void inverted_rc_track_flat_to_right_banked_25_deg_down( /** rct2: 0x008A9A18 */ static void inverted_rc_track_left_banked_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_rc_track_flat_to_right_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -10396,7 +10396,7 @@ static void inverted_rc_track_left_banked_25_deg_down_to_flat( /** rct2: 0x008A9A28 */ static void inverted_rc_track_right_banked_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { inverted_rc_track_flat_to_left_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); diff --git a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp index affd1cd461..2ad294f7ab 100644 --- a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp @@ -1622,7 +1622,7 @@ static constexpr const uint32_t junior_rc_track_pieces_diag_60_deg_down_to_25_de void junior_rc_paint_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType) + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType) { uint32_t imageId = junior_rc_track_pieces_flat[chainType][direction] | session->TrackColours[SCHEME_TRACK]; sub_98196C_rotated(session, direction, imageId, 0, 6, 32, 20, 1, height); @@ -1642,7 +1642,7 @@ void junior_rc_paint_track_flat( void junior_rc_paint_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, uint8_t rideType) + const TileElement* tileElement, uint8_t rideType) { uint32_t imageId; @@ -1700,7 +1700,7 @@ void junior_rc_paint_station( void junior_rc_paint_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType) + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType) { uint32_t imageId = junior_rc_track_pieces_25_deg_up[chainType][direction] | session->TrackColours[SCHEME_TRACK]; sub_98196C_rotated(session, direction, imageId, 0, 6, 32, 20, 1, height); @@ -1722,7 +1722,7 @@ void junior_rc_paint_track_25_deg_up( void junior_rc_paint_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType) + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType) { uint32_t imageId = junior_rc_track_pieces_flat_to_25_deg_up[chainType][direction] | session->TrackColours[SCHEME_TRACK]; @@ -1750,7 +1750,7 @@ void junior_rc_paint_track_flat_to_25_deg_up( void junior_rc_paint_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType) + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType) { uint32_t imageId = junior_rc_track_pieces_25_deg_up_to_flat[chainType][direction] | session->TrackColours[SCHEME_TRACK]; sub_98196C_rotated(session, direction, imageId, 0, 6, 32, 20, 1, height); @@ -1797,7 +1797,7 @@ static constexpr const int8_t junior_rc_track_right_quarter_turn_5_tiles_support static void junior_rc_right_quarter_turn_5_tiles_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_right_quarter_turn_5_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -1877,7 +1877,7 @@ static constexpr const uint8_t junior_rc_left_quarter_turn_5_tiles_to_right_turn /* rct2: 0x0051917A */ static void junior_rc_left_quarter_turn_5_tiles_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = junior_rc_left_quarter_turn_5_tiles_to_right_turn_map[trackSequence]; junior_rc_right_quarter_turn_5_tiles_paint_setup( @@ -1889,7 +1889,7 @@ static void junior_rc_left_quarter_turn_5_tiles_paint_setup( */ static void junior_rc_flat_to_left_bank_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t image_id; @@ -1938,7 +1938,7 @@ static void junior_rc_flat_to_left_bank_paint_setup( */ static void junior_rc_flat_to_right_bank_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t image_id; @@ -1984,14 +1984,14 @@ static void junior_rc_flat_to_right_bank_paint_setup( static void junior_rc_left_bank_to_flat_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { junior_rc_flat_to_right_bank_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } static void junior_rc_right_bank_to_flat_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { junior_rc_flat_to_left_bank_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -2061,7 +2061,7 @@ static constexpr const LocationXYZ16 junior_rc_banked_right_quarter_turn_5_tiles /* rct2: 0x008AB010, 0x0052304C */ static void junior_rc_banked_right_quarter_turn_5_tiles_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint8_t thickness = 1; if (direction == 2 && (trackSequence == 0 || trackSequence == 6)) @@ -2155,7 +2155,7 @@ static void junior_rc_banked_right_quarter_turn_5_tiles_paint_setup( /* rct2: 0x008AB000 */ static void junior_rc_banked_left_quarter_turn_5_tiles_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = junior_rc_left_quarter_turn_5_tiles_to_right_turn_map[trackSequence]; junior_rc_banked_right_quarter_turn_5_tiles_paint_setup( @@ -2167,7 +2167,7 @@ static void junior_rc_banked_left_quarter_turn_5_tiles_paint_setup( */ static void junior_rc_left_bank_to_25_deg_up_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t image_id; @@ -2228,7 +2228,7 @@ static void junior_rc_left_bank_to_25_deg_up_paint_setup( */ static void junior_rc_right_bank_to_25_deg_up_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t image_id; @@ -2289,7 +2289,7 @@ static void junior_rc_right_bank_to_25_deg_up_paint_setup( */ static void junior_rc_25_deg_up_to_left_bank_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t image_id; @@ -2351,7 +2351,7 @@ static void junior_rc_25_deg_up_to_left_bank_paint_setup( */ static void junior_rc_25_deg_up_to_right_bank_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t image_id; @@ -2413,7 +2413,7 @@ static void junior_rc_25_deg_up_to_right_bank_paint_setup( */ static void junior_rc_left_bank_to_25_deg_down_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { junior_rc_25_deg_up_to_right_bank_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -2423,7 +2423,7 @@ static void junior_rc_left_bank_to_25_deg_down_paint_setup( */ static void junior_rc_right_bank_to_25_deg_down_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { junior_rc_25_deg_up_to_left_bank_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -2433,7 +2433,7 @@ static void junior_rc_right_bank_to_25_deg_down_paint_setup( */ static void junior_rc_25_deg_down_to_left_bank_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { junior_rc_right_bank_to_25_deg_up_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -2443,7 +2443,7 @@ static void junior_rc_25_deg_down_to_left_bank_paint_setup( */ static void junior_rc_25_deg_down_to_right_bank_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { junior_rc_left_bank_to_25_deg_up_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -2467,7 +2467,7 @@ static constexpr const LocationXY16 junior_rc_left_bank_bound_offsets[4] = { */ static void junior_rc_left_bank_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t image_id; @@ -2503,14 +2503,14 @@ static void junior_rc_left_bank_paint_setup( */ static void junior_rc_right_bank_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { junior_rc_left_bank_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } void junior_rc_paint_track_left_quarter_turn_5_tiles_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType) + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType) { track_paint_util_right_quarter_turn_5_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -2590,7 +2590,7 @@ void junior_rc_paint_track_left_quarter_turn_5_tiles_25_deg_up( void junior_rc_paint_track_right_quarter_turn_5_tiles_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType) + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType) { track_paint_util_right_quarter_turn_5_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -2671,7 +2671,7 @@ void junior_rc_paint_track_right_quarter_turn_5_tiles_25_deg_up( /* rct2: 0x008AAE10, 0x00519D88, 0x00519DAC, 0x00519DD0, 0x00519DF4 */ static void junior_rc_left_quarter_turn_5_tiles_25_deg_up_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_left_quarter_turn_5_tiles_25_deg_up( @@ -2682,7 +2682,7 @@ static void junior_rc_left_quarter_turn_5_tiles_25_deg_up_paint_setup( /* rct2: 0x008AAE20, 0x00519E18, 0x0051A148, 0x0051A452, 0x0051A738 */ static void junior_rc_right_quarter_turn_5_tiles_25_deg_up_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_right_quarter_turn_5_tiles_25_deg_up( @@ -2693,7 +2693,7 @@ static void junior_rc_right_quarter_turn_5_tiles_25_deg_up_paint_setup( /* rct2: 0x008AAE30, 0x0051AA42, 0x0051AA68, 0x0051AA8C, 0x0051AAB0 */ static void junior_rc_left_quarter_turn_5_tiles_25_deg_down_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { junior_rc_right_quarter_turn_5_tiles_25_deg_up_paint_setup( session, rideIndex, junior_rc_left_quarter_turn_5_tiles_to_right_turn_map[trackSequence], (direction + 1) & 3, height, @@ -2703,7 +2703,7 @@ static void junior_rc_left_quarter_turn_5_tiles_25_deg_down_paint_setup( /* rct2: 0x008AAE40, 0x0051AAD4, 0x0051AE04, 0x0051B10E, 0x0051B3F4 */ static void junior_rc_right_quarter_turn_5_tiles_25_deg_down_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { junior_rc_left_quarter_turn_5_tiles_25_deg_up_paint_setup( session, rideIndex, junior_rc_left_quarter_turn_5_tiles_to_right_turn_map[trackSequence], (direction - 1) & 3, height, @@ -2713,7 +2713,7 @@ static void junior_rc_right_quarter_turn_5_tiles_25_deg_down_paint_setup( /* rct2: 0x008AAE50, 0x0051B6FE, 0x0051B946, 0x0051BB8E, 0x0051BBA8 */ static void junior_rc_s_bend_left_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (direction == 2 || direction == 3) { @@ -2817,7 +2817,7 @@ static void junior_rc_s_bend_left_paint_setup( /* rct2: 0x008AAE60, 0x0051BBC0, 0x0051BE06, 0x0051C04E, 0x0051C068 */ static void junior_rc_s_bend_right_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (direction == 2 || direction == 3) { @@ -2921,7 +2921,7 @@ static void junior_rc_s_bend_right_paint_setup( /** rct2: 0x008AAEB0, 0x0051C0E0, 0x0051C2C1, 0x0051C47F, 0x0051C61D */ static void junior_rc_right_quarter_turn_3_tiles_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_right_quarter_turn_3_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -2960,7 +2960,7 @@ static void junior_rc_right_quarter_turn_3_tiles_paint_setup( /** rct2: 0x008AAEA0 */ static void junior_rc_left_quarter_turn_3_tiles_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; junior_rc_right_quarter_turn_3_tiles_paint_setup( @@ -3016,7 +3016,7 @@ static constexpr const LocationXYZ16 junior_rc_right_quarter_turn_3_tiles_bank_o /** rct2: 0x008AA0D0, 0x00523EA0, 0x005240CC, 0x0052430F, 0x00524500*/ static void junior_rc_right_quarter_turn_3_tiles_bank_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint8_t thickness[4][4] = { { 1, 1, 1, 1 }, { 1, 1, 1, 1 }, { 26, 1, 1, 26 }, { 1, 1, 1, 1 } }; @@ -3067,7 +3067,7 @@ static void junior_rc_right_quarter_turn_3_tiles_bank_paint_setup( void junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType) + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType) { uint32_t imageId = 0; LocationXY16 offset = {}; @@ -3146,7 +3146,7 @@ void junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_up( void junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType) + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType) { uint32_t imageId = 0; LocationXY16 offset = {}; @@ -3226,7 +3226,7 @@ void junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_down( /** rct2: 0x008AA0C0 */ static void junior_rc_left_quarter_turn_3_tiles_bank_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; junior_rc_right_quarter_turn_3_tiles_bank_paint_setup( @@ -3236,7 +3236,7 @@ static void junior_rc_left_quarter_turn_3_tiles_bank_paint_setup( /** rct2: 0x008AAED0, 0x0051C83C, 0x0051C9EC, 0x0051CB76, 0x0051CCDC*/ static void junior_rc_right_quarter_turn_3_tiles_25_deg_up_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_up( @@ -3247,7 +3247,7 @@ static void junior_rc_right_quarter_turn_3_tiles_25_deg_up_paint_setup( /** rct2: 0x008AAEF0, 0x0051CEC8, 0x0051D078, 0x0051D202, 0x0051D368*/ static void junior_rc_right_quarter_turn_3_tiles_25_deg_down_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_down( @@ -3260,7 +3260,7 @@ static constexpr const uint8_t junior_rc_left_quarter_turn_3_tiles_to_right_turn /** rct2: 0x008AAEC0 */ static void junior_rc_left_quarter_turn_3_tiles_25_deg_up_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = junior_rc_left_quarter_turn_3_tiles_to_right_turn_map[trackSequence]; junior_rc_right_quarter_turn_3_tiles_25_deg_down_paint_setup( @@ -3270,7 +3270,7 @@ static void junior_rc_left_quarter_turn_3_tiles_25_deg_up_paint_setup( /** rct2: 0x008AAEE0 */ static void junior_rc_left_quarter_turn_3_tiles_25_deg_down_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = junior_rc_left_quarter_turn_3_tiles_to_right_turn_map[trackSequence]; junior_rc_right_quarter_turn_3_tiles_25_deg_up_paint_setup( @@ -3280,7 +3280,7 @@ static void junior_rc_left_quarter_turn_3_tiles_25_deg_down_paint_setup( /** rct2: 0x008AB0F0, 0x0052B3A4, 0x0052B5F8, 0x0052B863, 0x0052BA78 */ static void junior_rc_right_half_banked_helix_up_small_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { const int8_t thickness[2] = { 1, 26 }; @@ -3348,7 +3348,7 @@ static void junior_rc_right_half_banked_helix_up_small_paint_setup( /** rct2: 0x008AB110, 0x0052BD80, 0x0052BFD4, 0x0052C23B, 0x0052C450 */ static void junior_rc_right_half_banked_helix_down_small_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { const int8_t thickness[2] = { 1, 26 }; @@ -3416,7 +3416,7 @@ static void junior_rc_right_half_banked_helix_down_small_paint_setup( /** rct2: 0x008AB0E0 */ static void junior_rc_left_half_banked_helix_up_small_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence > 3) { @@ -3432,7 +3432,7 @@ static void junior_rc_left_half_banked_helix_up_small_paint_setup( /** rct2: 0x008AB100 */ static void junior_rc_left_half_banked_helix_down_small_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence > 3) { @@ -3448,7 +3448,7 @@ static void junior_rc_left_half_banked_helix_down_small_paint_setup( /** rct2: 0x008AB130, 0x0052C7BC, 0x0052CB6B, 0x0052CF32, 0x0052D2B3 */ static void junior_rc_right_half_banked_helix_up_large_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { const int8_t thickness[2] = { 1, 26 }; @@ -3534,7 +3534,7 @@ static void junior_rc_right_half_banked_helix_up_large_paint_setup( /** rct2: 0x008AB150, 0x0052D778, 0x0052DB27, 0x0052DEEA, 0x0052E26B */ static void junior_rc_right_half_banked_helix_down_large_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { const int8_t thickness[2] = { 1, 26 }; @@ -3620,7 +3620,7 @@ static void junior_rc_right_half_banked_helix_down_large_paint_setup( /** rct2: 0x008AB120 */ static void junior_rc_left_half_banked_helix_up_large_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence > 6) { @@ -3636,7 +3636,7 @@ static void junior_rc_left_half_banked_helix_up_large_paint_setup( /** rct2: 0x008AB140 */ static void junior_rc_left_half_banked_helix_down_large_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence > 6) { @@ -3654,7 +3654,7 @@ static void junior_rc_left_half_banked_helix_down_large_paint_setup( */ static void junior_rc_brake_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t image_id; @@ -3689,7 +3689,7 @@ static void junior_rc_brake_paint_setup( */ static void junior_rc_block_brake_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t image_id; @@ -3724,7 +3724,7 @@ static void junior_rc_block_brake_paint_setup( /** rct2: 0x008AAF80 */ static void junior_rc_left_eighth_to_diag_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_eighth_to_diag_tiles_paint( session, defaultEighthToDiagThickness, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -3790,7 +3790,7 @@ static void junior_rc_left_eighth_to_diag_paint_setup( /** rct2: 0x008AAF90 */ static void junior_rc_right_eighth_to_diag_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_eighth_to_diag_tiles_paint( session, defaultEighthToDiagThickness, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -3856,7 +3856,7 @@ static void junior_rc_right_eighth_to_diag_paint_setup( /** rct2: 0x008AAFA0 */ static void junior_rc_left_eighth_to_orthogonal_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { const uint8_t map[] = { 4, 2, 3, 1, 0 }; trackSequence = map[trackSequence]; @@ -3866,7 +3866,7 @@ static void junior_rc_left_eighth_to_orthogonal_paint_setup( /** rct2: 0x008AAFB0 */ static void junior_rc_right_eighth_to_orthogonal_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { const uint8_t map[] = { 4, 2, 3, 1, 0 }; trackSequence = map[trackSequence]; @@ -3957,7 +3957,7 @@ static constexpr const int8_t junior_rc_left_eighth_to_diag_bank_thickness[4][4] /** rct2: 0x008AB160 */ static void junior_rc_left_eighth_to_diag_bank_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_eighth_to_diag_tiles_paint( session, junior_rc_left_eighth_to_diag_bank_thickness, height, direction, trackSequence, @@ -4104,7 +4104,7 @@ static constexpr const int8_t junior_rc_right_eighth_to_diag_bank_thickness[4][4 /** rct2: 0x008AB170 */ static void junior_rc_right_eighth_to_diag_bank_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_eighth_to_diag_tiles_paint( session, junior_rc_right_eighth_to_diag_bank_thickness, height, direction, trackSequence, @@ -4170,7 +4170,7 @@ static void junior_rc_right_eighth_to_diag_bank_paint_setup( /** rct2: 0x008AB180 */ static void junior_rc_left_eighth_to_orthogonal_bank_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { const uint8_t map[] = { 4, 2, 3, 1, 0 }; trackSequence = map[trackSequence]; @@ -4181,7 +4181,7 @@ static void junior_rc_left_eighth_to_orthogonal_bank_paint_setup( /** rct2: 0x008AB190 */ static void junior_rc_right_eighth_to_orthogonal_bank_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { const uint8_t map[] = { 4, 2, 3, 1, 0 }; trackSequence = map[trackSequence]; @@ -4197,7 +4197,7 @@ static constexpr const uint8_t junior_rc_diag_support_segment[] = { 1, 0, 2, 3 } void junior_rc_paint_track_diag_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType) + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType) { track_paint_util_diag_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -4217,7 +4217,7 @@ void junior_rc_paint_track_diag_flat( void junior_rc_paint_track_diag_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType) + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType) { track_paint_util_diag_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -4237,7 +4237,7 @@ void junior_rc_paint_track_diag_25_deg_up( void junior_rc_paint_track_diag_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType) + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType) { track_paint_util_diag_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -4257,7 +4257,7 @@ void junior_rc_paint_track_diag_flat_to_25_deg_up( void junior_rc_paint_track_diag_flat_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType) + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType) { // There is no specific chain for the Water Coaster, use the Junior RC chain instead chainType = std::min(JUNIOR_RC_CHAIN_FRICTION_WHEELS, chainType); @@ -4280,7 +4280,7 @@ void junior_rc_paint_track_diag_flat_to_60_deg_up( void junior_rc_paint_track_diag_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType) + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType) { track_paint_util_diag_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -4300,7 +4300,7 @@ void junior_rc_paint_track_diag_25_deg_up_to_flat( void junior_rc_paint_track_diag_60_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType) + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType) { // There is no specific chain for the Water Coaster, use the Junior RC chain instead chainType = std::min(JUNIOR_RC_CHAIN_FRICTION_WHEELS, chainType); @@ -4323,7 +4323,7 @@ void junior_rc_paint_track_diag_60_deg_up_to_flat( void junior_rc_paint_track_diag_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType) + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType) { track_paint_util_diag_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -4343,7 +4343,7 @@ void junior_rc_paint_track_diag_25_deg_down( void junior_rc_paint_track_diag_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType) + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType) { track_paint_util_diag_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -4363,7 +4363,7 @@ void junior_rc_paint_track_diag_flat_to_25_deg_down( void junior_rc_paint_track_diag_flat_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType) + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType) { // There is no specific chain for the Water Coaster, use the Junior RC chain instead chainType = std::min(JUNIOR_RC_CHAIN_FRICTION_WHEELS, chainType); @@ -4386,7 +4386,7 @@ void junior_rc_paint_track_diag_flat_to_60_deg_down( void junior_rc_paint_track_diag_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType) + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType) { track_paint_util_diag_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -4406,7 +4406,7 @@ void junior_rc_paint_track_diag_25_deg_down_to_flat( void junior_rc_paint_track_diag_60_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType) + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType) { // There is no specific chain for the Water Coaster, use the Junior RC chain instead chainType = std::min(JUNIOR_RC_CHAIN_FRICTION_WHEELS, chainType); @@ -4430,7 +4430,7 @@ void junior_rc_paint_track_diag_60_deg_down_to_flat( /** rct2: 0x008AAF10 */ static void junior_rc_diag_flat_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_diag_flat( @@ -4441,7 +4441,7 @@ static void junior_rc_diag_flat_paint_setup( /** rct2: 0x008AAF40 */ static void junior_rc_diag_25_deg_up_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_diag_25_deg_up( @@ -4452,7 +4452,7 @@ static void junior_rc_diag_25_deg_up_paint_setup( /** rct2: 0x008AAF20 */ static void junior_rc_diag_flat_to_25_deg_up_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_diag_flat_to_25_deg_up( @@ -4462,7 +4462,7 @@ static void junior_rc_diag_flat_to_25_deg_up_paint_setup( static void junior_rc_diag_flat_to_60_deg_up_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_diag_flat_to_60_deg_up( @@ -4473,7 +4473,7 @@ static void junior_rc_diag_flat_to_60_deg_up_paint_setup( /** rct2: 0x008AAF30 */ static void junior_rc_diag_25_deg_up_to_flat_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_diag_25_deg_up_to_flat( @@ -4483,7 +4483,7 @@ static void junior_rc_diag_25_deg_up_to_flat_paint_setup( static void junior_rc_diag_60_deg_up_to_flat_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_diag_60_deg_up_to_flat( @@ -4494,7 +4494,7 @@ static void junior_rc_diag_60_deg_up_to_flat_paint_setup( /** rct2: 0x008AAF70 */ static void junior_rc_diag_25_deg_down_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_diag_25_deg_down( @@ -4505,7 +4505,7 @@ static void junior_rc_diag_25_deg_down_paint_setup( /** rct2: 0x008AAF50 */ static void junior_rc_diag_flat_to_25_deg_down_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_diag_flat_to_25_deg_down( @@ -4515,7 +4515,7 @@ static void junior_rc_diag_flat_to_25_deg_down_paint_setup( static void junior_rc_diag_flat_to_60_deg_down_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_diag_flat_to_60_deg_down( @@ -4526,7 +4526,7 @@ static void junior_rc_diag_flat_to_60_deg_down_paint_setup( /** rct2: 0x008AAF60 */ static void junior_rc_diag_25_deg_down_to_flat_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_diag_25_deg_down_to_flat( @@ -4536,7 +4536,7 @@ static void junior_rc_diag_25_deg_down_to_flat_paint_setup( static void junior_rc_diag_60_deg_down_to_flat_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_diag_60_deg_down_to_flat( @@ -4547,7 +4547,7 @@ static void junior_rc_diag_60_deg_down_to_flat_paint_setup( /** rct2: 0x008AB1C0 */ static void junior_rc_diag_flat_to_left_bank_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_diag_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -4574,7 +4574,7 @@ static void junior_rc_diag_flat_to_left_bank_paint_setup( /** rct2: 0x008AB1D0 */ static void junior_rc_diag_flat_to_right_bank_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_diag_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -4601,7 +4601,7 @@ static void junior_rc_diag_flat_to_right_bank_paint_setup( /** rct2: 0x008AB1E0 */ static void junior_rc_diag_left_bank_to_flat_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_diag_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -4628,7 +4628,7 @@ static void junior_rc_diag_left_bank_to_flat_paint_setup( /** rct2: 0x008AB1F0 */ static void junior_rc_diag_right_bank_to_flat_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_diag_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -4655,7 +4655,7 @@ static void junior_rc_diag_right_bank_to_flat_paint_setup( /** rct2: 0x008AB220 */ static void junior_rc_diag_left_bank_to_25_deg_up_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_diag_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -4682,7 +4682,7 @@ static void junior_rc_diag_left_bank_to_25_deg_up_paint_setup( /** rct2: 0x008AB230 */ static void junior_rc_diag_right_bank_to_25_deg_up_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_diag_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -4709,7 +4709,7 @@ static void junior_rc_diag_right_bank_to_25_deg_up_paint_setup( /** rct2: 0x008AB200 */ static void junior_rc_diag_25_deg_up_to_left_bank_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_diag_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -4736,7 +4736,7 @@ static void junior_rc_diag_25_deg_up_to_left_bank_paint_setup( /** rct2: 0x008AB210 */ static void junior_rc_diag_25_deg_up_to_right_bank_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_diag_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -4763,7 +4763,7 @@ static void junior_rc_diag_25_deg_up_to_right_bank_paint_setup( /** rct2: 0x008AB200 */ static void junior_rc_diag_left_bank_to_25_deg_down_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_diag_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -4790,7 +4790,7 @@ static void junior_rc_diag_left_bank_to_25_deg_down_paint_setup( /** rct2: 0x008AB210 */ static void junior_rc_diag_right_bank_to_25_deg_down_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_diag_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -4817,7 +4817,7 @@ static void junior_rc_diag_right_bank_to_25_deg_down_paint_setup( /** rct2: 0x008AB220 */ static void junior_rc_diag_25_deg_down_to_left_bank_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_diag_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -4844,7 +4844,7 @@ static void junior_rc_diag_25_deg_down_to_left_bank_paint_setup( /** rct2: 0x008AB230 */ static void junior_rc_diag_25_deg_down_to_right_bank_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_diag_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -4885,7 +4885,7 @@ static constexpr const LocationXYZ16 junior_rc_diag_right_bank_bound_offsets[4] /** rct2: 0x008AB1A0 */ static void junior_rc_diag_left_bank_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint8_t thickness = direction == 0 ? 0 : 1; track_paint_util_diag_tiles_paint( @@ -4908,7 +4908,7 @@ static void junior_rc_diag_left_bank_paint_setup( /** rct2: 0x008AB1B0 */ static void junior_rc_diag_right_bank_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint8_t thickness = direction == 2 ? 0 : 1; track_paint_util_diag_tiles_paint( @@ -4953,7 +4953,7 @@ static constexpr const LocationXY16 junior_rc_60_deg_up_bound_lengths[4] = { void junior_rc_paint_track_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType) + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType) { uint32_t image_id = session->TrackColours[SCHEME_TRACK]; @@ -4998,7 +4998,7 @@ void junior_rc_paint_track_60_deg_up( static void junior_rc_60_deg_up_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_60_deg_up( @@ -5008,7 +5008,7 @@ static void junior_rc_60_deg_up_paint_setup( static void junior_rc_60_deg_down_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { junior_rc_60_deg_up_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -5031,7 +5031,7 @@ static constexpr const LocationXY16 junior_rc_25_deg_up_to_60_deg_up_bound_offse void junior_rc_paint_track_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType) + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType) { uint32_t image_id = session->TrackColours[SCHEME_TRACK]; @@ -5094,7 +5094,7 @@ void junior_rc_paint_track_25_deg_up_to_60_deg_up( static void junior_rc_25_deg_up_to_60_deg_up_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_25_deg_up_to_60_deg_up( @@ -5104,14 +5104,14 @@ static void junior_rc_25_deg_up_to_60_deg_up_paint_setup( static void junior_rc_60_deg_down_to_25_deg_down_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { junior_rc_25_deg_up_to_60_deg_up_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } void junior_rc_paint_track_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType) + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType) { uint32_t image_id = session->TrackColours[SCHEME_TRACK]; @@ -5173,7 +5173,7 @@ void junior_rc_paint_track_60_deg_up_to_25_deg_up( static void junior_rc_60_deg_up_to_25_deg_up_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_60_deg_up_to_25_deg_up( @@ -5183,14 +5183,14 @@ static void junior_rc_60_deg_up_to_25_deg_up_paint_setup( static void junior_rc_25_deg_down_to_60_deg_down_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { junior_rc_60_deg_up_to_25_deg_up_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } void junior_rc_paint_track_diag_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType) + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType) { track_paint_util_diag_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -5210,7 +5210,7 @@ void junior_rc_paint_track_diag_60_deg_up( void junior_rc_paint_track_diag_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType) + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType) { track_paint_util_diag_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -5230,7 +5230,7 @@ void junior_rc_paint_track_diag_60_deg_down( void junior_rc_paint_track_diag_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType) + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType) { track_paint_util_diag_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -5251,7 +5251,7 @@ void junior_rc_paint_track_diag_25_deg_up_to_60_deg_up( void junior_rc_paint_track_diag_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType) + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType) { if (direction == 1 && trackSequence == 3) { @@ -5282,7 +5282,7 @@ void junior_rc_paint_track_diag_60_deg_up_to_25_deg_up( void junior_rc_paint_track_diag_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType) + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType) { if (direction == 3 && trackSequence == 0) { @@ -5313,7 +5313,7 @@ void junior_rc_paint_track_diag_25_deg_down_to_60_deg_down( void junior_rc_paint_track_diag_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType) + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType) { track_paint_util_diag_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -5334,7 +5334,7 @@ void junior_rc_paint_track_diag_60_deg_down_to_25_deg_down( static void junior_rc_diag_60_deg_up_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_diag_60_deg_up( @@ -5344,7 +5344,7 @@ static void junior_rc_diag_60_deg_up_paint_setup( static void junior_rc_diag_60_deg_down_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_diag_60_deg_down( @@ -5354,7 +5354,7 @@ static void junior_rc_diag_60_deg_down_paint_setup( static void junior_rc_diag_25_deg_up_to_60_deg_up_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_diag_25_deg_up_to_60_deg_up( @@ -5364,7 +5364,7 @@ static void junior_rc_diag_25_deg_up_to_60_deg_up_paint_setup( static void junior_rc_diag_60_deg_up_to_25_deg_up_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_diag_60_deg_up_to_25_deg_up( @@ -5374,7 +5374,7 @@ static void junior_rc_diag_60_deg_up_to_25_deg_up_paint_setup( static void junior_rc_diag_25_deg_down_to_60_deg_down_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_diag_25_deg_down_to_60_deg_down( @@ -5384,7 +5384,7 @@ static void junior_rc_diag_25_deg_down_to_60_deg_down_paint_setup( static void junior_rc_diag_60_deg_down_to_25_deg_down_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_diag_60_deg_down_to_25_deg_down( @@ -5424,7 +5424,7 @@ static constexpr const LocationXY16 junior_rc_60_deg_up_to_flat_tile_offsets[4][ static void junior_rc_flat_to_60_deg_up_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t image_id = session->TrackColours[SCHEME_TRACK]; @@ -5488,14 +5488,14 @@ static void junior_rc_flat_to_60_deg_up_paint_setup( static void junior_rc_60_deg_down_to_flat_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { junior_rc_flat_to_60_deg_up_paint_setup(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } static void junior_rc_60_deg_up_to_flat_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t image_id = session->TrackColours[SCHEME_TRACK]; @@ -5558,7 +5558,7 @@ static void junior_rc_60_deg_up_to_flat_paint_setup( static void junior_rc_flat_to_60_deg_down_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { junior_rc_60_deg_up_to_flat_paint_setup(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -5566,7 +5566,7 @@ static void junior_rc_flat_to_60_deg_down_paint_setup( /* rct2: 0x00518394 */ static void junior_rc_flat_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_flat( @@ -5577,7 +5577,7 @@ static void junior_rc_flat_paint_setup( /* rct2: 0x00515629, 0x00514D22, 0x005151B9 */ static void paint_junior_rc_station_track( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { junior_rc_paint_station(session, rideIndex, trackSequence, direction, height, tileElement, RIDE_TYPE_JUNIOR_ROLLER_COASTER); } @@ -5585,7 +5585,7 @@ static void paint_junior_rc_station_track( /* rct2: 0x0051881E */ static void junior_rc_25_deg_up_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_25_deg_up( @@ -5596,7 +5596,7 @@ static void junior_rc_25_deg_up_paint_setup( /* rct2: 0x00518B42 */ static void junior_rc_flat_to_25_deg_up_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_flat_to_25_deg_up( @@ -5607,7 +5607,7 @@ static void junior_rc_flat_to_25_deg_up_paint_setup( /* rct2: 0x00518E56 */ static void junior_rc_25_deg_up_to_flat_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_25_deg_up_to_flat( @@ -5618,7 +5618,7 @@ static void junior_rc_25_deg_up_to_flat_paint_setup( /* rct2: 0x005189B0 */ static void junior_rc_25_deg_down_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { junior_rc_25_deg_up_paint_setup(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -5626,7 +5626,7 @@ static void junior_rc_25_deg_down_paint_setup( /* rct2: 0x00518FE8 */ static void junior_rc_flat_to_25_deg_down_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { junior_rc_25_deg_up_to_flat_paint_setup(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -5634,14 +5634,14 @@ static void junior_rc_flat_to_25_deg_down_paint_setup( /* rct2: 0x00518CCC */ static void junior_rc_25_deg_down_to_flat_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { junior_rc_flat_to_25_deg_up_paint_setup(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } static void junior_rc_booster_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { int32_t XoffsetNESW = 12; int32_t YoffsetNESW = -10; @@ -5679,7 +5679,7 @@ static void junior_rc_booster_paint_setup( static void junior_rc_track_on_ride_photo( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId = junior_rc_track_pieces_flat[0][direction] | session->TrackColours[SCHEME_TRACK]; constexpr const int8_t photoCameraOffset = -1; diff --git a/src/openrct2/ride/coaster/JuniorRollerCoaster.h b/src/openrct2/ride/coaster/JuniorRollerCoaster.h index 306787ea8f..9d8431680b 100644 --- a/src/openrct2/ride/coaster/JuniorRollerCoaster.h +++ b/src/openrct2/ride/coaster/JuniorRollerCoaster.h @@ -22,94 +22,94 @@ enum JUNIOR_RC_CHAINTYPE void junior_rc_paint_station( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, uint8_t rideType); + const TileElement* tileElement, uint8_t rideType); void junior_rc_paint_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType); + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType); void junior_rc_paint_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType); + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType); void junior_rc_paint_track_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType); + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType); void junior_rc_paint_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType); + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType); void junior_rc_paint_track_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType); + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType); void junior_rc_paint_track_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType); + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType); void junior_rc_paint_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType); + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType); void junior_rc_paint_track_left_quarter_turn_5_tiles_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType); + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType); void junior_rc_paint_track_right_quarter_turn_5_tiles_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType); + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType); void junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType); + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType); void junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType); + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType); void junior_rc_paint_track_diag_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType); + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType); void junior_rc_paint_track_diag_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType); + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType); void junior_rc_paint_track_diag_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType); + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType); void junior_rc_paint_track_diag_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType); + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType); void junior_rc_paint_track_diag_flat_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType); + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType); void junior_rc_paint_track_diag_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType); + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType); void junior_rc_paint_track_diag_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType); + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType); void junior_rc_paint_track_diag_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType); + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType); void junior_rc_paint_track_diag_60_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType); + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType); void junior_rc_paint_track_diag_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType); + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType); void junior_rc_paint_track_diag_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType); + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType); void junior_rc_paint_track_diag_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType); + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType); void junior_rc_paint_track_diag_flat_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType); + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType); void junior_rc_paint_track_diag_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType); + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType); void junior_rc_paint_track_diag_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType); + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType); void junior_rc_paint_track_diag_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType); + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType); void junior_rc_paint_track_diag_60_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height, - const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType); + const TileElement* tileElement, JUNIOR_RC_CHAINTYPE chainType); #endif // _JUNIOR_ROLLER_COASTER_H diff --git a/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp b/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp index 8a382e1d8e..0eefcee1b8 100644 --- a/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp @@ -22,7 +22,7 @@ /** rct2: 0x0082491C */ static void lay_down_rc_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -134,7 +134,7 @@ static void lay_down_rc_track_flat( /** rct2: 0x00824B8C, 0x00824B9C, 0x00824BAC */ static void lay_down_rc_track_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->IsInverted()) { @@ -192,7 +192,7 @@ static void lay_down_rc_track_station( /** rct2: 0x0082492C */ static void lay_down_rc_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -357,7 +357,7 @@ static void lay_down_rc_track_25_deg_up( /** rct2: 0x0082493C */ static void lay_down_rc_track_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -473,7 +473,7 @@ static void lay_down_rc_track_60_deg_up( /** rct2: 0x0082494C */ static void lay_down_rc_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -638,7 +638,7 @@ static void lay_down_rc_track_flat_to_25_deg_up( /** rct2: 0x0082495C */ static void lay_down_rc_track_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -768,7 +768,7 @@ static void lay_down_rc_track_25_deg_up_to_60_deg_up( /** rct2: 0x0082496C */ static void lay_down_rc_track_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -922,7 +922,7 @@ static void lay_down_rc_track_60_deg_up_to_25_deg_up( /** rct2: 0x0082497C */ static void lay_down_rc_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -1087,7 +1087,7 @@ static void lay_down_rc_track_25_deg_up_to_flat( /** rct2: 0x0082498C */ static void lay_down_rc_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { lay_down_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1095,7 +1095,7 @@ static void lay_down_rc_track_25_deg_down( /** rct2: 0x0082499C */ static void lay_down_rc_track_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { lay_down_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1103,7 +1103,7 @@ static void lay_down_rc_track_60_deg_down( /** rct2: 0x008249AC */ static void lay_down_rc_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { lay_down_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1111,7 +1111,7 @@ static void lay_down_rc_track_flat_to_25_deg_down( /** rct2: 0x008249BC */ static void lay_down_rc_track_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { lay_down_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1119,7 +1119,7 @@ static void lay_down_rc_track_25_deg_down_to_60_deg_down( /** rct2: 0x008249CC */ static void lay_down_rc_track_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { lay_down_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1127,7 +1127,7 @@ static void lay_down_rc_track_60_deg_down_to_25_deg_down( /** rct2: 0x008249DC */ static void lay_down_rc_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { lay_down_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1135,7 +1135,7 @@ static void lay_down_rc_track_25_deg_down_to_flat( /** rct2: 0x008249EC */ static void lay_down_rc_track_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -1504,7 +1504,7 @@ static void lay_down_rc_track_left_quarter_turn_5( /** rct2: 0x008249FC */ static void lay_down_rc_track_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; lay_down_rc_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -1513,7 +1513,7 @@ static void lay_down_rc_track_right_quarter_turn_5( /** rct2: 0x00824A0C */ static void lay_down_rc_track_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -1594,7 +1594,7 @@ static void lay_down_rc_track_flat_to_left_bank( /** rct2: 0x00824A1C */ static void lay_down_rc_track_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -1675,7 +1675,7 @@ static void lay_down_rc_track_flat_to_right_bank( /** rct2: 0x00824A2C */ static void lay_down_rc_track_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -1756,7 +1756,7 @@ static void lay_down_rc_track_left_bank_to_flat( /** rct2: 0x00824A3C */ static void lay_down_rc_track_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -1837,7 +1837,7 @@ static void lay_down_rc_track_right_bank_to_flat( /** rct2: 0x00824A4C */ static void lay_down_rc_track_banked_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -2207,7 +2207,7 @@ static void lay_down_rc_track_banked_left_quarter_turn_5( /** rct2: 0x00824A5C */ static void lay_down_rc_track_banked_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; lay_down_rc_track_banked_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -2216,7 +2216,7 @@ static void lay_down_rc_track_banked_right_quarter_turn_5( /** rct2: 0x00824A6C */ static void lay_down_rc_track_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -2328,7 +2328,7 @@ static void lay_down_rc_track_left_bank_to_25_deg_up( /** rct2: 0x00824A7C */ static void lay_down_rc_track_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -2440,7 +2440,7 @@ static void lay_down_rc_track_right_bank_to_25_deg_up( /** rct2: 0x00824A8C */ static void lay_down_rc_track_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -2552,7 +2552,7 @@ static void lay_down_rc_track_25_deg_up_to_left_bank( /** rct2: 0x00824A9C */ static void lay_down_rc_track_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -2664,7 +2664,7 @@ static void lay_down_rc_track_25_deg_up_to_right_bank( /** rct2: 0x00824AAC */ static void lay_down_rc_track_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { lay_down_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -2672,7 +2672,7 @@ static void lay_down_rc_track_left_bank_to_25_deg_down( /** rct2: 0x00824ABC */ static void lay_down_rc_track_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { lay_down_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -2680,7 +2680,7 @@ static void lay_down_rc_track_right_bank_to_25_deg_down( /** rct2: 0x00824ACC */ static void lay_down_rc_track_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { lay_down_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -2688,7 +2688,7 @@ static void lay_down_rc_track_25_deg_down_to_left_bank( /** rct2: 0x00824ADC */ static void lay_down_rc_track_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { lay_down_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -2696,7 +2696,7 @@ static void lay_down_rc_track_25_deg_down_to_right_bank( /** rct2: 0x00824AEC */ static void lay_down_rc_track_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -2773,7 +2773,7 @@ static void lay_down_rc_track_left_bank( /** rct2: 0x00824AFC */ static void lay_down_rc_track_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { lay_down_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -2781,7 +2781,7 @@ static void lay_down_rc_track_right_bank( /** rct2: 0x00824B0C */ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -3125,7 +3125,7 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up( /** rct2: 0x00824B1C */ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -3469,7 +3469,7 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up( /** rct2: 0x00824B2C */ static void lay_down_rc_track_left_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; lay_down_rc_track_right_quarter_turn_5_25_deg_up( @@ -3479,7 +3479,7 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_down( /** rct2: 0x00824B3C */ static void lay_down_rc_track_right_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; lay_down_rc_track_left_quarter_turn_5_25_deg_up( @@ -3489,7 +3489,7 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_down( /** rct2: 0x00824B4C */ static void lay_down_rc_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -3816,7 +3816,7 @@ static void lay_down_rc_track_s_bend_left( /** rct2: 0x00824B5C */ static void lay_down_rc_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -4143,7 +4143,7 @@ static void lay_down_rc_track_s_bend_right( /** rct2: 0x00824B6C */ static void lay_down_rc_track_left_vertical_loop( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4422,7 +4422,7 @@ static void lay_down_rc_track_left_vertical_loop( /** rct2: 0x00824B7C */ static void lay_down_rc_track_right_vertical_loop( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4657,7 +4657,7 @@ static void lay_down_rc_track_right_vertical_loop( /** rct2: 0x00824BBC */ static void lay_down_rc_track_left_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -4896,7 +4896,7 @@ static void lay_down_rc_track_left_quarter_turn_3( /** rct2: 0x00824BCC */ static void lay_down_rc_track_right_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; lay_down_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -4905,7 +4905,7 @@ static void lay_down_rc_track_right_quarter_turn_3( /** rct2: 0x00824BDC */ static void lay_down_rc_track_left_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -5150,7 +5150,7 @@ static void lay_down_rc_track_left_quarter_turn_3_bank( /** rct2: 0x00824BEC */ static void lay_down_rc_track_right_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; lay_down_rc_track_left_quarter_turn_3_bank(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -5159,7 +5159,7 @@ static void lay_down_rc_track_right_quarter_turn_3_bank( /** rct2: 0x00824BFC */ static void lay_down_rc_track_left_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -5330,7 +5330,7 @@ static void lay_down_rc_track_left_quarter_turn_3_25_deg_up( /** rct2: 0x00824C0C */ static void lay_down_rc_track_right_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -5507,7 +5507,7 @@ static void lay_down_rc_track_right_quarter_turn_3_25_deg_up( /** rct2: 0x00824C1C */ static void lay_down_rc_track_left_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; lay_down_rc_track_right_quarter_turn_3_25_deg_up( @@ -5517,7 +5517,7 @@ static void lay_down_rc_track_left_quarter_turn_3_25_deg_down( /** rct2: 0x00824C2C */ static void lay_down_rc_track_right_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; lay_down_rc_track_left_quarter_turn_3_25_deg_up( @@ -5527,7 +5527,7 @@ static void lay_down_rc_track_right_quarter_turn_3_25_deg_down( /** rct2: 0x00824C9C */ static void lay_down_rc_track_left_half_banked_helix_up_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5749,7 +5749,7 @@ static void lay_down_rc_track_left_half_banked_helix_up_small( /** rct2: 0x00824CAC */ static void lay_down_rc_track_right_half_banked_helix_up_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5971,7 +5971,7 @@ static void lay_down_rc_track_right_half_banked_helix_up_small( /** rct2: 0x00824CBC */ static void lay_down_rc_track_left_half_banked_helix_down_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 4) { @@ -5986,7 +5986,7 @@ static void lay_down_rc_track_left_half_banked_helix_down_small( /** rct2: 0x00824CCC */ static void lay_down_rc_track_right_half_banked_helix_down_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 4) { @@ -6001,7 +6001,7 @@ static void lay_down_rc_track_right_half_banked_helix_down_small( /** rct2: 0x00824CDC */ static void lay_down_rc_track_left_half_banked_helix_up_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6347,7 +6347,7 @@ static void lay_down_rc_track_left_half_banked_helix_up_large( /** rct2: 0x00824CEC */ static void lay_down_rc_track_right_half_banked_helix_up_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6693,7 +6693,7 @@ static void lay_down_rc_track_right_half_banked_helix_up_large( /** rct2: 0x00824CFC */ static void lay_down_rc_track_left_half_banked_helix_down_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 7) { @@ -6708,7 +6708,7 @@ static void lay_down_rc_track_left_half_banked_helix_down_large( /** rct2: 0x00824D0C */ static void lay_down_rc_track_right_half_banked_helix_down_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 7) { @@ -6723,7 +6723,7 @@ static void lay_down_rc_track_right_half_banked_helix_down_large( /** rct2: 0x00824D3C */ static void lay_down_rc_track_left_quarter_turn_1_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -6801,7 +6801,7 @@ static void lay_down_rc_track_left_quarter_turn_1_60_deg_up( /** rct2: 0x00824D1C */ static void lay_down_rc_track_right_quarter_turn_1_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -6880,7 +6880,7 @@ static void lay_down_rc_track_right_quarter_turn_1_60_deg_up( /** rct2: 0x00824D2C */ static void lay_down_rc_track_left_quarter_turn_1_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { lay_down_rc_track_right_quarter_turn_1_60_deg_up( session, rideIndex, trackSequence, (direction + 1) & 3, height, tileElement); @@ -6889,7 +6889,7 @@ static void lay_down_rc_track_left_quarter_turn_1_60_deg_down( /** rct2: 0x00824D4C */ static void lay_down_rc_track_right_quarter_turn_1_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { lay_down_rc_track_left_quarter_turn_1_60_deg_up( session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -6898,7 +6898,7 @@ static void lay_down_rc_track_right_quarter_turn_1_60_deg_down( /** rct2: 0x00824D5C */ static void lay_down_rc_track_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -6959,7 +6959,7 @@ static void lay_down_rc_track_brakes( /** rct2: 0x00824D6C */ static void lay_down_rc_track_on_ride_photo( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -7062,7 +7062,7 @@ static void lay_down_rc_track_on_ride_photo( /** rct2: 0x00824D8C */ static void lay_down_rc_track_left_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -7376,7 +7376,7 @@ static void lay_down_rc_track_left_eighth_to_diag( /** rct2: 0x00824D9C */ static void lay_down_rc_track_right_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -7690,7 +7690,7 @@ static void lay_down_rc_track_right_eighth_to_diag( /** rct2: 0x00824DAC */ static void lay_down_rc_track_left_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; lay_down_rc_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -7699,7 +7699,7 @@ static void lay_down_rc_track_left_eighth_to_orthogonal( /** rct2: 0x00824DBC */ static void lay_down_rc_track_right_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; lay_down_rc_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, tileElement); @@ -7708,7 +7708,7 @@ static void lay_down_rc_track_right_eighth_to_orthogonal( /** rct2: 0x00824DCC */ static void lay_down_rc_track_left_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -8023,7 +8023,7 @@ static void lay_down_rc_track_left_eighth_bank_to_diag( /** rct2: 0x00824DDC */ static void lay_down_rc_track_right_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -8338,7 +8338,7 @@ static void lay_down_rc_track_right_eighth_bank_to_diag( /** rct2: 0x00824DEC */ static void lay_down_rc_track_left_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; lay_down_rc_track_right_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -8347,7 +8347,7 @@ static void lay_down_rc_track_left_eighth_bank_to_orthogonal( /** rct2: 0x00824DFC */ static void lay_down_rc_track_right_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; lay_down_rc_track_left_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, tileElement); @@ -8356,7 +8356,7 @@ static void lay_down_rc_track_right_eighth_bank_to_orthogonal( /** rct2: 0x00824D7C */ static void lay_down_rc_track_diag_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -8648,7 +8648,7 @@ static void lay_down_rc_track_diag_flat( /** rct2: 0x00824E2C */ static void lay_down_rc_track_diag_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -8940,7 +8940,7 @@ static void lay_down_rc_track_diag_25_deg_up( /** rct2: 0x00824E8C */ static void lay_down_rc_track_diag_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -9176,7 +9176,7 @@ static void lay_down_rc_track_diag_60_deg_up( /** rct2: 0x00824E0C */ static void lay_down_rc_track_diag_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -9468,7 +9468,7 @@ static void lay_down_rc_track_diag_flat_to_25_deg_up( /** rct2: 0x00824E6C */ static void lay_down_rc_track_diag_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -9704,7 +9704,7 @@ static void lay_down_rc_track_diag_25_deg_up_to_60_deg_up( /** rct2: 0x00824E7C */ static void lay_down_rc_track_diag_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -9940,7 +9940,7 @@ static void lay_down_rc_track_diag_60_deg_up_to_25_deg_up( /** rct2: 0x00824E1C */ static void lay_down_rc_track_diag_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -10232,7 +10232,7 @@ static void lay_down_rc_track_diag_25_deg_up_to_flat( /** rct2: 0x00824E5C */ static void lay_down_rc_track_diag_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -10468,7 +10468,7 @@ static void lay_down_rc_track_diag_25_deg_down( /** rct2: 0x00824EBC */ static void lay_down_rc_track_diag_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -10704,7 +10704,7 @@ static void lay_down_rc_track_diag_60_deg_down( /** rct2: 0x00824E3C */ static void lay_down_rc_track_diag_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -10933,7 +10933,7 @@ static void lay_down_rc_track_diag_flat_to_25_deg_down( /** rct2: 0x00824E9C */ static void lay_down_rc_track_diag_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -11169,7 +11169,7 @@ static void lay_down_rc_track_diag_25_deg_down_to_60_deg_down( /** rct2: 0x00824EAC */ static void lay_down_rc_track_diag_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -11405,7 +11405,7 @@ static void lay_down_rc_track_diag_60_deg_down_to_25_deg_down( /** rct2: 0x00824E4C */ static void lay_down_rc_track_diag_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -11641,7 +11641,7 @@ static void lay_down_rc_track_diag_25_deg_down_to_flat( /** rct2: 0x00824EEC */ static void lay_down_rc_track_diag_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -11811,7 +11811,7 @@ static void lay_down_rc_track_diag_flat_to_left_bank( /** rct2: 0x00824EFC */ static void lay_down_rc_track_diag_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -11981,7 +11981,7 @@ static void lay_down_rc_track_diag_flat_to_right_bank( /** rct2: 0x00824F0C */ static void lay_down_rc_track_diag_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -12151,7 +12151,7 @@ static void lay_down_rc_track_diag_left_bank_to_flat( /** rct2: 0x00824F1C */ static void lay_down_rc_track_diag_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -12321,7 +12321,7 @@ static void lay_down_rc_track_diag_right_bank_to_flat( /** rct2: 0x00824F4C */ static void lay_down_rc_track_diag_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -12490,7 +12490,7 @@ static void lay_down_rc_track_diag_left_bank_to_25_deg_up( /** rct2: 0x00824F5C */ static void lay_down_rc_track_diag_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -12659,7 +12659,7 @@ static void lay_down_rc_track_diag_right_bank_to_25_deg_up( /** rct2: 0x00824F2C */ static void lay_down_rc_track_diag_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -12828,7 +12828,7 @@ static void lay_down_rc_track_diag_25_deg_up_to_left_bank( /** rct2: 0x00824F3C */ static void lay_down_rc_track_diag_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -12997,7 +12997,7 @@ static void lay_down_rc_track_diag_25_deg_up_to_right_bank( /** rct2: 0x00824F6C */ static void lay_down_rc_track_diag_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -13159,7 +13159,7 @@ static void lay_down_rc_track_diag_left_bank_to_25_deg_down( /** rct2: 0x00824F7C */ static void lay_down_rc_track_diag_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -13321,7 +13321,7 @@ static void lay_down_rc_track_diag_right_bank_to_25_deg_down( /** rct2: 0x00824F8C */ static void lay_down_rc_track_diag_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -13490,7 +13490,7 @@ static void lay_down_rc_track_diag_25_deg_down_to_left_bank( /** rct2: 0x00824F9C */ static void lay_down_rc_track_diag_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -13659,7 +13659,7 @@ static void lay_down_rc_track_diag_25_deg_down_to_right_bank( /** rct2: 0x00824ECC */ static void lay_down_rc_track_diag_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -13826,7 +13826,7 @@ static void lay_down_rc_track_diag_left_bank( /** rct2: 0x00824EDC */ static void lay_down_rc_track_diag_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -13993,7 +13993,7 @@ static void lay_down_rc_track_diag_right_bank( /** rct2: 0x00824FAC */ static void lay_down_rc_track_left_flyer_twist_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -14105,7 +14105,7 @@ static void lay_down_rc_track_left_flyer_twist_up( /** rct2: 0x00824FBC */ static void lay_down_rc_track_right_flyer_twist_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -14215,7 +14215,7 @@ static void lay_down_rc_track_right_flyer_twist_up( /** rct2: 0x00824FCC */ static void lay_down_rc_track_left_flyer_twist_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -14327,7 +14327,7 @@ static void lay_down_rc_track_left_flyer_twist_down( /** rct2: 0x00824FDC */ static void lay_down_rc_track_right_flyer_twist_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -14437,7 +14437,7 @@ static void lay_down_rc_track_right_flyer_twist_down( /** rct2: 0x00824C3C */ static void lay_down_rc_track_flyer_half_loop_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -14567,7 +14567,7 @@ static void lay_down_rc_track_flyer_half_loop_up( /** rct2: 0x00824C4C */ static void lay_down_rc_track_flyer_half_loop_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -14697,7 +14697,7 @@ static void lay_down_rc_track_flyer_half_loop_down( /** rct2: 0x00824C5C */ static void lay_down_rc_track_left_flyer_corkscrew_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -14824,7 +14824,7 @@ static void lay_down_rc_track_left_flyer_corkscrew_up( /** rct2: 0x00824C6C */ static void lay_down_rc_track_right_flyer_corkscrew_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -14938,7 +14938,7 @@ static void lay_down_rc_track_right_flyer_corkscrew_up( /** rct2: 0x00824C7C */ static void lay_down_rc_track_left_flyer_corkscrew_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -15052,7 +15052,7 @@ static void lay_down_rc_track_left_flyer_corkscrew_down( /** rct2: 0x00824C8C */ static void lay_down_rc_track_right_flyer_corkscrew_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { lay_down_rc_track_left_flyer_corkscrew_up(session, rideIndex, 2 - trackSequence, (direction + 3) % 4, height, tileElement); } @@ -15060,7 +15060,7 @@ static void lay_down_rc_track_right_flyer_corkscrew_down( /** rct2: 0x00824FEC */ static void lay_down_rc_track_block_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -15117,7 +15117,7 @@ static void lay_down_rc_track_block_brakes( static void lay_down_rc_track_left_quarter_banked_helix_large_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -15301,7 +15301,7 @@ static void lay_down_rc_track_left_quarter_banked_helix_large_up( static void lay_down_rc_track_right_quarter_banked_helix_large_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -15485,7 +15485,7 @@ static void lay_down_rc_track_right_quarter_banked_helix_large_up( static void lay_down_rc_track_left_quarter_banked_helix_large_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -15669,7 +15669,7 @@ static void lay_down_rc_track_left_quarter_banked_helix_large_down( static void lay_down_rc_track_right_quarter_banked_helix_large_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { diff --git a/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp b/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp index 9b48398ab6..a2a64972ad 100644 --- a/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp @@ -22,7 +22,7 @@ /** rct2: 0x008A6D50, 0x008A6D60, 0x008A6D70 */ static void lim_launched_rc_track_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][3] = { { 15018, 15020, SPR_STATION_BASE_B_SW_NE }, @@ -55,7 +55,7 @@ static void lim_launched_rc_track_station( /** rct2: 0x008A65E0 */ static void lim_launched_rc_track_left_vertical_loop( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -318,7 +318,7 @@ static void lim_launched_rc_track_left_vertical_loop( /** rct2: 0x008A65F0 */ static void lim_launched_rc_track_right_vertical_loop( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -535,7 +535,7 @@ static void lim_launched_rc_track_right_vertical_loop( /** rct2: 0x008A6D10 */ static void lim_launched_rc_track_left_twist_down_to_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -672,7 +672,7 @@ static void lim_launched_rc_track_left_twist_down_to_up( /** rct2: 0x008A6D20 */ static void lim_launched_rc_track_right_twist_down_to_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -809,7 +809,7 @@ static void lim_launched_rc_track_right_twist_down_to_up( /** rct2: 0x008A6D30 */ static void lim_launched_rc_track_left_twist_up_to_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -946,7 +946,7 @@ static void lim_launched_rc_track_left_twist_up_to_down( /** rct2: 0x008A6D40 */ static void lim_launched_rc_track_right_twist_up_to_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1083,7 +1083,7 @@ static void lim_launched_rc_track_right_twist_up_to_down( /** rct2: 0x008A6CD0 */ static void lim_launched_rc_track_left_corkscrew_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1195,7 +1195,7 @@ static void lim_launched_rc_track_left_corkscrew_up( /** rct2: 0x008A6CE0 */ static void lim_launched_rc_track_right_corkscrew_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1308,7 +1308,7 @@ static void lim_launched_rc_track_right_corkscrew_up( /** rct2: 0x008A6CF0 */ static void lim_launched_rc_track_left_corkscrew_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { lim_launched_rc_track_right_corkscrew_up(session, rideIndex, 2 - trackSequence, (direction + 1) & 3, height, tileElement); } @@ -1316,7 +1316,7 @@ static void lim_launched_rc_track_left_corkscrew_down( /** rct2: 0x008A6D00 */ static void lim_launched_rc_track_right_corkscrew_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { lim_launched_rc_track_left_corkscrew_up(session, rideIndex, 2 - trackSequence, (direction - 1) & 3, height, tileElement); } @@ -1324,7 +1324,7 @@ static void lim_launched_rc_track_right_corkscrew_down( /** rct2: 0x008A6D80 */ static void lim_launched_rc_track_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1352,7 +1352,7 @@ static void lim_launched_rc_track_brakes( /** rct2: 0x008A6C10 */ static void lim_launched_rc_track_90_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1393,7 +1393,7 @@ static void lim_launched_rc_track_90_deg_up( /** rct2: 0x008A6C20 */ static void lim_launched_rc_track_90_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { lim_launched_rc_track_90_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1401,7 +1401,7 @@ static void lim_launched_rc_track_90_deg_down( /** rct2: 0x008A6C30 */ static void lim_launched_rc_track_60_deg_up_to_90_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1444,7 +1444,7 @@ static void lim_launched_rc_track_60_deg_up_to_90_deg_up( /** rct2: 0x008A6C40 */ static void lim_launched_rc_track_90_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { lim_launched_rc_track_60_deg_up_to_90_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1452,7 +1452,7 @@ static void lim_launched_rc_track_90_deg_down_to_60_deg_down( /** rct2: 0x008A6C50 */ static void lim_launched_rc_track_90_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1490,7 +1490,7 @@ static void lim_launched_rc_track_90_deg_up_to_60_deg_up( /** rct2: 0x008A6C60 */ static void lim_launched_rc_track_60_deg_down_to_90_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1534,7 +1534,7 @@ static void lim_launched_rc_track_60_deg_down_to_90_deg_down( /** rct2: 0x008A6C70 */ static void lim_launched_rc_track_90_deg_to_inverted_flat_quarter_loop_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1632,7 +1632,7 @@ static void lim_launched_rc_track_90_deg_to_inverted_flat_quarter_loop_up( /** rct2: 0x008A6C80 */ static void lim_launched_rc_track_inverted_flat_to_90_deg_quarter_loop_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { lim_launched_rc_track_90_deg_to_inverted_flat_quarter_loop_up( session, rideIndex, 2 - trackSequence, direction, height, tileElement); @@ -1641,7 +1641,7 @@ static void lim_launched_rc_track_inverted_flat_to_90_deg_quarter_loop_down( /** rct2: 0x008A6D90 */ static void lim_launched_rc_track_block_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1668,7 +1668,7 @@ static void lim_launched_rc_track_block_brakes( static void lim_launched_rc_track_left_quarter_turn_1_90_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1715,7 +1715,7 @@ static void lim_launched_rc_track_left_quarter_turn_1_90_deg_up( /** rct2: 0x008A6CA0 */ static void lim_launched_rc_track_right_quarter_turn_1_90_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1762,7 +1762,7 @@ static void lim_launched_rc_track_right_quarter_turn_1_90_deg_up( /** rct2: 0x008A6CB0 */ static void lim_launched_rc_track_left_quarter_turn_1_90_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { lim_launched_rc_track_right_quarter_turn_1_90_deg_up( session, rideIndex, trackSequence, (direction + 1) & 3, height, tileElement); @@ -1771,7 +1771,7 @@ static void lim_launched_rc_track_left_quarter_turn_1_90_deg_down( /** rct2: 0x008A6CC0 */ static void lim_launched_rc_track_right_quarter_turn_1_90_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { lim_launched_rc_track_left_quarter_turn_1_90_deg_up( session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); diff --git a/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp b/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp index e464997fd3..d984501cb8 100644 --- a/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp @@ -25,7 +25,7 @@ /** rct2: 0x008A6370 */ static void looping_rc_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -81,7 +81,7 @@ static void looping_rc_track_flat( static void looping_rc_track_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { const uint32_t stationTrackNESW = is_csg_loaded() ? LOOPING_RC_BOOSTER_NE_SW : 15016; const uint32_t stationTrackNWSE = is_csg_loaded() ? LOOPING_RC_BOOSTER_NW_SE : 15017; @@ -108,7 +108,7 @@ static void looping_rc_track_station( /** rct2: 0x008A6380 */ static void looping_rc_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -178,7 +178,7 @@ static void looping_rc_track_25_deg_up( /** rct2: 0x008A6390 */ static void looping_rc_track_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -248,7 +248,7 @@ static void looping_rc_track_60_deg_up( /** rct2: 0x008A63A0 */ static void looping_rc_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -318,7 +318,7 @@ static void looping_rc_track_flat_to_25_deg_up( /** rct2: 0x008A63B0 */ static void looping_rc_track_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -396,7 +396,7 @@ static void looping_rc_track_25_deg_up_to_60_deg_up( /** rct2: 0x008A63C0 */ static void looping_rc_track_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -474,7 +474,7 @@ static void looping_rc_track_60_deg_up_to_25_deg_up( /** rct2: 0x008A63D0 */ static void looping_rc_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -544,7 +544,7 @@ static void looping_rc_track_25_deg_up_to_flat( /** rct2: 0x008A63E0 */ static void looping_rc_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { looping_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -552,7 +552,7 @@ static void looping_rc_track_25_deg_down( /** rct2: 0x008A63F0 */ static void looping_rc_track_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { looping_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -560,7 +560,7 @@ static void looping_rc_track_60_deg_down( /** rct2: 0x008A6400 */ static void looping_rc_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { looping_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -568,7 +568,7 @@ static void looping_rc_track_flat_to_25_deg_down( /** rct2: 0x008A6410 */ static void looping_rc_track_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { looping_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -576,7 +576,7 @@ static void looping_rc_track_25_deg_down_to_60_deg_down( /** rct2: 0x008A6420 */ static void looping_rc_track_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { looping_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -584,7 +584,7 @@ static void looping_rc_track_60_deg_down_to_25_deg_down( /** rct2: 0x008A6430 */ static void looping_rc_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { looping_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -592,7 +592,7 @@ static void looping_rc_track_25_deg_down_to_flat( /** rct2: 0x008A6440 */ static void looping_rc_track_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -756,7 +756,7 @@ static void looping_rc_track_left_quarter_turn_5( /** rct2: 0x008A6450 */ static void looping_rc_track_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; looping_rc_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -765,7 +765,7 @@ static void looping_rc_track_right_quarter_turn_5( /** rct2: 0x008A6460 */ static void looping_rc_track_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -803,7 +803,7 @@ static void looping_rc_track_flat_to_left_bank( /** rct2: 0x008A6470 */ static void looping_rc_track_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -841,7 +841,7 @@ static void looping_rc_track_flat_to_right_bank( /** rct2: 0x008A6480 */ static void looping_rc_track_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -879,7 +879,7 @@ static void looping_rc_track_left_bank_to_flat( /** rct2: 0x008A6490 */ static void looping_rc_track_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -917,7 +917,7 @@ static void looping_rc_track_right_bank_to_flat( /** rct2: 0x008A64A0 */ static void looping_rc_track_banked_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1091,7 +1091,7 @@ static void looping_rc_track_banked_left_quarter_turn_5( /** rct2: 0x008A64B0 */ static void looping_rc_track_banked_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; looping_rc_track_banked_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -1100,7 +1100,7 @@ static void looping_rc_track_banked_right_quarter_turn_5( /** rct2: 0x008A64C0 */ static void looping_rc_track_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1145,7 +1145,7 @@ static void looping_rc_track_left_bank_to_25_deg_up( /** rct2: 0x008A64D0 */ static void looping_rc_track_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1190,7 +1190,7 @@ static void looping_rc_track_right_bank_to_25_deg_up( /** rct2: 0x008A64E0 */ static void looping_rc_track_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1235,7 +1235,7 @@ static void looping_rc_track_25_deg_up_to_left_bank( /** rct2: 0x008A64F0 */ static void looping_rc_track_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1280,7 +1280,7 @@ static void looping_rc_track_25_deg_up_to_right_bank( /** rct2: 0x008A6500 */ static void looping_rc_track_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { looping_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1288,7 +1288,7 @@ static void looping_rc_track_left_bank_to_25_deg_down( /** rct2: 0x008A6510 */ static void looping_rc_track_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { looping_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1296,7 +1296,7 @@ static void looping_rc_track_right_bank_to_25_deg_down( /** rct2: 0x008A6520 */ static void looping_rc_track_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { looping_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1304,7 +1304,7 @@ static void looping_rc_track_25_deg_down_to_left_bank( /** rct2: 0x008A6530 */ static void looping_rc_track_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { looping_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1312,7 +1312,7 @@ static void looping_rc_track_25_deg_down_to_right_bank( /** rct2: 0x008A6540 */ static void looping_rc_track_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1346,7 +1346,7 @@ static void looping_rc_track_left_bank( /** rct2: 0x008A6550 */ static void looping_rc_track_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { looping_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1354,7 +1354,7 @@ static void looping_rc_track_right_bank( /** rct2: 0x008A6560 */ static void looping_rc_track_left_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1518,7 +1518,7 @@ static void looping_rc_track_left_quarter_turn_5_25_deg_up( /** rct2: 0x008A6570 */ static void looping_rc_track_right_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1682,7 +1682,7 @@ static void looping_rc_track_right_quarter_turn_5_25_deg_up( /** rct2: 0x008A6580 */ static void looping_rc_track_left_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; looping_rc_track_right_quarter_turn_5_25_deg_up( @@ -1692,7 +1692,7 @@ static void looping_rc_track_left_quarter_turn_5_25_deg_down( /** rct2: 0x008A6590 */ static void looping_rc_track_right_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; looping_rc_track_left_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -1701,7 +1701,7 @@ static void looping_rc_track_right_quarter_turn_5_25_deg_down( /** rct2: 0x008A65A0 */ static void looping_rc_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1836,7 +1836,7 @@ static void looping_rc_track_s_bend_left( /** rct2: 0x008A65B0 */ static void looping_rc_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1971,7 +1971,7 @@ static void looping_rc_track_s_bend_right( /** rct2: 0x008A65C0 */ static void looping_rc_track_left_vertical_loop( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2258,7 +2258,7 @@ static void looping_rc_track_left_vertical_loop( /** rct2: 0x008A65D0 */ static void looping_rc_track_right_vertical_loop( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2513,7 +2513,7 @@ static void looping_rc_track_right_vertical_loop( /** rct2: 0x008A6630 */ static void looping_rc_track_left_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2616,7 +2616,7 @@ static void looping_rc_track_left_quarter_turn_3( /** rct2: 0x008A6640 */ static void looping_rc_track_right_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; looping_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -2625,7 +2625,7 @@ static void looping_rc_track_right_quarter_turn_3( /** rct2: 0x008A6650 */ static void looping_rc_track_left_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2737,7 +2737,7 @@ static void looping_rc_track_left_quarter_turn_3_bank( /** rct2: 0x008A6660 */ static void looping_rc_track_right_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; looping_rc_track_left_quarter_turn_3_bank(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -2746,7 +2746,7 @@ static void looping_rc_track_right_quarter_turn_3_bank( /** rct2: 0x008A6670 */ static void looping_rc_track_left_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2825,7 +2825,7 @@ static void looping_rc_track_left_quarter_turn_3_25_deg_up( /** rct2: 0x008A6680 */ static void looping_rc_track_right_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2911,7 +2911,7 @@ static void looping_rc_track_right_quarter_turn_3_25_deg_up( /** rct2: 0x008A6690 */ static void looping_rc_track_left_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; looping_rc_track_right_quarter_turn_3_25_deg_up( @@ -2921,7 +2921,7 @@ static void looping_rc_track_left_quarter_turn_3_25_deg_down( /** rct2: 0x008A66A0 */ static void looping_rc_track_right_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; looping_rc_track_left_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -2930,7 +2930,7 @@ static void looping_rc_track_right_quarter_turn_3_25_deg_down( /** rct2: 0x008A66B0 */ static void looping_rc_track_left_half_banked_helix_up_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3148,7 +3148,7 @@ static void looping_rc_track_left_half_banked_helix_up_small( /** rct2: 0x008A66C0 */ static void looping_rc_track_right_half_banked_helix_up_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3366,7 +3366,7 @@ static void looping_rc_track_right_half_banked_helix_up_small( /** rct2: 0x008A66D0 */ static void looping_rc_track_left_half_banked_helix_down_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 4) { @@ -3381,7 +3381,7 @@ static void looping_rc_track_left_half_banked_helix_down_small( /** rct2: 0x008A66E0 */ static void looping_rc_track_right_half_banked_helix_down_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 4) { @@ -3396,7 +3396,7 @@ static void looping_rc_track_right_half_banked_helix_down_small( /** rct2: 0x008A66F0 */ static void looping_rc_track_left_half_banked_helix_up_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3738,7 +3738,7 @@ static void looping_rc_track_left_half_banked_helix_up_large( /** rct2: 0x008A6700 */ static void looping_rc_track_right_half_banked_helix_up_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4080,7 +4080,7 @@ static void looping_rc_track_right_half_banked_helix_up_large( /** rct2: 0x008A6710 */ static void looping_rc_track_left_half_banked_helix_down_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 7) { @@ -4095,7 +4095,7 @@ static void looping_rc_track_left_half_banked_helix_down_large( /** rct2: 0x008A6720 */ static void looping_rc_track_right_half_banked_helix_down_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 7) { @@ -4110,7 +4110,7 @@ static void looping_rc_track_right_half_banked_helix_down_large( /** rct2: 0x008A6750 */ static void looping_rc_track_left_quarter_turn_1_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -4147,7 +4147,7 @@ static void looping_rc_track_left_quarter_turn_1_60_deg_up( /** rct2: 0x008A6730 */ static void looping_rc_track_right_quarter_turn_1_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -4184,7 +4184,7 @@ static void looping_rc_track_right_quarter_turn_1_60_deg_up( /** rct2: 0x008A6740 */ static void looping_rc_track_left_quarter_turn_1_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { looping_rc_track_right_quarter_turn_1_60_deg_up( session, rideIndex, trackSequence, (direction + 1) & 3, height, tileElement); @@ -4193,7 +4193,7 @@ static void looping_rc_track_left_quarter_turn_1_60_deg_down( /** rct2: 0x008A6760 */ static void looping_rc_track_right_quarter_turn_1_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { looping_rc_track_left_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); } @@ -4201,7 +4201,7 @@ static void looping_rc_track_right_quarter_turn_1_60_deg_down( /** rct2: 0x008A6770 */ static void looping_rc_track_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -4233,7 +4233,7 @@ static void looping_rc_track_brakes( /** rct2: 0x008A6A40 */ static void looping_rc_track_25_deg_up_left_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -4274,7 +4274,7 @@ static void looping_rc_track_25_deg_up_left_banked( /** rct2: 0x008A6A50 */ static void looping_rc_track_25_deg_up_right_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -4315,7 +4315,7 @@ static void looping_rc_track_25_deg_up_right_banked( /** rct2: 0x008A6780 */ static void looping_rc_track_on_ride_photo( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -4361,7 +4361,7 @@ static void looping_rc_track_on_ride_photo( /** rct2: 0x008A6A60 */ static void looping_rc_track_25_deg_down_left_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { looping_rc_track_25_deg_up_right_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -4369,7 +4369,7 @@ static void looping_rc_track_25_deg_down_left_banked( /** rct2: 0x008A6A70 */ static void looping_rc_track_25_deg_down_right_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { looping_rc_track_25_deg_up_left_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -4377,7 +4377,7 @@ static void looping_rc_track_25_deg_down_right_banked( /** rct2: 0x008A6860 */ static void looping_rc_track_left_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4516,7 +4516,7 @@ static void looping_rc_track_left_eighth_to_diag( /** rct2: 0x008A6870 */ static void looping_rc_track_right_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4654,7 +4654,7 @@ static void looping_rc_track_right_eighth_to_diag( /** rct2: 0x008A6880 */ static void looping_rc_track_left_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; looping_rc_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -4663,7 +4663,7 @@ static void looping_rc_track_left_eighth_to_orthogonal( /** rct2: 0x008A6890 */ static void looping_rc_track_right_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; looping_rc_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, tileElement); @@ -4672,7 +4672,7 @@ static void looping_rc_track_right_eighth_to_orthogonal( /** rct2: 0x008A68A0 */ static void looping_rc_track_left_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4814,7 +4814,7 @@ static void looping_rc_track_left_eighth_bank_to_diag( /** rct2: 0x008A68B0 */ static void looping_rc_track_right_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4956,7 +4956,7 @@ static void looping_rc_track_right_eighth_bank_to_diag( /** rct2: 0x008A68C0 */ static void looping_rc_track_left_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; looping_rc_track_right_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -4965,7 +4965,7 @@ static void looping_rc_track_left_eighth_bank_to_orthogonal( /** rct2: 0x008A68D0 */ static void looping_rc_track_right_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; looping_rc_track_left_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, tileElement); @@ -4974,7 +4974,7 @@ static void looping_rc_track_right_eighth_bank_to_orthogonal( /** rct2: 0x008A6790 */ static void looping_rc_track_diag_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5120,7 +5120,7 @@ static void looping_rc_track_diag_flat( /** rct2: 0x008A67C0 */ static void looping_rc_track_diag_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5266,7 +5266,7 @@ static void looping_rc_track_diag_25_deg_up( /** rct2: 0x008A67F0 */ static void looping_rc_track_diag_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5412,7 +5412,7 @@ static void looping_rc_track_diag_60_deg_up( /** rct2: 0x008A67A0 */ static void looping_rc_track_diag_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5558,7 +5558,7 @@ static void looping_rc_track_diag_flat_to_25_deg_up( /** rct2: 0x008A67D0 */ static void looping_rc_track_diag_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5704,7 +5704,7 @@ static void looping_rc_track_diag_25_deg_up_to_60_deg_up( /** rct2: 0x008A67E0 */ static void looping_rc_track_diag_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5850,7 +5850,7 @@ static void looping_rc_track_diag_60_deg_up_to_25_deg_up( /** rct2: 0x008A67B0 */ static void looping_rc_track_diag_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5996,7 +5996,7 @@ static void looping_rc_track_diag_25_deg_up_to_flat( /** rct2: 0x008A6820 */ static void looping_rc_track_diag_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6142,7 +6142,7 @@ static void looping_rc_track_diag_25_deg_down( /** rct2: 0x008A6850 */ static void looping_rc_track_diag_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6288,7 +6288,7 @@ static void looping_rc_track_diag_60_deg_down( /** rct2: 0x008A6800 */ static void looping_rc_track_diag_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6432,7 +6432,7 @@ static void looping_rc_track_diag_flat_to_25_deg_down( /** rct2: 0x008A6830 */ static void looping_rc_track_diag_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6578,7 +6578,7 @@ static void looping_rc_track_diag_25_deg_down_to_60_deg_down( /** rct2: 0x008A6840 */ static void looping_rc_track_diag_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6724,7 +6724,7 @@ static void looping_rc_track_diag_60_deg_down_to_25_deg_down( /** rct2: 0x008A6810 */ static void looping_rc_track_diag_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6870,7 +6870,7 @@ static void looping_rc_track_diag_25_deg_down_to_flat( /** rct2: 0x008A6900 */ static void looping_rc_track_diag_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6949,7 +6949,7 @@ static void looping_rc_track_diag_flat_to_left_bank( /** rct2: 0x008A6910 */ static void looping_rc_track_diag_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7028,7 +7028,7 @@ static void looping_rc_track_diag_flat_to_right_bank( /** rct2: 0x008A6920 */ static void looping_rc_track_diag_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7107,7 +7107,7 @@ static void looping_rc_track_diag_left_bank_to_flat( /** rct2: 0x008A6930 */ static void looping_rc_track_diag_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7186,7 +7186,7 @@ static void looping_rc_track_diag_right_bank_to_flat( /** rct2: 0x008A6960 */ static void looping_rc_track_diag_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7265,7 +7265,7 @@ static void looping_rc_track_diag_left_bank_to_25_deg_up( /** rct2: 0x008A6970 */ static void looping_rc_track_diag_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7344,7 +7344,7 @@ static void looping_rc_track_diag_right_bank_to_25_deg_up( /** rct2: 0x008A6940 */ static void looping_rc_track_diag_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7423,7 +7423,7 @@ static void looping_rc_track_diag_25_deg_up_to_left_bank( /** rct2: 0x008A6950 */ static void looping_rc_track_diag_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7502,7 +7502,7 @@ static void looping_rc_track_diag_25_deg_up_to_right_bank( /** rct2: 0x008A6980 */ static void looping_rc_track_diag_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7579,7 +7579,7 @@ static void looping_rc_track_diag_left_bank_to_25_deg_down( /** rct2: 0x008A6990 */ static void looping_rc_track_diag_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7656,7 +7656,7 @@ static void looping_rc_track_diag_right_bank_to_25_deg_down( /** rct2: 0x008A69A0 */ static void looping_rc_track_diag_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7735,7 +7735,7 @@ static void looping_rc_track_diag_25_deg_down_to_left_bank( /** rct2: 0x008A69B0 */ static void looping_rc_track_diag_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7814,7 +7814,7 @@ static void looping_rc_track_diag_25_deg_down_to_right_bank( /** rct2: 0x008A68E0 */ static void looping_rc_track_diag_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7890,7 +7890,7 @@ static void looping_rc_track_diag_left_bank( /** rct2: 0x008A68F0 */ static void looping_rc_track_diag_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7966,7 +7966,7 @@ static void looping_rc_track_diag_right_bank( /** rct2: 0x008A6C00 */ static void looping_rc_track_block_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -7998,7 +7998,7 @@ static void looping_rc_track_block_brakes( /** rct2: 0x008A6BC0 */ static void looping_rc_track_left_banked_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8080,7 +8080,7 @@ static void looping_rc_track_left_banked_quarter_turn_3_25_deg_up( /** rct2: 0x008A6BD0 */ static void looping_rc_track_right_banked_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8169,7 +8169,7 @@ static void looping_rc_track_right_banked_quarter_turn_3_25_deg_up( /** rct2: 0x008A6BE0 */ static void looping_rc_track_left_banked_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; looping_rc_track_right_banked_quarter_turn_3_25_deg_up( @@ -8179,7 +8179,7 @@ static void looping_rc_track_left_banked_quarter_turn_3_25_deg_down( /** rct2: 0x008A6BF0 */ static void looping_rc_track_right_banked_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; looping_rc_track_left_banked_quarter_turn_3_25_deg_up( @@ -8189,7 +8189,7 @@ static void looping_rc_track_right_banked_quarter_turn_3_25_deg_down( /** rct2: 0x008A6B80 */ static void looping_rc_track_left_banked_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8359,7 +8359,7 @@ static void looping_rc_track_left_banked_quarter_turn_5_25_deg_up( /** rct2: 0x008A6B90 */ static void looping_rc_track_right_banked_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8529,7 +8529,7 @@ static void looping_rc_track_right_banked_quarter_turn_5_25_deg_up( /** rct2: 0x008A6BA0 */ static void looping_rc_track_left_banked_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; looping_rc_track_right_banked_quarter_turn_5_25_deg_up( @@ -8539,7 +8539,7 @@ static void looping_rc_track_left_banked_quarter_turn_5_25_deg_down( /** rct2: 0x008A6BB0 */ static void looping_rc_track_right_banked_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; looping_rc_track_left_banked_quarter_turn_5_25_deg_up( @@ -8549,7 +8549,7 @@ static void looping_rc_track_right_banked_quarter_turn_5_25_deg_down( /** rct2: 0x008A6A80 */ static void looping_rc_track_25_deg_up_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8592,7 +8592,7 @@ static void looping_rc_track_25_deg_up_to_left_banked_25_deg_up( /** rct2: 0x008A6A90 */ static void looping_rc_track_25_deg_up_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8635,7 +8635,7 @@ static void looping_rc_track_25_deg_up_to_right_banked_25_deg_up( /** rct2: 0x008A6AA0 */ static void looping_rc_track_left_banked_25_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8678,7 +8678,7 @@ static void looping_rc_track_left_banked_25_deg_up_to_25_deg_up( /** rct2: 0x008A6AB0 */ static void looping_rc_track_right_banked_25_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8721,7 +8721,7 @@ static void looping_rc_track_right_banked_25_deg_up_to_25_deg_up( /** rct2: 0x008A6AC0 */ static void looping_rc_track_25_deg_down_to_left_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { looping_rc_track_right_banked_25_deg_up_to_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -8730,7 +8730,7 @@ static void looping_rc_track_25_deg_down_to_left_banked_25_deg_down( /** rct2: 0x008A6AD0 */ static void looping_rc_track_25_deg_down_to_right_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { looping_rc_track_left_banked_25_deg_up_to_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -8739,7 +8739,7 @@ static void looping_rc_track_25_deg_down_to_right_banked_25_deg_down( /** rct2: 0x008A6AE0 */ static void looping_rc_track_left_banked_25_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { looping_rc_track_25_deg_up_to_right_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -8748,7 +8748,7 @@ static void looping_rc_track_left_banked_25_deg_down_to_25_deg_down( /** rct2: 0x008A6AF0 */ static void looping_rc_track_right_banked_25_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { looping_rc_track_25_deg_up_to_left_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -8757,7 +8757,7 @@ static void looping_rc_track_right_banked_25_deg_down_to_25_deg_down( /** rct2: 0x008A6B00 */ static void looping_rc_track_left_banked_flat_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8798,7 +8798,7 @@ static void looping_rc_track_left_banked_flat_to_left_banked_25_deg_up( /** rct2: 0x008A6B10 */ static void looping_rc_track_right_banked_flat_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8839,7 +8839,7 @@ static void looping_rc_track_right_banked_flat_to_right_banked_25_deg_up( /** rct2: 0x008A6B40 */ static void looping_rc_track_left_banked_25_deg_up_to_left_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8880,7 +8880,7 @@ static void looping_rc_track_left_banked_25_deg_up_to_left_banked_flat( /** rct2: 0x008A6B50 */ static void looping_rc_track_right_banked_25_deg_up_to_right_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8921,7 +8921,7 @@ static void looping_rc_track_right_banked_25_deg_up_to_right_banked_flat( /** rct2: 0x008A6B60 */ static void looping_rc_track_left_banked_flat_to_left_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { looping_rc_track_right_banked_25_deg_up_to_right_banked_flat( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -8930,7 +8930,7 @@ static void looping_rc_track_left_banked_flat_to_left_banked_25_deg_down( /** rct2: 0x008A6B70 */ static void looping_rc_track_right_banked_flat_to_right_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { looping_rc_track_left_banked_25_deg_up_to_left_banked_flat( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -8939,7 +8939,7 @@ static void looping_rc_track_right_banked_flat_to_right_banked_25_deg_down( /** rct2: 0x008A6B20 */ static void looping_rc_track_left_banked_25_deg_down_to_left_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { looping_rc_track_right_banked_flat_to_right_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -8948,7 +8948,7 @@ static void looping_rc_track_left_banked_25_deg_down_to_left_banked_flat( /** rct2: 0x008A6B30 */ static void looping_rc_track_right_banked_25_deg_down_to_right_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { looping_rc_track_left_banked_flat_to_left_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -8957,7 +8957,7 @@ static void looping_rc_track_right_banked_25_deg_down_to_right_banked_flat( /** rct2: 0x008A69C0 */ static void looping_rc_track_flat_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -9000,7 +9000,7 @@ static void looping_rc_track_flat_to_left_banked_25_deg_up( /** rct2: 0x008A69D0 */ static void looping_rc_track_flat_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -9043,7 +9043,7 @@ static void looping_rc_track_flat_to_right_banked_25_deg_up( /** rct2: 0x008A69E0 */ static void looping_rc_track_left_banked_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -9086,7 +9086,7 @@ static void looping_rc_track_left_banked_25_deg_up_to_flat( /** rct2: 0x008A69F0 */ static void looping_rc_track_right_banked_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -9129,7 +9129,7 @@ static void looping_rc_track_right_banked_25_deg_up_to_flat( /** rct2: 0x008A6A00 */ static void looping_rc_track_flat_to_left_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { looping_rc_track_right_banked_25_deg_up_to_flat( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -9138,7 +9138,7 @@ static void looping_rc_track_flat_to_left_banked_25_deg_down( /** rct2: 0x008A6A10 */ static void looping_rc_track_flat_to_right_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { looping_rc_track_left_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -9146,7 +9146,7 @@ static void looping_rc_track_flat_to_right_banked_25_deg_down( /** rct2: 0x008A6A20 */ static void looping_rc_track_left_banked_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { looping_rc_track_flat_to_right_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -9155,14 +9155,14 @@ static void looping_rc_track_left_banked_25_deg_down_to_flat( /** rct2: 0x008A6A30 */ static void looping_rc_track_right_banked_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { looping_rc_track_flat_to_left_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } static void looping_rc_track_booster( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!is_csg_loaded()) { diff --git a/src/openrct2/ride/coaster/MineRide.cpp b/src/openrct2/ride/coaster/MineRide.cpp index df61919456..00b7057d6f 100644 --- a/src/openrct2/ride/coaster/MineRide.cpp +++ b/src/openrct2/ride/coaster/MineRide.cpp @@ -22,7 +22,7 @@ /** rct2: 0x008B08D0 */ static void mine_ride_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -55,7 +55,7 @@ static void mine_ride_track_flat( static void mine_ride_track_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][3] = { { 19338, SPR_STATION_BASE_A_SW_NE }, @@ -79,7 +79,7 @@ static void mine_ride_track_station( /** rct2: 0x008B08E0 */ static void mine_ride_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -136,7 +136,7 @@ static void mine_ride_track_25_deg_up( /** rct2: 0x008B08F0 */ static void mine_ride_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -193,7 +193,7 @@ static void mine_ride_track_flat_to_25_deg_up( /** rct2: 0x008B0900 */ static void mine_ride_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -250,7 +250,7 @@ static void mine_ride_track_25_deg_up_to_flat( /** rct2: 0x008B0910 */ static void mine_ride_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mine_ride_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -258,7 +258,7 @@ static void mine_ride_track_25_deg_down( /** rct2: 0x008B0920 */ static void mine_ride_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mine_ride_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -266,7 +266,7 @@ static void mine_ride_track_flat_to_25_deg_down( /** rct2: 0x008B0930 */ static void mine_ride_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mine_ride_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -274,7 +274,7 @@ static void mine_ride_track_25_deg_down_to_flat( /** rct2: 0x008B0940 */ static void mine_ride_track_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -452,7 +452,7 @@ static void mine_ride_track_left_quarter_turn_5( /** rct2: 0x008B0950 */ static void mine_ride_track_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mine_ride_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -461,7 +461,7 @@ static void mine_ride_track_right_quarter_turn_5( /** rct2: 0x008B0960 */ static void mine_ride_track_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -515,7 +515,7 @@ static void mine_ride_track_flat_to_left_bank( /** rct2: 0x008B0970 */ static void mine_ride_track_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -569,7 +569,7 @@ static void mine_ride_track_flat_to_right_bank( /** rct2: 0x008B0980 */ static void mine_ride_track_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -623,7 +623,7 @@ static void mine_ride_track_left_bank_to_flat( /** rct2: 0x008B0990 */ static void mine_ride_track_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -677,7 +677,7 @@ static void mine_ride_track_right_bank_to_flat( /** rct2: 0x008B09A0 */ static void mine_ride_track_banked_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -865,7 +865,7 @@ static void mine_ride_track_banked_left_quarter_turn_5( /** rct2: 0x008B09B0 */ static void mine_ride_track_banked_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mine_ride_track_banked_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -874,7 +874,7 @@ static void mine_ride_track_banked_right_quarter_turn_5( /** rct2: 0x008B09C0 */ static void mine_ride_track_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -935,7 +935,7 @@ static void mine_ride_track_left_bank_to_25_deg_up( /** rct2: 0x008B09D0 */ static void mine_ride_track_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -996,7 +996,7 @@ static void mine_ride_track_right_bank_to_25_deg_up( /** rct2: 0x008B09E0 */ static void mine_ride_track_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1057,7 +1057,7 @@ static void mine_ride_track_25_deg_up_to_left_bank( /** rct2: 0x008B09F0 */ static void mine_ride_track_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1118,7 +1118,7 @@ static void mine_ride_track_25_deg_up_to_right_bank( /** rct2: 0x008B0A00 */ static void mine_ride_track_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mine_ride_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1126,7 +1126,7 @@ static void mine_ride_track_left_bank_to_25_deg_down( /** rct2: 0x008B0A10 */ static void mine_ride_track_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mine_ride_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1134,7 +1134,7 @@ static void mine_ride_track_right_bank_to_25_deg_down( /** rct2: 0x008B0A20 */ static void mine_ride_track_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mine_ride_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1142,7 +1142,7 @@ static void mine_ride_track_25_deg_down_to_left_bank( /** rct2: 0x008B0A30 */ static void mine_ride_track_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mine_ride_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1150,7 +1150,7 @@ static void mine_ride_track_25_deg_down_to_right_bank( /** rct2: 0x008B0A40 */ static void mine_ride_track_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1200,7 +1200,7 @@ static void mine_ride_track_left_bank( /** rct2: 0x008B0A50 */ static void mine_ride_track_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mine_ride_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1208,7 +1208,7 @@ static void mine_ride_track_right_bank( /** rct2: 0x008B0A60 */ static void mine_ride_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1357,7 +1357,7 @@ static void mine_ride_track_s_bend_left( /** rct2: 0x008B0A70 */ static void mine_ride_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1506,7 +1506,7 @@ static void mine_ride_track_s_bend_right( /** rct2: 0x008B0AB0 */ static void mine_ride_track_left_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1623,7 +1623,7 @@ static void mine_ride_track_left_quarter_turn_3( /** rct2: 0x008B0AC0 */ static void mine_ride_track_right_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mine_ride_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -1632,7 +1632,7 @@ static void mine_ride_track_right_quarter_turn_3( /** rct2: 0x008B0AD0 */ static void mine_ride_track_left_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1758,7 +1758,7 @@ static void mine_ride_track_left_quarter_turn_3_bank( /** rct2: 0x008B0AE0 */ static void mine_ride_track_right_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mine_ride_track_left_quarter_turn_3_bank(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -1767,7 +1767,7 @@ static void mine_ride_track_right_quarter_turn_3_bank( /** rct2: 0x008B0AF0 */ static void mine_ride_track_left_half_banked_helix_up_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2013,7 +2013,7 @@ static void mine_ride_track_left_half_banked_helix_up_small( /** rct2: 0x008B0B00 */ static void mine_ride_track_right_half_banked_helix_up_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2259,7 +2259,7 @@ static void mine_ride_track_right_half_banked_helix_up_small( /** rct2: 0x008B0B10 */ static void mine_ride_track_left_half_banked_helix_down_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 4) { @@ -2274,7 +2274,7 @@ static void mine_ride_track_left_half_banked_helix_down_small( /** rct2: 0x008B0B20 */ static void mine_ride_track_right_half_banked_helix_down_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 4) { @@ -2289,7 +2289,7 @@ static void mine_ride_track_right_half_banked_helix_down_small( /** rct2: 0x008B0B30 */ static void mine_ride_track_left_half_banked_helix_up_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2659,7 +2659,7 @@ static void mine_ride_track_left_half_banked_helix_up_large( /** rct2: 0x008B0B40 */ static void mine_ride_track_right_half_banked_helix_up_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3029,7 +3029,7 @@ static void mine_ride_track_right_half_banked_helix_up_large( /** rct2: 0x008B0B50 */ static void mine_ride_track_left_half_banked_helix_down_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 7) { @@ -3044,7 +3044,7 @@ static void mine_ride_track_left_half_banked_helix_down_large( /** rct2: 0x008B0B60 */ static void mine_ride_track_right_half_banked_helix_down_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 7) { @@ -3059,7 +3059,7 @@ static void mine_ride_track_right_half_banked_helix_down_large( /** rct2: 0x008B0B70 */ static void mine_ride_track_on_ride_photo( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -3105,7 +3105,7 @@ static void mine_ride_track_on_ride_photo( /** rct2: 0x008B0B90 */ static void mine_ride_track_left_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3251,7 +3251,7 @@ static void mine_ride_track_left_eighth_to_diag( /** rct2: 0x008B0BA0 */ static void mine_ride_track_right_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3396,7 +3396,7 @@ static void mine_ride_track_right_eighth_to_diag( /** rct2: 0x008B0BB0 */ static void mine_ride_track_left_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mine_ride_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -3405,7 +3405,7 @@ static void mine_ride_track_left_eighth_to_orthogonal( /** rct2: 0x008B0BC0 */ static void mine_ride_track_right_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mine_ride_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, tileElement); @@ -3414,7 +3414,7 @@ static void mine_ride_track_right_eighth_to_orthogonal( /** rct2: 0x008B0BD0 */ static void mine_ride_track_left_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3563,7 +3563,7 @@ static void mine_ride_track_left_eighth_bank_to_diag( /** rct2: 0x008B0BE0 */ static void mine_ride_track_right_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3712,7 +3712,7 @@ static void mine_ride_track_right_eighth_bank_to_diag( /** rct2: 0x008B0BF0 */ static void mine_ride_track_left_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mine_ride_track_right_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -3721,7 +3721,7 @@ static void mine_ride_track_left_eighth_bank_to_orthogonal( /** rct2: 0x008B0C00 */ static void mine_ride_track_right_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mine_ride_track_left_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, tileElement); @@ -3730,7 +3730,7 @@ static void mine_ride_track_right_eighth_bank_to_orthogonal( /** rct2: 0x008B0B80 */ static void mine_ride_track_diag_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3806,7 +3806,7 @@ static void mine_ride_track_diag_flat( /** rct2: 0x008B0C30 */ static void mine_ride_track_diag_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3882,7 +3882,7 @@ static void mine_ride_track_diag_25_deg_up( /** rct2: 0x008B0C10 */ static void mine_ride_track_diag_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3958,7 +3958,7 @@ static void mine_ride_track_diag_flat_to_25_deg_up( /** rct2: 0x008B0C20 */ static void mine_ride_track_diag_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4034,7 +4034,7 @@ static void mine_ride_track_diag_25_deg_up_to_flat( /** rct2: 0x008B0C60 */ static void mine_ride_track_diag_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4110,7 +4110,7 @@ static void mine_ride_track_diag_25_deg_down( /** rct2: 0x008B0C40 */ static void mine_ride_track_diag_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4184,7 +4184,7 @@ static void mine_ride_track_diag_flat_to_25_deg_down( /** rct2: 0x008B0C50 */ static void mine_ride_track_diag_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4260,7 +4260,7 @@ static void mine_ride_track_diag_25_deg_down_to_flat( /** rct2: 0x008B0C90 */ static void mine_ride_track_diag_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4339,7 +4339,7 @@ static void mine_ride_track_diag_flat_to_left_bank( /** rct2: 0x008B0CA0 */ static void mine_ride_track_diag_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4418,7 +4418,7 @@ static void mine_ride_track_diag_flat_to_right_bank( /** rct2: 0x008B0CB0 */ static void mine_ride_track_diag_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4497,7 +4497,7 @@ static void mine_ride_track_diag_left_bank_to_flat( /** rct2: 0x008B0CC0 */ static void mine_ride_track_diag_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4576,7 +4576,7 @@ static void mine_ride_track_diag_right_bank_to_flat( /** rct2: 0x008B0CF0 */ static void mine_ride_track_diag_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4655,7 +4655,7 @@ static void mine_ride_track_diag_left_bank_to_25_deg_up( /** rct2: 0x008B0D00 */ static void mine_ride_track_diag_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4734,7 +4734,7 @@ static void mine_ride_track_diag_right_bank_to_25_deg_up( /** rct2: 0x008B0CD0 */ static void mine_ride_track_diag_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4813,7 +4813,7 @@ static void mine_ride_track_diag_25_deg_up_to_left_bank( /** rct2: 0x008B0CE0 */ static void mine_ride_track_diag_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4892,7 +4892,7 @@ static void mine_ride_track_diag_25_deg_up_to_right_bank( /** rct2: 0x008B0D10 */ static void mine_ride_track_diag_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4969,7 +4969,7 @@ static void mine_ride_track_diag_left_bank_to_25_deg_down( /** rct2: 0x008B0D20 */ static void mine_ride_track_diag_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5046,7 +5046,7 @@ static void mine_ride_track_diag_right_bank_to_25_deg_down( /** rct2: 0x008B0D30 */ static void mine_ride_track_diag_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5125,7 +5125,7 @@ static void mine_ride_track_diag_25_deg_down_to_left_bank( /** rct2: 0x008B0D40 */ static void mine_ride_track_diag_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5204,7 +5204,7 @@ static void mine_ride_track_diag_25_deg_down_to_right_bank( /** rct2: 0x008B0C70 */ static void mine_ride_track_diag_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5280,7 +5280,7 @@ static void mine_ride_track_diag_left_bank( /** rct2: 0x008B0C80 */ static void mine_ride_track_diag_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { diff --git a/src/openrct2/ride/coaster/MineTrainCoaster.cpp b/src/openrct2/ride/coaster/MineTrainCoaster.cpp index 878bc5d3fb..cdc511e85b 100644 --- a/src/openrct2/ride/coaster/MineTrainCoaster.cpp +++ b/src/openrct2/ride/coaster/MineTrainCoaster.cpp @@ -22,7 +22,7 @@ /** rct2: 0x0071BFA4 */ static void mine_train_rc_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -76,7 +76,7 @@ static void mine_train_rc_track_flat( /** rct2: 0x0071C154, 0x0071C164, 0x0071C174 */ static void mine_train_rc_track_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][3] = { { 20064, 20060, SPR_STATION_BASE_B_SW_NE }, @@ -110,7 +110,7 @@ static void mine_train_rc_track_station( /** rct2: 0x0071BFB4 */ static void mine_train_rc_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -179,7 +179,7 @@ static void mine_train_rc_track_25_deg_up( /** rct2: 0x0071BFC4 */ static void mine_train_rc_track_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -219,7 +219,7 @@ static void mine_train_rc_track_60_deg_up( /** rct2: 0x0071BFD4 */ static void mine_train_rc_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -288,7 +288,7 @@ static void mine_train_rc_track_flat_to_25_deg_up( /** rct2: 0x0071BFE4 */ static void mine_train_rc_track_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -332,7 +332,7 @@ static void mine_train_rc_track_25_deg_up_to_60_deg_up( /** rct2: 0x0071BFF4 */ static void mine_train_rc_track_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -376,7 +376,7 @@ static void mine_train_rc_track_60_deg_up_to_25_deg_up( /** rct2: 0x0071C004 */ static void mine_train_rc_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -445,7 +445,7 @@ static void mine_train_rc_track_25_deg_up_to_flat( /** rct2: 0x0071C014 */ static void mine_train_rc_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mine_train_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -453,7 +453,7 @@ static void mine_train_rc_track_25_deg_down( /** rct2: 0x0071C024 */ static void mine_train_rc_track_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mine_train_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -461,7 +461,7 @@ static void mine_train_rc_track_60_deg_down( /** rct2: 0x0071C034 */ static void mine_train_rc_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mine_train_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -469,7 +469,7 @@ static void mine_train_rc_track_flat_to_25_deg_down( /** rct2: 0x0071C044 */ static void mine_train_rc_track_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mine_train_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -477,7 +477,7 @@ static void mine_train_rc_track_25_deg_down_to_60_deg_down( /** rct2: 0x0071C054 */ static void mine_train_rc_track_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mine_train_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -485,7 +485,7 @@ static void mine_train_rc_track_60_deg_down_to_25_deg_down( /** rct2: 0x0071C064 */ static void mine_train_rc_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mine_train_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -493,7 +493,7 @@ static void mine_train_rc_track_25_deg_down_to_flat( /** rct2: 0x0071C0B4 */ static void mine_train_rc_track_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -681,7 +681,7 @@ static void mine_train_rc_track_left_quarter_turn_5( /** rct2: 0x0071C0C4 */ static void mine_train_rc_track_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mine_train_rc_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -690,7 +690,7 @@ static void mine_train_rc_track_right_quarter_turn_5( /** rct2: 0x0071C074 */ static void mine_train_rc_track_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -727,7 +727,7 @@ static void mine_train_rc_track_flat_to_left_bank( /** rct2: 0x0071C084 */ static void mine_train_rc_track_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -764,7 +764,7 @@ static void mine_train_rc_track_flat_to_right_bank( /** rct2: 0x0071C094 */ static void mine_train_rc_track_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -801,7 +801,7 @@ static void mine_train_rc_track_left_bank_to_flat( /** rct2: 0x0071C0A4 */ static void mine_train_rc_track_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -838,7 +838,7 @@ static void mine_train_rc_track_right_bank_to_flat( /** rct2: 0x0071C0D4 */ static void mine_train_rc_track_banked_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1036,7 +1036,7 @@ static void mine_train_rc_track_banked_left_quarter_turn_5( /** rct2: 0x0071C0E4 */ static void mine_train_rc_track_banked_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mine_train_rc_track_banked_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -1045,7 +1045,7 @@ static void mine_train_rc_track_banked_right_quarter_turn_5( /** rct2: 0x0071C204 */ static void mine_train_rc_track_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1089,7 +1089,7 @@ static void mine_train_rc_track_left_bank_to_25_deg_up( /** rct2: 0x0071C214 */ static void mine_train_rc_track_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1133,7 +1133,7 @@ static void mine_train_rc_track_right_bank_to_25_deg_up( /** rct2: 0x0071C224 */ static void mine_train_rc_track_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1177,7 +1177,7 @@ static void mine_train_rc_track_25_deg_up_to_left_bank( /** rct2: 0x0071C234 */ static void mine_train_rc_track_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1221,7 +1221,7 @@ static void mine_train_rc_track_25_deg_up_to_right_bank( /** rct2: 0x0071C244 */ static void mine_train_rc_track_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mine_train_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1229,7 +1229,7 @@ static void mine_train_rc_track_left_bank_to_25_deg_down( /** rct2: 0x0071C254 */ static void mine_train_rc_track_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mine_train_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1237,7 +1237,7 @@ static void mine_train_rc_track_right_bank_to_25_deg_down( /** rct2: 0x0071C264 */ static void mine_train_rc_track_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mine_train_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1245,7 +1245,7 @@ static void mine_train_rc_track_25_deg_down_to_left_bank( /** rct2: 0x0071C274 */ static void mine_train_rc_track_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mine_train_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1253,7 +1253,7 @@ static void mine_train_rc_track_25_deg_down_to_right_bank( /** rct2: 0x0071C304 */ static void mine_train_rc_track_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1286,7 +1286,7 @@ static void mine_train_rc_track_left_bank( /** rct2: 0x0071C314 */ static void mine_train_rc_track_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mine_train_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1294,7 +1294,7 @@ static void mine_train_rc_track_right_bank( /** rct2: 0x0071C0F4 */ static void mine_train_rc_track_left_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1482,7 +1482,7 @@ static void mine_train_rc_track_left_quarter_turn_5_25_deg_up( /** rct2: 0x0071C104 */ static void mine_train_rc_track_right_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1670,7 +1670,7 @@ static void mine_train_rc_track_right_quarter_turn_5_25_deg_up( /** rct2: 0x0071C114 */ static void mine_train_rc_track_left_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mine_train_rc_track_right_quarter_turn_5_25_deg_up( @@ -1680,7 +1680,7 @@ static void mine_train_rc_track_left_quarter_turn_5_25_deg_down( /** rct2: 0x0071C124 */ static void mine_train_rc_track_right_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mine_train_rc_track_left_quarter_turn_5_25_deg_up( @@ -1690,7 +1690,7 @@ static void mine_train_rc_track_right_quarter_turn_5_25_deg_down( /** rct2: 0x0071C134 */ static void mine_train_rc_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1829,7 +1829,7 @@ static void mine_train_rc_track_s_bend_left( /** rct2: 0x0071C144 */ static void mine_train_rc_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1968,7 +1968,7 @@ static void mine_train_rc_track_s_bend_right( /** rct2: 0x0071C184 */ static void mine_train_rc_track_left_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2090,7 +2090,7 @@ static void mine_train_rc_track_left_quarter_turn_3( /** rct2: 0x0071C194 */ static void mine_train_rc_track_right_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mine_train_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -2099,7 +2099,7 @@ static void mine_train_rc_track_right_quarter_turn_3( /** rct2: 0x0071C1A4 */ static void mine_train_rc_track_left_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2230,7 +2230,7 @@ static void mine_train_rc_track_left_quarter_turn_3_bank( /** rct2: 0x0071C1B4 */ static void mine_train_rc_track_right_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mine_train_rc_track_left_quarter_turn_3_bank(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -2239,7 +2239,7 @@ static void mine_train_rc_track_right_quarter_turn_3_bank( /** rct2: 0x0071C1C4 */ static void mine_train_rc_track_left_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2339,7 +2339,7 @@ static void mine_train_rc_track_left_quarter_turn_3_25_deg_up( /** rct2: 0x0071C1D4 */ static void mine_train_rc_track_right_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2439,7 +2439,7 @@ static void mine_train_rc_track_right_quarter_turn_3_25_deg_up( /** rct2: 0x0071C1E4 */ static void mine_train_rc_track_left_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mine_train_rc_track_right_quarter_turn_3_25_deg_up( @@ -2449,7 +2449,7 @@ static void mine_train_rc_track_left_quarter_turn_3_25_deg_down( /** rct2: 0x0071C1F4 */ static void mine_train_rc_track_right_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mine_train_rc_track_left_quarter_turn_3_25_deg_up( @@ -2459,7 +2459,7 @@ static void mine_train_rc_track_right_quarter_turn_3_25_deg_down( /** rct2: 0x0071C284 */ static void mine_train_rc_track_left_half_banked_helix_up_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2727,7 +2727,7 @@ static void mine_train_rc_track_left_half_banked_helix_up_small( /** rct2: 0x0071C294 */ static void mine_train_rc_track_right_half_banked_helix_up_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2995,7 +2995,7 @@ static void mine_train_rc_track_right_half_banked_helix_up_small( /** rct2: 0x0071C2A4 */ static void mine_train_rc_track_left_half_banked_helix_down_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 4) { @@ -3010,7 +3010,7 @@ static void mine_train_rc_track_left_half_banked_helix_down_small( /** rct2: 0x0071C2B4 */ static void mine_train_rc_track_right_half_banked_helix_down_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 4) { @@ -3025,7 +3025,7 @@ static void mine_train_rc_track_right_half_banked_helix_down_small( /** rct2: 0x0071C2C4 */ static void mine_train_rc_track_left_half_banked_helix_up_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3435,7 +3435,7 @@ static void mine_train_rc_track_left_half_banked_helix_up_large( /** rct2: 0x0071C2D4 */ static void mine_train_rc_track_right_half_banked_helix_up_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3833,7 +3833,7 @@ static void mine_train_rc_track_right_half_banked_helix_up_large( /** rct2: 0x0071C2E4 */ static void mine_train_rc_track_left_half_banked_helix_down_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 7) { @@ -3848,7 +3848,7 @@ static void mine_train_rc_track_left_half_banked_helix_down_large( /** rct2: 0x0071C2F4 */ static void mine_train_rc_track_right_half_banked_helix_down_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 7) { @@ -3863,7 +3863,7 @@ static void mine_train_rc_track_right_half_banked_helix_down_large( /** rct2: 0x0071C324 */ static void mine_train_rc_track_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -3888,7 +3888,7 @@ static void mine_train_rc_track_brakes( /** rct2: 0x0071C334 */ static void mine_train_rc_track_on_ride_photo( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -3922,7 +3922,7 @@ static void mine_train_rc_track_on_ride_photo( /** rct2: 0x0071C354 */ static void mine_train_rc_track_left_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4067,7 +4067,7 @@ static void mine_train_rc_track_left_eighth_to_diag( /** rct2: 0x0071C364 */ static void mine_train_rc_track_right_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4211,7 +4211,7 @@ static void mine_train_rc_track_right_eighth_to_diag( /** rct2: 0x0071C374 */ static void mine_train_rc_track_left_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mine_train_rc_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -4220,7 +4220,7 @@ static void mine_train_rc_track_left_eighth_to_orthogonal( /** rct2: 0x0071C384 */ static void mine_train_rc_track_right_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mine_train_rc_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, tileElement); @@ -4229,7 +4229,7 @@ static void mine_train_rc_track_right_eighth_to_orthogonal( /** rct2: 0x0071C394 */ static void mine_train_rc_track_left_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4377,7 +4377,7 @@ static void mine_train_rc_track_left_eighth_bank_to_diag( /** rct2: 0x0071C3A4 */ static void mine_train_rc_track_right_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4525,7 +4525,7 @@ static void mine_train_rc_track_right_eighth_bank_to_diag( /** rct2: 0x0071C3B4 */ static void mine_train_rc_track_left_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mine_train_rc_track_right_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -4534,7 +4534,7 @@ static void mine_train_rc_track_left_eighth_bank_to_orthogonal( /** rct2: 0x0071C3C4 */ static void mine_train_rc_track_right_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mine_train_rc_track_left_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, tileElement); @@ -4543,7 +4543,7 @@ static void mine_train_rc_track_right_eighth_bank_to_orthogonal( /** rct2: 0x0071C344 */ static void mine_train_rc_track_diag_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4697,7 +4697,7 @@ static void mine_train_rc_track_diag_flat( /** rct2: 0x0071C414 */ static void mine_train_rc_track_diag_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4867,7 +4867,7 @@ static void mine_train_rc_track_diag_25_deg_up( /** rct2: 0x0071C474 */ static void mine_train_rc_track_diag_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4945,7 +4945,7 @@ static void mine_train_rc_track_diag_60_deg_up( /** rct2: 0x0071C3F4 */ static void mine_train_rc_track_diag_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5099,7 +5099,7 @@ static void mine_train_rc_track_diag_flat_to_25_deg_up( /** rct2: 0x0071C454 */ static void mine_train_rc_track_diag_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5177,7 +5177,7 @@ static void mine_train_rc_track_diag_25_deg_up_to_60_deg_up( /** rct2: 0x0071C464 */ static void mine_train_rc_track_diag_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5255,7 +5255,7 @@ static void mine_train_rc_track_diag_60_deg_up_to_25_deg_up( /** rct2: 0x0071C404 */ static void mine_train_rc_track_diag_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5425,7 +5425,7 @@ static void mine_train_rc_track_diag_25_deg_up_to_flat( /** rct2: 0x0071C444 */ static void mine_train_rc_track_diag_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5595,7 +5595,7 @@ static void mine_train_rc_track_diag_25_deg_down( /** rct2: 0x0071C4A4 */ static void mine_train_rc_track_diag_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5673,7 +5673,7 @@ static void mine_train_rc_track_diag_60_deg_down( /** rct2: 0x0071C424 */ static void mine_train_rc_track_diag_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5841,7 +5841,7 @@ static void mine_train_rc_track_diag_flat_to_25_deg_down( /** rct2: 0x0071C484 */ static void mine_train_rc_track_diag_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5919,7 +5919,7 @@ static void mine_train_rc_track_diag_25_deg_down_to_60_deg_down( /** rct2: 0x0071C494 */ static void mine_train_rc_track_diag_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5997,7 +5997,7 @@ static void mine_train_rc_track_diag_60_deg_down_to_25_deg_down( /** rct2: 0x0071C434 */ static void mine_train_rc_track_diag_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6151,7 +6151,7 @@ static void mine_train_rc_track_diag_25_deg_down_to_flat( /** rct2: 0x0071C4D4 */ static void mine_train_rc_track_diag_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6232,7 +6232,7 @@ static void mine_train_rc_track_diag_flat_to_left_bank( /** rct2: 0x0071C4B4 */ static void mine_train_rc_track_diag_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6313,7 +6313,7 @@ static void mine_train_rc_track_diag_flat_to_right_bank( /** rct2: 0x0071C4C4 */ static void mine_train_rc_track_diag_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6394,7 +6394,7 @@ static void mine_train_rc_track_diag_left_bank_to_flat( /** rct2: 0x0071C4E4 */ static void mine_train_rc_track_diag_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6475,7 +6475,7 @@ static void mine_train_rc_track_diag_right_bank_to_flat( /** rct2: 0x0071C514 */ static void mine_train_rc_track_diag_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6556,7 +6556,7 @@ static void mine_train_rc_track_diag_left_bank_to_25_deg_up( /** rct2: 0x0071C524 */ static void mine_train_rc_track_diag_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6637,7 +6637,7 @@ static void mine_train_rc_track_diag_right_bank_to_25_deg_up( /** rct2: 0x0071C4F4 */ static void mine_train_rc_track_diag_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6718,7 +6718,7 @@ static void mine_train_rc_track_diag_25_deg_up_to_left_bank( /** rct2: 0x0071C504 */ static void mine_train_rc_track_diag_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6799,7 +6799,7 @@ static void mine_train_rc_track_diag_25_deg_up_to_right_bank( /** rct2: 0x0071C534 */ static void mine_train_rc_track_diag_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6875,7 +6875,7 @@ static void mine_train_rc_track_diag_left_bank_to_25_deg_down( /** rct2: 0x0071C544 */ static void mine_train_rc_track_diag_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6951,7 +6951,7 @@ static void mine_train_rc_track_diag_right_bank_to_25_deg_down( /** rct2: 0x0071C554 */ static void mine_train_rc_track_diag_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7032,7 +7032,7 @@ static void mine_train_rc_track_diag_25_deg_down_to_left_bank( /** rct2: 0x0071C564 */ static void mine_train_rc_track_diag_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7113,7 +7113,7 @@ static void mine_train_rc_track_diag_25_deg_down_to_right_bank( /** rct2: 0x0071C3D4 */ static void mine_train_rc_track_diag_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7195,7 +7195,7 @@ static void mine_train_rc_track_diag_left_bank( /** rct2: 0x0071C3E4 */ static void mine_train_rc_track_diag_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7277,7 +7277,7 @@ static void mine_train_rc_track_diag_right_bank( /** rct2: 0x0071C574 */ static void mine_train_rc_track_block_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { diff --git a/src/openrct2/ride/coaster/MiniRollerCoaster.cpp b/src/openrct2/ride/coaster/MiniRollerCoaster.cpp index e2eefc85d7..e0b6a6db82 100644 --- a/src/openrct2/ride/coaster/MiniRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MiniRollerCoaster.cpp @@ -22,7 +22,7 @@ /** rct2: 0x008A4ABC */ static void mini_rc_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -100,7 +100,7 @@ static void mini_rc_track_flat( static void mini_rc_track_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][3] = { { 18746, 18742, SPR_STATION_BASE_A_SW_NE }, @@ -133,7 +133,7 @@ static void mini_rc_track_station( /** rct2: 0x008A4ACC */ static void mini_rc_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -235,7 +235,7 @@ static void mini_rc_track_25_deg_up( /** rct2: 0x008A4ADC */ static void mini_rc_track_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -292,7 +292,7 @@ static void mini_rc_track_60_deg_up( /** rct2: 0x008A4AEC */ static void mini_rc_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -394,7 +394,7 @@ static void mini_rc_track_flat_to_25_deg_up( /** rct2: 0x008A4AFC */ static void mini_rc_track_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -455,7 +455,7 @@ static void mini_rc_track_25_deg_up_to_60_deg_up( /** rct2: 0x008A4B0C */ static void mini_rc_track_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -516,7 +516,7 @@ static void mini_rc_track_60_deg_up_to_25_deg_up( /** rct2: 0x008A4B1C */ static void mini_rc_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -618,7 +618,7 @@ static void mini_rc_track_25_deg_up_to_flat( /** rct2: 0x008A4B2C */ static void mini_rc_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mini_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -626,7 +626,7 @@ static void mini_rc_track_25_deg_down( /** rct2: 0x008A4B3C */ static void mini_rc_track_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mini_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -634,7 +634,7 @@ static void mini_rc_track_60_deg_down( /** rct2: 0x008A4B4C */ static void mini_rc_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mini_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -642,7 +642,7 @@ static void mini_rc_track_flat_to_25_deg_down( /** rct2: 0x008A4B5C */ static void mini_rc_track_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mini_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -650,7 +650,7 @@ static void mini_rc_track_25_deg_down_to_60_deg_down( /** rct2: 0x008A4B6C */ static void mini_rc_track_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mini_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -658,7 +658,7 @@ static void mini_rc_track_60_deg_down_to_25_deg_down( /** rct2: 0x008A4B7C */ static void mini_rc_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mini_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -666,7 +666,7 @@ static void mini_rc_track_25_deg_down_to_flat( /** rct2: 0x008A4B8C */ static void mini_rc_track_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -844,7 +844,7 @@ static void mini_rc_track_left_quarter_turn_5( /** rct2: 0x008A4B9C */ static void mini_rc_track_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mini_rc_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -853,7 +853,7 @@ static void mini_rc_track_right_quarter_turn_5( /** rct2: 0x008A4BAC */ static void mini_rc_track_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -907,7 +907,7 @@ static void mini_rc_track_flat_to_left_bank( /** rct2: 0x008A4BBC */ static void mini_rc_track_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -961,7 +961,7 @@ static void mini_rc_track_flat_to_right_bank( /** rct2: 0x008A4BCC */ static void mini_rc_track_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1015,7 +1015,7 @@ static void mini_rc_track_left_bank_to_flat( /** rct2: 0x008A4BDC */ static void mini_rc_track_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1069,7 +1069,7 @@ static void mini_rc_track_right_bank_to_flat( /** rct2: 0x008A4BEC */ static void mini_rc_track_banked_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1257,7 +1257,7 @@ static void mini_rc_track_banked_left_quarter_turn_5( /** rct2: 0x008A4BFC */ static void mini_rc_track_banked_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mini_rc_track_banked_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -1266,7 +1266,7 @@ static void mini_rc_track_banked_right_quarter_turn_5( /** rct2: 0x008A4C0C */ static void mini_rc_track_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1327,7 +1327,7 @@ static void mini_rc_track_left_bank_to_25_deg_up( /** rct2: 0x008A4C1C */ static void mini_rc_track_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1388,7 +1388,7 @@ static void mini_rc_track_right_bank_to_25_deg_up( /** rct2: 0x008A4C2C */ static void mini_rc_track_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1449,7 +1449,7 @@ static void mini_rc_track_25_deg_up_to_left_bank( /** rct2: 0x008A4C3C */ static void mini_rc_track_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1510,7 +1510,7 @@ static void mini_rc_track_25_deg_up_to_right_bank( /** rct2: 0x008A4C4C */ static void mini_rc_track_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mini_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1518,7 +1518,7 @@ static void mini_rc_track_left_bank_to_25_deg_down( /** rct2: 0x008A4C5C */ static void mini_rc_track_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mini_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1526,7 +1526,7 @@ static void mini_rc_track_right_bank_to_25_deg_down( /** rct2: 0x008A4C6C */ static void mini_rc_track_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mini_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1534,7 +1534,7 @@ static void mini_rc_track_25_deg_down_to_left_bank( /** rct2: 0x008A4C7C */ static void mini_rc_track_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mini_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1542,7 +1542,7 @@ static void mini_rc_track_25_deg_down_to_right_bank( /** rct2: 0x008A4C8C */ static void mini_rc_track_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1592,7 +1592,7 @@ static void mini_rc_track_left_bank( /** rct2: 0x008A4C9C */ static void mini_rc_track_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mini_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1600,7 +1600,7 @@ static void mini_rc_track_right_bank( /** rct2: 0x008A4CAC */ static void mini_rc_track_left_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1778,7 +1778,7 @@ static void mini_rc_track_left_quarter_turn_5_25_deg_up( /** rct2: 0x008A4CBC */ static void mini_rc_track_right_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1956,7 +1956,7 @@ static void mini_rc_track_right_quarter_turn_5_25_deg_up( /** rct2: 0x008A4CCC */ static void mini_rc_track_left_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mini_rc_track_right_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, tileElement); @@ -1965,7 +1965,7 @@ static void mini_rc_track_left_quarter_turn_5_25_deg_down( /** rct2: 0x008A4CDC */ static void mini_rc_track_right_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mini_rc_track_left_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -1974,7 +1974,7 @@ static void mini_rc_track_right_quarter_turn_5_25_deg_down( /** rct2: 0x008A4CEC */ static void mini_rc_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2123,7 +2123,7 @@ static void mini_rc_track_s_bend_left( /** rct2: 0x008A4CFC */ static void mini_rc_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2272,7 +2272,7 @@ static void mini_rc_track_s_bend_right( /** rct2: 0x008A4D3C */ static void mini_rc_track_left_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2389,7 +2389,7 @@ static void mini_rc_track_left_quarter_turn_3( /** rct2: 0x008A4D4C */ static void mini_rc_track_right_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mini_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -2398,7 +2398,7 @@ static void mini_rc_track_right_quarter_turn_3( /** rct2: 0x008A4D5C */ static void mini_rc_track_left_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2524,7 +2524,7 @@ static void mini_rc_track_left_quarter_turn_3_bank( /** rct2: 0x008A4D6C */ static void mini_rc_track_right_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mini_rc_track_left_quarter_turn_3_bank(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -2533,7 +2533,7 @@ static void mini_rc_track_right_quarter_turn_3_bank( /** rct2: 0x008A4D7C */ static void mini_rc_track_left_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2626,7 +2626,7 @@ static void mini_rc_track_left_quarter_turn_3_25_deg_up( /** rct2: 0x008A4D8C */ static void mini_rc_track_right_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2719,7 +2719,7 @@ static void mini_rc_track_right_quarter_turn_3_25_deg_up( /** rct2: 0x008A4D9C */ static void mini_rc_track_left_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mini_rc_track_right_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, tileElement); @@ -2728,7 +2728,7 @@ static void mini_rc_track_left_quarter_turn_3_25_deg_down( /** rct2: 0x008A4DAC */ static void mini_rc_track_right_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mini_rc_track_left_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -2737,7 +2737,7 @@ static void mini_rc_track_right_quarter_turn_3_25_deg_down( /** rct2: 0x008A4DBC */ static void mini_rc_track_left_half_banked_helix_up_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2983,7 +2983,7 @@ static void mini_rc_track_left_half_banked_helix_up_small( /** rct2: 0x008A4DCC */ static void mini_rc_track_right_half_banked_helix_up_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3229,7 +3229,7 @@ static void mini_rc_track_right_half_banked_helix_up_small( /** rct2: 0x008A4DDC */ static void mini_rc_track_left_half_banked_helix_down_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 4) { @@ -3243,7 +3243,7 @@ static void mini_rc_track_left_half_banked_helix_down_small( /** rct2: 0x008A4DEC */ static void mini_rc_track_right_half_banked_helix_down_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 4) { @@ -3257,7 +3257,7 @@ static void mini_rc_track_right_half_banked_helix_down_small( /** rct2: 0x008A4DFC */ static void mini_rc_track_left_half_banked_helix_up_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3627,7 +3627,7 @@ static void mini_rc_track_left_half_banked_helix_up_large( /** rct2: 0x008A4E0C */ static void mini_rc_track_right_half_banked_helix_up_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3997,7 +3997,7 @@ static void mini_rc_track_right_half_banked_helix_up_large( /** rct2: 0x008A4E1C */ static void mini_rc_track_left_half_banked_helix_down_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 7) { @@ -4011,7 +4011,7 @@ static void mini_rc_track_left_half_banked_helix_down_large( /** rct2: 0x008A4E2C */ static void mini_rc_track_right_half_banked_helix_down_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 7) { @@ -4025,7 +4025,7 @@ static void mini_rc_track_right_half_banked_helix_down_large( /** rct2: 0x008A4E5C */ static void mini_rc_track_left_quarter_turn_1_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -4062,7 +4062,7 @@ static void mini_rc_track_left_quarter_turn_1_60_deg_up( /** rct2: 0x008A4E3C */ static void mini_rc_track_right_quarter_turn_1_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -4099,7 +4099,7 @@ static void mini_rc_track_right_quarter_turn_1_60_deg_up( /** rct2: 0x008A4E4C */ static void mini_rc_track_left_quarter_turn_1_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mini_rc_track_right_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, tileElement); } @@ -4107,7 +4107,7 @@ static void mini_rc_track_left_quarter_turn_1_60_deg_down( /** rct2: 0x008A4E6C */ static void mini_rc_track_right_quarter_turn_1_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mini_rc_track_left_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); } @@ -4115,7 +4115,7 @@ static void mini_rc_track_right_quarter_turn_1_60_deg_down( /** rct2: 0x008A4E7C */ static void mini_rc_track_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -4149,7 +4149,7 @@ static void mini_rc_track_brakes( /** rct2: 0x008A50CC */ static void mini_rc_track_25_deg_up_left_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -4206,7 +4206,7 @@ static void mini_rc_track_25_deg_up_left_banked( /** rct2: 0x008A50DC */ static void mini_rc_track_25_deg_up_right_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -4263,7 +4263,7 @@ static void mini_rc_track_25_deg_up_right_banked( /** rct2: 0x008A4E8C */ static void mini_rc_track_on_ride_photo( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -4309,7 +4309,7 @@ static void mini_rc_track_on_ride_photo( /** rct2: 0x008A50EC */ static void mini_rc_track_25_deg_down_left_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mini_rc_track_25_deg_up_right_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -4317,7 +4317,7 @@ static void mini_rc_track_25_deg_down_left_banked( /** rct2: 0x008A50FC */ static void mini_rc_track_25_deg_down_right_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mini_rc_track_25_deg_up_left_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -4325,7 +4325,7 @@ static void mini_rc_track_25_deg_down_right_banked( /** rct2: 0x008A4EAC */ static void mini_rc_track_left_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4471,7 +4471,7 @@ static void mini_rc_track_left_eighth_to_diag( /** rct2: 0x008A4EBC */ static void mini_rc_track_right_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4616,7 +4616,7 @@ static void mini_rc_track_right_eighth_to_diag( /** rct2: 0x008A4ECC */ static void mini_rc_track_left_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mini_rc_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -4625,7 +4625,7 @@ static void mini_rc_track_left_eighth_to_orthogonal( /** rct2: 0x008A4EDC */ static void mini_rc_track_right_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mini_rc_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, tileElement); @@ -4634,7 +4634,7 @@ static void mini_rc_track_right_eighth_to_orthogonal( /** rct2: 0x008A4EEC */ static void mini_rc_track_left_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4783,7 +4783,7 @@ static void mini_rc_track_left_eighth_bank_to_diag( /** rct2: 0x008A4EFC */ static void mini_rc_track_right_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4932,7 +4932,7 @@ static void mini_rc_track_right_eighth_bank_to_diag( /** rct2: 0x008A4F0C */ static void mini_rc_track_left_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mini_rc_track_right_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -4941,7 +4941,7 @@ static void mini_rc_track_left_eighth_bank_to_orthogonal( /** rct2: 0x008A4F1C */ static void mini_rc_track_right_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mini_rc_track_left_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, tileElement); @@ -4950,7 +4950,7 @@ static void mini_rc_track_right_eighth_bank_to_orthogonal( /** rct2: 0x008A4E9C */ static void mini_rc_track_diag_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5096,7 +5096,7 @@ static void mini_rc_track_diag_flat( /** rct2: 0x008A4F4C */ static void mini_rc_track_diag_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5242,7 +5242,7 @@ static void mini_rc_track_diag_25_deg_up( /** rct2: 0x008A4FAC */ static void mini_rc_track_diag_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5318,7 +5318,7 @@ static void mini_rc_track_diag_60_deg_up( /** rct2: 0x008A4F2C */ static void mini_rc_track_diag_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5464,7 +5464,7 @@ static void mini_rc_track_diag_flat_to_25_deg_up( /** rct2: 0x008A4F8C */ static void mini_rc_track_diag_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5540,7 +5540,7 @@ static void mini_rc_track_diag_25_deg_up_to_60_deg_up( /** rct2: 0x008A4F9C */ static void mini_rc_track_diag_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5616,7 +5616,7 @@ static void mini_rc_track_diag_60_deg_up_to_25_deg_up( /** rct2: 0x008A4F3C */ static void mini_rc_track_diag_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5762,7 +5762,7 @@ static void mini_rc_track_diag_25_deg_up_to_flat( /** rct2: 0x008A4F7C */ static void mini_rc_track_diag_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5908,7 +5908,7 @@ static void mini_rc_track_diag_25_deg_down( /** rct2: 0x008A4FDC */ static void mini_rc_track_diag_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5984,7 +5984,7 @@ static void mini_rc_track_diag_60_deg_down( /** rct2: 0x008A4F5C */ static void mini_rc_track_diag_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6128,7 +6128,7 @@ static void mini_rc_track_diag_flat_to_25_deg_down( /** rct2: 0x008A4FBC */ static void mini_rc_track_diag_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6204,7 +6204,7 @@ static void mini_rc_track_diag_25_deg_down_to_60_deg_down( /** rct2: 0x008A4FCC */ static void mini_rc_track_diag_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6280,7 +6280,7 @@ static void mini_rc_track_diag_60_deg_down_to_25_deg_down( /** rct2: 0x008A4F6C */ static void mini_rc_track_diag_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6426,7 +6426,7 @@ static void mini_rc_track_diag_25_deg_down_to_flat( /** rct2: 0x008A500C */ static void mini_rc_track_diag_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6505,7 +6505,7 @@ static void mini_rc_track_diag_flat_to_left_bank( /** rct2: 0x008A501C */ static void mini_rc_track_diag_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6584,7 +6584,7 @@ static void mini_rc_track_diag_flat_to_right_bank( /** rct2: 0x008A502C */ static void mini_rc_track_diag_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6663,7 +6663,7 @@ static void mini_rc_track_diag_left_bank_to_flat( /** rct2: 0x008A503C */ static void mini_rc_track_diag_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6742,7 +6742,7 @@ static void mini_rc_track_diag_right_bank_to_flat( /** rct2: 0x008A506C */ static void mini_rc_track_diag_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6821,7 +6821,7 @@ static void mini_rc_track_diag_left_bank_to_25_deg_up( /** rct2: 0x008A507C */ static void mini_rc_track_diag_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6900,7 +6900,7 @@ static void mini_rc_track_diag_right_bank_to_25_deg_up( /** rct2: 0x008A504C */ static void mini_rc_track_diag_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6979,7 +6979,7 @@ static void mini_rc_track_diag_25_deg_up_to_left_bank( /** rct2: 0x008A505C */ static void mini_rc_track_diag_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7058,7 +7058,7 @@ static void mini_rc_track_diag_25_deg_up_to_right_bank( /** rct2: 0x008A508C */ static void mini_rc_track_diag_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7135,7 +7135,7 @@ static void mini_rc_track_diag_left_bank_to_25_deg_down( /** rct2: 0x008A509C */ static void mini_rc_track_diag_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7212,7 +7212,7 @@ static void mini_rc_track_diag_right_bank_to_25_deg_down( /** rct2: 0x008A50AC */ static void mini_rc_track_diag_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7291,7 +7291,7 @@ static void mini_rc_track_diag_25_deg_down_to_left_bank( /** rct2: 0x008A50BC */ static void mini_rc_track_diag_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7370,7 +7370,7 @@ static void mini_rc_track_diag_25_deg_down_to_right_bank( /** rct2: 0x008A4FEC */ static void mini_rc_track_diag_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7446,7 +7446,7 @@ static void mini_rc_track_diag_left_bank( /** rct2: 0x008A4FFC */ static void mini_rc_track_diag_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7522,7 +7522,7 @@ static void mini_rc_track_diag_right_bank( /** rct2: 0x008A530C */ static void mini_rc_track_block_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -7556,7 +7556,7 @@ static void mini_rc_track_block_brakes( /** rct2: 0x008A510C */ static void mini_rc_track_left_banked_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7652,7 +7652,7 @@ static void mini_rc_track_left_banked_quarter_turn_3_25_deg_up( /** rct2: 0x008A511C */ static void mini_rc_track_right_banked_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7748,7 +7748,7 @@ static void mini_rc_track_right_banked_quarter_turn_3_25_deg_up( /** rct2: 0x008A512C */ static void mini_rc_track_left_banked_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mini_rc_track_right_banked_quarter_turn_3_25_deg_up( @@ -7758,7 +7758,7 @@ static void mini_rc_track_left_banked_quarter_turn_3_25_deg_down( /** rct2: 0x008A513C */ static void mini_rc_track_right_banked_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mini_rc_track_left_banked_quarter_turn_3_25_deg_up( @@ -7768,7 +7768,7 @@ static void mini_rc_track_right_banked_quarter_turn_3_25_deg_down( /** rct2: 0x008A514C */ static void mini_rc_track_left_banked_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7952,7 +7952,7 @@ static void mini_rc_track_left_banked_quarter_turn_5_25_deg_up( /** rct2: 0x008A515C */ static void mini_rc_track_right_banked_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8136,7 +8136,7 @@ static void mini_rc_track_right_banked_quarter_turn_5_25_deg_up( /** rct2: 0x008A516C */ static void mini_rc_track_left_banked_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mini_rc_track_right_banked_quarter_turn_5_25_deg_up( @@ -8146,7 +8146,7 @@ static void mini_rc_track_left_banked_quarter_turn_5_25_deg_down( /** rct2: 0x008A517C */ static void mini_rc_track_right_banked_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mini_rc_track_left_banked_quarter_turn_5_25_deg_up( @@ -8156,7 +8156,7 @@ static void mini_rc_track_right_banked_quarter_turn_5_25_deg_down( /** rct2: 0x008A518C */ static void mini_rc_track_25_deg_up_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8215,7 +8215,7 @@ static void mini_rc_track_25_deg_up_to_left_banked_25_deg_up( /** rct2: 0x008A519C */ static void mini_rc_track_25_deg_up_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8274,7 +8274,7 @@ static void mini_rc_track_25_deg_up_to_right_banked_25_deg_up( /** rct2: 0x008A51AC */ static void mini_rc_track_left_banked_25_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8333,7 +8333,7 @@ static void mini_rc_track_left_banked_25_deg_up_to_25_deg_up( /** rct2: 0x008A51BC */ static void mini_rc_track_right_banked_25_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8392,7 +8392,7 @@ static void mini_rc_track_right_banked_25_deg_up_to_25_deg_up( /** rct2: 0x008A51CC */ static void mini_rc_track_25_deg_down_to_left_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mini_rc_track_right_banked_25_deg_up_to_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -8401,7 +8401,7 @@ static void mini_rc_track_25_deg_down_to_left_banked_25_deg_down( /** rct2: 0x008A51DC */ static void mini_rc_track_25_deg_down_to_right_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mini_rc_track_left_banked_25_deg_up_to_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -8410,7 +8410,7 @@ static void mini_rc_track_25_deg_down_to_right_banked_25_deg_down( /** rct2: 0x008A51EC */ static void mini_rc_track_left_banked_25_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mini_rc_track_25_deg_up_to_right_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -8419,7 +8419,7 @@ static void mini_rc_track_left_banked_25_deg_down_to_25_deg_down( /** rct2: 0x008A51FC */ static void mini_rc_track_right_banked_25_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mini_rc_track_25_deg_up_to_left_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -8428,7 +8428,7 @@ static void mini_rc_track_right_banked_25_deg_down_to_25_deg_down( /** rct2: 0x008A520C */ static void mini_rc_track_left_banked_flat_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8485,7 +8485,7 @@ static void mini_rc_track_left_banked_flat_to_left_banked_25_deg_up( /** rct2: 0x008A521C */ static void mini_rc_track_right_banked_flat_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8542,7 +8542,7 @@ static void mini_rc_track_right_banked_flat_to_right_banked_25_deg_up( /** rct2: 0x008A524C */ static void mini_rc_track_left_banked_25_deg_up_to_left_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8599,7 +8599,7 @@ static void mini_rc_track_left_banked_25_deg_up_to_left_banked_flat( /** rct2: 0x008A525C */ static void mini_rc_track_right_banked_25_deg_up_to_right_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8656,7 +8656,7 @@ static void mini_rc_track_right_banked_25_deg_up_to_right_banked_flat( /** rct2: 0x008A526C */ static void mini_rc_track_left_banked_flat_to_left_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mini_rc_track_right_banked_25_deg_up_to_right_banked_flat( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -8665,7 +8665,7 @@ static void mini_rc_track_left_banked_flat_to_left_banked_25_deg_down( /** rct2: 0x008A527C */ static void mini_rc_track_right_banked_flat_to_right_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mini_rc_track_left_banked_25_deg_up_to_left_banked_flat( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -8674,7 +8674,7 @@ static void mini_rc_track_right_banked_flat_to_right_banked_25_deg_down( /** rct2: 0x008A522C */ static void mini_rc_track_left_banked_25_deg_down_to_left_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mini_rc_track_right_banked_flat_to_right_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -8683,7 +8683,7 @@ static void mini_rc_track_left_banked_25_deg_down_to_left_banked_flat( /** rct2: 0x008A523C */ static void mini_rc_track_right_banked_25_deg_down_to_right_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mini_rc_track_left_banked_flat_to_left_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -8692,7 +8692,7 @@ static void mini_rc_track_right_banked_25_deg_down_to_right_banked_flat( /** rct2: 0x008A528C */ static void mini_rc_track_flat_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8751,7 +8751,7 @@ static void mini_rc_track_flat_to_left_banked_25_deg_up( /** rct2: 0x008A529C */ static void mini_rc_track_flat_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8810,7 +8810,7 @@ static void mini_rc_track_flat_to_right_banked_25_deg_up( /** rct2: 0x008A52AC */ static void mini_rc_track_left_banked_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8869,7 +8869,7 @@ static void mini_rc_track_left_banked_25_deg_up_to_flat( /** rct2: 0x008A52BC */ static void mini_rc_track_right_banked_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -8928,7 +8928,7 @@ static void mini_rc_track_right_banked_25_deg_up_to_flat( /** rct2: 0x008A52CC */ static void mini_rc_track_flat_to_left_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mini_rc_track_right_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -8936,7 +8936,7 @@ static void mini_rc_track_flat_to_left_banked_25_deg_down( /** rct2: 0x008A52DC */ static void mini_rc_track_flat_to_right_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mini_rc_track_left_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -8944,7 +8944,7 @@ static void mini_rc_track_flat_to_right_banked_25_deg_down( /** rct2: 0x008A52EC */ static void mini_rc_track_left_banked_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mini_rc_track_flat_to_right_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -8952,14 +8952,14 @@ static void mini_rc_track_left_banked_25_deg_down_to_flat( /** rct2: 0x008A52FC */ static void mini_rc_track_right_banked_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mini_rc_track_flat_to_left_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } static void mini_rc_track_left_curved_lift_hill( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -9051,7 +9051,7 @@ static void mini_rc_track_left_curved_lift_hill( static void mini_rc_track_right_curved_lift_hill( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -9143,7 +9143,7 @@ static void mini_rc_track_right_curved_lift_hill( static void mini_rc_track_booster( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { // These offsets could be moved to the g2.dat file when that supports offsets. int8_t ne_sw_offsetX = 7; diff --git a/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp b/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp index 55001eb532..3ceddf4a73 100644 --- a/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp +++ b/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp @@ -22,7 +22,7 @@ /** rct2: 0x008AFE9C */ static void mini_suspended_rc_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -83,7 +83,7 @@ static void mini_suspended_rc_track_flat( /** rct2: 0x008AFF4C, 0x008AFF5C, 0x008AFF6C */ static void mini_suspended_rc_track_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][3] = { { SPR_STATION_BASE_C_SW_NE, 28433, SPR_STATION_INVERTED_BAR_E_SW_NE }, @@ -109,7 +109,7 @@ static void mini_suspended_rc_track_station( /** rct2: 0x008AFEAC */ static void mini_suspended_rc_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -203,7 +203,7 @@ static void mini_suspended_rc_track_25_deg_up( /** rct2: 0x008AFEBC */ static void mini_suspended_rc_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -297,7 +297,7 @@ static void mini_suspended_rc_track_flat_to_25_deg_up( /** rct2: 0x008AFECC */ static void mini_suspended_rc_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -391,7 +391,7 @@ static void mini_suspended_rc_track_25_deg_up_to_flat( /** rct2: 0x008AFEDC */ static void mini_suspended_rc_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mini_suspended_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -399,7 +399,7 @@ static void mini_suspended_rc_track_25_deg_down( /** rct2: 0x008AFEEC */ static void mini_suspended_rc_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mini_suspended_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -407,7 +407,7 @@ static void mini_suspended_rc_track_flat_to_25_deg_down( /** rct2: 0x008AFEFC */ static void mini_suspended_rc_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { mini_suspended_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -415,7 +415,7 @@ static void mini_suspended_rc_track_25_deg_down_to_flat( /** rct2: 0x008AFF0C */ static void mini_suspended_rc_track_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -602,7 +602,7 @@ static void mini_suspended_rc_track_left_quarter_turn_5( /** rct2: 0x008AFF1C */ static void mini_suspended_rc_track_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mini_suspended_rc_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -611,7 +611,7 @@ static void mini_suspended_rc_track_right_quarter_turn_5( /** rct2: 0x008AFF2C */ static void mini_suspended_rc_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -792,7 +792,7 @@ static void mini_suspended_rc_track_s_bend_left( /** rct2: 0x008AFF3C */ static void mini_suspended_rc_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -973,7 +973,7 @@ static void mini_suspended_rc_track_s_bend_right( /** rct2: 0x008AFF7C */ static void mini_suspended_rc_track_left_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1103,7 +1103,7 @@ static void mini_suspended_rc_track_left_quarter_turn_3( /** rct2: 0x008AFF8C */ static void mini_suspended_rc_track_right_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mini_suspended_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -1112,7 +1112,7 @@ static void mini_suspended_rc_track_right_quarter_turn_3( /** rct2: 0x008AFFAC */ static void mini_suspended_rc_track_left_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1286,7 +1286,7 @@ static void mini_suspended_rc_track_left_eighth_to_diag( /** rct2: 0x008AFFBC */ static void mini_suspended_rc_track_right_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1460,7 +1460,7 @@ static void mini_suspended_rc_track_right_eighth_to_diag( /** rct2: 0x008AFFCC */ static void mini_suspended_rc_track_left_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mini_suspended_rc_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -1469,7 +1469,7 @@ static void mini_suspended_rc_track_left_eighth_to_orthogonal( /** rct2: 0x008AFFDC */ static void mini_suspended_rc_track_right_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mini_suspended_rc_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, tileElement); @@ -1478,7 +1478,7 @@ static void mini_suspended_rc_track_right_eighth_to_orthogonal( /** rct2: 0x008AFF9C */ static void mini_suspended_rc_track_diag_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1617,7 +1617,7 @@ static void mini_suspended_rc_track_diag_flat( /** rct2: 0x008B000C */ static void mini_suspended_rc_track_diag_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1756,7 +1756,7 @@ static void mini_suspended_rc_track_diag_25_deg_up( /** rct2: 0x008AFFEC */ static void mini_suspended_rc_track_diag_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1895,7 +1895,7 @@ static void mini_suspended_rc_track_diag_flat_to_25_deg_up( /** rct2: 0x008AFFFC */ static void mini_suspended_rc_track_diag_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2034,7 +2034,7 @@ static void mini_suspended_rc_track_diag_25_deg_up_to_flat( /** rct2: 0x008B003C */ static void mini_suspended_rc_track_diag_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2173,7 +2173,7 @@ static void mini_suspended_rc_track_diag_25_deg_down( /** rct2: 0x008B001C */ static void mini_suspended_rc_track_diag_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2309,7 +2309,7 @@ static void mini_suspended_rc_track_diag_flat_to_25_deg_down( /** rct2: 0x008B002C */ static void mini_suspended_rc_track_diag_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { diff --git a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp index c5f0f57fa6..83e8eae378 100644 --- a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp @@ -22,7 +22,7 @@ /** rct2: 0x00792D88 */ static void multi_dimension_rc_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -106,7 +106,7 @@ static void multi_dimension_rc_track_flat( /** rct2: 0x00792F98, 0x00792FA8, 0x00792FB8 */ static void multi_dimension_rc_track_station( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][3] = { { 15810, 15812, SPR_STATION_INVERTED_BAR_A_SW_NE }, @@ -164,7 +164,7 @@ static void multi_dimension_rc_track_station( /** rct2: 0x00792D98 */ static void multi_dimension_rc_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -299,7 +299,7 @@ static void multi_dimension_rc_track_25_deg_up( /** rct2: 0x00792DA8 */ static void multi_dimension_rc_track_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -380,7 +380,7 @@ static void multi_dimension_rc_track_60_deg_up( /** rct2: 0x00792DB8 */ static void multi_dimension_rc_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -515,7 +515,7 @@ static void multi_dimension_rc_track_flat_to_25_deg_up( /** rct2: 0x00792DC8 */ static void multi_dimension_rc_track_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -606,7 +606,7 @@ static void multi_dimension_rc_track_25_deg_up_to_60_deg_up( /** rct2: 0x00792DD8 */ static void multi_dimension_rc_track_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -721,7 +721,7 @@ static void multi_dimension_rc_track_60_deg_up_to_25_deg_up( /** rct2: 0x00792DE8 */ static void multi_dimension_rc_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -856,7 +856,7 @@ static void multi_dimension_rc_track_25_deg_up_to_flat( /** rct2: 0x00792DF8 */ static void multi_dimension_rc_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { multi_dimension_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -864,7 +864,7 @@ static void multi_dimension_rc_track_25_deg_down( /** rct2: 0x00792E08 */ static void multi_dimension_rc_track_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { multi_dimension_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -872,7 +872,7 @@ static void multi_dimension_rc_track_60_deg_down( /** rct2: 0x00792E18 */ static void multi_dimension_rc_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { multi_dimension_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -880,7 +880,7 @@ static void multi_dimension_rc_track_flat_to_25_deg_down( /** rct2: 0x00792E28 */ static void multi_dimension_rc_track_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { multi_dimension_rc_track_60_deg_up_to_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -889,7 +889,7 @@ static void multi_dimension_rc_track_25_deg_down_to_60_deg_down( /** rct2: 0x00792E38 */ static void multi_dimension_rc_track_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { multi_dimension_rc_track_25_deg_up_to_60_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -898,7 +898,7 @@ static void multi_dimension_rc_track_60_deg_down_to_25_deg_down( /** rct2: 0x00792E48 */ static void multi_dimension_rc_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { multi_dimension_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -906,7 +906,7 @@ static void multi_dimension_rc_track_25_deg_down_to_flat( /** rct2: 0x00792E58 */ static void multi_dimension_rc_track_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -1273,7 +1273,7 @@ static void multi_dimension_rc_track_left_quarter_turn_5( /** rct2: 0x00792E68 */ static void multi_dimension_rc_track_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; multi_dimension_rc_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -1282,7 +1282,7 @@ static void multi_dimension_rc_track_right_quarter_turn_5( /** rct2: 0x00792E78 */ static void multi_dimension_rc_track_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -1362,7 +1362,7 @@ static void multi_dimension_rc_track_flat_to_left_bank( /** rct2: 0x00792E88 */ static void multi_dimension_rc_track_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -1442,7 +1442,7 @@ static void multi_dimension_rc_track_flat_to_right_bank( /** rct2: 0x00792E98 */ static void multi_dimension_rc_track_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -1522,7 +1522,7 @@ static void multi_dimension_rc_track_left_bank_to_flat( /** rct2: 0x00792EA8 */ static void multi_dimension_rc_track_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -1602,7 +1602,7 @@ static void multi_dimension_rc_track_right_bank_to_flat( /** rct2: 0x00792EB8 */ static void multi_dimension_rc_track_banked_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -1970,7 +1970,7 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5( /** rct2: 0x00792EC8 */ static void multi_dimension_rc_track_banked_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; multi_dimension_rc_track_banked_left_quarter_turn_5( @@ -1980,7 +1980,7 @@ static void multi_dimension_rc_track_banked_right_quarter_turn_5( /** rct2: 0x00792ED8 */ static void multi_dimension_rc_track_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -2091,7 +2091,7 @@ static void multi_dimension_rc_track_left_bank_to_25_deg_up( /** rct2: 0x00792EE8 */ static void multi_dimension_rc_track_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -2202,7 +2202,7 @@ static void multi_dimension_rc_track_right_bank_to_25_deg_up( /** rct2: 0x00792EF8 */ static void multi_dimension_rc_track_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -2313,7 +2313,7 @@ static void multi_dimension_rc_track_25_deg_up_to_left_bank( /** rct2: 0x00792F08 */ static void multi_dimension_rc_track_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -2424,7 +2424,7 @@ static void multi_dimension_rc_track_25_deg_up_to_right_bank( /** rct2: 0x00792F18 */ static void multi_dimension_rc_track_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { multi_dimension_rc_track_25_deg_up_to_right_bank( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -2433,7 +2433,7 @@ static void multi_dimension_rc_track_left_bank_to_25_deg_down( /** rct2: 0x00792F28 */ static void multi_dimension_rc_track_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { multi_dimension_rc_track_25_deg_up_to_left_bank( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -2442,7 +2442,7 @@ static void multi_dimension_rc_track_right_bank_to_25_deg_down( /** rct2: 0x00792F38 */ static void multi_dimension_rc_track_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { multi_dimension_rc_track_right_bank_to_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -2451,7 +2451,7 @@ static void multi_dimension_rc_track_25_deg_down_to_left_bank( /** rct2: 0x00792F48 */ static void multi_dimension_rc_track_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { multi_dimension_rc_track_left_bank_to_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -2460,7 +2460,7 @@ static void multi_dimension_rc_track_25_deg_down_to_right_bank( /** rct2: 0x00792F58 */ static void multi_dimension_rc_track_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -2536,7 +2536,7 @@ static void multi_dimension_rc_track_left_bank( /** rct2: 0x00792F68 */ static void multi_dimension_rc_track_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { multi_dimension_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -2544,7 +2544,7 @@ static void multi_dimension_rc_track_right_bank( /** rct2: 0x00792F78 */ static void multi_dimension_rc_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -2859,7 +2859,7 @@ static void multi_dimension_rc_track_s_bend_left( /** rct2: 0x00792F88 */ static void multi_dimension_rc_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -3174,7 +3174,7 @@ static void multi_dimension_rc_track_s_bend_right( /** rct2: 0x00792FC8 */ static void multi_dimension_rc_track_left_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -3411,7 +3411,7 @@ static void multi_dimension_rc_track_left_quarter_turn_3( /** rct2: 0x00792FD8 */ static void multi_dimension_rc_track_right_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; multi_dimension_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -3420,7 +3420,7 @@ static void multi_dimension_rc_track_right_quarter_turn_3( /** rct2: 0x00792FE8 */ static void multi_dimension_rc_track_left_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -3663,7 +3663,7 @@ static void multi_dimension_rc_track_left_quarter_turn_3_bank( /** rct2: 0x00792FF8 */ static void multi_dimension_rc_track_right_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; multi_dimension_rc_track_left_quarter_turn_3_bank( @@ -3673,7 +3673,7 @@ static void multi_dimension_rc_track_right_quarter_turn_3_bank( /** rct2: 0x00793008 */ static void multi_dimension_rc_track_left_half_banked_helix_up_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3889,7 +3889,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_small( /** rct2: 0x00793018 */ static void multi_dimension_rc_track_right_half_banked_helix_up_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4105,7 +4105,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_small( /** rct2: 0x00793028 */ static void multi_dimension_rc_track_left_half_banked_helix_down_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 4) { @@ -4120,7 +4120,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_down_small( /** rct2: 0x00793038 */ static void multi_dimension_rc_track_right_half_banked_helix_down_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 4) { @@ -4135,7 +4135,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_down_small( /** rct2: 0x00793048 */ static void multi_dimension_rc_track_left_half_banked_helix_up_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4475,7 +4475,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large( /** rct2: 0x00793058 */ static void multi_dimension_rc_track_right_half_banked_helix_up_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4815,7 +4815,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large( /** rct2: 0x00793068 */ static void multi_dimension_rc_track_left_half_banked_helix_down_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 7) { @@ -4830,7 +4830,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_down_large( /** rct2: 0x00793078 */ static void multi_dimension_rc_track_right_half_banked_helix_down_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 7) { @@ -4845,7 +4845,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_down_large( /** rct2: 0x00793088 */ static void multi_dimension_rc_track_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -4905,7 +4905,7 @@ static void multi_dimension_rc_track_brakes( /** rct2: 0x00793098 */ static void multi_dimension_rc_track_on_ride_photo( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -5008,7 +5008,7 @@ static void multi_dimension_rc_track_on_ride_photo( /** rct2: 0x00793328 */ static void multi_dimension_rc_track_90_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -5089,7 +5089,7 @@ static void multi_dimension_rc_track_90_deg_up( /** rct2: 0x00793338 */ static void multi_dimension_rc_track_90_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { multi_dimension_rc_track_90_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -5097,7 +5097,7 @@ static void multi_dimension_rc_track_90_deg_down( /** rct2: 0x00793348 */ static void multi_dimension_rc_track_60_deg_up_to_90_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -5186,7 +5186,7 @@ static void multi_dimension_rc_track_60_deg_up_to_90_deg_up( /** rct2: 0x00793358 */ static void multi_dimension_rc_track_90_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { multi_dimension_rc_track_60_deg_up_to_90_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -5195,7 +5195,7 @@ static void multi_dimension_rc_track_90_deg_down_to_60_deg_down( /** rct2: 0x00793368 */ static void multi_dimension_rc_track_90_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -5276,7 +5276,7 @@ static void multi_dimension_rc_track_90_deg_up_to_60_deg_up( /** rct2: 0x00793378 */ static void multi_dimension_rc_track_60_deg_down_to_90_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -5363,7 +5363,7 @@ static void multi_dimension_rc_track_60_deg_down_to_90_deg_down( /** rct2: 0x007930B8 */ static void multi_dimension_rc_track_left_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -5668,7 +5668,7 @@ static void multi_dimension_rc_track_left_eighth_to_diag( /** rct2: 0x007930C8 */ static void multi_dimension_rc_track_right_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -5973,7 +5973,7 @@ static void multi_dimension_rc_track_right_eighth_to_diag( /** rct2: 0x007930D8 */ static void multi_dimension_rc_track_left_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; multi_dimension_rc_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -5982,7 +5982,7 @@ static void multi_dimension_rc_track_left_eighth_to_orthogonal( /** rct2: 0x007930E8 */ static void multi_dimension_rc_track_right_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; multi_dimension_rc_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, tileElement); @@ -5991,7 +5991,7 @@ static void multi_dimension_rc_track_right_eighth_to_orthogonal( /** rct2: 0x007930F8 */ static void multi_dimension_rc_track_left_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -6297,7 +6297,7 @@ static void multi_dimension_rc_track_left_eighth_bank_to_diag( /** rct2: 0x00793108 */ static void multi_dimension_rc_track_right_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -6603,7 +6603,7 @@ static void multi_dimension_rc_track_right_eighth_bank_to_diag( /** rct2: 0x00793118 */ static void multi_dimension_rc_track_left_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; multi_dimension_rc_track_right_eighth_bank_to_diag( @@ -6613,7 +6613,7 @@ static void multi_dimension_rc_track_left_eighth_bank_to_orthogonal( /** rct2: 0x00793128 */ static void multi_dimension_rc_track_right_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; multi_dimension_rc_track_left_eighth_bank_to_diag( @@ -6623,7 +6623,7 @@ static void multi_dimension_rc_track_right_eighth_bank_to_orthogonal( /** rct2: 0x007930A8 */ static void multi_dimension_rc_track_diag_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -6915,7 +6915,7 @@ static void multi_dimension_rc_track_diag_flat( /** rct2: 0x00793158 */ static void multi_dimension_rc_track_diag_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -7207,7 +7207,7 @@ static void multi_dimension_rc_track_diag_25_deg_up( /** rct2: 0x007931B8 */ static void multi_dimension_rc_track_diag_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -7373,7 +7373,7 @@ static void multi_dimension_rc_track_diag_60_deg_up( /** rct2: 0x00793138 */ static void multi_dimension_rc_track_diag_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -7665,7 +7665,7 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_up( /** rct2: 0x00793198 */ static void multi_dimension_rc_track_diag_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -7831,7 +7831,7 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_60_deg_up( /** rct2: 0x007931A8 */ static void multi_dimension_rc_track_diag_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -7997,7 +7997,7 @@ static void multi_dimension_rc_track_diag_60_deg_up_to_25_deg_up( /** rct2: 0x00793148 */ static void multi_dimension_rc_track_diag_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -8289,7 +8289,7 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_flat( /** rct2: 0x00793188 */ static void multi_dimension_rc_track_diag_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -8525,7 +8525,7 @@ static void multi_dimension_rc_track_diag_25_deg_down( /** rct2: 0x007931E8 */ static void multi_dimension_rc_track_diag_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -8691,7 +8691,7 @@ static void multi_dimension_rc_track_diag_60_deg_down( /** rct2: 0x00793168 */ static void multi_dimension_rc_track_diag_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -8923,7 +8923,7 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_down( /** rct2: 0x007931C8 */ static void multi_dimension_rc_track_diag_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -9089,7 +9089,7 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_60_deg_down( /** rct2: 0x007931D8 */ static void multi_dimension_rc_track_diag_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -9255,7 +9255,7 @@ static void multi_dimension_rc_track_diag_60_deg_down_to_25_deg_down( /** rct2: 0x00793178 */ static void multi_dimension_rc_track_diag_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -9491,7 +9491,7 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_flat( /** rct2: 0x00793218 */ static void multi_dimension_rc_track_diag_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -9661,7 +9661,7 @@ static void multi_dimension_rc_track_diag_flat_to_left_bank( /** rct2: 0x00793228 */ static void multi_dimension_rc_track_diag_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -9831,7 +9831,7 @@ static void multi_dimension_rc_track_diag_flat_to_right_bank( /** rct2: 0x00793238 */ static void multi_dimension_rc_track_diag_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -10001,7 +10001,7 @@ static void multi_dimension_rc_track_diag_left_bank_to_flat( /** rct2: 0x00793248 */ static void multi_dimension_rc_track_diag_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -10171,7 +10171,7 @@ static void multi_dimension_rc_track_diag_right_bank_to_flat( /** rct2: 0x00793278 */ static void multi_dimension_rc_track_diag_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -10340,7 +10340,7 @@ static void multi_dimension_rc_track_diag_left_bank_to_25_deg_up( /** rct2: 0x00793288 */ static void multi_dimension_rc_track_diag_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -10509,7 +10509,7 @@ static void multi_dimension_rc_track_diag_right_bank_to_25_deg_up( /** rct2: 0x00793258 */ static void multi_dimension_rc_track_diag_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -10678,7 +10678,7 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_left_bank( /** rct2: 0x00793268 */ static void multi_dimension_rc_track_diag_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -10847,7 +10847,7 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_right_bank( /** rct2: 0x00793298 */ static void multi_dimension_rc_track_diag_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -11009,7 +11009,7 @@ static void multi_dimension_rc_track_diag_left_bank_to_25_deg_down( /** rct2: 0x007932A8 */ static void multi_dimension_rc_track_diag_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -11171,7 +11171,7 @@ static void multi_dimension_rc_track_diag_right_bank_to_25_deg_down( /** rct2: 0x007932B8 */ static void multi_dimension_rc_track_diag_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -11340,7 +11340,7 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_left_bank( /** rct2: 0x007932C8 */ static void multi_dimension_rc_track_diag_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -11509,7 +11509,7 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_right_bank( /** rct2: 0x007931F8 */ static void multi_dimension_rc_track_diag_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -11676,7 +11676,7 @@ static void multi_dimension_rc_track_diag_left_bank( /** rct2: 0x00793208 */ static void multi_dimension_rc_track_diag_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -11843,7 +11843,7 @@ static void multi_dimension_rc_track_diag_right_bank( /** rct2: 0x007932D8 */ static void multi_dimension_rc_track_left_flyer_twist_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -11955,7 +11955,7 @@ static void multi_dimension_rc_track_left_flyer_twist_up( /** rct2: 0x007932E8 */ static void multi_dimension_rc_track_right_flyer_twist_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -12065,7 +12065,7 @@ static void multi_dimension_rc_track_right_flyer_twist_up( /** rct2: 0x007932F8 */ static void multi_dimension_rc_track_left_flyer_twist_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -12177,7 +12177,7 @@ static void multi_dimension_rc_track_left_flyer_twist_down( /** rct2: 0x00793308 */ static void multi_dimension_rc_track_right_flyer_twist_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -12287,7 +12287,7 @@ static void multi_dimension_rc_track_right_flyer_twist_down( /** rct2: 0x00793398 */ static void multi_dimension_rc_track_multidim_inverted_flat_to_90_deg_quarter_loop_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -12486,7 +12486,7 @@ static void multi_dimension_rc_track_multidim_inverted_flat_to_90_deg_quarter_lo /** rct2: 0x00793318 */ static void multi_dimension_rc_track_block_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -12543,7 +12543,7 @@ static void multi_dimension_rc_track_block_brakes( /** rct2: 0x00793388 */ static void multi_dimension_rc_track_multidim_90_deg_up_to_inverted_flat_quarter_loop( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -12738,7 +12738,7 @@ static void multi_dimension_rc_track_multidim_90_deg_up_to_inverted_flat_quarter /** rct2: 0x00793398 */ static void multi_dimension_rc_track_multidim_flat_to_90_deg_down_quarter_loop( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { @@ -12937,7 +12937,7 @@ static void multi_dimension_rc_track_multidim_flat_to_90_deg_down_quarter_loop( /** rct2: 0x00793388 */ static void multi_dimension_rc_track_elem_255( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (!tileElement->AsTrack()->IsInverted()) { diff --git a/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp b/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp index 24644a6d42..20d49fa65a 100644 --- a/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp +++ b/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp @@ -195,7 +195,7 @@ static constexpr const uint32_t reverse_freefall_rc_track_pieces_vertical_suppor static void paint_reverse_freefall_rc_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (direction & 1) { @@ -217,7 +217,7 @@ static void paint_reverse_freefall_rc_flat( static void paint_reverse_freefall_rc_station( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { Ride* ride = get_ride(rideIndex); uint32_t imageId; @@ -259,7 +259,7 @@ static void paint_reverse_freefall_rc_station( static void paint_reverse_freefall_rc_slope( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { TESTPAINT_IGNORE_ALL(); @@ -355,7 +355,7 @@ static void paint_reverse_freefall_rc_slope( static void paint_reverse_freefall_rc_vertical( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t supportsImageId, trackImageId; switch (trackSequence) diff --git a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp index c0df832990..581deaf79d 100644 --- a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp @@ -43,7 +43,7 @@ void vehicle_visual_reverser( /** rct2: 0x0086E65C */ static void reverser_rc_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -88,7 +88,7 @@ static void reverser_rc_track_flat( static void reverser_rc_track_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][3] = { { 21506, SPR_STATION_BASE_A_SW_NE }, @@ -112,7 +112,7 @@ static void reverser_rc_track_station( /** rct2: 0x0086E66C */ static void reverser_rc_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -181,7 +181,7 @@ static void reverser_rc_track_25_deg_up( /** rct2: 0x0086E67C */ static void reverser_rc_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -250,7 +250,7 @@ static void reverser_rc_track_flat_to_25_deg_up( /** rct2: 0x0086E68C */ static void reverser_rc_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -319,7 +319,7 @@ static void reverser_rc_track_25_deg_up_to_flat( /** rct2: 0x0086E69C */ static void reverser_rc_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { reverser_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -327,7 +327,7 @@ static void reverser_rc_track_25_deg_down( /** rct2: 0x0086E6AC */ static void reverser_rc_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { reverser_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -335,7 +335,7 @@ static void reverser_rc_track_flat_to_25_deg_down( /** rct2: 0x0086E6BC */ static void reverser_rc_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { reverser_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -343,7 +343,7 @@ static void reverser_rc_track_25_deg_down_to_flat( /** rct2: 0x0086E6CC */ static void reverser_rc_track_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -524,7 +524,7 @@ static void reverser_rc_track_left_quarter_turn_5( /** rct2: 0x0086E6DC */ static void reverser_rc_track_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; reverser_rc_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -533,7 +533,7 @@ static void reverser_rc_track_right_quarter_turn_5( /** rct2: 0x0086E6EC */ static void reverser_rc_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -672,7 +672,7 @@ static void reverser_rc_track_s_bend_left( /** rct2: 0x0086E6FC */ static void reverser_rc_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -811,7 +811,7 @@ static void reverser_rc_track_s_bend_right( /** rct2: 0x0086E73C */ static void reverser_rc_track_left_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -918,7 +918,7 @@ static void reverser_rc_track_left_quarter_turn_3( /** rct2: 0x0086E74C */ static void reverser_rc_track_right_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; reverser_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -927,7 +927,7 @@ static void reverser_rc_track_right_quarter_turn_3( /** rct2: 0x0086E75C */ static void reverser_rc_track_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -952,7 +952,7 @@ static void reverser_rc_track_brakes( /** rct2: 0x0086E76C */ static void reverser_rc_track_left_reverser( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1137,7 +1137,7 @@ static void reverser_rc_track_left_reverser( /** rct2: 0x0086E77C */ static void reverser_rc_track_right_reverser( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { diff --git a/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp b/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp index f1f3f6ff87..b0111b2f44 100644 --- a/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp @@ -69,7 +69,7 @@ /** rct2: 0x0077839C */ static void side_friction_rc_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -141,7 +141,7 @@ static void side_friction_rc_track_flat( /** rct2: 0x007784AC, 0x007784BC, 0x007784CC */ static void side_friction_rc_track_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4] = { 21610, @@ -162,7 +162,7 @@ static void side_friction_rc_track_station( /** rct2: 0x007783AC */ static void side_friction_rc_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -247,7 +247,7 @@ static void side_friction_rc_track_25_deg_up( /** rct2: 0x007783CC */ static void side_friction_rc_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -332,7 +332,7 @@ static void side_friction_rc_track_flat_to_25_deg_up( /** rct2: 0x007783FC */ static void side_friction_rc_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -417,7 +417,7 @@ static void side_friction_rc_track_25_deg_up_to_flat( /** rct2: 0x0077840C */ static void side_friction_rc_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { side_friction_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -425,7 +425,7 @@ static void side_friction_rc_track_25_deg_down( /** rct2: 0x0077842C */ static void side_friction_rc_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { side_friction_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -433,7 +433,7 @@ static void side_friction_rc_track_flat_to_25_deg_down( /** rct2: 0x0077845C */ static void side_friction_rc_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { side_friction_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -441,7 +441,7 @@ static void side_friction_rc_track_25_deg_down_to_flat( /** rct2: 0x0077846C */ static void side_friction_rc_track_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -682,7 +682,7 @@ static void side_friction_rc_track_left_quarter_turn_5( /** rct2: 0x0077847C */ static void side_friction_rc_track_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; side_friction_rc_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -691,7 +691,7 @@ static void side_friction_rc_track_right_quarter_turn_5( /** rct2: 0x0077848C */ static void side_friction_rc_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -878,7 +878,7 @@ static void side_friction_rc_track_s_bend_left( /** rct2: 0x0077849C */ static void side_friction_rc_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1065,7 +1065,7 @@ static void side_friction_rc_track_s_bend_right( /** rct2: 0x007784DC */ static void side_friction_rc_track_left_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1208,7 +1208,7 @@ static void side_friction_rc_track_left_quarter_turn_3( /** rct2: 0x007784EC */ static void side_friction_rc_track_right_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; side_friction_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -1217,7 +1217,7 @@ static void side_friction_rc_track_right_quarter_turn_3( /** rct2: 0x007784FC */ static void side_friction_rc_track_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1246,7 +1246,7 @@ static void side_friction_rc_track_brakes( /** rct2: 0x007785DC */ static void side_friction_rc_track_left_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1439,7 +1439,7 @@ static void side_friction_rc_track_left_eighth_to_diag( /** rct2: 0x007785EC */ static void side_friction_rc_track_right_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1631,7 +1631,7 @@ static void side_friction_rc_track_right_eighth_to_diag( /** rct2: 0x007785FC */ static void side_friction_rc_track_left_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; side_friction_rc_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -1640,7 +1640,7 @@ static void side_friction_rc_track_left_eighth_to_orthogonal( /** rct2: 0x0077860C */ static void side_friction_rc_track_right_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; side_friction_rc_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, tileElement); @@ -1649,7 +1649,7 @@ static void side_friction_rc_track_right_eighth_to_orthogonal( /** rct2: 0x0077850C */ static void side_friction_rc_track_diag_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1815,7 +1815,7 @@ static void side_friction_rc_track_diag_flat( /** rct2: 0x0077853C */ static void side_friction_rc_track_diag_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1997,7 +1997,7 @@ static void side_friction_rc_track_diag_25_deg_up( /** rct2: 0x0077851C */ static void side_friction_rc_track_diag_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2163,7 +2163,7 @@ static void side_friction_rc_track_diag_flat_to_25_deg_up( /** rct2: 0x0077852C */ static void side_friction_rc_track_diag_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2345,7 +2345,7 @@ static void side_friction_rc_track_diag_25_deg_up_to_flat( /** rct2: 0x0077859C */ static void side_friction_rc_track_diag_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2527,7 +2527,7 @@ static void side_friction_rc_track_diag_25_deg_down( /** rct2: 0x0077857C */ static void side_friction_rc_track_diag_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2704,7 +2704,7 @@ static void side_friction_rc_track_diag_flat_to_25_deg_down( /** rct2: 0x0077858C */ static void side_friction_rc_track_diag_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2869,7 +2869,7 @@ static void side_friction_rc_track_diag_25_deg_down_to_flat( static void side_friction_rc_track_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -2928,14 +2928,14 @@ static void side_friction_rc_track_60_deg_up( static void side_friction_rc_track_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { side_friction_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } static void side_friction_rc_track_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -2991,14 +2991,14 @@ static void side_friction_rc_track_25_deg_up_to_60_deg_up( static void side_friction_rc_track_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { side_friction_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } static void side_friction_rc_track_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -3054,14 +3054,14 @@ static void side_friction_rc_track_60_deg_up_to_25_deg_up( static void side_friction_rc_track_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { side_friction_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } static void side_friction_rc_track_diag_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3146,14 +3146,14 @@ static void side_friction_rc_track_diag_60_deg_up( static void side_friction_rc_track_diag_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { side_friction_rc_track_diag_60_deg_up(session, rideIndex, 3 - trackSequence, (direction + 2) % 4, height, tileElement); } static void side_friction_rc_track_diag_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3242,7 +3242,7 @@ static void side_friction_rc_track_diag_60_deg_up_to_25_deg_up( static void side_friction_rc_track_diag_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { side_friction_rc_track_diag_60_deg_up_to_25_deg_up( session, rideIndex, 3 - trackSequence, (direction + 2) & 3, height, tileElement); @@ -3250,7 +3250,7 @@ static void side_friction_rc_track_diag_25_deg_down_to_60_deg_down( static void side_friction_rc_track_diag_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3337,7 +3337,7 @@ static void side_friction_rc_track_diag_25_deg_up_to_60_deg_up( static void side_friction_rc_track_diag_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { side_friction_rc_track_diag_25_deg_up_to_60_deg_up( session, rideIndex, 3 - trackSequence, (direction + 2) & 3, height, tileElement); diff --git a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp index 048ef9400c..e13090b9ec 100644 --- a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp @@ -22,7 +22,7 @@ /** rct2: 0x008A7114 */ static void stand_up_rc_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -73,7 +73,7 @@ static void stand_up_rc_track_flat( /** rct2: 0x008A7384, 0x008A7394, 0x008A73A4 */ static void stand_up_rc_track_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][3] = { { 25567, 25571, SPR_STATION_BASE_A_SW_NE }, @@ -106,7 +106,7 @@ static void stand_up_rc_track_station( /** rct2: 0x008A7124 */ static void stand_up_rc_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -168,7 +168,7 @@ static void stand_up_rc_track_25_deg_up( /** rct2: 0x008A7134 */ static void stand_up_rc_track_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -234,7 +234,7 @@ static void stand_up_rc_track_60_deg_up( /** rct2: 0x008A7144 */ static void stand_up_rc_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -296,7 +296,7 @@ static void stand_up_rc_track_flat_to_25_deg_up( /** rct2: 0x008A7154 */ static void stand_up_rc_track_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -370,7 +370,7 @@ static void stand_up_rc_track_25_deg_up_to_60_deg_up( /** rct2: 0x008A7164 */ static void stand_up_rc_track_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -444,7 +444,7 @@ static void stand_up_rc_track_60_deg_up_to_25_deg_up( /** rct2: 0x008A7174 */ static void stand_up_rc_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -506,7 +506,7 @@ static void stand_up_rc_track_25_deg_up_to_flat( /** rct2: 0x008A7184 */ static void stand_up_rc_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { stand_up_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -514,7 +514,7 @@ static void stand_up_rc_track_25_deg_down( /** rct2: 0x008A7194 */ static void stand_up_rc_track_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { stand_up_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -522,7 +522,7 @@ static void stand_up_rc_track_60_deg_down( /** rct2: 0x008A71A4 */ static void stand_up_rc_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { stand_up_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -530,7 +530,7 @@ static void stand_up_rc_track_flat_to_25_deg_down( /** rct2: 0x008A71B4 */ static void stand_up_rc_track_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { stand_up_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -538,7 +538,7 @@ static void stand_up_rc_track_25_deg_down_to_60_deg_down( /** rct2: 0x008A71C4 */ static void stand_up_rc_track_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { stand_up_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -546,7 +546,7 @@ static void stand_up_rc_track_60_deg_down_to_25_deg_down( /** rct2: 0x008A71D4 */ static void stand_up_rc_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { stand_up_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -554,7 +554,7 @@ static void stand_up_rc_track_25_deg_down_to_flat( /** rct2: 0x008A71E4 */ static void stand_up_rc_track_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -711,7 +711,7 @@ static void stand_up_rc_track_left_quarter_turn_5( /** rct2: 0x008A71F4 */ static void stand_up_rc_track_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; stand_up_rc_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -720,7 +720,7 @@ static void stand_up_rc_track_right_quarter_turn_5( /** rct2: 0x008A7204 */ static void stand_up_rc_track_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -750,7 +750,7 @@ static void stand_up_rc_track_flat_to_left_bank( /** rct2: 0x008A7214 */ static void stand_up_rc_track_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -780,7 +780,7 @@ static void stand_up_rc_track_flat_to_right_bank( /** rct2: 0x008A7224 */ static void stand_up_rc_track_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -810,7 +810,7 @@ static void stand_up_rc_track_left_bank_to_flat( /** rct2: 0x008A7234 */ static void stand_up_rc_track_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -840,7 +840,7 @@ static void stand_up_rc_track_right_bank_to_flat( /** rct2: 0x008A7244 */ static void stand_up_rc_track_banked_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1014,7 +1014,7 @@ static void stand_up_rc_track_banked_left_quarter_turn_5( /** rct2: 0x008A7254 */ static void stand_up_rc_track_banked_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; stand_up_rc_track_banked_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -1023,7 +1023,7 @@ static void stand_up_rc_track_banked_right_quarter_turn_5( /** rct2: 0x008A7264 */ static void stand_up_rc_track_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1060,7 +1060,7 @@ static void stand_up_rc_track_left_bank_to_25_deg_up( /** rct2: 0x008A7274 */ static void stand_up_rc_track_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1097,7 +1097,7 @@ static void stand_up_rc_track_right_bank_to_25_deg_up( /** rct2: 0x008A7284 */ static void stand_up_rc_track_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1134,7 +1134,7 @@ static void stand_up_rc_track_25_deg_up_to_left_bank( /** rct2: 0x008A7294 */ static void stand_up_rc_track_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1171,7 +1171,7 @@ static void stand_up_rc_track_25_deg_up_to_right_bank( /** rct2: 0x008A72A4 */ static void stand_up_rc_track_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { stand_up_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1179,7 +1179,7 @@ static void stand_up_rc_track_left_bank_to_25_deg_down( /** rct2: 0x008A72B4 */ static void stand_up_rc_track_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { stand_up_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1187,7 +1187,7 @@ static void stand_up_rc_track_right_bank_to_25_deg_down( /** rct2: 0x008A72C4 */ static void stand_up_rc_track_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { stand_up_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1195,7 +1195,7 @@ static void stand_up_rc_track_25_deg_down_to_left_bank( /** rct2: 0x008A72D4 */ static void stand_up_rc_track_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { stand_up_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1203,7 +1203,7 @@ static void stand_up_rc_track_25_deg_down_to_right_bank( /** rct2: 0x008A72E4 */ static void stand_up_rc_track_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1233,7 +1233,7 @@ static void stand_up_rc_track_left_bank( /** rct2: 0x008A72F4 */ static void stand_up_rc_track_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { stand_up_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1241,7 +1241,7 @@ static void stand_up_rc_track_right_bank( /** rct2: 0x008A7304 */ static void stand_up_rc_track_left_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1529,7 +1529,7 @@ static void stand_up_rc_track_left_quarter_turn_5_25_deg_up( /** rct2: 0x008A7314 */ static void stand_up_rc_track_right_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1817,7 +1817,7 @@ static void stand_up_rc_track_right_quarter_turn_5_25_deg_up( /** rct2: 0x008A7324 */ static void stand_up_rc_track_left_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; stand_up_rc_track_right_quarter_turn_5_25_deg_up( @@ -1827,7 +1827,7 @@ static void stand_up_rc_track_left_quarter_turn_5_25_deg_down( /** rct2: 0x008A7334 */ static void stand_up_rc_track_right_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; stand_up_rc_track_left_quarter_turn_5_25_deg_up( @@ -1837,7 +1837,7 @@ static void stand_up_rc_track_right_quarter_turn_5_25_deg_down( /** rct2: 0x008A7344 */ static void stand_up_rc_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1972,7 +1972,7 @@ static void stand_up_rc_track_s_bend_left( /** rct2: 0x008A7354 */ static void stand_up_rc_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2107,7 +2107,7 @@ static void stand_up_rc_track_s_bend_right( /** rct2: 0x008A7364 */ static void stand_up_rc_track_left_vertical_loop( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2364,7 +2364,7 @@ static void stand_up_rc_track_left_vertical_loop( /** rct2: 0x008A7374 */ static void stand_up_rc_track_right_vertical_loop( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2589,7 +2589,7 @@ static void stand_up_rc_track_right_vertical_loop( /** rct2: 0x008A73B4 */ static void stand_up_rc_track_left_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2689,7 +2689,7 @@ static void stand_up_rc_track_left_quarter_turn_3( /** rct2: 0x008A73C4 */ static void stand_up_rc_track_right_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; stand_up_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -2698,7 +2698,7 @@ static void stand_up_rc_track_right_quarter_turn_3( /** rct2: 0x008A73D4 */ static void stand_up_rc_track_left_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2810,7 +2810,7 @@ static void stand_up_rc_track_left_quarter_turn_3_bank( /** rct2: 0x008A73E4 */ static void stand_up_rc_track_right_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; stand_up_rc_track_left_quarter_turn_3_bank(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -2819,7 +2819,7 @@ static void stand_up_rc_track_right_quarter_turn_3_bank( /** rct2: 0x008A73F4 */ static void stand_up_rc_track_left_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2954,7 +2954,7 @@ static void stand_up_rc_track_left_quarter_turn_3_25_deg_up( /** rct2: 0x008A7404 */ static void stand_up_rc_track_right_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3101,7 +3101,7 @@ static void stand_up_rc_track_right_quarter_turn_3_25_deg_up( /** rct2: 0x008A7414 */ static void stand_up_rc_track_left_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; stand_up_rc_track_right_quarter_turn_3_25_deg_up( @@ -3111,7 +3111,7 @@ static void stand_up_rc_track_left_quarter_turn_3_25_deg_down( /** rct2: 0x008A7424 */ static void stand_up_rc_track_right_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; stand_up_rc_track_left_quarter_turn_3_25_deg_up( @@ -3121,7 +3121,7 @@ static void stand_up_rc_track_right_quarter_turn_3_25_deg_down( /** rct2: 0x008A7434 */ static void stand_up_rc_track_half_loop_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3247,7 +3247,7 @@ static void stand_up_rc_track_half_loop_up( /** rct2: 0x008A7444 */ static void stand_up_rc_track_half_loop_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { stand_up_rc_track_half_loop_up(session, rideIndex, 3 - trackSequence, direction, height, tileElement); } @@ -3255,7 +3255,7 @@ static void stand_up_rc_track_half_loop_down( /** rct2: 0x008A7454 */ static void stand_up_rc_track_left_corkscrew_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3367,7 +3367,7 @@ static void stand_up_rc_track_left_corkscrew_up( /** rct2: 0x008A7464 */ static void stand_up_rc_track_right_corkscrew_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3480,7 +3480,7 @@ static void stand_up_rc_track_right_corkscrew_up( /** rct2: 0x008A7474 */ static void stand_up_rc_track_left_corkscrew_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { stand_up_rc_track_right_corkscrew_up(session, rideIndex, 2 - trackSequence, (direction + 1) & 3, height, tileElement); } @@ -3488,7 +3488,7 @@ static void stand_up_rc_track_left_corkscrew_down( /** rct2: 0x008A7484 */ static void stand_up_rc_track_right_corkscrew_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { stand_up_rc_track_left_corkscrew_up(session, rideIndex, 2 - trackSequence, (direction - 1) & 3, height, tileElement); } @@ -3496,7 +3496,7 @@ static void stand_up_rc_track_right_corkscrew_down( /** rct2: 0x008A7734 */ static void stand_up_rc_track_left_half_banked_helix_up_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3714,7 +3714,7 @@ static void stand_up_rc_track_left_half_banked_helix_up_small( /** rct2: 0x008A7744 */ static void stand_up_rc_track_right_half_banked_helix_up_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3932,7 +3932,7 @@ static void stand_up_rc_track_right_half_banked_helix_up_small( /** rct2: 0x008A7754 */ static void stand_up_rc_track_left_half_banked_helix_down_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 4) { @@ -3947,7 +3947,7 @@ static void stand_up_rc_track_left_half_banked_helix_down_small( /** rct2: 0x008A7764 */ static void stand_up_rc_track_right_half_banked_helix_down_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 4) { @@ -3962,7 +3962,7 @@ static void stand_up_rc_track_right_half_banked_helix_down_small( /** rct2: 0x008A76F4 */ static void stand_up_rc_track_left_half_banked_helix_up_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4304,7 +4304,7 @@ static void stand_up_rc_track_left_half_banked_helix_up_large( /** rct2: 0x008A7704 */ static void stand_up_rc_track_right_half_banked_helix_up_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4646,7 +4646,7 @@ static void stand_up_rc_track_right_half_banked_helix_up_large( /** rct2: 0x008A7714 */ static void stand_up_rc_track_left_half_banked_helix_down_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 7) { @@ -4661,7 +4661,7 @@ static void stand_up_rc_track_left_half_banked_helix_down_large( /** rct2: 0x008A7724 */ static void stand_up_rc_track_right_half_banked_helix_down_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 7) { @@ -4676,7 +4676,7 @@ static void stand_up_rc_track_right_half_banked_helix_down_large( /** rct2: 0x008A7494 */ static void stand_up_rc_track_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -4702,7 +4702,7 @@ static void stand_up_rc_track_brakes( /** rct2: 0x008A74A4 */ static void stand_up_rc_track_on_ride_photo( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -4744,7 +4744,7 @@ static void stand_up_rc_track_on_ride_photo( /** rct2: 0x008A74B4 */ static void stand_up_rc_track_left_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4883,7 +4883,7 @@ static void stand_up_rc_track_left_eighth_to_diag( /** rct2: 0x008A74C4 */ static void stand_up_rc_track_right_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5021,7 +5021,7 @@ static void stand_up_rc_track_right_eighth_to_diag( /** rct2: 0x008A74D4 */ static void stand_up_rc_track_left_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; stand_up_rc_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -5030,7 +5030,7 @@ static void stand_up_rc_track_left_eighth_to_orthogonal( /** rct2: 0x008A74E4 */ static void stand_up_rc_track_right_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; stand_up_rc_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, tileElement); @@ -5039,7 +5039,7 @@ static void stand_up_rc_track_right_eighth_to_orthogonal( /** rct2: 0x008A76A4 */ static void stand_up_rc_track_left_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5181,7 +5181,7 @@ static void stand_up_rc_track_left_eighth_bank_to_diag( /** rct2: 0x008A76B4 */ static void stand_up_rc_track_right_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5322,7 +5322,7 @@ static void stand_up_rc_track_right_eighth_bank_to_diag( /** rct2: 0x008A76C4 */ static void stand_up_rc_track_left_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; stand_up_rc_track_right_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -5331,7 +5331,7 @@ static void stand_up_rc_track_left_eighth_bank_to_orthogonal( /** rct2: 0x008A76D4 */ static void stand_up_rc_track_right_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; stand_up_rc_track_left_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, tileElement); @@ -5340,7 +5340,7 @@ static void stand_up_rc_track_right_eighth_bank_to_orthogonal( /** rct2: 0x008A74F4 */ static void stand_up_rc_track_diag_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5486,7 +5486,7 @@ static void stand_up_rc_track_diag_flat( /** rct2: 0x008A7524 */ static void stand_up_rc_track_diag_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5632,7 +5632,7 @@ static void stand_up_rc_track_diag_25_deg_up( /** rct2: 0x008A7584 */ static void stand_up_rc_track_diag_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5778,7 +5778,7 @@ static void stand_up_rc_track_diag_60_deg_up( /** rct2: 0x008A7504 */ static void stand_up_rc_track_diag_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5924,7 +5924,7 @@ static void stand_up_rc_track_diag_flat_to_25_deg_up( /** rct2: 0x008A7564 */ static void stand_up_rc_track_diag_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6070,7 +6070,7 @@ static void stand_up_rc_track_diag_25_deg_up_to_60_deg_up( /** rct2: 0x008A7574 */ static void stand_up_rc_track_diag_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6216,7 +6216,7 @@ static void stand_up_rc_track_diag_60_deg_up_to_25_deg_up( /** rct2: 0x008A7514 */ static void stand_up_rc_track_diag_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6362,7 +6362,7 @@ static void stand_up_rc_track_diag_25_deg_up_to_flat( /** rct2: 0x008A7554 */ static void stand_up_rc_track_diag_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6508,7 +6508,7 @@ static void stand_up_rc_track_diag_25_deg_down( /** rct2: 0x008A75B4 */ static void stand_up_rc_track_diag_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6654,7 +6654,7 @@ static void stand_up_rc_track_diag_60_deg_down( /** rct2: 0x008A7534 */ static void stand_up_rc_track_diag_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6798,7 +6798,7 @@ static void stand_up_rc_track_diag_flat_to_25_deg_down( /** rct2: 0x008A7594 */ static void stand_up_rc_track_diag_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6944,7 +6944,7 @@ static void stand_up_rc_track_diag_25_deg_down_to_60_deg_down( /** rct2: 0x008A75A4 */ static void stand_up_rc_track_diag_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7090,7 +7090,7 @@ static void stand_up_rc_track_diag_60_deg_down_to_25_deg_down( /** rct2: 0x008A7544 */ static void stand_up_rc_track_diag_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7236,7 +7236,7 @@ static void stand_up_rc_track_diag_25_deg_down_to_flat( /** rct2: 0x008A75E4 */ static void stand_up_rc_track_diag_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7315,7 +7315,7 @@ static void stand_up_rc_track_diag_flat_to_left_bank( /** rct2: 0x008A75F4 */ static void stand_up_rc_track_diag_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7394,7 +7394,7 @@ static void stand_up_rc_track_diag_flat_to_right_bank( /** rct2: 0x008A7604 */ static void stand_up_rc_track_diag_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7473,7 +7473,7 @@ static void stand_up_rc_track_diag_left_bank_to_flat( /** rct2: 0x008A7614 */ static void stand_up_rc_track_diag_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7552,7 +7552,7 @@ static void stand_up_rc_track_diag_right_bank_to_flat( /** rct2: 0x008A7644 */ static void stand_up_rc_track_diag_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7631,7 +7631,7 @@ static void stand_up_rc_track_diag_left_bank_to_25_deg_up( /** rct2: 0x008A7654 */ static void stand_up_rc_track_diag_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7710,7 +7710,7 @@ static void stand_up_rc_track_diag_right_bank_to_25_deg_up( /** rct2: 0x008A7624 */ static void stand_up_rc_track_diag_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7789,7 +7789,7 @@ static void stand_up_rc_track_diag_25_deg_up_to_left_bank( /** rct2: 0x008A7634 */ static void stand_up_rc_track_diag_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7868,7 +7868,7 @@ static void stand_up_rc_track_diag_25_deg_up_to_right_bank( /** rct2: 0x008A7664 */ static void stand_up_rc_track_diag_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7945,7 +7945,7 @@ static void stand_up_rc_track_diag_left_bank_to_25_deg_down( /** rct2: 0x008A7674 */ static void stand_up_rc_track_diag_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8022,7 +8022,7 @@ static void stand_up_rc_track_diag_right_bank_to_25_deg_down( /** rct2: 0x008A7684 */ static void stand_up_rc_track_diag_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8101,7 +8101,7 @@ static void stand_up_rc_track_diag_25_deg_down_to_left_bank( /** rct2: 0x008A7694 */ static void stand_up_rc_track_diag_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8180,7 +8180,7 @@ static void stand_up_rc_track_diag_25_deg_down_to_right_bank( /** rct2: 0x008A75C4 */ static void stand_up_rc_track_diag_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8256,7 +8256,7 @@ static void stand_up_rc_track_diag_left_bank( /** rct2: 0x008A75D4 */ static void stand_up_rc_track_diag_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8332,7 +8332,7 @@ static void stand_up_rc_track_diag_right_bank( /** rct2: 0x008A76E4 */ static void stand_up_rc_track_block_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { diff --git a/src/openrct2/ride/coaster/Steeplechase.cpp b/src/openrct2/ride/coaster/Steeplechase.cpp index 8fb4f3a27f..271bf2b137 100644 --- a/src/openrct2/ride/coaster/Steeplechase.cpp +++ b/src/openrct2/ride/coaster/Steeplechase.cpp @@ -22,7 +22,7 @@ /** rct2: 0x008A59A8 */ static void steeplechase_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -68,7 +68,7 @@ static void steeplechase_track_flat( static void steeplechase_track_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][3] = { { 28635, SPR_STATION_BASE_B_SW_NE }, @@ -93,7 +93,7 @@ static void steeplechase_track_station( /** rct2: 0x008A59B8 */ static void steeplechase_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -163,7 +163,7 @@ static void steeplechase_track_25_deg_up( /** rct2: 0x008A59C8 */ static void steeplechase_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -233,7 +233,7 @@ static void steeplechase_track_flat_to_25_deg_up( /** rct2: 0x008A59D8 */ static void steeplechase_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -303,7 +303,7 @@ static void steeplechase_track_25_deg_up_to_flat( /** rct2: 0x008A59E8 */ static void steeplechase_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { steeplechase_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -311,7 +311,7 @@ static void steeplechase_track_25_deg_down( /** rct2: 0x008A59F8 */ static void steeplechase_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { steeplechase_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -319,7 +319,7 @@ static void steeplechase_track_flat_to_25_deg_down( /** rct2: 0x008A5A08 */ static void steeplechase_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { steeplechase_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -327,7 +327,7 @@ static void steeplechase_track_25_deg_down_to_flat( /** rct2: 0x008A5A18 */ static void steeplechase_track_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -498,7 +498,7 @@ static void steeplechase_track_left_quarter_turn_5( /** rct2: 0x008A5A28 */ static void steeplechase_track_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; steeplechase_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -507,7 +507,7 @@ static void steeplechase_track_right_quarter_turn_5( /** rct2: 0x008A5A38 */ static void steeplechase_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -656,7 +656,7 @@ static void steeplechase_track_s_bend_left( /** rct2: 0x008A5A48 */ static void steeplechase_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -805,7 +805,7 @@ static void steeplechase_track_s_bend_right( /** rct2: 0x008A5A88 */ static void steeplechase_track_left_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -919,7 +919,7 @@ static void steeplechase_track_left_quarter_turn_3( /** rct2: 0x008A5A98 */ static void steeplechase_track_right_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; steeplechase_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -928,7 +928,7 @@ static void steeplechase_track_right_quarter_turn_3( /** rct2: 0x008A5AA8 */ static void steeplechase_track_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -953,7 +953,7 @@ static void steeplechase_track_brakes( /** rct2: 0x008A5AD8 */ static void steeplechase_track_left_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1099,7 +1099,7 @@ static void steeplechase_track_left_eighth_to_diag( /** rct2: 0x008A5AE8 */ static void steeplechase_track_right_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1244,7 +1244,7 @@ static void steeplechase_track_right_eighth_to_diag( /** rct2: 0x008A5AF8 */ static void steeplechase_track_left_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; steeplechase_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -1253,7 +1253,7 @@ static void steeplechase_track_left_eighth_to_orthogonal( /** rct2: 0x008A5B08 */ static void steeplechase_track_right_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; steeplechase_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, tileElement); @@ -1262,7 +1262,7 @@ static void steeplechase_track_right_eighth_to_orthogonal( /** rct2: 0x008A5AC8 */ static void steeplechase_track_diag_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1408,7 +1408,7 @@ static void steeplechase_track_diag_flat( /** rct2: 0x008A5B38 */ static void steeplechase_track_diag_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1554,7 +1554,7 @@ static void steeplechase_track_diag_25_deg_up( /** rct2: 0x008A5B18 */ static void steeplechase_track_diag_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1700,7 +1700,7 @@ static void steeplechase_track_diag_flat_to_25_deg_up( /** rct2: 0x008A5B28 */ static void steeplechase_track_diag_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1846,7 +1846,7 @@ static void steeplechase_track_diag_25_deg_up_to_flat( /** rct2: 0x008A5B68 */ static void steeplechase_track_diag_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1992,7 +1992,7 @@ static void steeplechase_track_diag_25_deg_down( /** rct2: 0x008A5B48 */ static void steeplechase_track_diag_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2136,7 +2136,7 @@ static void steeplechase_track_diag_flat_to_25_deg_down( /** rct2: 0x008A5B58 */ static void steeplechase_track_diag_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2282,7 +2282,7 @@ static void steeplechase_track_diag_25_deg_down_to_flat( /** rct2: 0x008A5AB8 */ static void steeplechase_track_block_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { diff --git a/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp b/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp index 8a586af1a4..a6e2850fbc 100644 --- a/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp +++ b/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp @@ -22,7 +22,7 @@ /** rct2: 0x008A8958 */ static void suspended_swinging_rc_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -75,7 +75,7 @@ static void suspended_swinging_rc_track_flat( /** rct2: 0x008A8AA8, 0x008A8AB8, 0x008A8AC8 */ static void suspended_swinging_rc_track_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][3] = { { SPR_STATION_BASE_C_SW_NE, 25963, SPR_STATION_INVERTED_BAR_D_SW_NE }, @@ -102,7 +102,7 @@ static void suspended_swinging_rc_track_station( /** rct2: 0x008A8968 */ static void suspended_swinging_rc_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -196,7 +196,7 @@ static void suspended_swinging_rc_track_25_deg_up( /** rct2: 0x008A8978 */ static void suspended_swinging_rc_track_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -237,7 +237,7 @@ static void suspended_swinging_rc_track_60_deg_up( /** rct2: 0x008A8988 */ static void suspended_swinging_rc_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -331,7 +331,7 @@ static void suspended_swinging_rc_track_flat_to_25_deg_up( /** rct2: 0x008A8998 */ static void suspended_swinging_rc_track_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -378,7 +378,7 @@ static void suspended_swinging_rc_track_25_deg_up_to_60_deg_up( /** rct2: 0x008A89A8 */ static void suspended_swinging_rc_track_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -484,7 +484,7 @@ static void suspended_swinging_rc_track_60_deg_up_to_25_deg_up( /** rct2: 0x008A89B8 */ static void suspended_swinging_rc_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (tileElement->AsTrack()->HasChain()) { @@ -578,7 +578,7 @@ static void suspended_swinging_rc_track_25_deg_up_to_flat( /** rct2: 0x008A89C8 */ static void suspended_swinging_rc_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { suspended_swinging_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -586,7 +586,7 @@ static void suspended_swinging_rc_track_25_deg_down( /** rct2: 0x008A89D8 */ static void suspended_swinging_rc_track_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { suspended_swinging_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -594,7 +594,7 @@ static void suspended_swinging_rc_track_60_deg_down( /** rct2: 0x008A89E8 */ static void suspended_swinging_rc_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { suspended_swinging_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -602,7 +602,7 @@ static void suspended_swinging_rc_track_flat_to_25_deg_down( /** rct2: 0x008A89F8 */ static void suspended_swinging_rc_track_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { suspended_swinging_rc_track_60_deg_up_to_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -611,7 +611,7 @@ static void suspended_swinging_rc_track_25_deg_down_to_60_deg_down( /** rct2: 0x008A8A08 */ static void suspended_swinging_rc_track_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { suspended_swinging_rc_track_25_deg_up_to_60_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -620,7 +620,7 @@ static void suspended_swinging_rc_track_60_deg_down_to_25_deg_down( /** rct2: 0x008A8A18 */ static void suspended_swinging_rc_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { suspended_swinging_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -628,7 +628,7 @@ static void suspended_swinging_rc_track_25_deg_down_to_flat( /** rct2: 0x008A8A28 */ static void suspended_swinging_rc_track_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -808,7 +808,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_5( /** rct2: 0x008A8A38 */ static void suspended_swinging_rc_track_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; suspended_swinging_rc_track_left_quarter_turn_5( @@ -818,7 +818,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_5( /** rct2: 0x008A8A48 */ static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -984,7 +984,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_up( /** rct2: 0x008A8A58 */ static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1150,7 +1150,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_up( /** rct2: 0x008A8A68 */ static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; suspended_swinging_rc_track_right_quarter_turn_5_25_deg_up( @@ -1160,7 +1160,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_down( /** rct2: 0x008A8A78 */ static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; suspended_swinging_rc_track_left_quarter_turn_5_25_deg_up( @@ -1170,7 +1170,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_down( /** rct2: 0x008A8A88 */ static void suspended_swinging_rc_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1329,7 +1329,7 @@ static void suspended_swinging_rc_track_s_bend_left( /** rct2: 0x008A8A98 */ static void suspended_swinging_rc_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1488,7 +1488,7 @@ static void suspended_swinging_rc_track_s_bend_right( /** rct2: 0x008A8AD8 */ static void suspended_swinging_rc_track_left_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1607,7 +1607,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_3( /** rct2: 0x008A8AE8 */ static void suspended_swinging_rc_track_right_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; suspended_swinging_rc_track_left_quarter_turn_3( @@ -1617,7 +1617,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_3( /** rct2: 0x008A8AF8 */ static void suspended_swinging_rc_track_left_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1704,7 +1704,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_3_25_deg_up( /** rct2: 0x008A8B08 */ static void suspended_swinging_rc_track_right_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1791,7 +1791,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_3_25_deg_up( /** rct2: 0x008A8B18 */ static void suspended_swinging_rc_track_left_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; suspended_swinging_rc_track_right_quarter_turn_3_25_deg_up( @@ -1801,7 +1801,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_3_25_deg_down( /** rct2: 0x008A8B28 */ static void suspended_swinging_rc_track_right_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; suspended_swinging_rc_track_left_quarter_turn_3_25_deg_up( @@ -1811,7 +1811,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_3_25_deg_down( /** rct2: 0x008A8B38 */ static void suspended_swinging_rc_track_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -1843,7 +1843,7 @@ static void suspended_swinging_rc_track_brakes( /** rct2: 0x008A8B48 */ static void suspended_swinging_rc_track_left_quarter_helix_large_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2028,7 +2028,7 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_up( /** rct2: 0x008A8B58 */ static void suspended_swinging_rc_track_right_quarter_helix_large_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2213,7 +2213,7 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_up( /** rct2: 0x008A8B68 */ static void suspended_swinging_rc_track_left_quarter_helix_large_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2398,7 +2398,7 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_down( /** rct2: 0x008A8B78 */ static void suspended_swinging_rc_track_right_quarter_helix_large_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2583,7 +2583,7 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_down( /** rct2: 0x008A8B88 */ static void suspended_swinging_rc_track_left_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2746,7 +2746,7 @@ static void suspended_swinging_rc_track_left_eighth_to_diag( /** rct2: 0x008A8B98 */ static void suspended_swinging_rc_track_right_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2909,7 +2909,7 @@ static void suspended_swinging_rc_track_right_eighth_to_diag( /** rct2: 0x008A8BA8 */ static void suspended_swinging_rc_track_left_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; suspended_swinging_rc_track_right_eighth_to_diag( @@ -2919,7 +2919,7 @@ static void suspended_swinging_rc_track_left_eighth_to_orthogonal( /** rct2: 0x008A8BB8 */ static void suspended_swinging_rc_track_right_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; suspended_swinging_rc_track_left_eighth_to_diag( @@ -2929,7 +2929,7 @@ static void suspended_swinging_rc_track_right_eighth_to_orthogonal( /** rct2: 0x008A8BC8 */ static void suspended_swinging_rc_track_diag_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3068,7 +3068,7 @@ static void suspended_swinging_rc_track_diag_flat( /** rct2: 0x008A8BF8 */ static void suspended_swinging_rc_track_diag_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3207,7 +3207,7 @@ static void suspended_swinging_rc_track_diag_25_deg_up( /** rct2: 0x008A8C58 */ static void suspended_swinging_rc_track_diag_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3290,7 +3290,7 @@ static void suspended_swinging_rc_track_diag_60_deg_up( /** rct2: 0x008A8BD8 */ static void suspended_swinging_rc_track_diag_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3429,7 +3429,7 @@ static void suspended_swinging_rc_track_diag_flat_to_25_deg_up( /** rct2: 0x008A8C38 */ static void suspended_swinging_rc_track_diag_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3512,7 +3512,7 @@ static void suspended_swinging_rc_track_diag_25_deg_up_to_60_deg_up( /** rct2: 0x008A8C48 */ static void suspended_swinging_rc_track_diag_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3595,7 +3595,7 @@ static void suspended_swinging_rc_track_diag_60_deg_up_to_25_deg_up( /** rct2: 0x008A8BE8 */ static void suspended_swinging_rc_track_diag_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3734,7 +3734,7 @@ static void suspended_swinging_rc_track_diag_25_deg_up_to_flat( /** rct2: 0x008A8C28 */ static void suspended_swinging_rc_track_diag_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3873,7 +3873,7 @@ static void suspended_swinging_rc_track_diag_25_deg_down( /** rct2: 0x008A8C88 */ static void suspended_swinging_rc_track_diag_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3935,7 +3935,7 @@ static void suspended_swinging_rc_track_diag_60_deg_down( /** rct2: 0x008A8C08 */ static void suspended_swinging_rc_track_diag_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4071,7 +4071,7 @@ static void suspended_swinging_rc_track_diag_flat_to_25_deg_down( /** rct2: 0x008A8C68 */ static void suspended_swinging_rc_track_diag_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4154,7 +4154,7 @@ static void suspended_swinging_rc_track_diag_25_deg_down_to_60_deg_down( /** rct2: 0x008A8C78 */ static void suspended_swinging_rc_track_diag_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4237,7 +4237,7 @@ static void suspended_swinging_rc_track_diag_60_deg_down_to_25_deg_down( /** rct2: 0x008A8C18 */ static void suspended_swinging_rc_track_diag_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4376,7 +4376,7 @@ static void suspended_swinging_rc_track_diag_25_deg_down_to_flat( /** rct2: 0x008A8B38 */ static void suspended_swinging_rc_track_block_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { diff --git a/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp b/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp index 5a4c66bb8e..f399598ce2 100644 --- a/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp @@ -23,7 +23,7 @@ /** rct2: 0x008AB6A4 */ static void twister_rc_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_flat(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); } @@ -31,7 +31,7 @@ static void twister_rc_track_flat( /** rct2: 0x008AB8F4, 0x008AB904, 0x008AB914 */ static void twister_rc_track_station( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_station(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); } @@ -39,7 +39,7 @@ static void twister_rc_track_station( /** rct2: 0x008AB6B4 */ static void twister_rc_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_up(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); } @@ -47,7 +47,7 @@ static void twister_rc_track_25_deg_up( /** rct2: 0x008AB6C4 */ static void twister_rc_track_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_60_deg_up(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); } @@ -55,7 +55,7 @@ static void twister_rc_track_60_deg_up( /** rct2: 0x008AB6D4 */ static void twister_rc_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_flat_to_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -64,7 +64,7 @@ static void twister_rc_track_flat_to_25_deg_up( /** rct2: 0x008AB6E4 */ static void twister_rc_track_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_up_to_60_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -73,7 +73,7 @@ static void twister_rc_track_25_deg_up_to_60_deg_up( /** rct2: 0x008AB6F4 */ static void twister_rc_track_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_60_deg_up_to_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -82,7 +82,7 @@ static void twister_rc_track_60_deg_up_to_25_deg_up( /** rct2: 0x008AB704 */ static void twister_rc_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_up_to_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -91,7 +91,7 @@ static void twister_rc_track_25_deg_up_to_flat( /** rct2: 0x008AB714 */ static void twister_rc_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -100,7 +100,7 @@ static void twister_rc_track_25_deg_down( /** rct2: 0x008AB724 */ static void twister_rc_track_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_60_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -109,7 +109,7 @@ static void twister_rc_track_60_deg_down( /** rct2: 0x008AB734 */ static void twister_rc_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_flat_to_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -118,7 +118,7 @@ static void twister_rc_track_flat_to_25_deg_down( /** rct2: 0x008AB744 */ static void twister_rc_track_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_down_to_60_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -127,7 +127,7 @@ static void twister_rc_track_25_deg_down_to_60_deg_down( /** rct2: 0x008AB754 */ static void twister_rc_track_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_60_deg_down_to_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -136,7 +136,7 @@ static void twister_rc_track_60_deg_down_to_25_deg_down( /** rct2: 0x008AB764 */ static void twister_rc_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_down_to_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -145,7 +145,7 @@ static void twister_rc_track_25_deg_down_to_flat( /** rct2: 0x008AB774 */ static void twister_rc_track_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_quarter_turn_5( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -154,7 +154,7 @@ static void twister_rc_track_left_quarter_turn_5( /** rct2: 0x008AB784 */ static void twister_rc_track_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_quarter_turn_5( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -163,7 +163,7 @@ static void twister_rc_track_right_quarter_turn_5( /** rct2: 0x008AB794 */ static void twister_rc_track_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_flat_to_left_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -172,7 +172,7 @@ static void twister_rc_track_flat_to_left_bank( /** rct2: 0x008AB7A4 */ static void twister_rc_track_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_flat_to_right_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -181,7 +181,7 @@ static void twister_rc_track_flat_to_right_bank( /** rct2: 0x008AB7B4 */ static void twister_rc_track_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_bank_to_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -190,7 +190,7 @@ static void twister_rc_track_left_bank_to_flat( /** rct2: 0x008AB7C4 */ static void twister_rc_track_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_bank_to_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -199,7 +199,7 @@ static void twister_rc_track_right_bank_to_flat( /** rct2: 0x008AB7D4 */ static void twister_rc_track_banked_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_banked_left_quarter_turn_5( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -208,7 +208,7 @@ static void twister_rc_track_banked_left_quarter_turn_5( /** rct2: 0x008AB7E4 */ static void twister_rc_track_banked_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_banked_right_quarter_turn_5( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -217,7 +217,7 @@ static void twister_rc_track_banked_right_quarter_turn_5( /** rct2: 0x008AB7F4 */ static void twister_rc_track_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_bank_to_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -226,7 +226,7 @@ static void twister_rc_track_left_bank_to_25_deg_up( /** rct2: 0x008AB804 */ static void twister_rc_track_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_bank_to_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -235,7 +235,7 @@ static void twister_rc_track_right_bank_to_25_deg_up( /** rct2: 0x008AB814 */ static void twister_rc_track_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_up_to_left_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -244,7 +244,7 @@ static void twister_rc_track_25_deg_up_to_left_bank( /** rct2: 0x008AB824 */ static void twister_rc_track_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_up_to_right_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -253,7 +253,7 @@ static void twister_rc_track_25_deg_up_to_right_bank( /** rct2: 0x008AB834 */ static void twister_rc_track_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_bank_to_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -262,7 +262,7 @@ static void twister_rc_track_left_bank_to_25_deg_down( /** rct2: 0x008AB844 */ static void twister_rc_track_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_bank_to_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -271,7 +271,7 @@ static void twister_rc_track_right_bank_to_25_deg_down( /** rct2: 0x008AB854 */ static void twister_rc_track_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_down_to_left_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -280,7 +280,7 @@ static void twister_rc_track_25_deg_down_to_left_bank( /** rct2: 0x008AB864 */ static void twister_rc_track_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_down_to_right_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -289,7 +289,7 @@ static void twister_rc_track_25_deg_down_to_right_bank( /** rct2: 0x008AB874 */ static void twister_rc_track_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_bank(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); } @@ -297,7 +297,7 @@ static void twister_rc_track_left_bank( /** rct2: 0x008AB884 */ static void twister_rc_track_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -306,7 +306,7 @@ static void twister_rc_track_right_bank( /** rct2: 0x008AB894 */ static void twister_rc_track_left_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_quarter_turn_5_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -315,7 +315,7 @@ static void twister_rc_track_left_quarter_turn_5_25_deg_up( /** rct2: 0x008AB8A4 */ static void twister_rc_track_right_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_quarter_turn_5_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -324,7 +324,7 @@ static void twister_rc_track_right_quarter_turn_5_25_deg_up( /** rct2: 0x008AB8B4 */ static void twister_rc_track_left_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_quarter_turn_5_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -333,7 +333,7 @@ static void twister_rc_track_left_quarter_turn_5_25_deg_down( /** rct2: 0x008AB8C4 */ static void twister_rc_track_right_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_quarter_turn_5_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -342,7 +342,7 @@ static void twister_rc_track_right_quarter_turn_5_25_deg_down( /** rct2: 0x008AB8D4 */ static void twister_rc_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_s_bend_left( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -351,7 +351,7 @@ static void twister_rc_track_s_bend_left( /** rct2: 0x008AB8E4 */ static void twister_rc_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_s_bend_right( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -360,7 +360,7 @@ static void twister_rc_track_s_bend_right( /** rct2: 0x008ABA84 */ static void twister_rc_track_left_vertical_loop( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_vertical_loop( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -369,7 +369,7 @@ static void twister_rc_track_left_vertical_loop( /** rct2: 0x008ABA94 */ static void twister_rc_track_right_vertical_loop( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_vertical_loop( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -378,7 +378,7 @@ static void twister_rc_track_right_vertical_loop( /** rct2: 0x008AB924 */ static void twister_rc_track_left_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_quarter_turn_3( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -387,7 +387,7 @@ static void twister_rc_track_left_quarter_turn_3( /** rct2: 0x008AB934 */ static void twister_rc_track_right_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_quarter_turn_3( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -396,7 +396,7 @@ static void twister_rc_track_right_quarter_turn_3( /** rct2: 0x008AB944 */ static void twister_rc_track_left_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_quarter_turn_3_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -405,7 +405,7 @@ static void twister_rc_track_left_quarter_turn_3_bank( /** rct2: 0x008AB954 */ static void twister_rc_track_right_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_quarter_turn_3_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -414,7 +414,7 @@ static void twister_rc_track_right_quarter_turn_3_bank( /** rct2: 0x008AB964 */ static void twister_rc_track_left_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_quarter_turn_3_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -423,7 +423,7 @@ static void twister_rc_track_left_quarter_turn_3_25_deg_up( /** rct2: 0x008AB974 */ static void twister_rc_track_right_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_quarter_turn_3_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -432,7 +432,7 @@ static void twister_rc_track_right_quarter_turn_3_25_deg_up( /** rct2: 0x008AB984 */ static void twister_rc_track_left_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_quarter_turn_3_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -441,7 +441,7 @@ static void twister_rc_track_left_quarter_turn_3_25_deg_down( /** rct2: 0x008AB994 */ static void twister_rc_track_right_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_quarter_turn_3_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -450,7 +450,7 @@ static void twister_rc_track_right_quarter_turn_3_25_deg_down( /** rct2: 0x008AB9A4 */ static void twister_rc_track_left_half_banked_helix_up_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_half_banked_helix_up_small( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -459,7 +459,7 @@ static void twister_rc_track_left_half_banked_helix_up_small( /** rct2: 0x008AB9B4 */ static void twister_rc_track_right_half_banked_helix_up_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_half_banked_helix_up_small( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -468,7 +468,7 @@ static void twister_rc_track_right_half_banked_helix_up_small( /** rct2: 0x008AB9C4 */ static void twister_rc_track_left_half_banked_helix_down_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_half_banked_helix_down_small( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -477,7 +477,7 @@ static void twister_rc_track_left_half_banked_helix_down_small( /** rct2: 0x008AB9D4 */ static void twister_rc_track_right_half_banked_helix_down_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_half_banked_helix_down_small( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -486,7 +486,7 @@ static void twister_rc_track_right_half_banked_helix_down_small( /** rct2: 0x008AB9E4 */ static void twister_rc_track_left_half_banked_helix_up_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_half_banked_helix_up_large( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -495,7 +495,7 @@ static void twister_rc_track_left_half_banked_helix_up_large( /** rct2: 0x008AB9F4 */ static void twister_rc_track_right_half_banked_helix_up_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_half_banked_helix_up_large( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -504,7 +504,7 @@ static void twister_rc_track_right_half_banked_helix_up_large( /** rct2: 0x008ABA04 */ static void twister_rc_track_left_half_banked_helix_down_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_half_banked_helix_down_large( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -513,7 +513,7 @@ static void twister_rc_track_left_half_banked_helix_down_large( /** rct2: 0x008ABA14 */ static void twister_rc_track_right_half_banked_helix_down_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_half_banked_helix_down_large( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -522,7 +522,7 @@ static void twister_rc_track_right_half_banked_helix_down_large( /** rct2: 0x008ABA44 */ static void twister_rc_track_left_quarter_turn_1_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_quarter_turn_1_60_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -531,7 +531,7 @@ static void twister_rc_track_left_quarter_turn_1_60_deg_up( /** rct2: 0x008ABA24 */ static void twister_rc_track_right_quarter_turn_1_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_quarter_turn_1_60_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -540,7 +540,7 @@ static void twister_rc_track_right_quarter_turn_1_60_deg_up( /** rct2: 0x008ABA34 */ static void twister_rc_track_left_quarter_turn_1_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_quarter_turn_1_60_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -549,7 +549,7 @@ static void twister_rc_track_left_quarter_turn_1_60_deg_down( /** rct2: 0x008ABA54 */ static void twister_rc_track_right_quarter_turn_1_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_quarter_turn_1_60_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -558,7 +558,7 @@ static void twister_rc_track_right_quarter_turn_1_60_deg_down( /** rct2: 0x008ABA64 */ static void twister_rc_track_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_brakes(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); } @@ -566,7 +566,7 @@ static void twister_rc_track_brakes( /** rct2: 0x008ABE04 */ static void twister_rc_track_25_deg_up_left_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_up_left_banked( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -575,7 +575,7 @@ static void twister_rc_track_25_deg_up_left_banked( /** rct2: 0x008ABE14 */ static void twister_rc_track_25_deg_up_right_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_up_right_banked( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -584,7 +584,7 @@ static void twister_rc_track_25_deg_up_right_banked( /** rct2: 0x008ABA74 */ static void twister_rc_track_on_ride_photo( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_on_ride_photo( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -593,7 +593,7 @@ static void twister_rc_track_on_ride_photo( /** rct2: 0x008ABE24 */ static void twister_rc_track_25_deg_down_left_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_down_left_banked( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -602,7 +602,7 @@ static void twister_rc_track_25_deg_down_left_banked( /** rct2: 0x008ABE34 */ static void twister_rc_track_25_deg_down_right_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_down_right_banked( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -611,7 +611,7 @@ static void twister_rc_track_25_deg_down_right_banked( /** rct2: 0x008ABE44 */ static void twister_rc_track_90_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_90_deg_up(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); } @@ -619,7 +619,7 @@ static void twister_rc_track_90_deg_up( /** rct2: 0x008ABE54 */ static void twister_rc_track_90_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_90_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -628,7 +628,7 @@ static void twister_rc_track_90_deg_down( /** rct2: 0x008ABE64 */ static void twister_rc_track_60_deg_up_to_90_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_60_deg_up_to_90_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -637,7 +637,7 @@ static void twister_rc_track_60_deg_up_to_90_deg_up( /** rct2: 0x008ABE74 */ static void twister_rc_track_90_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_90_deg_down_to_60_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -646,7 +646,7 @@ static void twister_rc_track_90_deg_down_to_60_deg_down( /** rct2: 0x008ABE84 */ static void twister_rc_track_90_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_90_deg_up_to_60_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -655,7 +655,7 @@ static void twister_rc_track_90_deg_up_to_60_deg_up( /** rct2: 0x008ABE94 */ static void twister_rc_track_60_deg_down_to_90_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_60_deg_down_to_90_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -664,7 +664,7 @@ static void twister_rc_track_60_deg_down_to_90_deg_down( /** rct2: 0x008ABAB4 */ static void twister_rc_track_left_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_eighth_to_diag( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -673,7 +673,7 @@ static void twister_rc_track_left_eighth_to_diag( /** rct2: 0x008ABAC4 */ static void twister_rc_track_right_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_eighth_to_diag( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -682,7 +682,7 @@ static void twister_rc_track_right_eighth_to_diag( /** rct2: 0x008ABAD4 */ static void twister_rc_track_left_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_eighth_to_orthogonal( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -691,7 +691,7 @@ static void twister_rc_track_left_eighth_to_orthogonal( /** rct2: 0x008ABAE4 */ static void twister_rc_track_right_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_eighth_to_orthogonal( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -700,7 +700,7 @@ static void twister_rc_track_right_eighth_to_orthogonal( /** rct2: 0x008ABAF4 */ static void twister_rc_track_left_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_eighth_bank_to_diag( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -709,7 +709,7 @@ static void twister_rc_track_left_eighth_bank_to_diag( /** rct2: 0x008ABB04 */ static void twister_rc_track_right_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_eighth_bank_to_diag( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -718,7 +718,7 @@ static void twister_rc_track_right_eighth_bank_to_diag( /** rct2: 0x008ABB14 */ static void twister_rc_track_left_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_eighth_bank_to_orthogonal( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -727,7 +727,7 @@ static void twister_rc_track_left_eighth_bank_to_orthogonal( /** rct2: 0x008ABB24 */ static void twister_rc_track_right_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_eighth_bank_to_orthogonal( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -736,7 +736,7 @@ static void twister_rc_track_right_eighth_bank_to_orthogonal( /** rct2: 0x008ABAA4 */ static void twister_rc_track_diag_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_flat(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); } @@ -744,7 +744,7 @@ static void twister_rc_track_diag_flat( /** rct2: 0x008ABB54 */ static void twister_rc_track_diag_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -753,7 +753,7 @@ static void twister_rc_track_diag_25_deg_up( /** rct2: 0x008ABBB4 */ static void twister_rc_track_diag_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_60_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -762,7 +762,7 @@ static void twister_rc_track_diag_60_deg_up( /** rct2: 0x008ABB34 */ static void twister_rc_track_diag_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_flat_to_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -771,7 +771,7 @@ static void twister_rc_track_diag_flat_to_25_deg_up( /** rct2: 0x008ABB94 */ static void twister_rc_track_diag_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_25_deg_up_to_60_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -780,7 +780,7 @@ static void twister_rc_track_diag_25_deg_up_to_60_deg_up( /** rct2: 0x008ABBA4 */ static void twister_rc_track_diag_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_60_deg_up_to_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -789,7 +789,7 @@ static void twister_rc_track_diag_60_deg_up_to_25_deg_up( /** rct2: 0x008ABB44 */ static void twister_rc_track_diag_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_25_deg_up_to_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -798,7 +798,7 @@ static void twister_rc_track_diag_25_deg_up_to_flat( /** rct2: 0x008ABB84 */ static void twister_rc_track_diag_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -807,7 +807,7 @@ static void twister_rc_track_diag_25_deg_down( /** rct2: 0x008ABBE4 */ static void twister_rc_track_diag_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_60_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -816,7 +816,7 @@ static void twister_rc_track_diag_60_deg_down( /** rct2: 0x008ABB64 */ static void twister_rc_track_diag_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_flat_to_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -825,7 +825,7 @@ static void twister_rc_track_diag_flat_to_25_deg_down( /** rct2: 0x008ABBC4 */ static void twister_rc_track_diag_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_25_deg_down_to_60_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -834,7 +834,7 @@ static void twister_rc_track_diag_25_deg_down_to_60_deg_down( /** rct2: 0x008ABBD4 */ static void twister_rc_track_diag_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_60_deg_down_to_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -843,7 +843,7 @@ static void twister_rc_track_diag_60_deg_down_to_25_deg_down( /** rct2: 0x008ABB74 */ static void twister_rc_track_diag_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_25_deg_down_to_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -852,7 +852,7 @@ static void twister_rc_track_diag_25_deg_down_to_flat( /** rct2: 0x008ABC14 */ static void twister_rc_track_diag_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_flat_to_left_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -861,7 +861,7 @@ static void twister_rc_track_diag_flat_to_left_bank( /** rct2: 0x008ABC24 */ static void twister_rc_track_diag_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_flat_to_right_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -870,7 +870,7 @@ static void twister_rc_track_diag_flat_to_right_bank( /** rct2: 0x008ABC34 */ static void twister_rc_track_diag_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_left_bank_to_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -879,7 +879,7 @@ static void twister_rc_track_diag_left_bank_to_flat( /** rct2: 0x008ABC44 */ static void twister_rc_track_diag_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_right_bank_to_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -888,7 +888,7 @@ static void twister_rc_track_diag_right_bank_to_flat( /** rct2: 0x008ABC74 */ static void twister_rc_track_diag_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_left_bank_to_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -897,7 +897,7 @@ static void twister_rc_track_diag_left_bank_to_25_deg_up( /** rct2: 0x008ABC84 */ static void twister_rc_track_diag_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_right_bank_to_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -906,7 +906,7 @@ static void twister_rc_track_diag_right_bank_to_25_deg_up( /** rct2: 0x008ABC54 */ static void twister_rc_track_diag_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_25_deg_up_to_left_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -915,7 +915,7 @@ static void twister_rc_track_diag_25_deg_up_to_left_bank( /** rct2: 0x008ABC64 */ static void twister_rc_track_diag_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_25_deg_up_to_right_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -924,7 +924,7 @@ static void twister_rc_track_diag_25_deg_up_to_right_bank( /** rct2: 0x008ABC94 */ static void twister_rc_track_diag_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_left_bank_to_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -933,7 +933,7 @@ static void twister_rc_track_diag_left_bank_to_25_deg_down( /** rct2: 0x008ABCA4 */ static void twister_rc_track_diag_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_right_bank_to_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -942,7 +942,7 @@ static void twister_rc_track_diag_right_bank_to_25_deg_down( /** rct2: 0x008ABCB4 */ static void twister_rc_track_diag_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_25_deg_down_to_left_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -951,7 +951,7 @@ static void twister_rc_track_diag_25_deg_down_to_left_bank( /** rct2: 0x008ABCC4 */ static void twister_rc_track_diag_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_25_deg_down_to_right_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -960,7 +960,7 @@ static void twister_rc_track_diag_25_deg_down_to_right_bank( /** rct2: 0x008ABBF4 */ static void twister_rc_track_diag_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_left_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -969,7 +969,7 @@ static void twister_rc_track_diag_left_bank( /** rct2: 0x008ABC04 */ static void twister_rc_track_diag_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_right_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -978,7 +978,7 @@ static void twister_rc_track_diag_right_bank( /** rct2: 0x008ABD74 */ static void twister_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_bank_to_left_quarter_turn_3_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -987,7 +987,7 @@ static void twister_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up( /** rct2: 0x008ABD84 */ static void twister_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_bank_to_right_quarter_turn_3_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -996,7 +996,7 @@ static void twister_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up( /** rct2: 0x008ABD94 */ static void twister_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_quarter_turn_3_25_deg_down_to_left_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1005,7 +1005,7 @@ static void twister_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank( /** rct2: 0x008ABDA4 */ static void twister_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_quarter_turn_3_25_deg_down_to_right_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1014,7 +1014,7 @@ static void twister_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank( /** rct2: 0x008AC0E4 */ static void twister_rc_track_block_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_block_brakes( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1023,7 +1023,7 @@ static void twister_rc_track_block_brakes( /** rct2: 0x008ABEA4 */ static void twister_rc_track_left_banked_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1032,7 +1032,7 @@ static void twister_rc_track_left_banked_quarter_turn_3_25_deg_up( /** rct2: 0x008ABEB4 */ static void twister_rc_track_right_banked_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1041,7 +1041,7 @@ static void twister_rc_track_right_banked_quarter_turn_3_25_deg_up( /** rct2: 0x008ABEC4 */ static void twister_rc_track_left_banked_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1050,7 +1050,7 @@ static void twister_rc_track_left_banked_quarter_turn_3_25_deg_down( /** rct2: 0x008ABED4 */ static void twister_rc_track_right_banked_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1059,7 +1059,7 @@ static void twister_rc_track_right_banked_quarter_turn_3_25_deg_down( /** rct2: 0x008ABEE4 */ static void twister_rc_track_left_banked_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1068,7 +1068,7 @@ static void twister_rc_track_left_banked_quarter_turn_5_25_deg_up( /** rct2: 0x008ABEF4 */ static void twister_rc_track_right_banked_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1077,7 +1077,7 @@ static void twister_rc_track_right_banked_quarter_turn_5_25_deg_up( /** rct2: 0x008ABF04 */ static void twister_rc_track_left_banked_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1086,7 +1086,7 @@ static void twister_rc_track_left_banked_quarter_turn_5_25_deg_down( /** rct2: 0x008ABF14 */ static void twister_rc_track_right_banked_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1095,7 +1095,7 @@ static void twister_rc_track_right_banked_quarter_turn_5_25_deg_down( /** rct2: 0x008ABF24 */ static void twister_rc_track_25_deg_up_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_up_to_left_banked_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1104,7 +1104,7 @@ static void twister_rc_track_25_deg_up_to_left_banked_25_deg_up( /** rct2: 0x008ABF34 */ static void twister_rc_track_25_deg_up_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_up_to_right_banked_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1113,7 +1113,7 @@ static void twister_rc_track_25_deg_up_to_right_banked_25_deg_up( /** rct2: 0x008ABF44 */ static void twister_rc_track_left_banked_25_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_banked_25_deg_up_to_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1122,7 +1122,7 @@ static void twister_rc_track_left_banked_25_deg_up_to_25_deg_up( /** rct2: 0x008ABF54 */ static void twister_rc_track_right_banked_25_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_banked_25_deg_up_to_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1131,7 +1131,7 @@ static void twister_rc_track_right_banked_25_deg_up_to_25_deg_up( /** rct2: 0x008ABF64 */ static void twister_rc_track_25_deg_down_to_left_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_down_to_left_banked_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1140,7 +1140,7 @@ static void twister_rc_track_25_deg_down_to_left_banked_25_deg_down( /** rct2: 0x008ABF74 */ static void twister_rc_track_25_deg_down_to_right_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_down_to_right_banked_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1149,7 +1149,7 @@ static void twister_rc_track_25_deg_down_to_right_banked_25_deg_down( /** rct2: 0x008ABF84 */ static void twister_rc_track_left_banked_25_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_banked_25_deg_down_to_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1158,7 +1158,7 @@ static void twister_rc_track_left_banked_25_deg_down_to_25_deg_down( /** rct2: 0x008ABF94 */ static void twister_rc_track_right_banked_25_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_banked_25_deg_down_to_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1167,7 +1167,7 @@ static void twister_rc_track_right_banked_25_deg_down_to_25_deg_down( /** rct2: 0x008ABFA4 */ static void twister_rc_track_left_banked_flat_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1176,7 +1176,7 @@ static void twister_rc_track_left_banked_flat_to_left_banked_25_deg_up( /** rct2: 0x008ABFB4 */ static void twister_rc_track_right_banked_flat_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1185,7 +1185,7 @@ static void twister_rc_track_right_banked_flat_to_right_banked_25_deg_up( /** rct2: 0x008ABFE4 */ static void twister_rc_track_left_banked_25_deg_up_to_left_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_banked_25_deg_up_to_left_banked_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1194,7 +1194,7 @@ static void twister_rc_track_left_banked_25_deg_up_to_left_banked_flat( /** rct2: 0x008ABFF4 */ static void twister_rc_track_right_banked_25_deg_up_to_right_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_banked_25_deg_up_to_right_banked_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1203,7 +1203,7 @@ static void twister_rc_track_right_banked_25_deg_up_to_right_banked_flat( /** rct2: 0x008AC004 */ static void twister_rc_track_left_banked_flat_to_left_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1212,7 +1212,7 @@ static void twister_rc_track_left_banked_flat_to_left_banked_25_deg_down( /** rct2: 0x008AC014 */ static void twister_rc_track_right_banked_flat_to_right_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1221,7 +1221,7 @@ static void twister_rc_track_right_banked_flat_to_right_banked_25_deg_down( /** rct2: 0x008ABFC4 */ static void twister_rc_track_left_banked_25_deg_down_to_left_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_banked_25_deg_down_to_left_banked_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1230,7 +1230,7 @@ static void twister_rc_track_left_banked_25_deg_down_to_left_banked_flat( /** rct2: 0x008ABFD4 */ static void twister_rc_track_right_banked_25_deg_down_to_right_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_banked_25_deg_down_to_right_banked_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1239,7 +1239,7 @@ static void twister_rc_track_right_banked_25_deg_down_to_right_banked_flat( /** rct2: 0x008AC024 */ static void twister_rc_track_flat_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_flat_to_left_banked_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1248,7 +1248,7 @@ static void twister_rc_track_flat_to_left_banked_25_deg_up( /** rct2: 0x008AC034 */ static void twister_rc_track_flat_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_flat_to_right_banked_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1257,7 +1257,7 @@ static void twister_rc_track_flat_to_right_banked_25_deg_up( /** rct2: 0x008AC044 */ static void twister_rc_track_left_banked_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_banked_25_deg_up_to_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1266,7 +1266,7 @@ static void twister_rc_track_left_banked_25_deg_up_to_flat( /** rct2: 0x008AC054 */ static void twister_rc_track_right_banked_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_banked_25_deg_up_to_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1275,7 +1275,7 @@ static void twister_rc_track_right_banked_25_deg_up_to_flat( /** rct2: 0x008AC064 */ static void twister_rc_track_flat_to_left_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_flat_to_left_banked_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1284,7 +1284,7 @@ static void twister_rc_track_flat_to_left_banked_25_deg_down( /** rct2: 0x008AC074 */ static void twister_rc_track_flat_to_right_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_flat_to_right_banked_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1293,7 +1293,7 @@ static void twister_rc_track_flat_to_right_banked_25_deg_down( /** rct2: 0x008AC084 */ static void twister_rc_track_left_banked_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_banked_25_deg_down_to_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1302,7 +1302,7 @@ static void twister_rc_track_left_banked_25_deg_down_to_flat( /** rct2: 0x008AC094 */ static void twister_rc_track_right_banked_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_banked_25_deg_down_to_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1311,7 +1311,7 @@ static void twister_rc_track_right_banked_25_deg_down_to_flat( /** rct2: 0x008AC0A4 */ static void twister_rc_track_left_quarter_turn_1_90_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_quarter_turn_1_90_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1320,7 +1320,7 @@ static void twister_rc_track_left_quarter_turn_1_90_deg_up( /** rct2: 0x008AC0B4 */ static void twister_rc_track_right_quarter_turn_1_90_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_quarter_turn_1_90_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1329,7 +1329,7 @@ static void twister_rc_track_right_quarter_turn_1_90_deg_up( /** rct2: 0x008AC0C4 */ static void twister_rc_track_left_quarter_turn_1_90_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_quarter_turn_1_90_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1338,7 +1338,7 @@ static void twister_rc_track_left_quarter_turn_1_90_deg_down( /** rct2: 0x008AC0D4 */ static void twister_rc_track_right_quarter_turn_1_90_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_quarter_turn_1_90_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1347,7 +1347,7 @@ static void twister_rc_track_right_quarter_turn_1_90_deg_down( /* The following track elements used to be specific to the Vertical Roller Coaster */ static void twister_rc_track_flat_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_flat_to_60_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1355,7 +1355,7 @@ static void twister_rc_track_flat_to_60_deg_up( static void twister_rc_track_60_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_60_deg_up_to_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1363,7 +1363,7 @@ static void twister_rc_track_60_deg_up_to_flat( static void twister_rc_track_flat_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_flat_to_60_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1371,7 +1371,7 @@ static void twister_rc_track_flat_to_60_deg_down( static void twister_rc_track_60_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_60_deg_up_to_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1379,7 +1379,7 @@ static void twister_rc_track_60_deg_down_to_flat( static void twister_rc_track_brake_for_drop( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_brake_for_drop( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1387,7 +1387,7 @@ static void twister_rc_track_brake_for_drop( static void twister_rc_track_diag_flat_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_flat_to_60_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1395,7 +1395,7 @@ static void twister_rc_track_diag_flat_to_60_deg_up( static void twister_rc_track_diag_60_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_60_deg_up_to_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1403,7 +1403,7 @@ static void twister_rc_track_diag_60_deg_up_to_flat( static void twister_rc_track_diag_flat_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_flat_to_60_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1411,7 +1411,7 @@ static void twister_rc_track_diag_flat_to_60_deg_down( static void twister_rc_track_diag_60_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_60_deg_down_to_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1421,7 +1421,7 @@ static void twister_rc_track_diag_60_deg_down_to_flat( /** rct2: 0x008ABCD4 */ static void twister_rc_track_half_loop_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_half_loop_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1430,7 +1430,7 @@ static void twister_rc_track_half_loop_up( /** rct2: 0x008ABCE4 */ static void twister_rc_track_half_loop_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_half_loop_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1439,7 +1439,7 @@ static void twister_rc_track_half_loop_down( /** rct2: 0x008ABD34 */ static void twister_rc_track_left_corkscrew_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_corkscrew_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1448,7 +1448,7 @@ static void twister_rc_track_left_corkscrew_up( /** rct2: 0x008ABD44 */ static void twister_rc_track_right_corkscrew_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_corkscrew_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1457,7 +1457,7 @@ static void twister_rc_track_right_corkscrew_up( /** rct2: 0x008ABD54 */ static void twister_rc_track_left_corkscrew_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_corkscrew_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1466,7 +1466,7 @@ static void twister_rc_track_left_corkscrew_down( /** rct2: 0x008ABD64 */ static void twister_rc_track_right_corkscrew_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_corkscrew_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1475,7 +1475,7 @@ static void twister_rc_track_right_corkscrew_down( /** rct2: 0x008AC0F4 */ static void twister_rc_track_flat_to_60_deg_up_long_base( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_flat_to_60_deg_up_long_base( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1484,7 +1484,7 @@ static void twister_rc_track_flat_to_60_deg_up_long_base( /** rct2: 0x008AC104 */ static void twister_rc_track_60_deg_up_to_flat_long_base( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_60_deg_up_to_flat_long_base( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1493,7 +1493,7 @@ static void twister_rc_track_60_deg_up_to_flat_long_base( /** rct2: 0x008AC114 */ static void twister_rc_track_flat_to_60_deg_down_long_base( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_flat_to_60_deg_down_long_base( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1502,7 +1502,7 @@ static void twister_rc_track_flat_to_60_deg_down_long_base( /** rct2: 0x008AC124 */ static void twister_rc_track_60_deg_up_to_flat_long_base122( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_60_deg_up_to_flat_long_base122( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1511,7 +1511,7 @@ static void twister_rc_track_60_deg_up_to_flat_long_base122( /** rct2: 0x008ABCF4 */ static void twister_rc_track_left_barrel_roll_up_to_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_barrel_roll_up_to_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1520,7 +1520,7 @@ static void twister_rc_track_left_barrel_roll_up_to_down( /** rct2: 0x008ABD04 */ static void twister_rc_track_right_barrel_roll_up_to_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_barrel_roll_up_to_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1529,7 +1529,7 @@ static void twister_rc_track_right_barrel_roll_up_to_down( /** rct2: 0x008ABD14 */ static void twister_rc_track_left_barrel_roll_down_to_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_barrel_roll_down_to_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1538,7 +1538,7 @@ static void twister_rc_track_left_barrel_roll_down_to_up( /** rct2: 0x008ABD24 */ static void twister_rc_track_right_barrel_roll_down_to_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_barrel_roll_down_to_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1547,7 +1547,7 @@ static void twister_rc_track_right_barrel_roll_down_to_up( /** rct2: 0x008ABDB4 */ static void twister_rc_track_powered_lift( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_powered_lift( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1556,7 +1556,7 @@ static void twister_rc_track_powered_lift( /** rct2: 0x008ABDC4 */ static void twister_rc_track_left_large_half_loop_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_large_half_loop_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1565,7 +1565,7 @@ static void twister_rc_track_left_large_half_loop_up( /** rct2: 0x008ABDD4 */ static void twister_rc_track_right_large_half_loop_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_large_half_loop_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1574,7 +1574,7 @@ static void twister_rc_track_right_large_half_loop_up( /** rct2: 0x008ABDE4 */ static void twister_rc_track_right_large_half_loop_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_large_half_loop_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1583,7 +1583,7 @@ static void twister_rc_track_right_large_half_loop_down( /** rct2: 0x008ABDF4 */ static void twister_rc_track_left_large_half_loop_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_large_half_loop_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1592,7 +1592,7 @@ static void twister_rc_track_left_large_half_loop_down( /** rct2: 0x008AC134 */ static void twister_rc_track_90_deg_to_inverted_flat_quarter_loop_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1601,7 +1601,7 @@ static void twister_rc_track_90_deg_to_inverted_flat_quarter_loop_up( /** rct2: 0x008AC144 */ static void twister_rc_track_inverted_flat_to_90_deg_quarter_loop_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_inverted_flat_to_90_deg_quarter_loop_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); @@ -1609,7 +1609,7 @@ static void twister_rc_track_inverted_flat_to_90_deg_quarter_loop_down( static void twister_rc_track_booster( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_booster(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES); } diff --git a/src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp b/src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp index c44c3e8cf2..33c7382caf 100644 --- a/src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp @@ -15,14 +15,14 @@ /** rct2: 0x008AA00C */ static void vertical_drop_rc_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_flat(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); } static void vertical_drop_rc_track_station( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_station(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); } @@ -30,7 +30,7 @@ static void vertical_drop_rc_track_station( /** rct2: 0x008AA01C */ static void vertical_drop_rc_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_up(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); } @@ -38,7 +38,7 @@ static void vertical_drop_rc_track_25_deg_up( /** rct2: 0x008AA02C */ static void vertical_drop_rc_track_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_60_deg_up(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); } @@ -46,7 +46,7 @@ static void vertical_drop_rc_track_60_deg_up( /** rct2: 0x008AA03C */ static void vertical_drop_rc_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_flat_to_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -55,7 +55,7 @@ static void vertical_drop_rc_track_flat_to_25_deg_up( /** rct2: 0x008AA04C */ static void vertical_drop_rc_track_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_up_to_60_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -64,7 +64,7 @@ static void vertical_drop_rc_track_25_deg_up_to_60_deg_up( /** rct2: 0x008AA05C */ static void vertical_drop_rc_track_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_60_deg_up_to_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -73,7 +73,7 @@ static void vertical_drop_rc_track_60_deg_up_to_25_deg_up( /** rct2: 0x008AA06C */ static void vertical_drop_rc_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_up_to_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -82,7 +82,7 @@ static void vertical_drop_rc_track_25_deg_up_to_flat( /** rct2: 0x008AA07C */ static void vertical_drop_rc_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -91,7 +91,7 @@ static void vertical_drop_rc_track_25_deg_down( /** rct2: 0x008AA08C */ static void vertical_drop_rc_track_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_60_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -100,7 +100,7 @@ static void vertical_drop_rc_track_60_deg_down( /** rct2: 0x008AA09C */ static void vertical_drop_rc_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_flat_to_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -109,7 +109,7 @@ static void vertical_drop_rc_track_flat_to_25_deg_down( /** rct2: 0x008AA0AC */ static void vertical_drop_rc_track_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_down_to_60_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -118,7 +118,7 @@ static void vertical_drop_rc_track_25_deg_down_to_60_deg_down( /** rct2: 0x008AA0BC */ static void vertical_drop_rc_track_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_60_deg_down_to_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -127,7 +127,7 @@ static void vertical_drop_rc_track_60_deg_down_to_25_deg_down( /** rct2: 0x008AA0CC */ static void vertical_drop_rc_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_down_to_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -136,7 +136,7 @@ static void vertical_drop_rc_track_25_deg_down_to_flat( /** rct2: 0x008AA0DC */ static void vertical_drop_rc_track_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_quarter_turn_5( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -145,7 +145,7 @@ static void vertical_drop_rc_track_left_quarter_turn_5( /** rct2: 0x008AA0EC */ static void vertical_drop_rc_track_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_quarter_turn_5( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -154,7 +154,7 @@ static void vertical_drop_rc_track_right_quarter_turn_5( /** rct2: 0x008AA0FC */ static void vertical_drop_rc_track_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_flat_to_left_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -163,7 +163,7 @@ static void vertical_drop_rc_track_flat_to_left_bank( /** rct2: 0x008AA10C */ static void vertical_drop_rc_track_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_flat_to_right_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -172,7 +172,7 @@ static void vertical_drop_rc_track_flat_to_right_bank( /** rct2: 0x008AA11C */ static void vertical_drop_rc_track_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_bank_to_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -181,7 +181,7 @@ static void vertical_drop_rc_track_left_bank_to_flat( /** rct2: 0x008AA12C */ static void vertical_drop_rc_track_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_bank_to_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -190,7 +190,7 @@ static void vertical_drop_rc_track_right_bank_to_flat( /** rct2: 0x008AA13C */ static void vertical_drop_rc_track_banked_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_banked_left_quarter_turn_5( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -199,7 +199,7 @@ static void vertical_drop_rc_track_banked_left_quarter_turn_5( /** rct2: 0x008AA14C */ static void vertical_drop_rc_track_banked_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_banked_right_quarter_turn_5( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -208,7 +208,7 @@ static void vertical_drop_rc_track_banked_right_quarter_turn_5( /** rct2: 0x008AA15C */ static void vertical_drop_rc_track_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_bank_to_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -217,7 +217,7 @@ static void vertical_drop_rc_track_left_bank_to_25_deg_up( /** rct2: 0x008AA16C */ static void vertical_drop_rc_track_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_bank_to_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -226,7 +226,7 @@ static void vertical_drop_rc_track_right_bank_to_25_deg_up( /** rct2: 0x008AA17C */ static void vertical_drop_rc_track_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_up_to_left_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -235,7 +235,7 @@ static void vertical_drop_rc_track_25_deg_up_to_left_bank( /** rct2: 0x008AA18C */ static void vertical_drop_rc_track_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_up_to_right_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -244,7 +244,7 @@ static void vertical_drop_rc_track_25_deg_up_to_right_bank( /** rct2: 0x008AA19C */ static void vertical_drop_rc_track_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_bank_to_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -253,7 +253,7 @@ static void vertical_drop_rc_track_left_bank_to_25_deg_down( /** rct2: 0x008AA1AC */ static void vertical_drop_rc_track_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_bank_to_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -262,7 +262,7 @@ static void vertical_drop_rc_track_right_bank_to_25_deg_down( /** rct2: 0x008AA1BC */ static void vertical_drop_rc_track_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_down_to_left_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -271,7 +271,7 @@ static void vertical_drop_rc_track_25_deg_down_to_left_bank( /** rct2: 0x008AA1CC */ static void vertical_drop_rc_track_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_down_to_right_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -280,7 +280,7 @@ static void vertical_drop_rc_track_25_deg_down_to_right_bank( /** rct2: 0x008AA1DC */ static void vertical_drop_rc_track_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_bank(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); } @@ -288,7 +288,7 @@ static void vertical_drop_rc_track_left_bank( /** rct2: 0x008AA1EC */ static void vertical_drop_rc_track_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -297,7 +297,7 @@ static void vertical_drop_rc_track_right_bank( /** rct2: 0x008AA1FC */ static void vertical_drop_rc_track_left_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_quarter_turn_5_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -306,7 +306,7 @@ static void vertical_drop_rc_track_left_quarter_turn_5_25_deg_up( /** rct2: 0x008AA20C */ static void vertical_drop_rc_track_right_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_quarter_turn_5_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -315,7 +315,7 @@ static void vertical_drop_rc_track_right_quarter_turn_5_25_deg_up( /** rct2: 0x008AA21C */ static void vertical_drop_rc_track_left_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_quarter_turn_5_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -324,7 +324,7 @@ static void vertical_drop_rc_track_left_quarter_turn_5_25_deg_down( /** rct2: 0x008AA22C */ static void vertical_drop_rc_track_right_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_quarter_turn_5_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -333,7 +333,7 @@ static void vertical_drop_rc_track_right_quarter_turn_5_25_deg_down( /** rct2: 0x008AA23C */ static void vertical_drop_rc_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_s_bend_left( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -342,7 +342,7 @@ static void vertical_drop_rc_track_s_bend_left( /** rct2: 0x008AA24C */ static void vertical_drop_rc_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_s_bend_right( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -351,7 +351,7 @@ static void vertical_drop_rc_track_s_bend_right( /** rct2: 0x008AA49C */ static void vertical_drop_rc_track_left_vertical_loop( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_vertical_loop( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -360,7 +360,7 @@ static void vertical_drop_rc_track_left_vertical_loop( /** rct2: 0x008AA4AC */ static void vertical_drop_rc_track_right_vertical_loop( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_vertical_loop( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -369,7 +369,7 @@ static void vertical_drop_rc_track_right_vertical_loop( /** rct2: 0x008AA28C */ static void vertical_drop_rc_track_left_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_quarter_turn_3( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -378,7 +378,7 @@ static void vertical_drop_rc_track_left_quarter_turn_3( /** rct2: 0x008AA29C */ static void vertical_drop_rc_track_right_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_quarter_turn_3( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -387,7 +387,7 @@ static void vertical_drop_rc_track_right_quarter_turn_3( /** rct2: 0x008AA2AC */ static void vertical_drop_rc_track_left_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_quarter_turn_3_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -396,7 +396,7 @@ static void vertical_drop_rc_track_left_quarter_turn_3_bank( /** rct2: 0x008AA2BC */ static void vertical_drop_rc_track_right_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_quarter_turn_3_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -405,7 +405,7 @@ static void vertical_drop_rc_track_right_quarter_turn_3_bank( /** rct2: 0x008AA2CC */ static void vertical_drop_rc_track_left_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_quarter_turn_3_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -414,7 +414,7 @@ static void vertical_drop_rc_track_left_quarter_turn_3_25_deg_up( /** rct2: 0x008AA2DC */ static void vertical_drop_rc_track_right_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_quarter_turn_3_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -423,7 +423,7 @@ static void vertical_drop_rc_track_right_quarter_turn_3_25_deg_up( /** rct2: 0x008AA2EC */ static void vertical_drop_rc_track_left_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_quarter_turn_3_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -432,7 +432,7 @@ static void vertical_drop_rc_track_left_quarter_turn_3_25_deg_down( /** rct2: 0x008AA2FC */ static void vertical_drop_rc_track_right_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_quarter_turn_3_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -441,7 +441,7 @@ static void vertical_drop_rc_track_right_quarter_turn_3_25_deg_down( /** rct2: 0x008AA30C */ static void vertical_drop_rc_track_left_half_banked_helix_up_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_half_banked_helix_up_small( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -450,7 +450,7 @@ static void vertical_drop_rc_track_left_half_banked_helix_up_small( /** rct2: 0x008AA31C */ static void vertical_drop_rc_track_right_half_banked_helix_up_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_half_banked_helix_up_small( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -459,7 +459,7 @@ static void vertical_drop_rc_track_right_half_banked_helix_up_small( /** rct2: 0x008AA32C */ static void vertical_drop_rc_track_left_half_banked_helix_down_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_half_banked_helix_down_small( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -468,7 +468,7 @@ static void vertical_drop_rc_track_left_half_banked_helix_down_small( /** rct2: 0x008AA33C */ static void vertical_drop_rc_track_right_half_banked_helix_down_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_half_banked_helix_down_small( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -477,7 +477,7 @@ static void vertical_drop_rc_track_right_half_banked_helix_down_small( /** rct2: 0x008AA34C */ static void vertical_drop_rc_track_left_half_banked_helix_up_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_half_banked_helix_up_large( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -486,7 +486,7 @@ static void vertical_drop_rc_track_left_half_banked_helix_up_large( /** rct2: 0x008AA35C */ static void vertical_drop_rc_track_right_half_banked_helix_up_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_half_banked_helix_up_large( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -495,7 +495,7 @@ static void vertical_drop_rc_track_right_half_banked_helix_up_large( /** rct2: 0x008AA36C */ static void vertical_drop_rc_track_left_half_banked_helix_down_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_half_banked_helix_down_large( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -504,7 +504,7 @@ static void vertical_drop_rc_track_left_half_banked_helix_down_large( /** rct2: 0x008AA37C */ static void vertical_drop_rc_track_right_half_banked_helix_down_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_half_banked_helix_down_large( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -513,7 +513,7 @@ static void vertical_drop_rc_track_right_half_banked_helix_down_large( /** rct2: 0x008AA3AC */ static void vertical_drop_rc_track_left_quarter_turn_1_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_quarter_turn_1_60_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -522,7 +522,7 @@ static void vertical_drop_rc_track_left_quarter_turn_1_60_deg_up( /** rct2: 0x008AA38C */ static void vertical_drop_rc_track_right_quarter_turn_1_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_quarter_turn_1_60_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -531,7 +531,7 @@ static void vertical_drop_rc_track_right_quarter_turn_1_60_deg_up( /** rct2: 0x008AA39C */ static void vertical_drop_rc_track_left_quarter_turn_1_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_quarter_turn_1_60_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -540,7 +540,7 @@ static void vertical_drop_rc_track_left_quarter_turn_1_60_deg_down( /** rct2: 0x008AA3BC */ static void vertical_drop_rc_track_right_quarter_turn_1_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_quarter_turn_1_60_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -549,7 +549,7 @@ static void vertical_drop_rc_track_right_quarter_turn_1_60_deg_down( /** rct2: 0x008AA40C */ static void vertical_drop_rc_track_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_brakes(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); } @@ -557,7 +557,7 @@ static void vertical_drop_rc_track_brakes( /** rct2: 0x008AA7EC */ static void vertical_drop_rc_track_25_deg_up_left_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_up_left_banked( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -566,7 +566,7 @@ static void vertical_drop_rc_track_25_deg_up_left_banked( /** rct2: 0x008AA7FC */ static void vertical_drop_rc_track_25_deg_up_right_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_up_right_banked( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -575,7 +575,7 @@ static void vertical_drop_rc_track_25_deg_up_right_banked( /** rct2: 0x008AA41C */ static void vertical_drop_rc_track_on_ride_photo( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_on_ride_photo( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -584,7 +584,7 @@ static void vertical_drop_rc_track_on_ride_photo( /** rct2: 0x008AA80C */ static void vertical_drop_rc_track_25_deg_down_left_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_down_left_banked( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -593,7 +593,7 @@ static void vertical_drop_rc_track_25_deg_down_left_banked( /** rct2: 0x008AA81C */ static void vertical_drop_rc_track_25_deg_down_right_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_down_right_banked( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -602,7 +602,7 @@ static void vertical_drop_rc_track_25_deg_down_right_banked( /** rct2: 0x008AA42C */ static void vertical_drop_rc_track_90_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_90_deg_up(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); } @@ -610,7 +610,7 @@ static void vertical_drop_rc_track_90_deg_up( /** rct2: 0x008AA43C */ static void vertical_drop_rc_track_90_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_90_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -619,7 +619,7 @@ static void vertical_drop_rc_track_90_deg_down( /** rct2: 0x008AA44C */ static void vertical_drop_rc_track_60_deg_up_to_90_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_60_deg_up_to_90_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -628,7 +628,7 @@ static void vertical_drop_rc_track_60_deg_up_to_90_deg_up( /** rct2: 0x008AA45C */ static void vertical_drop_rc_track_90_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_90_deg_down_to_60_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -637,7 +637,7 @@ static void vertical_drop_rc_track_90_deg_down_to_60_deg_down( /** rct2: 0x008AA46C */ static void vertical_drop_rc_track_90_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_90_deg_up_to_60_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -646,7 +646,7 @@ static void vertical_drop_rc_track_90_deg_up_to_60_deg_up( /** rct2: 0x008AA47C */ static void vertical_drop_rc_track_60_deg_down_to_90_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_60_deg_down_to_90_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -655,7 +655,7 @@ static void vertical_drop_rc_track_60_deg_down_to_90_deg_down( /** rct2: 0x008AA4CC */ static void vertical_drop_rc_track_left_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_eighth_to_diag( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -664,7 +664,7 @@ static void vertical_drop_rc_track_left_eighth_to_diag( /** rct2: 0x008AA4DC */ static void vertical_drop_rc_track_right_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_eighth_to_diag( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -673,7 +673,7 @@ static void vertical_drop_rc_track_right_eighth_to_diag( /** rct2: 0x008AA4EC */ static void vertical_drop_rc_track_left_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_eighth_to_orthogonal( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -682,7 +682,7 @@ static void vertical_drop_rc_track_left_eighth_to_orthogonal( /** rct2: 0x008AA4FC */ static void vertical_drop_rc_track_right_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_eighth_to_orthogonal( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -691,7 +691,7 @@ static void vertical_drop_rc_track_right_eighth_to_orthogonal( /** rct2: 0x008AA50C */ static void vertical_drop_rc_track_left_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_eighth_bank_to_diag( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -700,7 +700,7 @@ static void vertical_drop_rc_track_left_eighth_bank_to_diag( /** rct2: 0x008AA51C */ static void vertical_drop_rc_track_right_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_eighth_bank_to_diag( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -709,7 +709,7 @@ static void vertical_drop_rc_track_right_eighth_bank_to_diag( /** rct2: 0x008AA52C */ static void vertical_drop_rc_track_left_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_eighth_bank_to_orthogonal( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -718,7 +718,7 @@ static void vertical_drop_rc_track_left_eighth_bank_to_orthogonal( /** rct2: 0x008AA53C */ static void vertical_drop_rc_track_right_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_eighth_bank_to_orthogonal( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -727,7 +727,7 @@ static void vertical_drop_rc_track_right_eighth_bank_to_orthogonal( /** rct2: 0x008AA4BC */ static void vertical_drop_rc_track_diag_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_flat(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); } @@ -735,7 +735,7 @@ static void vertical_drop_rc_track_diag_flat( /** rct2: 0x008AA56C */ static void vertical_drop_rc_track_diag_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -744,7 +744,7 @@ static void vertical_drop_rc_track_diag_25_deg_up( /** rct2: 0x008AA5CC */ static void vertical_drop_rc_track_diag_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_60_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -753,7 +753,7 @@ static void vertical_drop_rc_track_diag_60_deg_up( /** rct2: 0x008AA54C */ static void vertical_drop_rc_track_diag_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_flat_to_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -762,7 +762,7 @@ static void vertical_drop_rc_track_diag_flat_to_25_deg_up( /** rct2: 0x008AA5AC */ static void vertical_drop_rc_track_diag_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_25_deg_up_to_60_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -771,7 +771,7 @@ static void vertical_drop_rc_track_diag_25_deg_up_to_60_deg_up( /** rct2: 0x008AA5BC */ static void vertical_drop_rc_track_diag_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_60_deg_up_to_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -780,7 +780,7 @@ static void vertical_drop_rc_track_diag_60_deg_up_to_25_deg_up( /** rct2: 0x008AA55C */ static void vertical_drop_rc_track_diag_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_25_deg_up_to_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -789,7 +789,7 @@ static void vertical_drop_rc_track_diag_25_deg_up_to_flat( /** rct2: 0x008AA59C */ static void vertical_drop_rc_track_diag_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -798,7 +798,7 @@ static void vertical_drop_rc_track_diag_25_deg_down( /** rct2: 0x008AA5FC */ static void vertical_drop_rc_track_diag_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_60_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -807,7 +807,7 @@ static void vertical_drop_rc_track_diag_60_deg_down( /** rct2: 0x008AA57C */ static void vertical_drop_rc_track_diag_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_flat_to_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -816,7 +816,7 @@ static void vertical_drop_rc_track_diag_flat_to_25_deg_down( /** rct2: 0x008AA5DC */ static void vertical_drop_rc_track_diag_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_25_deg_down_to_60_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -825,7 +825,7 @@ static void vertical_drop_rc_track_diag_25_deg_down_to_60_deg_down( /** rct2: 0x008AA5EC */ static void vertical_drop_rc_track_diag_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_60_deg_down_to_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -834,7 +834,7 @@ static void vertical_drop_rc_track_diag_60_deg_down_to_25_deg_down( /** rct2: 0x008AA58C */ static void vertical_drop_rc_track_diag_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_25_deg_down_to_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -843,7 +843,7 @@ static void vertical_drop_rc_track_diag_25_deg_down_to_flat( /** rct2: 0x008AA62C */ static void vertical_drop_rc_track_diag_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_flat_to_left_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -852,7 +852,7 @@ static void vertical_drop_rc_track_diag_flat_to_left_bank( /** rct2: 0x008AA63C */ static void vertical_drop_rc_track_diag_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_flat_to_right_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -861,7 +861,7 @@ static void vertical_drop_rc_track_diag_flat_to_right_bank( /** rct2: 0x008AA64C */ static void vertical_drop_rc_track_diag_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_left_bank_to_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -870,7 +870,7 @@ static void vertical_drop_rc_track_diag_left_bank_to_flat( /** rct2: 0x008AA65C */ static void vertical_drop_rc_track_diag_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_right_bank_to_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -879,7 +879,7 @@ static void vertical_drop_rc_track_diag_right_bank_to_flat( /** rct2: 0x008AA68C */ static void vertical_drop_rc_track_diag_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_left_bank_to_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -888,7 +888,7 @@ static void vertical_drop_rc_track_diag_left_bank_to_25_deg_up( /** rct2: 0x008AA69C */ static void vertical_drop_rc_track_diag_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_right_bank_to_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -897,7 +897,7 @@ static void vertical_drop_rc_track_diag_right_bank_to_25_deg_up( /** rct2: 0x008AA66C */ static void vertical_drop_rc_track_diag_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_25_deg_up_to_left_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -906,7 +906,7 @@ static void vertical_drop_rc_track_diag_25_deg_up_to_left_bank( /** rct2: 0x008AA67C */ static void vertical_drop_rc_track_diag_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_25_deg_up_to_right_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -915,7 +915,7 @@ static void vertical_drop_rc_track_diag_25_deg_up_to_right_bank( /** rct2: 0x008AA6AC */ static void vertical_drop_rc_track_diag_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_left_bank_to_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -924,7 +924,7 @@ static void vertical_drop_rc_track_diag_left_bank_to_25_deg_down( /** rct2: 0x008AA6BC */ static void vertical_drop_rc_track_diag_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_right_bank_to_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -933,7 +933,7 @@ static void vertical_drop_rc_track_diag_right_bank_to_25_deg_down( /** rct2: 0x008AA6CC */ static void vertical_drop_rc_track_diag_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_25_deg_down_to_left_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -942,7 +942,7 @@ static void vertical_drop_rc_track_diag_25_deg_down_to_left_bank( /** rct2: 0x008AA6DC */ static void vertical_drop_rc_track_diag_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_25_deg_down_to_right_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -951,7 +951,7 @@ static void vertical_drop_rc_track_diag_25_deg_down_to_right_bank( /** rct2: 0x008AA60C */ static void vertical_drop_rc_track_diag_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_left_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -960,7 +960,7 @@ static void vertical_drop_rc_track_diag_left_bank( /** rct2: 0x008AA61C */ static void vertical_drop_rc_track_diag_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_right_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -969,7 +969,7 @@ static void vertical_drop_rc_track_diag_right_bank( /** rct2: 0x008AA72C */ static void vertical_drop_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_bank_to_left_quarter_turn_3_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -978,7 +978,7 @@ static void vertical_drop_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up( /** rct2: 0x008AA73C */ static void vertical_drop_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_bank_to_right_quarter_turn_3_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -987,7 +987,7 @@ static void vertical_drop_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up( /** rct2: 0x008AA74C */ static void vertical_drop_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_quarter_turn_3_25_deg_down_to_left_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -996,7 +996,7 @@ static void vertical_drop_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank( /** rct2: 0x008AA75C */ static void vertical_drop_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_quarter_turn_3_25_deg_down_to_right_bank( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1005,7 +1005,7 @@ static void vertical_drop_rc_track_right_quarter_turn_3_25_deg_down_to_right_ban /** rct2: 0x008AA9EC */ static void vertical_drop_rc_track_block_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_block_brakes( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1014,7 +1014,7 @@ static void vertical_drop_rc_track_block_brakes( /** rct2: 0x008AA96C */ static void vertical_drop_rc_track_left_banked_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1023,7 +1023,7 @@ static void vertical_drop_rc_track_left_banked_quarter_turn_3_25_deg_up( /** rct2: 0x008AA97C */ static void vertical_drop_rc_track_right_banked_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1032,7 +1032,7 @@ static void vertical_drop_rc_track_right_banked_quarter_turn_3_25_deg_up( /** rct2: 0x008AA98C */ static void vertical_drop_rc_track_left_banked_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1041,7 +1041,7 @@ static void vertical_drop_rc_track_left_banked_quarter_turn_3_25_deg_down( /** rct2: 0x008AA99C */ static void vertical_drop_rc_track_right_banked_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1050,7 +1050,7 @@ static void vertical_drop_rc_track_right_banked_quarter_turn_3_25_deg_down( /** rct2: 0x008AA8AC */ static void vertical_drop_rc_track_left_banked_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1059,7 +1059,7 @@ static void vertical_drop_rc_track_left_banked_quarter_turn_5_25_deg_up( /** rct2: 0x008AA8BC */ static void vertical_drop_rc_track_right_banked_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1068,7 +1068,7 @@ static void vertical_drop_rc_track_right_banked_quarter_turn_5_25_deg_up( /** rct2: 0x008AA8CC */ static void vertical_drop_rc_track_left_banked_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1077,7 +1077,7 @@ static void vertical_drop_rc_track_left_banked_quarter_turn_5_25_deg_down( /** rct2: 0x008AA8DC */ static void vertical_drop_rc_track_right_banked_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1086,7 +1086,7 @@ static void vertical_drop_rc_track_right_banked_quarter_turn_5_25_deg_down( /** rct2: 0x008AA82C */ static void vertical_drop_rc_track_25_deg_up_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_up_to_left_banked_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1095,7 +1095,7 @@ static void vertical_drop_rc_track_25_deg_up_to_left_banked_25_deg_up( /** rct2: 0x008AA83C */ static void vertical_drop_rc_track_25_deg_up_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_up_to_right_banked_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1104,7 +1104,7 @@ static void vertical_drop_rc_track_25_deg_up_to_right_banked_25_deg_up( /** rct2: 0x008AA84C */ static void vertical_drop_rc_track_left_banked_25_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_banked_25_deg_up_to_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1113,7 +1113,7 @@ static void vertical_drop_rc_track_left_banked_25_deg_up_to_25_deg_up( /** rct2: 0x008AA85C */ static void vertical_drop_rc_track_right_banked_25_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_banked_25_deg_up_to_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1122,7 +1122,7 @@ static void vertical_drop_rc_track_right_banked_25_deg_up_to_25_deg_up( /** rct2: 0x008AA86C */ static void vertical_drop_rc_track_25_deg_down_to_left_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_down_to_left_banked_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1131,7 +1131,7 @@ static void vertical_drop_rc_track_25_deg_down_to_left_banked_25_deg_down( /** rct2: 0x008AA87C */ static void vertical_drop_rc_track_25_deg_down_to_right_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_25_deg_down_to_right_banked_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1140,7 +1140,7 @@ static void vertical_drop_rc_track_25_deg_down_to_right_banked_25_deg_down( /** rct2: 0x008AA88C */ static void vertical_drop_rc_track_left_banked_25_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_banked_25_deg_down_to_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1149,7 +1149,7 @@ static void vertical_drop_rc_track_left_banked_25_deg_down_to_25_deg_down( /** rct2: 0x008AA89C */ static void vertical_drop_rc_track_right_banked_25_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_banked_25_deg_down_to_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1158,7 +1158,7 @@ static void vertical_drop_rc_track_right_banked_25_deg_down_to_25_deg_down( /** rct2: 0x008AA8EC */ static void vertical_drop_rc_track_left_banked_flat_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1167,7 +1167,7 @@ static void vertical_drop_rc_track_left_banked_flat_to_left_banked_25_deg_up( /** rct2: 0x008AA8FC */ static void vertical_drop_rc_track_right_banked_flat_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1176,7 +1176,7 @@ static void vertical_drop_rc_track_right_banked_flat_to_right_banked_25_deg_up( /** rct2: 0x008AA92C */ static void vertical_drop_rc_track_left_banked_25_deg_up_to_left_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_banked_25_deg_up_to_left_banked_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1185,7 +1185,7 @@ static void vertical_drop_rc_track_left_banked_25_deg_up_to_left_banked_flat( /** rct2: 0x008AA93C */ static void vertical_drop_rc_track_right_banked_25_deg_up_to_right_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_banked_25_deg_up_to_right_banked_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1194,7 +1194,7 @@ static void vertical_drop_rc_track_right_banked_25_deg_up_to_right_banked_flat( /** rct2: 0x008AA94C */ static void vertical_drop_rc_track_left_banked_flat_to_left_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1203,7 +1203,7 @@ static void vertical_drop_rc_track_left_banked_flat_to_left_banked_25_deg_down( /** rct2: 0x008AA95C */ static void vertical_drop_rc_track_right_banked_flat_to_right_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1212,7 +1212,7 @@ static void vertical_drop_rc_track_right_banked_flat_to_right_banked_25_deg_down /** rct2: 0x008AA90C */ static void vertical_drop_rc_track_left_banked_25_deg_down_to_left_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_banked_25_deg_down_to_left_banked_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1221,7 +1221,7 @@ static void vertical_drop_rc_track_left_banked_25_deg_down_to_left_banked_flat( /** rct2: 0x008AA91C */ static void vertical_drop_rc_track_right_banked_25_deg_down_to_right_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_banked_25_deg_down_to_right_banked_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1230,7 +1230,7 @@ static void vertical_drop_rc_track_right_banked_25_deg_down_to_right_banked_flat /** rct2: 0x008AA76C */ static void vertical_drop_rc_track_flat_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_flat_to_left_banked_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1239,7 +1239,7 @@ static void vertical_drop_rc_track_flat_to_left_banked_25_deg_up( /** rct2: 0x008AA77C */ static void vertical_drop_rc_track_flat_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_flat_to_right_banked_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1248,7 +1248,7 @@ static void vertical_drop_rc_track_flat_to_right_banked_25_deg_up( /** rct2: 0x008AA78C */ static void vertical_drop_rc_track_left_banked_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_banked_25_deg_up_to_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1257,7 +1257,7 @@ static void vertical_drop_rc_track_left_banked_25_deg_up_to_flat( /** rct2: 0x008AA79C */ static void vertical_drop_rc_track_right_banked_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_banked_25_deg_up_to_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1266,7 +1266,7 @@ static void vertical_drop_rc_track_right_banked_25_deg_up_to_flat( /** rct2: 0x008AA7AC */ static void vertical_drop_rc_track_flat_to_left_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_flat_to_left_banked_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1275,7 +1275,7 @@ static void vertical_drop_rc_track_flat_to_left_banked_25_deg_down( /** rct2: 0x008AA7BC */ static void vertical_drop_rc_track_flat_to_right_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_flat_to_right_banked_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1284,7 +1284,7 @@ static void vertical_drop_rc_track_flat_to_right_banked_25_deg_down( /** rct2: 0x008AA7CC */ static void vertical_drop_rc_track_left_banked_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_banked_25_deg_down_to_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1293,7 +1293,7 @@ static void vertical_drop_rc_track_left_banked_25_deg_down_to_flat( /** rct2: 0x008AA7DC */ static void vertical_drop_rc_track_right_banked_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_banked_25_deg_down_to_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1302,7 +1302,7 @@ static void vertical_drop_rc_track_right_banked_25_deg_down_to_flat( /** rct2: 0x008AA9AC */ static void vertical_drop_rc_track_left_quarter_turn_1_90_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_quarter_turn_1_90_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1311,7 +1311,7 @@ static void vertical_drop_rc_track_left_quarter_turn_1_90_deg_up( /** rct2: 0x008AA9BC */ static void vertical_drop_rc_track_right_quarter_turn_1_90_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_quarter_turn_1_90_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1320,7 +1320,7 @@ static void vertical_drop_rc_track_right_quarter_turn_1_90_deg_up( /** rct2: 0x008AA9CC */ static void vertical_drop_rc_track_left_quarter_turn_1_90_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_quarter_turn_1_90_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1329,7 +1329,7 @@ static void vertical_drop_rc_track_left_quarter_turn_1_90_deg_down( /** rct2: 0x008AA9DC */ static void vertical_drop_rc_track_right_quarter_turn_1_90_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_quarter_turn_1_90_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1339,7 +1339,7 @@ static void vertical_drop_rc_track_right_quarter_turn_1_90_deg_down( /** rct2: 0x008AA3CC */ static void vertical_drop_rc_track_flat_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_flat_to_60_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1348,7 +1348,7 @@ static void vertical_drop_rc_track_flat_to_60_deg_up( /** rct2: 0x008AA3DC */ static void vertical_drop_rc_track_60_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_60_deg_up_to_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1357,7 +1357,7 @@ static void vertical_drop_rc_track_60_deg_up_to_flat( /** rct2: 0x008AA3EC */ static void vertical_drop_rc_track_flat_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_flat_to_60_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1366,7 +1366,7 @@ static void vertical_drop_rc_track_flat_to_60_deg_down( /** rct2: 0x008AA3FC */ static void vertical_drop_rc_track_60_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_60_deg_down_to_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1375,7 +1375,7 @@ static void vertical_drop_rc_track_60_deg_down_to_flat( /** rct2: 0x008AA48C */ static void vertical_drop_rc_track_brake_for_drop( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_brake_for_drop( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1384,7 +1384,7 @@ static void vertical_drop_rc_track_brake_for_drop( /** rct2: 0x008AA6EC */ static void vertical_drop_rc_track_diag_flat_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_flat_to_60_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1393,7 +1393,7 @@ static void vertical_drop_rc_track_diag_flat_to_60_deg_up( /** rct2: 0x008AA6FC */ static void vertical_drop_rc_track_diag_60_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_60_deg_up_to_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1402,7 +1402,7 @@ static void vertical_drop_rc_track_diag_60_deg_up_to_flat( /** rct2: 0x008AA70C */ static void vertical_drop_rc_track_diag_flat_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_flat_to_60_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1411,7 +1411,7 @@ static void vertical_drop_rc_track_diag_flat_to_60_deg_down( /** rct2: 0x008AA71C */ static void vertical_drop_rc_track_diag_60_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_diag_60_deg_down_to_flat( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1420,7 +1420,7 @@ static void vertical_drop_rc_track_diag_60_deg_down_to_flat( /* The following elements used to be specific to the steel twister RC */ static void vertical_drop_rc_track_half_loop_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_half_loop_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1428,7 +1428,7 @@ static void vertical_drop_rc_track_half_loop_up( static void vertical_drop_rc_track_half_loop_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_half_loop_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1436,7 +1436,7 @@ static void vertical_drop_rc_track_half_loop_down( static void vertical_drop_rc_track_left_corkscrew_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_corkscrew_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1444,7 +1444,7 @@ static void vertical_drop_rc_track_left_corkscrew_up( static void vertical_drop_rc_track_right_corkscrew_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_corkscrew_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1452,7 +1452,7 @@ static void vertical_drop_rc_track_right_corkscrew_up( static void vertical_drop_rc_track_left_corkscrew_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_corkscrew_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1460,7 +1460,7 @@ static void vertical_drop_rc_track_left_corkscrew_down( static void vertical_drop_rc_track_right_corkscrew_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_corkscrew_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1468,7 +1468,7 @@ static void vertical_drop_rc_track_right_corkscrew_down( static void vertical_drop_rc_track_flat_to_60_deg_up_long_base( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_flat_to_60_deg_up_long_base( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1476,7 +1476,7 @@ static void vertical_drop_rc_track_flat_to_60_deg_up_long_base( static void vertical_drop_rc_track_60_deg_up_to_flat_long_base( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_60_deg_up_to_flat_long_base( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1484,7 +1484,7 @@ static void vertical_drop_rc_track_60_deg_up_to_flat_long_base( static void vertical_drop_rc_track_flat_to_60_deg_down_long_base( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_flat_to_60_deg_down_long_base( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1492,7 +1492,7 @@ static void vertical_drop_rc_track_flat_to_60_deg_down_long_base( static void vertical_drop_rc_track_60_deg_up_to_flat_long_base122( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_60_deg_up_to_flat_long_base122( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1500,7 +1500,7 @@ static void vertical_drop_rc_track_60_deg_up_to_flat_long_base122( static void vertical_drop_rc_track_left_barrel_roll_up_to_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_barrel_roll_up_to_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1508,7 +1508,7 @@ static void vertical_drop_rc_track_left_barrel_roll_up_to_down( static void vertical_drop_rc_track_right_barrel_roll_up_to_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_barrel_roll_up_to_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1516,7 +1516,7 @@ static void vertical_drop_rc_track_right_barrel_roll_up_to_down( static void vertical_drop_rc_track_left_barrel_roll_down_to_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_barrel_roll_down_to_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1524,7 +1524,7 @@ static void vertical_drop_rc_track_left_barrel_roll_down_to_up( static void vertical_drop_rc_track_right_barrel_roll_down_to_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_barrel_roll_down_to_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1532,7 +1532,7 @@ static void vertical_drop_rc_track_right_barrel_roll_down_to_up( static void vertical_drop_rc_track_powered_lift( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_powered_lift( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1540,7 +1540,7 @@ static void vertical_drop_rc_track_powered_lift( static void vertical_drop_rc_track_left_large_half_loop_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_large_half_loop_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1548,7 +1548,7 @@ static void vertical_drop_rc_track_left_large_half_loop_up( static void vertical_drop_rc_track_right_large_half_loop_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_large_half_loop_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1556,7 +1556,7 @@ static void vertical_drop_rc_track_right_large_half_loop_up( static void vertical_drop_rc_track_right_large_half_loop_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_right_large_half_loop_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1564,7 +1564,7 @@ static void vertical_drop_rc_track_right_large_half_loop_down( static void vertical_drop_rc_track_left_large_half_loop_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_left_large_half_loop_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1572,7 +1572,7 @@ static void vertical_drop_rc_track_left_large_half_loop_down( static void vertical_drop_rc_track_90_deg_to_inverted_flat_quarter_loop_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1580,7 +1580,7 @@ static void vertical_drop_rc_track_90_deg_to_inverted_flat_quarter_loop_up( static void vertical_drop_rc_track_inverted_flat_to_90_deg_quarter_loop_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_inverted_flat_to_90_deg_quarter_loop_down( session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); @@ -1588,7 +1588,7 @@ static void vertical_drop_rc_track_inverted_flat_to_90_deg_quarter_loop_down( static void vertical_drop_rc_track_booster( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bolliger_mabillard_track_booster(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED); } diff --git a/src/openrct2/ride/coaster/VirginiaReel.cpp b/src/openrct2/ride/coaster/VirginiaReel.cpp index d520c90fe5..c5c1149432 100644 --- a/src/openrct2/ride/coaster/VirginiaReel.cpp +++ b/src/openrct2/ride/coaster/VirginiaReel.cpp @@ -226,7 +226,7 @@ void vehicle_visual_virginia_reel( /** rct2: 0x00811264 */ static void paint_virginia_reel_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { const uint32_t* sprites = virginia_reel_track_pieces_flat; if (tileElement->AsTrack()->HasChain()) @@ -255,7 +255,7 @@ static void paint_virginia_reel_track_flat( /** rct2: 0x00811274 */ static void paint_virginia_reel_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { const uint32_t* sprites = virginia_reel_track_pieces_25_deg_up; if (tileElement->AsTrack()->HasChain()) @@ -307,7 +307,7 @@ static void paint_virginia_reel_track_25_deg_up( /** rct2: 0x00811294 */ static void paint_virginia_reel_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { const uint32_t* sprites = virginia_reel_track_pieces_flat_to_25_deg_up; if (tileElement->AsTrack()->HasChain()) @@ -354,7 +354,7 @@ static void paint_virginia_reel_track_flat_to_25_deg_up( /** rct2: 0x00811294 */ static void paint_virginia_reel_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { const uint32_t* sprites = virginia_reel_track_pieces_25_deg_up_to_flat; if (tileElement->AsTrack()->HasChain()) @@ -406,7 +406,7 @@ static void paint_virginia_reel_track_25_deg_up_to_flat( /** rct2: 0x008112A4 */ static void paint_virginia_reel_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_virginia_reel_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -414,7 +414,7 @@ static void paint_virginia_reel_track_25_deg_down( /** rct2: 0x008112B4 */ static void paint_virginia_reel_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_virginia_reel_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -422,7 +422,7 @@ static void paint_virginia_reel_track_flat_to_25_deg_down( /** rct2: 0x008112C4 */ static void paint_virginia_reel_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_virginia_reel_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -430,7 +430,7 @@ static void paint_virginia_reel_track_25_deg_down_to_flat( /** rct2: 0x008112D4, 0x008112E4, 0x008112F4 */ static void paint_virginia_reel_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; @@ -467,7 +467,7 @@ static constexpr const uint8_t virginia_reel_left_quarter_turn_supports[] = { 5, /** rct2: 0x00811304 */ static void paint_virginia_reel_track_left_quarter_turn_3_tiles( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_left_quarter_turn_3_tiles_paint( session, 2, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -497,7 +497,7 @@ static constexpr const uint8_t virginia_reel_right_quarter_turn_3_tiles_to_left_ /** rct2: 0x00811314 */ static void paint_virginia_reel_track_right_quarter_turn_3_tiles( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = virginia_reel_right_quarter_turn_3_tiles_to_left_turn_map[trackSequence]; paint_virginia_reel_track_left_quarter_turn_3_tiles( @@ -507,7 +507,7 @@ static void paint_virginia_reel_track_right_quarter_turn_3_tiles( /** rct2: 0x00811324 */ static void paint_virginia_reel_track_left_quarter_turn_1_tile( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_left_quarter_turn_1_tile_paint( session, 2, height, 0, direction, session->TrackColours[SCHEME_TRACK], @@ -540,7 +540,7 @@ static void paint_virginia_reel_track_left_quarter_turn_1_tile( /** rct2: 0x00811334 */ static void paint_virginia_reel_track_right_quarter_turn_1_tile( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_virginia_reel_track_left_quarter_turn_1_tile( session, rideIndex, trackSequence, (direction + 3) % 4, height, tileElement); diff --git a/src/openrct2/ride/coaster/WildMouse.cpp b/src/openrct2/ride/coaster/WildMouse.cpp index b2e881b168..7d03bed0c6 100644 --- a/src/openrct2/ride/coaster/WildMouse.cpp +++ b/src/openrct2/ride/coaster/WildMouse.cpp @@ -165,7 +165,7 @@ static constexpr const uint32_t _wild_mouse_block_brakes_image_ids[4] = { /** rct2: 0x0078B1E4 */ static void wild_mouse_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_WILD_MOUSE_FLAT_SW_NE, SPR_WILD_MOUSE_FLAT_CHAIN_SW_NE }, @@ -189,7 +189,7 @@ static void wild_mouse_track_flat( static void wild_mouse_track_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t baseImageIds[4] = { SPR_STATION_BASE_B_SW_NE, @@ -224,7 +224,7 @@ static void wild_mouse_track_station( /** rct2: 0x0078B1F4 */ static void wild_mouse_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_WILD_MOUSE_25_DEG_SW_NE, SPR_WILD_MOUSE_25_DEG_CHAIN_SW_NE }, @@ -256,7 +256,7 @@ static void wild_mouse_track_25_deg_up( /** rct2: 0x0078B204 */ static void wild_mouse_track_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_WILD_MOUSE_60_DEG_SW_NE, SPR_WILD_MOUSE_60_DEG_CHAIN_SW_NE }, @@ -302,7 +302,7 @@ static void wild_mouse_track_60_deg_up( /** rct2: 0x0078B214 */ static void wild_mouse_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_WILD_MOUSE_FLAT_TO_25_DEG_SW_NE, SPR_WILD_MOUSE_FLAT_TO_25_DEG_CHAIN_SW_NE }, @@ -334,7 +334,7 @@ static void wild_mouse_track_flat_to_25_deg_up( /** rct2: 0x0078B224 */ static void wild_mouse_track_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_WILD_MOUSE_25_DEG_TO_60_DEG_SW_NE, SPR_WILD_MOUSE_25_DEG_TO_60_DEG_CHAIN_SW_NE }, @@ -381,7 +381,7 @@ static void wild_mouse_track_25_deg_up_to_60_deg_up( /** rct2: 0x0078B234 */ static void wild_mouse_track_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_WILD_MOUSE_60_DEG_TO_25_DEG_SW_NE, SPR_WILD_MOUSE_60_DEG_TO_25_DEG_CHAIN_SW_NE }, @@ -428,7 +428,7 @@ static void wild_mouse_track_60_deg_up_to_25_deg_up( /** rct2: 0x0078B244 */ static void wild_mouse_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_WILD_MOUSE_25_DEG_TO_FLAT_SW_NE, SPR_WILD_MOUSE_25_DEG_TO_FLAT_CHAIN_SW_NE }, @@ -460,7 +460,7 @@ static void wild_mouse_track_25_deg_up_to_flat( /** rct2: 0x0078B254 */ static void wild_mouse_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wild_mouse_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -468,7 +468,7 @@ static void wild_mouse_track_25_deg_down( /** rct2: 0x0078B264 */ static void wild_mouse_track_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wild_mouse_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -476,7 +476,7 @@ static void wild_mouse_track_60_deg_down( /** rct2: 0x0078B274 */ static void wild_mouse_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wild_mouse_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -484,7 +484,7 @@ static void wild_mouse_track_flat_to_25_deg_down( /** rct2: 0x0078B284 */ static void wild_mouse_track_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wild_mouse_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -492,7 +492,7 @@ static void wild_mouse_track_25_deg_down_to_60_deg_down( /** rct2: 0x0078B294 */ static void wild_mouse_track_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wild_mouse_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -500,14 +500,14 @@ static void wild_mouse_track_60_deg_down_to_25_deg_down( /** rct2: 0x0078B2A4 */ static void wild_mouse_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wild_mouse_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } static void wild_mouse_track_right_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const sprite_bb imageIds[4][3] = { { @@ -563,7 +563,7 @@ static void wild_mouse_track_right_quarter_turn_3( static void wild_mouse_track_right_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const sprite_bb imageIds[4][2] = { { @@ -621,7 +621,7 @@ static void wild_mouse_track_right_quarter_turn_3_25_deg_down( static void wild_mouse_track_left_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; wild_mouse_track_right_quarter_turn_3_25_deg_down( @@ -631,7 +631,7 @@ static void wild_mouse_track_left_quarter_turn_3_25_deg_up( /** rct2: 0x0078B314 */ static void wild_mouse_track_right_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const sprite_bb imageIds[4][2] = { { @@ -700,7 +700,7 @@ static void wild_mouse_track_right_quarter_turn_3_25_deg_up( /** rct2: 0x0078B324 */ static void wild_mouse_track_left_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; wild_mouse_track_right_quarter_turn_3_25_deg_up( @@ -709,7 +709,7 @@ static void wild_mouse_track_left_quarter_turn_3_25_deg_down( static void wild_mouse_track_left_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; wild_mouse_track_right_quarter_turn_3(session, rideIndex, trackSequence, (direction + 1) % 4, height, tileElement); @@ -718,7 +718,7 @@ static void wild_mouse_track_left_quarter_turn_3( /** rct2: 0x0078B394 */ static void wild_mouse_track_left_quarter_turn_1( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4] = { SPR_WILD_MOUSE_QUARTER_TURN_1_SW_NE, @@ -753,7 +753,7 @@ static void wild_mouse_track_left_quarter_turn_1( /** rct2: 0x0078B3A4 */ static void wild_mouse_track_right_quarter_turn_1( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wild_mouse_track_left_quarter_turn_1(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); } @@ -761,7 +761,7 @@ static void wild_mouse_track_right_quarter_turn_1( /** rct2: 0x0078B354 */ static void wild_mouse_track_flat_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_WILD_MOUSE_FLAT_TO_60_DEG_SW_NE, SPR_WILD_MOUSE_FLAT_TO_60_DEG_CHAIN_SW_NE }, @@ -808,7 +808,7 @@ static void wild_mouse_track_flat_to_60_deg_up( /** rct2: 0x0078B364 */ static void wild_mouse_track_60_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_WILD_MOUSE_60_DEG_TO_FLAT_SW_NE, SPR_WILD_MOUSE_60_DEG_TO_FLAT_CHAIN_SW_NE }, @@ -862,7 +862,7 @@ static void wild_mouse_track_60_deg_up_to_flat( /** rct2: 0x0078B374 */ static void wild_mouse_track_flat_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wild_mouse_track_60_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -870,7 +870,7 @@ static void wild_mouse_track_flat_to_60_deg_down( /** rct2: 0x0078B384 */ static void wild_mouse_track_60_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wild_mouse_track_flat_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -878,7 +878,7 @@ static void wild_mouse_track_60_deg_down_to_flat( /** rct2: 0x0078B344 */ static void wild_mouse_track_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId = _wild_mouse_brakes_image_ids[direction] | session->TrackColours[SCHEME_TRACK]; sub_98197C_rotated(session, direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height); @@ -895,7 +895,7 @@ static void wild_mouse_track_brakes( /** rct2: 0x0078B3C4 */ static void wild_mouse_track_rotation_control_toggle( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4] = { SPR_WILD_MOUSE_ROTATION_CONTROL_TOGGLE_SW_NE, @@ -919,7 +919,7 @@ static void wild_mouse_track_rotation_control_toggle( /** rct2: 0x0078B3B4 */ static void wild_mouse_track_block_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId = _wild_mouse_block_brakes_image_ids[direction] | session->TrackColours[SCHEME_TRACK]; sub_98197C_rotated(session, direction, imageId, 0, 0, 32, 20, 3, height, 0, 6, height); diff --git a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp index 0fb1c5d075..57c1653919 100644 --- a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp @@ -435,7 +435,7 @@ static void wooden_rc_track_paint_bb(paint_session* session, const sprite_bb_2* /** rct2: 0x008AC568 */ static void wooden_rc_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_WOODEN_RC_FLAT_SW_NE, SPR_WOODEN_RC_FLAT_CHAIN_SW_NE }, @@ -462,7 +462,7 @@ static void wooden_rc_track_flat( static void wooden_rc_track_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t stationImageIds[4][2] = { { SPR_WOODEN_RC_STATION_SW_NE, SPR_WOODEN_RC_STATION_RAILS_SW_NE }, @@ -494,7 +494,7 @@ static void wooden_rc_track_station( /** rct2: 0x008AC578 */ static void wooden_rc_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[2][4][4] = { { @@ -544,7 +544,7 @@ static void wooden_rc_track_25_deg_up( /** rct2: 0x008AC588 */ static void wooden_rc_track_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_WOODEN_RC_60_DEG_SW_NE, SPR_WOODEN_RC_60_DEG_RAILS_SW_NE }, @@ -582,7 +582,7 @@ static void wooden_rc_track_60_deg_up( /** rct2: 0x008AC598 */ static void wooden_rc_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[2][4][4] = { { @@ -632,7 +632,7 @@ static void wooden_rc_track_flat_to_25_deg_up( /** rct2: 0x008AC5A8 */ static void wooden_rc_track_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t 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 }, @@ -674,7 +674,7 @@ static void wooden_rc_track_25_deg_up_to_60_deg_up( /** rct2: 0x008AC5B8 */ static void wooden_rc_track_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t 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 }, @@ -716,7 +716,7 @@ static void wooden_rc_track_60_deg_up_to_25_deg_up( /** rct2: 0x008AC5C8 */ static void wooden_rc_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[2][4][4] = { { @@ -766,7 +766,7 @@ static void wooden_rc_track_25_deg_up_to_flat( /** rct2: 0x008AC5D8 */ static void wooden_rc_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -774,7 +774,7 @@ static void wooden_rc_track_25_deg_down( /** rct2: 0x008AC5E8 */ static void wooden_rc_track_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -782,7 +782,7 @@ static void wooden_rc_track_60_deg_down( /** rct2: 0x008AC5F8 */ static void wooden_rc_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -790,7 +790,7 @@ static void wooden_rc_track_flat_to_25_deg_down( /** rct2: 0x008AC608 */ static void wooden_rc_track_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -798,7 +798,7 @@ static void wooden_rc_track_25_deg_down_to_60_deg_down( /** rct2: 0x008AC618 */ static void wooden_rc_track_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -806,14 +806,14 @@ static void wooden_rc_track_60_deg_down_to_25_deg_down( /** rct2: 0x008AC628 */ static void wooden_rc_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } static void wooden_rc_track_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const sprite_bb_2 imageIds[2][4][7] = { { { @@ -1059,7 +1059,7 @@ static void wooden_rc_track_right_quarter_turn_5( static void wooden_rc_track_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; wooden_rc_track_right_quarter_turn_5(session, rideIndex, trackSequence, (direction + 1) & 3, height, tileElement); @@ -1068,7 +1068,7 @@ static void wooden_rc_track_left_quarter_turn_5( /** rct2: 0x008AC658 */ static void wooden_rc_track_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][4] = { { SPR_WOODEN_RC_FLAT_TO_LEFT_BANK_SW_NE, SPR_WOODEN_RC_FLAT_TO_LEFT_BANK_RAILS_SW_NE, 0, 0 }, @@ -1095,7 +1095,7 @@ static void wooden_rc_track_flat_to_left_bank( /** rct2: 0x008AC668 */ static void wooden_rc_track_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][4] = { { SPR_WOODEN_RC_FLAT_TO_RIGHT_BANK_SW_NE, SPR_WOODEN_RC_FLAT_TO_RIGHT_BANK_RAILS_SW_NE, @@ -1122,7 +1122,7 @@ static void wooden_rc_track_flat_to_right_bank( /** rct2: 0x008AC678 */ static void wooden_rc_track_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_rc_track_flat_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1130,14 +1130,14 @@ static void wooden_rc_track_left_bank_to_flat( /** rct2: 0x008AC688 */ static void wooden_rc_track_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_rc_track_flat_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } static void wooden_rc_track_banked_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const sprite_bb_2 imageIds[2][4][7] = { { { @@ -1383,7 +1383,7 @@ static void wooden_rc_track_banked_right_quarter_turn_5( static void wooden_rc_track_banked_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; wooden_rc_track_banked_right_quarter_turn_5(session, rideIndex, trackSequence, (direction + 1) & 3, height, tileElement); @@ -1392,7 +1392,7 @@ static void wooden_rc_track_banked_left_quarter_turn_5( /** rct2: 0x008AC6B8 */ static void wooden_rc_track_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t 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 }, @@ -1427,7 +1427,7 @@ static void wooden_rc_track_left_bank_to_25_deg_up( /** rct2: 0x008AC6C8 */ static void wooden_rc_track_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t 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 }, @@ -1462,7 +1462,7 @@ static void wooden_rc_track_right_bank_to_25_deg_up( /** rct2: 0x008AC6D8 */ static void wooden_rc_track_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t 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 }, @@ -1497,7 +1497,7 @@ static void wooden_rc_track_25_deg_up_to_left_bank( /** rct2: 0x008AC6E8 */ static void wooden_rc_track_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t 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 }, @@ -1532,7 +1532,7 @@ static void wooden_rc_track_25_deg_up_to_right_bank( /** rct2: 0x008AC6F8 */ static void wooden_rc_track_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1540,7 +1540,7 @@ static void wooden_rc_track_left_bank_to_25_deg_down( /** rct2: 0x008AC708 */ static void wooden_rc_track_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1548,7 +1548,7 @@ static void wooden_rc_track_right_bank_to_25_deg_down( /** rct2: 0x008AC718 */ static void wooden_rc_track_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1556,7 +1556,7 @@ static void wooden_rc_track_25_deg_down_to_left_bank( /** rct2: 0x008AC728 */ static void wooden_rc_track_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1564,7 +1564,7 @@ static void wooden_rc_track_25_deg_down_to_right_bank( /** rct2: 0x008AC738 */ static void wooden_rc_track_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_WOODEN_RC_LEFT_BANK_SW_NE, SPR_WOODEN_RC_LEFT_BANK_RAILS_SW_NE }, @@ -1584,7 +1584,7 @@ static void wooden_rc_track_left_bank( /** rct2: 0x008AC748 */ static void wooden_rc_track_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -1592,7 +1592,7 @@ static void wooden_rc_track_right_bank( /** rct2: 0x008AC758 */ static void wooden_rc_track_left_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1893,7 +1893,7 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up( /** rct2: 0x008AC768 */ static void wooden_rc_track_right_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2194,7 +2194,7 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up( /** rct2: 0x008AC778 */ static void wooden_rc_track_left_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; wooden_rc_track_right_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, tileElement); @@ -2203,7 +2203,7 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_down( /** rct2: 0x008AC788 */ static void wooden_rc_track_right_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; wooden_rc_track_left_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -2212,7 +2212,7 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_down( /** rct2: 0x008AC798 */ static void wooden_rc_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2431,7 +2431,7 @@ static void wooden_rc_track_s_bend_left( /** rct2: 0x008AC7A8 */ static void wooden_rc_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2650,7 +2650,7 @@ static void wooden_rc_track_s_bend_right( /** rct2: 0x008ACE18 */ static void wooden_rc_track_left_vertical_loop( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -2907,7 +2907,7 @@ static void wooden_rc_track_left_vertical_loop( /** rct2: 0x008ACE28 */ static void wooden_rc_track_right_vertical_loop( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3132,7 +3132,7 @@ static void wooden_rc_track_right_vertical_loop( /** rct2: 0x008AC7E8 */ static void wooden_rc_track_left_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3302,7 +3302,7 @@ static void wooden_rc_track_left_quarter_turn_3( /** rct2: 0x008AC7F8 */ static void wooden_rc_track_right_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; wooden_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -3311,7 +3311,7 @@ static void wooden_rc_track_right_quarter_turn_3( /** rct2: 0x008AC808 */ static void wooden_rc_track_left_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3481,7 +3481,7 @@ static void wooden_rc_track_left_quarter_turn_3_bank( /** rct2: 0x008AC818 */ static void wooden_rc_track_right_quarter_turn_3_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; wooden_rc_track_left_quarter_turn_3_bank(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -3490,7 +3490,7 @@ static void wooden_rc_track_right_quarter_turn_3_bank( /** rct2: 0x008AC828 */ static void wooden_rc_track_left_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3621,7 +3621,7 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_up( /** rct2: 0x008AC838 */ static void wooden_rc_track_right_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -3752,7 +3752,7 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_up( /** rct2: 0x008AC848 */ static void wooden_rc_track_left_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; wooden_rc_track_right_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, tileElement); @@ -3761,7 +3761,7 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_down( /** rct2: 0x008AC858 */ static void wooden_rc_track_right_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; wooden_rc_track_left_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -3770,7 +3770,7 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_down( /** rct2: 0x008ACAB8 */ static void wooden_rc_track_left_half_banked_helix_up_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4146,7 +4146,7 @@ static void wooden_rc_track_left_half_banked_helix_up_small( /** rct2: 0x008ACAC8 */ static void wooden_rc_track_right_half_banked_helix_up_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -4522,7 +4522,7 @@ static void wooden_rc_track_right_half_banked_helix_up_small( /** rct2: 0x008ACAD8 */ static void wooden_rc_track_left_half_banked_helix_down_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 4) { @@ -4537,7 +4537,7 @@ static void wooden_rc_track_left_half_banked_helix_down_small( /** rct2: 0x008ACAE8 */ static void wooden_rc_track_right_half_banked_helix_down_small( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 4) { @@ -4552,7 +4552,7 @@ static void wooden_rc_track_right_half_banked_helix_down_small( /** rct2: 0x008ACAF8 */ static void wooden_rc_track_left_half_banked_helix_up_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5144,7 +5144,7 @@ static void wooden_rc_track_left_half_banked_helix_up_large( /** rct2: 0x008ACB08 */ static void wooden_rc_track_right_half_banked_helix_up_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -5736,7 +5736,7 @@ static void wooden_rc_track_right_half_banked_helix_up_large( /** rct2: 0x008ACB18 */ static void wooden_rc_track_left_half_banked_helix_down_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 7) { @@ -5751,7 +5751,7 @@ static void wooden_rc_track_left_half_banked_helix_down_large( /** rct2: 0x008ACB28 */ static void wooden_rc_track_right_half_banked_helix_down_large( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence >= 7) { @@ -5766,7 +5766,7 @@ static void wooden_rc_track_right_half_banked_helix_down_large( /** rct2: 0x008ACB98 */ static void wooden_rc_track_left_quarter_turn_1_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -5819,7 +5819,7 @@ static void wooden_rc_track_left_quarter_turn_1_60_deg_up( /** rct2: 0x008ACB78 */ static void wooden_rc_track_right_quarter_turn_1_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -5872,7 +5872,7 @@ static void wooden_rc_track_right_quarter_turn_1_60_deg_up( /** rct2: 0x008ACB88 */ static void wooden_rc_track_left_quarter_turn_1_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_rc_track_right_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, tileElement); } @@ -5880,7 +5880,7 @@ static void wooden_rc_track_left_quarter_turn_1_60_deg_down( /** rct2: 0x008ACBA8 */ static void wooden_rc_track_right_quarter_turn_1_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_rc_track_left_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); } @@ -5888,7 +5888,7 @@ static void wooden_rc_track_right_quarter_turn_1_60_deg_down( /** rct2: 0x008AC868 */ static void wooden_rc_track_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_WOODEN_RC_BRAKES_SW_NE, SPR_WOODEN_RC_BRAKES_RAILS_SW_NE }, @@ -5908,7 +5908,7 @@ static void wooden_rc_track_brakes( /** rct2: 0x008ACC78 */ static void wooden_rc_track_25_deg_up_left_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -5964,7 +5964,7 @@ static void wooden_rc_track_25_deg_up_left_banked( /** rct2: 0x008ACC88 */ static void wooden_rc_track_25_deg_up_right_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -6020,7 +6020,7 @@ static void wooden_rc_track_25_deg_up_right_banked( /** rct2: 0x008AC878 */ static void wooden_rc_track_on_ride_photo( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -6059,7 +6059,7 @@ static void wooden_rc_track_on_ride_photo( /** rct2: 0x008ACC98 */ static void wooden_rc_track_25_deg_down_left_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_rc_track_25_deg_up_right_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -6067,7 +6067,7 @@ static void wooden_rc_track_25_deg_down_left_banked( /** rct2: 0x008ACCA8 */ static void wooden_rc_track_25_deg_down_right_banked( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_rc_track_25_deg_up_left_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -6075,7 +6075,7 @@ static void wooden_rc_track_25_deg_down_right_banked( /** rct2: 0x008ACE08 */ static void wooden_rc_track_water_splash( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6453,7 +6453,7 @@ static void wooden_rc_track_water_splash( /** rct2: 0x008AC958 */ static void wooden_rc_track_left_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6686,7 +6686,7 @@ static void wooden_rc_track_left_eighth_to_diag( /** rct2: 0x008AC968 */ static void wooden_rc_track_right_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -6917,7 +6917,7 @@ static void wooden_rc_track_right_eighth_to_diag( /** rct2: 0x008AC978 */ static void wooden_rc_track_left_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; wooden_rc_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -6926,7 +6926,7 @@ static void wooden_rc_track_left_eighth_to_orthogonal( /** rct2: 0x008AC988 */ static void wooden_rc_track_right_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; wooden_rc_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, tileElement); @@ -6935,7 +6935,7 @@ static void wooden_rc_track_right_eighth_to_orthogonal( /** rct2: 0x008AC998 */ static void wooden_rc_track_left_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7168,7 +7168,7 @@ static void wooden_rc_track_left_eighth_bank_to_diag( /** rct2: 0x008AC9A8 */ static void wooden_rc_track_right_eighth_bank_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7399,7 +7399,7 @@ static void wooden_rc_track_right_eighth_bank_to_diag( /** rct2: 0x008AC9B8 */ static void wooden_rc_track_left_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; wooden_rc_track_right_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -7408,7 +7408,7 @@ static void wooden_rc_track_left_eighth_bank_to_orthogonal( /** rct2: 0x008AC9C8 */ static void wooden_rc_track_right_eighth_bank_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; wooden_rc_track_left_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, tileElement); @@ -7417,7 +7417,7 @@ static void wooden_rc_track_right_eighth_bank_to_orthogonal( /** rct2: 0x008AC888 */ static void wooden_rc_track_diag_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7619,7 +7619,7 @@ static void wooden_rc_track_diag_flat( /** rct2: 0x008AC8B8 */ static void wooden_rc_track_diag_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7837,7 +7837,7 @@ static void wooden_rc_track_diag_25_deg_up( /** rct2: 0x008AC8E8 */ static void wooden_rc_track_diag_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -7939,7 +7939,7 @@ static void wooden_rc_track_diag_60_deg_up( /** rct2: 0x008AC898 */ static void wooden_rc_track_diag_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8141,7 +8141,7 @@ static void wooden_rc_track_diag_flat_to_25_deg_up( /** rct2: 0x008AC8C8 */ static void wooden_rc_track_diag_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8243,7 +8243,7 @@ static void wooden_rc_track_diag_25_deg_up_to_60_deg_up( /** rct2: 0x008AC8D8 */ static void wooden_rc_track_diag_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8345,7 +8345,7 @@ static void wooden_rc_track_diag_60_deg_up_to_25_deg_up( /** rct2: 0x008AC8A8 */ static void wooden_rc_track_diag_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8563,7 +8563,7 @@ static void wooden_rc_track_diag_25_deg_up_to_flat( /** rct2: 0x008AC918 */ static void wooden_rc_track_diag_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8781,7 +8781,7 @@ static void wooden_rc_track_diag_25_deg_down( /** rct2: 0x008AC948 */ static void wooden_rc_track_diag_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -8883,7 +8883,7 @@ static void wooden_rc_track_diag_60_deg_down( /** rct2: 0x008AC8F8 */ static void wooden_rc_track_diag_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -9096,7 +9096,7 @@ static void wooden_rc_track_diag_flat_to_25_deg_down( /** rct2: 0x008AC928 */ static void wooden_rc_track_diag_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -9198,7 +9198,7 @@ static void wooden_rc_track_diag_25_deg_down_to_60_deg_down( /** rct2: 0x008AC938 */ static void wooden_rc_track_diag_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -9300,7 +9300,7 @@ static void wooden_rc_track_diag_60_deg_down_to_25_deg_down( /** rct2: 0x008AC908 */ static void wooden_rc_track_diag_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -9502,7 +9502,7 @@ static void wooden_rc_track_diag_25_deg_down_to_flat( /** rct2: 0x008ACA18 */ static void wooden_rc_track_diag_flat_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -9604,7 +9604,7 @@ static void wooden_rc_track_diag_flat_to_left_bank( /** rct2: 0x008AC9F8 */ static void wooden_rc_track_diag_flat_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -9706,7 +9706,7 @@ static void wooden_rc_track_diag_flat_to_right_bank( /** rct2: 0x008ACA08 */ static void wooden_rc_track_diag_left_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -9808,7 +9808,7 @@ static void wooden_rc_track_diag_left_bank_to_flat( /** rct2: 0x008ACA28 */ static void wooden_rc_track_diag_right_bank_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -9910,7 +9910,7 @@ static void wooden_rc_track_diag_right_bank_to_flat( /** rct2: 0x008ACA58 */ static void wooden_rc_track_diag_left_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -10012,7 +10012,7 @@ static void wooden_rc_track_diag_left_bank_to_25_deg_up( /** rct2: 0x008ACA68 */ static void wooden_rc_track_diag_right_bank_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -10114,7 +10114,7 @@ static void wooden_rc_track_diag_right_bank_to_25_deg_up( /** rct2: 0x008ACA38 */ static void wooden_rc_track_diag_25_deg_up_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -10216,7 +10216,7 @@ static void wooden_rc_track_diag_25_deg_up_to_left_bank( /** rct2: 0x008ACA48 */ static void wooden_rc_track_diag_25_deg_up_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -10318,7 +10318,7 @@ static void wooden_rc_track_diag_25_deg_up_to_right_bank( /** rct2: 0x008ACA78 */ static void wooden_rc_track_diag_left_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -10415,7 +10415,7 @@ static void wooden_rc_track_diag_left_bank_to_25_deg_down( /** rct2: 0x008ACA88 */ static void wooden_rc_track_diag_right_bank_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -10512,7 +10512,7 @@ static void wooden_rc_track_diag_right_bank_to_25_deg_down( /** rct2: 0x008ACA98 */ static void wooden_rc_track_diag_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -10614,7 +10614,7 @@ static void wooden_rc_track_diag_25_deg_down_to_left_bank( /** rct2: 0x008ACAA8 */ static void wooden_rc_track_diag_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -10716,7 +10716,7 @@ static void wooden_rc_track_diag_25_deg_down_to_right_bank( /** rct2: 0x008AC9D8 */ static void wooden_rc_track_diag_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -10818,7 +10818,7 @@ static void wooden_rc_track_diag_left_bank( /** rct2: 0x008AC9E8 */ static void wooden_rc_track_diag_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -10920,7 +10920,7 @@ static void wooden_rc_track_diag_right_bank( /** rct2: 0x008ACB38 */ static void wooden_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -11051,7 +11051,7 @@ static void wooden_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up( /** rct2: 0x008ACB48 */ static void wooden_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -11182,7 +11182,7 @@ static void wooden_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up( /** rct2: 0x008ACB58 */ static void wooden_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -11313,7 +11313,7 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank( /** rct2: 0x008ACB68 */ static void wooden_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -11444,7 +11444,7 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank( /** rct2: 0x008ACDF8 */ static void wooden_rc_track_block_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_rc_track_paint( session, _wooden_rc_block_brakes_image_ids[direction][0], _wooden_rc_block_brakes_image_ids[direction][1], direction, 0, @@ -11458,7 +11458,7 @@ static void wooden_rc_track_block_brakes( /** rct2: 0x008ACCB8 */ static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -11589,7 +11589,7 @@ static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_up( /** rct2: 0x008ACCC8 */ static void wooden_rc_track_right_banked_quarter_turn_3_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -11720,7 +11720,7 @@ static void wooden_rc_track_right_banked_quarter_turn_3_25_deg_up( /** rct2: 0x008ACCD8 */ static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; wooden_rc_track_right_banked_quarter_turn_3_25_deg_up( @@ -11730,7 +11730,7 @@ static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_down( /** rct2: 0x008ACCE8 */ static void wooden_rc_track_right_banked_quarter_turn_3_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; wooden_rc_track_left_banked_quarter_turn_3_25_deg_up( @@ -11740,7 +11740,7 @@ static void wooden_rc_track_right_banked_quarter_turn_3_25_deg_down( /** rct2: 0x008ACC38 */ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -12041,7 +12041,7 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up( /** rct2: 0x008ACC48 */ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -12342,7 +12342,7 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up( /** rct2: 0x008ACC58 */ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; wooden_rc_track_right_banked_quarter_turn_5_25_deg_up( @@ -12352,7 +12352,7 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_down( /** rct2: 0x008ACC68 */ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; wooden_rc_track_left_banked_quarter_turn_5_25_deg_up( @@ -12362,7 +12362,7 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_down( /** rct2: 0x008ACCF8 */ static void wooden_rc_track_25_deg_up_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -12410,7 +12410,7 @@ static void wooden_rc_track_25_deg_up_to_left_banked_25_deg_up( /** rct2: 0x008ACD08 */ static void wooden_rc_track_25_deg_up_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -12458,7 +12458,7 @@ static void wooden_rc_track_25_deg_up_to_right_banked_25_deg_up( /** rct2: 0x008ACD18 */ static void wooden_rc_track_left_banked_25_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -12506,7 +12506,7 @@ static void wooden_rc_track_left_banked_25_deg_up_to_25_deg_up( /** rct2: 0x008ACD28 */ static void wooden_rc_track_right_banked_25_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -12554,7 +12554,7 @@ static void wooden_rc_track_right_banked_25_deg_up_to_25_deg_up( /** rct2: 0x008ACD38 */ static void wooden_rc_track_25_deg_down_to_left_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_rc_track_right_banked_25_deg_up_to_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -12563,7 +12563,7 @@ static void wooden_rc_track_25_deg_down_to_left_banked_25_deg_down( /** rct2: 0x008ACD48 */ static void wooden_rc_track_25_deg_down_to_right_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_rc_track_left_banked_25_deg_up_to_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -12572,7 +12572,7 @@ static void wooden_rc_track_25_deg_down_to_right_banked_25_deg_down( /** rct2: 0x008ACD58 */ static void wooden_rc_track_left_banked_25_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_rc_track_25_deg_up_to_right_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -12581,7 +12581,7 @@ static void wooden_rc_track_left_banked_25_deg_down_to_25_deg_down( /** rct2: 0x008ACD68 */ static void wooden_rc_track_right_banked_25_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_rc_track_25_deg_up_to_left_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -12590,7 +12590,7 @@ static void wooden_rc_track_right_banked_25_deg_down_to_25_deg_down( /** rct2: 0x008ACD78 */ static void wooden_rc_track_left_banked_flat_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -12646,7 +12646,7 @@ static void wooden_rc_track_left_banked_flat_to_left_banked_25_deg_up( /** rct2: 0x008ACD88 */ static void wooden_rc_track_right_banked_flat_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -12702,7 +12702,7 @@ static void wooden_rc_track_right_banked_flat_to_right_banked_25_deg_up( /** rct2: 0x008ACD98 */ static void wooden_rc_track_left_banked_25_deg_up_to_left_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -12758,7 +12758,7 @@ static void wooden_rc_track_left_banked_25_deg_up_to_left_banked_flat( /** rct2: 0x008ACDA8 */ static void wooden_rc_track_right_banked_25_deg_up_to_right_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -12814,7 +12814,7 @@ static void wooden_rc_track_right_banked_25_deg_up_to_right_banked_flat( /** rct2: 0x008ACDB8 */ static void wooden_rc_track_left_banked_flat_to_left_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_rc_track_right_banked_25_deg_up_to_right_banked_flat( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -12823,7 +12823,7 @@ static void wooden_rc_track_left_banked_flat_to_left_banked_25_deg_down( /** rct2: 0x008ACDC8 */ static void wooden_rc_track_right_banked_flat_to_right_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_rc_track_left_banked_25_deg_up_to_left_banked_flat( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -12832,7 +12832,7 @@ static void wooden_rc_track_right_banked_flat_to_right_banked_25_deg_down( /** rct2: 0x008ACDD8 */ static void wooden_rc_track_left_banked_25_deg_down_to_left_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_rc_track_right_banked_flat_to_right_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -12841,7 +12841,7 @@ static void wooden_rc_track_left_banked_25_deg_down_to_left_banked_flat( /** rct2: 0x008ACDE8 */ static void wooden_rc_track_right_banked_25_deg_down_to_right_banked_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_rc_track_left_banked_flat_to_left_banked_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -12850,7 +12850,7 @@ static void wooden_rc_track_right_banked_25_deg_down_to_right_banked_flat( /** rct2: 0x008ACBB8 */ static void wooden_rc_track_flat_to_left_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -12906,7 +12906,7 @@ static void wooden_rc_track_flat_to_left_banked_25_deg_up( /** rct2: 0x008ACBC8 */ static void wooden_rc_track_flat_to_right_banked_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -12962,7 +12962,7 @@ static void wooden_rc_track_flat_to_right_banked_25_deg_up( /** rct2: 0x008ACBD8 */ static void wooden_rc_track_left_banked_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -13018,7 +13018,7 @@ static void wooden_rc_track_left_banked_25_deg_up_to_flat( /** rct2: 0x008ACBE8 */ static void wooden_rc_track_right_banked_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -13074,7 +13074,7 @@ static void wooden_rc_track_right_banked_25_deg_up_to_flat( /** rct2: 0x008ACBF8 */ static void wooden_rc_track_flat_to_left_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_rc_track_right_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -13082,7 +13082,7 @@ static void wooden_rc_track_flat_to_left_banked_25_deg_down( /** rct2: 0x008ACC08 */ static void wooden_rc_track_flat_to_right_banked_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_rc_track_left_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -13090,7 +13090,7 @@ static void wooden_rc_track_flat_to_right_banked_25_deg_down( /** rct2: 0x008ACC18 */ static void wooden_rc_track_left_banked_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_rc_track_flat_to_right_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -13098,7 +13098,7 @@ static void wooden_rc_track_left_banked_25_deg_down_to_flat( /** rct2: 0x008ACC28 */ static void wooden_rc_track_right_banked_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_rc_track_flat_to_left_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } diff --git a/src/openrct2/ride/coaster/WoodenWildMouse.cpp b/src/openrct2/ride/coaster/WoodenWildMouse.cpp index 6b843ad9c1..1f5411e984 100644 --- a/src/openrct2/ride/coaster/WoodenWildMouse.cpp +++ b/src/openrct2/ride/coaster/WoodenWildMouse.cpp @@ -124,7 +124,7 @@ enum /** rct2: 0x008A5464 */ static void wooden_wild_mouse_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4] = { SPR_WOODEN_WILD_MOUSE_FLAT_SW_NE, @@ -148,7 +148,7 @@ static void wooden_wild_mouse_track_flat( static void wooden_wild_mouse_track_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_WOODEN_WILD_MOUSE_FLAT_SW_NE, SPR_STATION_BASE_B_SW_NE }, @@ -173,7 +173,7 @@ static void wooden_wild_mouse_track_station( /** rct2: 0x008A5474 */ static void wooden_wild_mouse_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[2][4] = { { @@ -213,7 +213,7 @@ static void wooden_wild_mouse_track_25_deg_up( /** rct2: 0x008A5484 */ static void wooden_wild_mouse_track_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[2][4] = { { @@ -261,7 +261,7 @@ static void wooden_wild_mouse_track_60_deg_up( /** rct2: 0x008A5494 */ static void wooden_wild_mouse_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[2][4] = { { @@ -301,7 +301,7 @@ static void wooden_wild_mouse_track_flat_to_25_deg_up( /** rct2: 0x008A54A4 */ static void wooden_wild_mouse_track_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[2][4][2] = { { @@ -352,7 +352,7 @@ static void wooden_wild_mouse_track_25_deg_up_to_60_deg_up( static void wooden_wild_mouse_track_60_deg_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[2][4][2] = { { @@ -404,7 +404,7 @@ static void wooden_wild_mouse_track_60_deg_to_25_deg_up( /** rct2: 0x008A54C4 */ static void wooden_wild_mouse_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[2][4] = { { @@ -444,7 +444,7 @@ static void wooden_wild_mouse_track_25_deg_up_to_flat( /** rct2: 0x008A54D4 */ static void wooden_wild_mouse_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_wild_mouse_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -452,7 +452,7 @@ static void wooden_wild_mouse_track_25_deg_down( /** rct2: 0x008A54E4 */ static void wooden_wild_mouse_track_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_wild_mouse_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -460,7 +460,7 @@ static void wooden_wild_mouse_track_60_deg_down( /** rct2: 0x008A54F4 */ static void wooden_wild_mouse_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_wild_mouse_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -468,7 +468,7 @@ static void wooden_wild_mouse_track_flat_to_25_deg_down( /** rct2: 0x008A5504 */ static void wooden_wild_mouse_track_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_wild_mouse_track_60_deg_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -476,7 +476,7 @@ static void wooden_wild_mouse_track_25_deg_down_to_60_deg_down( /** rct2: 0x008A5514 */ static void wooden_wild_mouse_track_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_wild_mouse_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -484,14 +484,14 @@ static void wooden_wild_mouse_track_60_deg_down_to_25_deg_down( /** rct2: 0x008A5524 */ static void wooden_wild_mouse_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_wild_mouse_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } static void wooden_wild_mouse_track_right_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const sprite_bb imageIds[4][3] = { { @@ -549,7 +549,7 @@ static void wooden_wild_mouse_track_right_quarter_turn_3( static void wooden_wild_mouse_track_left_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; wooden_wild_mouse_track_right_quarter_turn_3(session, rideIndex, trackSequence, (direction + 1) % 4, height, tileElement); @@ -557,7 +557,7 @@ static void wooden_wild_mouse_track_left_quarter_turn_3( static void wooden_wild_mouse_track_left_quarter_turn_1( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4] = { SPR_WOODEN_WILD_MOUSE_QUARTER_TURN_1_SW_NE, @@ -592,7 +592,7 @@ static void wooden_wild_mouse_track_left_quarter_turn_1( /** rct2: 0x008A55D4 */ static void wooden_wild_mouse_track_right_quarter_turn_1( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_wild_mouse_track_left_quarter_turn_1(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); } @@ -600,7 +600,7 @@ static void wooden_wild_mouse_track_right_quarter_turn_1( /** rct2: 0x008A55E4 */ static void wooden_wild_mouse_track_flat_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[2][4][2] = { { @@ -651,7 +651,7 @@ static void wooden_wild_mouse_track_flat_to_60_deg_up( /** rct2: 0x008A55F4 */ static void wooden_wild_mouse_track_60_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[2][4][2] = { { @@ -702,7 +702,7 @@ static void wooden_wild_mouse_track_60_deg_up_to_flat( /** rct2: 0x008A5604 */ static void wooden_wild_mouse_track_flat_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_wild_mouse_track_60_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -710,7 +710,7 @@ static void wooden_wild_mouse_track_flat_to_60_deg_down( /** rct2: 0x008A5614 */ static void wooden_wild_mouse_track_60_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { wooden_wild_mouse_track_flat_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } diff --git a/src/openrct2/ride/gentle/CarRide.cpp b/src/openrct2/ride/gentle/CarRide.cpp index c19ce5056e..aa2b605c8e 100644 --- a/src/openrct2/ride/gentle/CarRide.cpp +++ b/src/openrct2/ride/gentle/CarRide.cpp @@ -146,7 +146,7 @@ static constexpr const uint32_t car_ride_track_pieces_quarter_turn_3_tiles[4][3] /** rct2: 0x006F72C8 */ static void paint_car_ride_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId = car_ride_track_pieces_flat[direction] | session->TrackColours[SCHEME_TRACK]; @@ -177,7 +177,7 @@ static void paint_car_ride_track_flat( /** rct2: 0x006F72D8 */ static void paint_car_ride_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId = car_ride_track_pieces_25_deg_up[direction] | session->TrackColours[SCHEME_TRACK]; @@ -215,7 +215,7 @@ static void paint_car_ride_track_25_deg_up( /** rct2: 0x006F72E8 */ static void paint_car_ride_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId = car_ride_track_pieces_flat_to_25_deg_up[direction] | session->TrackColours[SCHEME_TRACK]; @@ -253,7 +253,7 @@ static void paint_car_ride_track_flat_to_25_deg_up( /** rct2: 0x006F72F8 */ static void paint_car_ride_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId = car_ride_track_pieces_25_deg_up_to_flat[direction] | session->TrackColours[SCHEME_TRACK]; @@ -291,7 +291,7 @@ static void paint_car_ride_track_25_deg_up_to_flat( /** rct2: 0x006F7308 */ static void paint_car_ride_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_car_ride_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -299,7 +299,7 @@ static void paint_car_ride_track_25_deg_down( /** rct2: 0x006F7318 */ static void paint_car_ride_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_car_ride_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -307,7 +307,7 @@ static void paint_car_ride_track_flat_to_25_deg_down( /** rct2: 0x006F7328 */ static void paint_car_ride_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_car_ride_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -315,7 +315,7 @@ static void paint_car_ride_track_25_deg_down_to_flat( /** rct2: 0x006F7338, 0x006F7348, 0x006F7358 */ static void paint_car_ride_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; @@ -369,7 +369,7 @@ static void paint_car_ride_station( /** rct2: 0x006F7378 */ static void paint_car_ride_track_right_quarter_turn_3_tiles( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_right_quarter_turn_3_tiles_paint( session, 3, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -406,7 +406,7 @@ static void paint_car_ride_track_right_quarter_turn_3_tiles( /** rct2: 0x006F7368 */ static void paint_car_ride_track_left_quarter_turn_3_tiles( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; paint_car_ride_track_right_quarter_turn_3_tiles( @@ -416,7 +416,7 @@ static void paint_car_ride_track_left_quarter_turn_3_tiles( /** rct2: 0x006F7388 */ static void paint_car_ride_track_left_quarter_turn_1_tile( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId = car_ride_track_pieces_left_quarter_turn_1_tile[direction] | session->TrackColours[SCHEME_TRACK]; @@ -447,7 +447,7 @@ static void paint_car_ride_track_left_quarter_turn_1_tile( /** rct2: 0x006F7398 */ static void paint_car_ride_track_right_quarter_turn_1_tile( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_car_ride_track_left_quarter_turn_1_tile(session, rideIndex, trackSequence, (direction + 3) % 4, height, tileElement); } @@ -455,7 +455,7 @@ static void paint_car_ride_track_right_quarter_turn_1_tile( /** rct2: 0x006F73A8 */ static void paint_car_ride_track_spinning_tunnel( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId = car_ride_track_pieces_flat[direction] | session->TrackColours[SCHEME_TRACK]; @@ -488,7 +488,7 @@ static void paint_car_ride_track_spinning_tunnel( /** rct2: 0x006F73B8 */ static void paint_car_ride_track_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { LocationXY16 position = session->MapPosition; @@ -539,7 +539,7 @@ static void paint_car_ride_track_60_deg_up( /** rct2: 0x006F73C8 */ static void paint_car_ride_track_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { LocationXY16 position = session->MapPosition; @@ -597,7 +597,7 @@ static void paint_car_ride_track_25_deg_up_to_60_deg_up( /** rct2: 0x006F73D8 */ static void paint_car_ride_track_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { LocationXY16 position = session->MapPosition; @@ -655,7 +655,7 @@ static void paint_car_ride_track_60_deg_up_to_25_deg_up( /** rct2: 0x006F73E8 */ static void paint_car_ride_track_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_car_ride_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -663,7 +663,7 @@ static void paint_car_ride_track_60_deg_down( /** rct2: 0x006F73F8 */ static void paint_car_ride_track_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_car_ride_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -671,7 +671,7 @@ static void paint_car_ride_track_25_deg_down_to_60_deg_down( /** rct2: 0x006F7408 */ static void paint_car_ride_track_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_car_ride_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -679,7 +679,7 @@ static void paint_car_ride_track_60_deg_down_to_25_deg_down( /** rct2: 0x006F7418 */ static void paint_car_ride_track_log_bumps( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId = car_ride_track_pieces_log_bumps[direction] | session->TrackColours[SCHEME_TRACK]; diff --git a/src/openrct2/ride/gentle/CircusShow.cpp b/src/openrct2/ride/gentle/CircusShow.cpp index fd58b81cd5..acf2e1a183 100644 --- a/src/openrct2/ride/gentle/CircusShow.cpp +++ b/src/openrct2/ride/gentle/CircusShow.cpp @@ -20,7 +20,7 @@ static void paint_circus_show_tent( paint_session* session, uint8_t rideIndex, uint8_t direction, int8_t al, int8_t cl, uint16_t height) { - const rct_tile_element* savedTileElement = static_cast(session->CurrentlyDrawnItem); + const TileElement* savedTileElement = static_cast(session->CurrentlyDrawnItem); Ride* ride = get_ride(rideIndex); rct_ride_entry* rideEntry = get_ride_entry(ride->subtype); @@ -50,7 +50,7 @@ static void paint_circus_show_tent( */ static void paint_circus_show( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = track_map_3x3[direction][trackSequence]; diff --git a/src/openrct2/ride/gentle/CrookedHouse.cpp b/src/openrct2/ride/gentle/CrookedHouse.cpp index 863979c63b..a2706f3c36 100644 --- a/src/openrct2/ride/gentle/CrookedHouse.cpp +++ b/src/openrct2/ride/gentle/CrookedHouse.cpp @@ -34,7 +34,7 @@ static constexpr const rct_crooked_house_bound_box crooked_house_data[] = { { 6, static void paint_crooked_house_structure( paint_session* session, uint8_t direction, uint8_t x_offset, uint8_t y_offset, uint32_t segment, int32_t height) { - const rct_tile_element* original_tile_element = static_cast(session->CurrentlyDrawnItem); + const TileElement* original_tile_element = static_cast(session->CurrentlyDrawnItem); Ride* ride = get_ride(original_tile_element->AsTrack()->GetRideIndex()); @@ -60,7 +60,7 @@ static void paint_crooked_house_structure( static void paint_crooked_house( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = track_map_3x3[direction][trackSequence]; diff --git a/src/openrct2/ride/gentle/Dodgems.cpp b/src/openrct2/ride/gentle/Dodgems.cpp index fbfa20639e..88404624b5 100644 --- a/src/openrct2/ride/gentle/Dodgems.cpp +++ b/src/openrct2/ride/gentle/Dodgems.cpp @@ -38,7 +38,7 @@ static void paint_dodgems_roof(paint_session* session, int32_t height, int32_t o static void paint_dodgems( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint8_t relativeTrackSequence = track_map_4x4[direction][trackSequence]; diff --git a/src/openrct2/ride/gentle/FerrisWheel.cpp b/src/openrct2/ride/gentle/FerrisWheel.cpp index b344c8e470..9b1ffb0fa4 100644 --- a/src/openrct2/ride/gentle/FerrisWheel.cpp +++ b/src/openrct2/ride/gentle/FerrisWheel.cpp @@ -52,7 +52,7 @@ static void paint_ferris_wheel_structure( { uint32_t imageId, baseImageId; - const rct_tile_element* savedTileElement = static_cast(session->CurrentlyDrawnItem); + const TileElement* savedTileElement = static_cast(session->CurrentlyDrawnItem); Ride* ride = get_ride(rideIndex); rct_ride_entry* rideEntry = get_ride_entry(ride->subtype); @@ -137,7 +137,7 @@ static void paint_ferris_wheel_structure( */ static void paint_ferris_wheel( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint8_t relativeTrackSequence = track_map_1x4[direction][trackSequence]; diff --git a/src/openrct2/ride/gentle/FlyingSaucers.cpp b/src/openrct2/ride/gentle/FlyingSaucers.cpp index d7e4f09fd8..7801c769aa 100644 --- a/src/openrct2/ride/gentle/FlyingSaucers.cpp +++ b/src/openrct2/ride/gentle/FlyingSaucers.cpp @@ -34,7 +34,7 @@ static constexpr const uint32_t flying_saucers_fence_sprites[] = { */ static void paint_flying_saucers( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint8_t relativeTrackSequence = track_map_4x4[direction][trackSequence]; diff --git a/src/openrct2/ride/gentle/GhostTrain.cpp b/src/openrct2/ride/gentle/GhostTrain.cpp index 565fccdf78..c85664d774 100644 --- a/src/openrct2/ride/gentle/GhostTrain.cpp +++ b/src/openrct2/ride/gentle/GhostTrain.cpp @@ -130,7 +130,7 @@ static constexpr const uint32_t ghost_train_track_pieces_brakes[4] = { /** rct2: 0x00770BEC */ static void paint_ghost_train_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { LocationXY16 position = session->MapPosition; @@ -167,7 +167,7 @@ static void paint_ghost_train_track_flat( /** rct2: 0x00770BFC */ static void paint_ghost_train_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { LocationXY16 position = session->MapPosition; @@ -220,7 +220,7 @@ static void paint_ghost_train_track_25_deg_up( /** rct2: 0x00770C0C */ static void paint_ghost_train_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { LocationXY16 position = session->MapPosition; @@ -272,7 +272,7 @@ static void paint_ghost_train_track_flat_to_25_deg_up( static void paint_ghost_train_track_25_deg_up_to_flat_shared( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { LocationXY16 position = session->MapPosition; @@ -309,7 +309,7 @@ static void paint_ghost_train_track_25_deg_up_to_flat_shared( /** rct2: 0x00770C1C */ static void paint_ghost_train_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_ghost_train_track_25_deg_up_to_flat_shared(session, rideIndex, trackSequence, direction, height, tileElement); @@ -333,7 +333,7 @@ static void paint_ghost_train_track_25_deg_up_to_flat( /** rct2: 0x00770C2C */ static void paint_ghost_train_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_ghost_train_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -341,7 +341,7 @@ static void paint_ghost_train_track_25_deg_down( /** rct2: 0x00770C3C */ static void paint_ghost_train_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_ghost_train_track_25_deg_up_to_flat_shared( session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); @@ -366,7 +366,7 @@ static void paint_ghost_train_track_flat_to_25_deg_down( /** rct2: 0x00770C4C */ static void paint_ghost_train_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_ghost_train_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -374,7 +374,7 @@ static void paint_ghost_train_track_25_deg_down_to_flat( /** rct2: 0x00770C5C, 0x00770C6C, 0x00770C7C */ static void paint_ghost_train_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; @@ -428,7 +428,7 @@ static void paint_ghost_train_station( /** rct2: 0x00770C9C */ static void paint_ghost_train_track_right_quarter_turn_3_tiles( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_right_quarter_turn_3_tiles_paint( session, 3, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -465,7 +465,7 @@ static void paint_ghost_train_track_right_quarter_turn_3_tiles( /** rct2: 0x00770CAC */ static void paint_ghost_train_track_left_quarter_turn_3_tiles( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; paint_ghost_train_track_right_quarter_turn_3_tiles( @@ -475,7 +475,7 @@ static void paint_ghost_train_track_left_quarter_turn_3_tiles( /** rct2: 0x00770CAC */ static void paint_ghost_train_track_left_quarter_turn_1_tile( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_left_quarter_turn_1_tile_paint( session, 3, height, 0, direction, session->TrackColours[SCHEME_TRACK], ghost_train_track_pieces_quarter_turn_1_tile); @@ -489,7 +489,7 @@ static void paint_ghost_train_track_left_quarter_turn_1_tile( /** rct2: 0x00770CBC */ static void paint_ghost_train_track_right_quarter_turn_1_tile( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_ghost_train_track_left_quarter_turn_1_tile( session, rideIndex, trackSequence, (direction + 3) % 4, height, tileElement); @@ -498,7 +498,7 @@ static void paint_ghost_train_track_right_quarter_turn_1_tile( /** rct2: 0x00770CCC */ static void paint_ghost_train_track_spinning_tunnel( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId = ghost_train_track_pieces_spinning_tunnel_track[direction] | session->TrackColours[SCHEME_TRACK]; @@ -531,7 +531,7 @@ static void paint_ghost_train_track_spinning_tunnel( /** rct2: 0x00770CDC */ static void paint_ghost_train_track_brakes( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { LocationXY16 position = session->MapPosition; diff --git a/src/openrct2/ride/gentle/HauntedHouse.cpp b/src/openrct2/ride/gentle/HauntedHouse.cpp index 8303731908..d782568273 100644 --- a/src/openrct2/ride/gentle/HauntedHouse.cpp +++ b/src/openrct2/ride/gentle/HauntedHouse.cpp @@ -33,7 +33,7 @@ static haunted_house_bound_box haunted_house_data[] = { static void paint_haunted_house_structure( paint_session* session, uint8_t rideIndex, uint8_t direction, int8_t xOffset, int8_t yOffset, uint8_t part, uint16_t height) { - const rct_tile_element* savedTileElement = static_cast(session->CurrentlyDrawnItem); + const TileElement* savedTileElement = static_cast(session->CurrentlyDrawnItem); uint8_t frameNum = 0; @@ -89,7 +89,7 @@ static void paint_haunted_house_structure( */ static void paint_haunted_house( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = track_map_3x3[direction][trackSequence]; diff --git a/src/openrct2/ride/gentle/Maze.cpp b/src/openrct2/ride/gentle/Maze.cpp index 24c11fdc61..3b9b03c44a 100644 --- a/src/openrct2/ride/gentle/Maze.cpp +++ b/src/openrct2/ride/gentle/Maze.cpp @@ -46,7 +46,7 @@ enum */ static void maze_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint16_t maze_entry = tileElement->AsTrack()->GetMazeEntry(); maze_entry = rol16(maze_entry, direction * 4); diff --git a/src/openrct2/ride/gentle/MerryGoRound.cpp b/src/openrct2/ride/gentle/MerryGoRound.cpp index 02595948ad..d84fd763a4 100644 --- a/src/openrct2/ride/gentle/MerryGoRound.cpp +++ b/src/openrct2/ride/gentle/MerryGoRound.cpp @@ -26,7 +26,7 @@ static constexpr const uint16_t merry_go_round_breakdown_vibration[] = { 0, 1, 2 static void paint_merry_go_round_structure( paint_session* session, uint8_t rideIndex, uint8_t direction, int8_t xOffset, int8_t yOffset, uint16_t height) { - const rct_tile_element* savedTileElement = static_cast(session->CurrentlyDrawnItem); + const TileElement* savedTileElement = static_cast(session->CurrentlyDrawnItem); height += 7; Ride* ride = get_ride(rideIndex); @@ -106,7 +106,7 @@ static void paint_merry_go_round_structure( */ static void paint_merry_go_round( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = track_map_3x3[direction][trackSequence]; diff --git a/src/openrct2/ride/gentle/MiniGolf.cpp b/src/openrct2/ride/gentle/MiniGolf.cpp index d76a31ef09..c5218982e4 100644 --- a/src/openrct2/ride/gentle/MiniGolf.cpp +++ b/src/openrct2/ride/gentle/MiniGolf.cpp @@ -393,7 +393,7 @@ static paint_struct* mini_golf_paint_util_7c( bound_box_offset_x, bound_box_offset_y, bound_box_offset_z); } -static bool mini_golf_paint_util_should_draw_fence(paint_session* session, const rct_tile_element* tileElement) +static bool mini_golf_paint_util_should_draw_fence(paint_session* session, const TileElement* tileElement) { if (!session->DidPassSurface) { @@ -401,7 +401,7 @@ static bool mini_golf_paint_util_should_draw_fence(paint_session* session, const return false; } - const rct_tile_element* surfaceElement = session->SurfaceElement; + const TileElement* surfaceElement = session->SurfaceElement; if (surfaceElement->base_height != tileElement->base_height) { return true; @@ -418,7 +418,7 @@ static bool mini_golf_paint_util_should_draw_fence(paint_session* session, const /** rct2: 0x0087F10C */ static void paint_mini_golf_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; @@ -465,7 +465,7 @@ static void paint_mini_golf_track_flat( /** rct2: 0x0087F11C */ static void paint_mini_golf_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; @@ -504,7 +504,7 @@ static void paint_mini_golf_track_25_deg_up( /** rct2: 0x0087F12C */ static void paint_mini_golf_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; @@ -543,7 +543,7 @@ static void paint_mini_golf_track_flat_to_25_deg_up( /** rct2: 0x0087F13C */ static void paint_mini_golf_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; @@ -582,7 +582,7 @@ static void paint_mini_golf_track_25_deg_up_to_flat( /** rct2: 0x0087F14C */ static void paint_mini_golf_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_mini_golf_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -590,7 +590,7 @@ static void paint_mini_golf_track_25_deg_down( /** rct2: 0x0087F15C */ static void paint_mini_golf_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_mini_golf_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -598,7 +598,7 @@ static void paint_mini_golf_track_flat_to_25_deg_down( /** rct2: 0x0087F16C */ static void paint_mini_golf_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_mini_golf_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -606,7 +606,7 @@ static void paint_mini_golf_track_25_deg_down_to_flat( /** rct2: 0x0087F17C, 0x0087F18C, 0x0087F19C */ static void paint_mini_golf_station( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { LocationXY16 position = session->MapPosition; Ride* ride = get_ride(rideIndex); @@ -670,7 +670,7 @@ static void paint_mini_golf_station( /** rct2: 0x0087F1AC */ static void paint_mini_golf_track_left_quarter_turn_1_tile( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; @@ -750,7 +750,7 @@ static void paint_mini_golf_track_left_quarter_turn_1_tile( /** rct2: 0x0087F1BC */ static void paint_mini_golf_track_right_quarter_turn_1_tile( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_mini_golf_track_left_quarter_turn_1_tile(session, rideIndex, trackSequence, (direction + 3) % 4, height, tileElement); } @@ -808,7 +808,7 @@ static void paint_mini_golf_hole_ab( /** rct2: 0x0087F1CC */ static void paint_mini_golf_hole_a( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_mini_golf_hole_ab(session, trackSequence, direction, height, mini_golf_track_sprites_hole_a); } @@ -816,7 +816,7 @@ static void paint_mini_golf_hole_a( /** rct2: 0x0087F1DC */ static void paint_mini_golf_hole_b( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_mini_golf_hole_ab(session, trackSequence, direction, height, mini_golf_track_sprites_hole_b); } @@ -824,7 +824,7 @@ static void paint_mini_golf_hole_b( /** rct2: 0x0087F1EC */ static void paint_mini_golf_hole_c( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; LocationXY16 boundBox, boundBoxOffset; @@ -891,7 +891,7 @@ static void paint_mini_golf_hole_c( /** rct2: 0x0087F1FC */ static void paint_mini_golf_hole_d( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; LocationXY16 boundBox, boundBoxOffset; @@ -981,7 +981,7 @@ static void paint_mini_golf_hole_d( /** rct2: 0x0087F1FC */ static void paint_mini_golf_hole_e( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; LocationXY16 boundBox, boundBoxOffset; diff --git a/src/openrct2/ride/gentle/MiniHelicopters.cpp b/src/openrct2/ride/gentle/MiniHelicopters.cpp index ddfec64fc0..26d2a56212 100644 --- a/src/openrct2/ride/gentle/MiniHelicopters.cpp +++ b/src/openrct2/ride/gentle/MiniHelicopters.cpp @@ -19,7 +19,7 @@ /** rct2: 0x */ static void paint_mini_helicopters_track_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; @@ -57,7 +57,7 @@ static void paint_mini_helicopters_track_station( /** rct2: 0x0081F348 */ static void paint_mini_helicopters_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { LocationXY16 position = session->MapPosition; uint32_t imageId; @@ -90,7 +90,7 @@ static void paint_mini_helicopters_track_flat( /** rct2: 0x0081F368 */ static void paint_mini_helicopters_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { LocationXY16 position = session->MapPosition; uint32_t imageId; @@ -132,7 +132,7 @@ static void paint_mini_helicopters_track_flat_to_25_deg_up( /** rct2: 0x0081F358 */ static void paint_mini_helicopters_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { LocationXY16 position = session->MapPosition; uint32_t imageId; @@ -174,7 +174,7 @@ static void paint_mini_helicopters_track_25_deg_up( /** rct2: 0x0081F378 */ static void paint_mini_helicopters_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { LocationXY16 position = session->MapPosition; uint32_t imageId; @@ -216,7 +216,7 @@ static void paint_mini_helicopters_track_25_deg_up_to_flat( /** rct2: 0x */ static void paint_mini_helicopters_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_mini_helicopters_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -224,7 +224,7 @@ static void paint_mini_helicopters_track_flat_to_25_deg_down( /** rct2: 0x0081F388 */ static void paint_mini_helicopters_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_mini_helicopters_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -232,7 +232,7 @@ static void paint_mini_helicopters_track_25_deg_down( /** rct2: 0x0081F3A8 */ static void paint_mini_helicopters_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_mini_helicopters_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -240,7 +240,7 @@ static void paint_mini_helicopters_track_25_deg_down_to_flat( /** rct2: 0x0081F3E8 */ static void paint_mini_helicopters_track_left_quarter_turn_3_tiles( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_left_quarter_turn_3_tiles_paint( session, 3, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -273,7 +273,7 @@ static constexpr const uint8_t mini_helicopters_right_quarter_turn_3_tiles_to_le /** rct2: 0x0081F3F8 */ static void paint_mini_helicopters_track_right_quarter_turn_3_tiles( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mini_helicopters_right_quarter_turn_3_tiles_to_left_turn_map[trackSequence]; paint_mini_helicopters_track_left_quarter_turn_3_tiles( @@ -283,7 +283,7 @@ static void paint_mini_helicopters_track_right_quarter_turn_3_tiles( /** rct2: 0x0081F408 */ static void paint_mini_helicopters_track_left_quarter_turn_1_tile( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_left_quarter_turn_1_tile_paint( session, 1, height, 0, direction, session->TrackColours[SCHEME_TRACK], @@ -298,7 +298,7 @@ static void paint_mini_helicopters_track_left_quarter_turn_1_tile( /** rct2: 0x0081F418 */ static void paint_mini_helicopters_track_right_quarter_turn_1_tile( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_mini_helicopters_track_left_quarter_turn_1_tile( session, rideIndex, trackSequence, (direction + 3) % 4, height, tileElement); diff --git a/src/openrct2/ride/gentle/MonorailCycles.cpp b/src/openrct2/ride/gentle/MonorailCycles.cpp index a4ca28316e..4b99d94393 100644 --- a/src/openrct2/ride/gentle/MonorailCycles.cpp +++ b/src/openrct2/ride/gentle/MonorailCycles.cpp @@ -165,7 +165,7 @@ static paint_struct* paint_monorail_cycles_util_7c( /** rct2: 0x0088AD48 */ static void paint_monorail_cycles_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId = monorail_cycles_track_pieces_flat[(direction & 1)] | session->TrackColours[SCHEME_TRACK]; paint_monorail_cycles_util_7c( @@ -192,7 +192,7 @@ static void paint_monorail_cycles_track_flat( /** rct2: 0x0088ADD8 */ static void paint_monorail_cycles_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; @@ -230,7 +230,7 @@ static void paint_monorail_cycles_station( /** rct2: 0x0088AD88 */ static void paint_monorail_cycles_track_left_quarter_turn_3_tiles( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_left_quarter_turn_3_tiles_paint( session, 3, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -263,7 +263,7 @@ static constexpr const uint8_t monorail_cycles_right_quarter_turn_3_tiles_to_lef /** rct2: 0x0088AD98 */ static void paint_monorail_cycles_track_right_quarter_turn_3_tiles( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = monorail_cycles_right_quarter_turn_3_tiles_to_left_turn_map[trackSequence]; paint_monorail_cycles_track_left_quarter_turn_3_tiles( @@ -287,7 +287,7 @@ static constexpr const int8_t monorail_cycles_track_right_quarter_turn_5_tiles_s /** rct2: 0x0088ADB8 */ static void paint_monorail_cycles_track_right_quarter_turn_5_tiles( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_right_quarter_turn_5_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -403,7 +403,7 @@ static void paint_monorail_cycles_track_right_quarter_turn_5_tiles( /** rct2: 0x0088ADA8 */ static void paint_monorail_cycles_track_left_quarter_turn_5_tiles( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; paint_monorail_cycles_track_right_quarter_turn_5_tiles( @@ -413,7 +413,7 @@ static void paint_monorail_cycles_track_left_quarter_turn_5_tiles( /** rct2: 0x0088ADC8 */ static void paint_monorail_cycles_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (direction == 2 || direction == 3) { @@ -522,7 +522,7 @@ static void paint_monorail_cycles_track_s_bend_left( /** rct2: 0x*/ static void paint_monorail_cycles_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (direction == 2 || direction == 3) { diff --git a/src/openrct2/ride/gentle/ObservationTower.cpp b/src/openrct2/ride/gentle/ObservationTower.cpp index 9ac578c033..4b3d6ed04a 100644 --- a/src/openrct2/ride/gentle/ObservationTower.cpp +++ b/src/openrct2/ride/gentle/ObservationTower.cpp @@ -76,7 +76,7 @@ void vehicle_visual_observation_tower( /** rct2: 0x0070DD6C */ static void paint_observation_tower_base( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = track_map_3x3[direction][trackSequence]; @@ -151,7 +151,7 @@ static void paint_observation_tower_base( /** rct2: 0x0070DD7C */ static void paint_observation_tower_section( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence == 1) { @@ -161,7 +161,7 @@ static void paint_observation_tower_section( uint32_t imageId = SPR_OBSERVATION_TOWER_SEGMENT | session->TrackColours[SCHEME_TRACK]; sub_98197C(session, imageId, 0, 0, 2, 2, 30, height, 8, 8, height); - const rct_tile_element* nextTileElement = tileElement + 1; + const TileElement* nextTileElement = tileElement + 1; if (tileElement->IsLastForTile() || tileElement->clearance_height != nextTileElement->base_height) { imageId = SPR_OBSERVATION_TOWER_SEGMENT_TOP | session->TrackColours[SCHEME_TRACK]; diff --git a/src/openrct2/ride/gentle/SpaceRings.cpp b/src/openrct2/ride/gentle/SpaceRings.cpp index 29528c7488..c050f5bbf2 100644 --- a/src/openrct2/ride/gentle/SpaceRings.cpp +++ b/src/openrct2/ride/gentle/SpaceRings.cpp @@ -33,7 +33,7 @@ static constexpr const uint32_t space_rings_fence_sprites[] = { /** rct2: 0x00768A3B */ static void paint_space_rings_structure(paint_session* session, Ride* ride, uint8_t direction, uint32_t segment, int32_t height) { - const rct_tile_element* savedTileElement = static_cast(session->CurrentlyDrawnItem); + const TileElement* savedTileElement = static_cast(session->CurrentlyDrawnItem); uint32_t vehicleIndex = (segment - direction) & 0x3; @@ -85,7 +85,7 @@ static void paint_space_rings_structure(paint_session* session, Ride* ride, uint /** rct2: 0x00767C40 */ static void paint_space_rings( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = track_map_3x3[direction][trackSequence]; diff --git a/src/openrct2/ride/gentle/SpiralSlide.cpp b/src/openrct2/ride/gentle/SpiralSlide.cpp index 8b2be162d1..9dde5dcb7c 100644 --- a/src/openrct2/ride/gentle/SpiralSlide.cpp +++ b/src/openrct2/ride/gentle/SpiralSlide.cpp @@ -47,7 +47,7 @@ enum static void spiral_slide_paint_tile_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t image_id = 0; @@ -65,7 +65,7 @@ static void spiral_slide_paint_tile_right( static void spiral_slide_paint_tile_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t image_id = 0; @@ -83,7 +83,7 @@ static void spiral_slide_paint_tile_left( static void spiral_slide_paint_tile_front( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t image_id = 0; @@ -191,7 +191,7 @@ static constexpr const uint32_t spiral_slide_fence_sprites[] = { */ static void paint_spiral_slide( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = track_map_2x2[direction][trackSequence]; diff --git a/src/openrct2/ride/shops/Facility.cpp b/src/openrct2/ride/shops/Facility.cpp index cbf313acba..2f75dfe6b4 100644 --- a/src/openrct2/ride/shops/Facility.cpp +++ b/src/openrct2/ride/shops/Facility.cpp @@ -24,7 +24,7 @@ */ static void facility_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool hasSupports = wooden_a_supports_paint_setup( session, direction & 1, 0, height, session->TrackColours[SCHEME_3], nullptr); diff --git a/src/openrct2/ride/shops/Shop.cpp b/src/openrct2/ride/shops/Shop.cpp index fb6cf1f66f..41df397f8b 100644 --- a/src/openrct2/ride/shops/Shop.cpp +++ b/src/openrct2/ride/shops/Shop.cpp @@ -24,7 +24,7 @@ */ static void shop_paint_setup( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool hasSupports = wooden_a_supports_paint_setup( session, direction & 1, 0, height, session->TrackColours[SCHEME_3], nullptr); diff --git a/src/openrct2/ride/thrill/3dCinema.cpp b/src/openrct2/ride/thrill/3dCinema.cpp index 9b5bbcd7f6..33895bffba 100644 --- a/src/openrct2/ride/thrill/3dCinema.cpp +++ b/src/openrct2/ride/thrill/3dCinema.cpp @@ -20,7 +20,7 @@ static void paint_3d_cinema_structure( paint_session* session, uint8_t rideIndex, uint8_t direction, int8_t xOffset, int8_t yOffset, uint16_t height) { - const rct_tile_element* savedTileElement = static_cast(session->CurrentlyDrawnItem); + const TileElement* savedTileElement = static_cast(session->CurrentlyDrawnItem); Ride* ride = get_ride(rideIndex); rct_ride_entry* rideEntry = get_ride_entry(ride->subtype); @@ -55,7 +55,7 @@ static void paint_3d_cinema_structure( */ static void paint_3d_cinema( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = track_map_3x3[direction][trackSequence]; diff --git a/src/openrct2/ride/thrill/Enterprise.cpp b/src/openrct2/ride/thrill/Enterprise.cpp index d830d70edf..29ab9ffb4c 100644 --- a/src/openrct2/ride/thrill/Enterprise.cpp +++ b/src/openrct2/ride/thrill/Enterprise.cpp @@ -17,11 +17,11 @@ /** rct2: 0x008A2ABC */ static void paint_enterprise_structure( - paint_session* session, Ride* ride, int8_t xOffset, int8_t yOffset, uint16_t height, const rct_tile_element* tileElement) + paint_session* session, Ride* ride, int8_t xOffset, int8_t yOffset, uint16_t height, const TileElement* tileElement) { height += 7; - const rct_tile_element* savedTileElement = static_cast(session->CurrentlyDrawnItem); + const TileElement* savedTileElement = static_cast(session->CurrentlyDrawnItem); rct_ride_entry* rideEntry = get_ride_entry(ride->subtype); rct_vehicle* vehicle = nullptr; @@ -80,7 +80,7 @@ static void paint_enterprise_structure( /** rct2: 0x008A1584 */ static void paint_enterprise( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = track_map_4x4[direction][trackSequence]; diff --git a/src/openrct2/ride/thrill/GoKarts.cpp b/src/openrct2/ride/thrill/GoKarts.cpp index 542fdec9dd..41c61f08f5 100644 --- a/src/openrct2/ride/thrill/GoKarts.cpp +++ b/src/openrct2/ride/thrill/GoKarts.cpp @@ -126,7 +126,7 @@ static constexpr const uint32_t go_karts_track_pieces_25_deg_up_to_flat[4][2] = /** rct2: 0x0074A748 */ static void paint_go_karts_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; if (direction == 0 || direction == 2) @@ -159,7 +159,7 @@ static void paint_go_karts_track_flat( /** rct2: 0x0074A758 */ static void paint_go_karts_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; paint_struct* ps; @@ -213,7 +213,7 @@ static void paint_go_karts_track_25_deg_up( /** rct2: 0x0074A768 */ static void paint_go_karts_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; paint_struct* ps; @@ -267,7 +267,7 @@ static void paint_go_karts_track_flat_to_25_deg_up( /** rct2: 0x */ static void paint_go_karts_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; paint_struct* ps; @@ -321,7 +321,7 @@ static void paint_go_karts_track_25_deg_up_to_flat( /** rct2: 0x0074A788 */ static void paint_go_karts_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_go_karts_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -329,7 +329,7 @@ static void paint_go_karts_track_25_deg_down( /** rct2: 0x0074A798 */ static void paint_go_karts_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_go_karts_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -337,7 +337,7 @@ static void paint_go_karts_track_flat_to_25_deg_down( /** rct2: 0x0074A7A8 */ static void paint_go_karts_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_go_karts_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -345,7 +345,7 @@ static void paint_go_karts_track_25_deg_down_to_flat( /** rct2: 0x */ static void paint_go_karts_station( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { LocationXY16 position = session->MapPosition; Ride* ride = get_ride(rideIndex); @@ -456,7 +456,7 @@ static void paint_go_karts_station( /** rct2: 0x0074A7E8 */ static void paint_go_karts_track_left_quarter_turn_1_tile( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; @@ -526,7 +526,7 @@ static void paint_go_karts_track_left_quarter_turn_1_tile( /** rct2: 0x0074A7F8 */ static void paint_go_karts_track_right_quarter_turn_1_tile( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_go_karts_track_left_quarter_turn_1_tile(session, rideIndex, trackSequence, (direction + 3) % 4, height, tileElement); } diff --git a/src/openrct2/ride/thrill/LaunchedFreefall.cpp b/src/openrct2/ride/thrill/LaunchedFreefall.cpp index 8e38a79930..8b31cad737 100644 --- a/src/openrct2/ride/thrill/LaunchedFreefall.cpp +++ b/src/openrct2/ride/thrill/LaunchedFreefall.cpp @@ -86,7 +86,7 @@ void vehicle_visual_launched_freefall( /** rct2: 0x006FD1F8 */ static void paint_launched_freefall_base( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = track_map_3x3[direction][trackSequence]; @@ -160,7 +160,7 @@ static void paint_launched_freefall_base( /** rct2: 0x006FD208 */ static void paint_launched_freefall_tower_section( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence == 1) { @@ -170,7 +170,7 @@ static void paint_launched_freefall_tower_section( uint32_t imageId = SPR_LAUNCHED_FREEFALL_TOWER_SEGMENT | session->TrackColours[SCHEME_TRACK]; sub_98197C(session, imageId, 0, 0, 2, 2, 30, height, 8, 8, height); - const rct_tile_element* nextTileElement = tileElement + 1; + const TileElement* nextTileElement = tileElement + 1; if (tileElement->IsLastForTile() || tileElement->clearance_height != nextTileElement->base_height) { imageId = SPR_LAUNCHED_FREEFALL_TOWER_SEGMENT_TOP | session->TrackColours[SCHEME_TRACK]; diff --git a/src/openrct2/ride/thrill/MagicCarpet.cpp b/src/openrct2/ride/thrill/MagicCarpet.cpp index 3f2c21e792..48cae27b5a 100644 --- a/src/openrct2/ride/thrill/MagicCarpet.cpp +++ b/src/openrct2/ride/thrill/MagicCarpet.cpp @@ -180,7 +180,7 @@ static void paint_magic_carpet_vehicle( static void paint_magic_carpet_structure( paint_session* session, Ride* ride, uint8_t direction, int8_t axisOffset, uint16_t height) { - const rct_tile_element* savedTileElement = static_cast(session->CurrentlyDrawnItem); + const TileElement* savedTileElement = static_cast(session->CurrentlyDrawnItem); rct_vehicle* vehicle = get_first_vehicle(ride); uint32_t swingImageId = 0; @@ -216,7 +216,7 @@ static void paint_magic_carpet_structure( /** rct2: 0x00898514 */ static void paint_magic_carpet( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint8_t relativeTrackSequence = track_map_1x4[direction][trackSequence]; diff --git a/src/openrct2/ride/thrill/MotionSimulator.cpp b/src/openrct2/ride/thrill/MotionSimulator.cpp index 8b0371057a..36f1db5788 100644 --- a/src/openrct2/ride/thrill/MotionSimulator.cpp +++ b/src/openrct2/ride/thrill/MotionSimulator.cpp @@ -31,13 +31,12 @@ enum * rct2: 0x0076522A */ static void paint_motionsimulator_vehicle( - paint_session* session, int8_t offsetX, int8_t offsetY, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + paint_session* session, int8_t offsetX, int8_t offsetY, uint8_t direction, int32_t height, const TileElement* tileElement) { Ride* ride = get_ride(tileElement->AsTrack()->GetRideIndex()); rct_ride_entry* rideEntry = get_ride_entry_by_ride(ride); - const rct_tile_element* savedTileElement = static_cast(session->CurrentlyDrawnItem); + const TileElement* savedTileElement = static_cast(session->CurrentlyDrawnItem); rct_vehicle* vehicle = nullptr; if (ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK) @@ -129,7 +128,7 @@ static void paint_motionsimulator_vehicle( /** rct2: 0x008A85C4 */ static void paint_motionsimulator( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = track_map_2x2[direction][trackSequence]; diff --git a/src/openrct2/ride/thrill/PirateShip.cpp b/src/openrct2/ride/thrill/PirateShip.cpp index 0acda9d179..a5c703f804 100644 --- a/src/openrct2/ride/thrill/PirateShip.cpp +++ b/src/openrct2/ride/thrill/PirateShip.cpp @@ -60,7 +60,7 @@ static void paint_pirate_ship_structure( { uint32_t imageId, baseImageId; - const rct_tile_element* savedTileElement = static_cast(session->CurrentlyDrawnItem); + const TileElement* savedTileElement = static_cast(session->CurrentlyDrawnItem); rct_ride_entry* rideEntry = get_ride_entry(ride->subtype); rct_vehicle* vehicle = nullptr; @@ -169,7 +169,7 @@ static void paint_pirate_ship_structure( /** rct2: 0x008A85C4 */ static void paint_pirate_ship( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint8_t relativeTrackSequence = track_map_1x5[direction][trackSequence]; Ride* ride = get_ride(rideIndex); diff --git a/src/openrct2/ride/thrill/RotoDrop.cpp b/src/openrct2/ride/thrill/RotoDrop.cpp index a9c7a56049..232cb8bfdf 100644 --- a/src/openrct2/ride/thrill/RotoDrop.cpp +++ b/src/openrct2/ride/thrill/RotoDrop.cpp @@ -88,7 +88,7 @@ void vehicle_visual_roto_drop( /** rct2: 0x00886194 */ static void paint_roto_drop_base( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = track_map_3x3[direction][trackSequence]; @@ -167,7 +167,7 @@ static void paint_roto_drop_base( /** rct2: 0x008861A4 */ static void paint_roto_drop_tower_section( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence == 1) { @@ -177,7 +177,7 @@ static void paint_roto_drop_tower_section( uint32_t imageId = SPR_ROTO_DROP_TOWER_SEGMENT | session->TrackColours[SCHEME_TRACK]; sub_98197C(session, imageId, 0, 0, 2, 2, 30, height, 8, 8, height); - const rct_tile_element* nextTileElement = tileElement + 1; + const TileElement* nextTileElement = tileElement + 1; if (tileElement->IsLastForTile() || tileElement->clearance_height != nextTileElement->base_height) { imageId = SPR_ROTO_DROP_TOWER_SEGMENT_TOP | session->TrackColours[SCHEME_TRACK]; diff --git a/src/openrct2/ride/thrill/SwingingInverterShip.cpp b/src/openrct2/ride/thrill/SwingingInverterShip.cpp index 486f5a651b..649cb8d8ab 100644 --- a/src/openrct2/ride/thrill/SwingingInverterShip.cpp +++ b/src/openrct2/ride/thrill/SwingingInverterShip.cpp @@ -49,7 +49,7 @@ static constexpr const uint32_t swinging_inverter_ship_frame_sprites[] = { SPR_S static void paint_swinging_inverter_ship_structure( paint_session* session, Ride* ride, uint8_t direction, int8_t axisOffset, uint16_t height) { - const rct_tile_element* savedTileElement = static_cast(session->CurrentlyDrawnItem); + const TileElement* savedTileElement = static_cast(session->CurrentlyDrawnItem); rct_ride_entry* rideEntry = get_ride_entry(ride->subtype); rct_vehicle* vehicle = nullptr; @@ -123,7 +123,7 @@ static void paint_swinging_inverter_ship_structure( /** rct2: 0x00760260 */ static void paint_swinging_inverter_ship( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint8_t relativeTrackSequence = track_map_1x4[direction][trackSequence]; diff --git a/src/openrct2/ride/thrill/TopSpin.cpp b/src/openrct2/ride/thrill/TopSpin.cpp index b1fe2ac079..ec13ec0017 100644 --- a/src/openrct2/ride/thrill/TopSpin.cpp +++ b/src/openrct2/ride/thrill/TopSpin.cpp @@ -42,12 +42,12 @@ static int8_t TopSpinSeatPositionOffset[] = { */ static void top_spin_paint_vehicle( paint_session* session, int8_t al, int8_t cl, uint8_t rideIndex, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint16_t boundBoxOffsetX, boundBoxOffsetY, boundBoxOffsetZ; // As we will be drawing a vehicle we need to backup the tileElement that // is assigned to the drawings. - const rct_tile_element* curTileElement = static_cast(session->CurrentlyDrawnItem); + const TileElement* curTileElement = static_cast(session->CurrentlyDrawnItem); height += 3; @@ -243,7 +243,7 @@ static void top_spin_paint_vehicle( */ static void paint_top_spin( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = track_map_3x3[direction][trackSequence]; diff --git a/src/openrct2/ride/thrill/Twist.cpp b/src/openrct2/ride/thrill/Twist.cpp index ff9105dc11..60b260a176 100644 --- a/src/openrct2/ride/thrill/Twist.cpp +++ b/src/openrct2/ride/thrill/Twist.cpp @@ -19,7 +19,7 @@ static void paint_twist_structure( paint_session* session, Ride* ride, uint8_t direction, int8_t xOffset, int8_t yOffset, uint16_t height) { - const rct_tile_element* savedTileElement = static_cast(session->CurrentlyDrawnItem); + const TileElement* savedTileElement = static_cast(session->CurrentlyDrawnItem); rct_ride_entry* rideEntry = get_ride_entry(ride->subtype); rct_vehicle* vehicle = nullptr; @@ -80,7 +80,7 @@ static void paint_twist_structure( /** rct2: 0x0076D858 */ static void paint_twist( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = track_map_3x3[direction][trackSequence]; diff --git a/src/openrct2/ride/transport/Chairlift.cpp b/src/openrct2/ride/transport/Chairlift.cpp index e76bd60587..06ca31dac9 100644 --- a/src/openrct2/ride/transport/Chairlift.cpp +++ b/src/openrct2/ride/transport/Chairlift.cpp @@ -107,10 +107,10 @@ static void chairlift_paint_util_draw_supports(paint_session* session, int32_t s } } -static const rct_tile_element* chairlift_paint_util_map_get_track_element_at_from_ride_fuzzy( +static const TileElement* chairlift_paint_util_map_get_track_element_at_from_ride_fuzzy( int32_t x, int32_t y, int32_t z, int32_t rideIndex) { - const rct_tile_element* tileElement = map_get_first_element_at(x >> 5, y >> 5); + const TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5); if (tileElement == nullptr) { return nullptr; @@ -132,7 +132,7 @@ static const rct_tile_element* chairlift_paint_util_map_get_track_element_at_fro }; static bool chairlift_paint_util_is_first_track( - uint8_t rideIndex, const rct_tile_element* tileElement, LocationXY16 pos, uint8_t trackType) + uint8_t rideIndex, const TileElement* tileElement, LocationXY16 pos, uint8_t trackType) { if (tileElement->AsTrack()->GetTrackType() != TRACK_ELEM_BEGIN_STATION) { @@ -145,14 +145,14 @@ static bool chairlift_paint_util_is_first_track( static_cast(pos.y - delta.y), }; - const rct_tile_element* nextTrack = chairlift_paint_util_map_get_track_element_at_from_ride_fuzzy( + const TileElement* nextTrack = chairlift_paint_util_map_get_track_element_at_from_ride_fuzzy( newPos.x, newPos.y, tileElement->base_height, rideIndex); return nextTrack == nullptr; } static bool chairlift_paint_util_is_last_track( - uint8_t rideIndex, const rct_tile_element* tileElement, LocationXY16 pos, uint8_t trackType) + uint8_t rideIndex, const TileElement* tileElement, LocationXY16 pos, uint8_t trackType) { if (tileElement->AsTrack()->GetTrackType() != TRACK_ELEM_END_STATION) { @@ -165,7 +165,7 @@ static bool chairlift_paint_util_is_last_track( static_cast(pos.y + delta.y), }; - const rct_tile_element* nextTrack = chairlift_paint_util_map_get_track_element_at_from_ride_fuzzy( + const TileElement* nextTrack = chairlift_paint_util_map_get_track_element_at_from_ride_fuzzy( newPos.x, newPos.y, tileElement->base_height, rideIndex); return nextTrack == nullptr; @@ -173,7 +173,7 @@ static bool chairlift_paint_util_is_last_track( static void chairlift_paint_station_ne_sw( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { const LocationXY16 pos = session->MapPosition; uint8_t trackType = tileElement->AsTrack()->GetTrackType(); @@ -264,7 +264,7 @@ static void chairlift_paint_station_ne_sw( static void chairlift_paint_station_se_nw( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { const LocationXY16 pos = session->MapPosition; uint8_t trackType = tileElement->AsTrack()->GetTrackType(); @@ -357,7 +357,7 @@ static void chairlift_paint_station_se_nw( /** rct2: 0x00744068 */ static void chairlift_paint_station( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (direction % 2) { @@ -371,7 +371,7 @@ static void chairlift_paint_station( static void chairlift_paint_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; if (direction & 1) @@ -394,7 +394,7 @@ static void chairlift_paint_flat( /** rct2: 0x00743FD8 */ static void chairlift_paint_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; @@ -432,7 +432,7 @@ static void chairlift_paint_25_deg_up( /** rct2: 0x00743FD8 */ static void chairlift_paint_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; @@ -487,7 +487,7 @@ static void chairlift_paint_flat_to_25_deg_up( /** rct2: 0x00743FF8 */ static void chairlift_paint_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; @@ -542,7 +542,7 @@ static void chairlift_paint_25_deg_up_to_flat( /** rct2: 0x00744008 */ static void chairlift_paint_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { chairlift_paint_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -550,7 +550,7 @@ static void chairlift_paint_25_deg_down( /** rct2: 0x00744018 */ static void chairlift_paint_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { chairlift_paint_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -558,7 +558,7 @@ static void chairlift_paint_flat_to_25_deg_down( /** rct2: 0x00744028 */ static void chairlift_paint_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { chairlift_paint_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -566,7 +566,7 @@ static void chairlift_paint_25_deg_down_to_flat( /** rct2: 0x00744038 */ static void chairlift_paint_left_quarter_turn_1_tile( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; @@ -633,7 +633,7 @@ static void chairlift_paint_left_quarter_turn_1_tile( /** rct2: 0x00744048 */ static void chairlift_paint_right_quarter_turn_1_tile( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { chairlift_paint_left_quarter_turn_1_tile(session, rideIndex, trackSequence, (direction + 3) % 4, height, tileElement); } diff --git a/src/openrct2/ride/transport/Lift.cpp b/src/openrct2/ride/transport/Lift.cpp index c173d17ec9..fe33188318 100644 --- a/src/openrct2/ride/transport/Lift.cpp +++ b/src/openrct2/ride/transport/Lift.cpp @@ -48,7 +48,7 @@ static void paint_lift_cage(paint_session* session, int8_t index, uint32_t colou /** rct2: 0x0076C6CC */ static void paint_lift_base( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = track_map_3x3[direction][trackSequence]; @@ -119,7 +119,7 @@ static void paint_lift_base( /** rct2: 0x0076C6DC */ static void paint_lift_tower_section( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (trackSequence == 1) { diff --git a/src/openrct2/ride/transport/MiniatureRailway.cpp b/src/openrct2/ride/transport/MiniatureRailway.cpp index e63f28773c..b19c0f750e 100644 --- a/src/openrct2/ride/transport/MiniatureRailway.cpp +++ b/src/openrct2/ride/transport/MiniatureRailway.cpp @@ -556,7 +556,7 @@ static uint32_t miniature_railway_track_to_grooved(uint32_t imageId) } static uint32_t miniature_railway_track_to_grooved_indent( - uint32_t imageId, const rct_tile_element* path, uint8_t direction, uint8_t rotation) + uint32_t imageId, const TileElement* path, uint8_t direction, uint8_t rotation) { if (!path) { @@ -589,7 +589,7 @@ static uint32_t miniature_railway_track_to_grooved_indent( /** rct2: 0x008AD0C0 */ static void paint_miniature_railway_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool paintAsGravel = false; bool paintGrooved = false; @@ -667,7 +667,7 @@ static void paint_miniature_railway_track_flat( /** rct2: 0x008AD170, 0x008AD180, 0x008AD190 */ static void paint_miniature_railway_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; @@ -691,7 +691,7 @@ static void paint_miniature_railway_station( /** rct2: 0x008AD0D0 */ static void paint_miniature_railway_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId = miniature_railway_track_pieces_25_deg_up[direction] | session->TrackColours[SCHEME_TRACK]; @@ -723,7 +723,7 @@ static void paint_miniature_railway_track_25_deg_up( /** rct2: 0x008AD0E0 */ static void paint_miniature_railway_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId = miniature_railway_track_pieces_flat_to_25_deg_up[direction] | session->TrackColours[SCHEME_TRACK]; @@ -755,7 +755,7 @@ static void paint_miniature_railway_track_flat_to_25_deg_up( /** rct2: 0x008AD0F0 */ static void paint_miniature_railway_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId = miniature_railway_track_pieces_25_deg_up_to_flat[direction] | session->TrackColours[SCHEME_TRACK]; @@ -787,7 +787,7 @@ static void paint_miniature_railway_track_25_deg_up_to_flat( /** rct2: 0x008AD100 */ static void paint_miniature_railway_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_miniature_railway_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -795,7 +795,7 @@ static void paint_miniature_railway_track_25_deg_down( /** rct2: 0x008AD110 */ static void paint_miniature_railway_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_miniature_railway_track_25_deg_up_to_flat( session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); @@ -804,7 +804,7 @@ static void paint_miniature_railway_track_flat_to_25_deg_down( /** rct2: 0x008AD120 */ static void paint_miniature_railway_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_miniature_railway_track_flat_to_25_deg_up( session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); @@ -919,7 +919,7 @@ static constexpr const int8_t miniature_railway_right_quarter_turn_5_tiles_sprit /** rct2: 0x008AD140 */ static void paint_miniature_railway_track_right_quarter_turn_5_tiles( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (right_quarter_turn_5_supports_type[direction][trackSequence] != -1) { @@ -1009,7 +1009,7 @@ static void paint_miniature_railway_track_right_quarter_turn_5_tiles( /** rct2: 0x008AD130 */ static void paint_miniature_railway_track_left_quarter_turn_5_tiles( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; paint_miniature_railway_track_right_quarter_turn_5_tiles( @@ -1033,7 +1033,7 @@ static constexpr const uint32_t miniature_railway_s_bend_left_tiles_track_floor[ /** rct2: 0x8AD150 */ static void paint_miniature_railway_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (direction == 2 || direction == 3) { @@ -1134,7 +1134,7 @@ static constexpr const uint32_t miniature_railway_s_bend_right_tiles_track_floor /** rct2: 0x008AD160 */ static void paint_miniature_railway_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (direction == 2 || direction == 3) { @@ -1265,7 +1265,7 @@ static constexpr const LocationXYZ16 miniature_railway_right_quarter_turn_3_tile /** rct2: 0x008AD1B0 */ static void paint_miniature_railway_track_right_quarter_turn_3_tiles( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isSupported = false; if (trackSequence != 1 && trackSequence != 2) @@ -1332,7 +1332,7 @@ static void paint_miniature_railway_track_right_quarter_turn_3_tiles( /** rct2: 0x008AD1A0 */ static void paint_miniature_railway_track_left_quarter_turn_3_tiles( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; paint_miniature_railway_track_right_quarter_turn_3_tiles( @@ -1415,7 +1415,7 @@ static constexpr const LocationXY16 miniature_railway_track_floor_pieces_left_ei /** rct2: 0x008AD1C0 */ static void paint_miniature_railway_track_left_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { const uint8_t supportType[4][5] = { { 0, 0, 3, 5, 1 }, { 1, 1, 4, 2, 0 }, { 0, 0, 5, 3, 1 }, { 1, 1, 2, 4, 0 } }; @@ -1551,7 +1551,7 @@ static constexpr const LocationXY16 miniature_railway_track_floor_pieces_right_e /** rct2: 0x008AD1D0 */ static void paint_miniature_railway_track_right_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { const uint8_t supportType[4][5] = { { 0, 0, 2, 4, 1 }, { 1, 1, 3, 5, 0 }, { 0, 0, 4, 2, 1 }, { 1, 1, 5, 3, 0 } }; @@ -1618,7 +1618,7 @@ static void paint_miniature_railway_track_right_eighth_to_diag( /** rct2: 0x008AD1E0 */ static void paint_miniature_railway_track_left_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; paint_miniature_railway_track_right_eighth_to_diag( @@ -1628,7 +1628,7 @@ static void paint_miniature_railway_track_left_eighth_to_orthogonal( /** rct2: 0x008AD1F0 */ static void paint_miniature_railway_track_right_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; paint_miniature_railway_track_left_eighth_to_diag( @@ -1678,7 +1678,7 @@ static constexpr const floor_desc floors[] = { /** rct2: 0x008AD200 */ static void miniature_railway_track_diag_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isSupported = false; int16_t supportType = monorail_diag_support_types[direction][trackSequence]; @@ -1748,7 +1748,7 @@ static bool wooden_supports_paint_setup( /** rct2: 0x008AD230 */ static void miniature_railway_track_diag_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { // TODO: The supports are inconsistent for different rotations @@ -1823,7 +1823,7 @@ static void miniature_railway_track_diag_25_deg_up( /** rct2: 0x008AD210 */ static void miniature_railway_track_diag_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool hasSupports = false; @@ -1871,7 +1871,7 @@ static void miniature_railway_track_diag_flat_to_25_deg_up( /** rct2: 0x008AD220 */ static void miniature_railway_track_diag_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { const int8_t supportOffsets[][4] = { { 0, +8, +8, +8 }, @@ -1947,7 +1947,7 @@ static void miniature_railway_track_diag_25_deg_up_to_flat( /** rct2: 0x008AD260 */ static void miniature_railway_track_diag_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { const int8_t supportOffsets[][4] = { { 0, +16, +16, 0 }, @@ -2022,7 +2022,7 @@ static void miniature_railway_track_diag_25_deg_down( /** rct2: 0x008AD240 */ static void miniature_railway_track_diag_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { const int8_t supportOffsets[][4] = { { 0, +16, +16, 0 }, @@ -2095,7 +2095,7 @@ static void miniature_railway_track_diag_flat_to_25_deg_down( static void miniature_railway_track_diag_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool hasSupports = false; uint32_t floorImage = 0; diff --git a/src/openrct2/ride/transport/Monorail.cpp b/src/openrct2/ride/transport/Monorail.cpp index 415003ecb6..ee5b0c6b9a 100644 --- a/src/openrct2/ride/transport/Monorail.cpp +++ b/src/openrct2/ride/transport/Monorail.cpp @@ -420,7 +420,7 @@ static constexpr const uint32_t monorail_track_pieces_diag_25_deg_up[4] = { /** rct2: 0x008AE1AC */ static void paint_monorail_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { LocationXY16 position = session->MapPosition; @@ -457,7 +457,7 @@ static void paint_monorail_track_flat( /** rct2: 0x008AE25C, 0x008AE26C, 0x008AE27C */ static void paint_monorail_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; @@ -511,7 +511,7 @@ static void paint_monorail_station( /** rct2: 0x008AE1BC */ static void paint_monorail_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { LocationXY16 position = session->MapPosition; @@ -555,7 +555,7 @@ static void paint_monorail_track_25_deg_up( /** rct2: 0x008AE1CC */ static void paint_monorail_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { LocationXY16 position = session->MapPosition; @@ -599,7 +599,7 @@ static void paint_monorail_track_flat_to_25_deg_up( /** rct2: 0x008AE1DC */ static void paint_monorail_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { LocationXY16 position = session->MapPosition; @@ -643,7 +643,7 @@ static void paint_monorail_track_25_deg_up_to_flat( /** rct2: 0x008AE1EC */ static void paint_monorail_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_monorail_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -651,7 +651,7 @@ static void paint_monorail_track_25_deg_down( /** rct2: 0x008AE1FC */ static void paint_monorail_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_monorail_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -659,7 +659,7 @@ static void paint_monorail_track_flat_to_25_deg_down( /** rct2: 0x008AE20C */ static void paint_monorail_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_monorail_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -667,7 +667,7 @@ static void paint_monorail_track_25_deg_down_to_flat( /** rct2: 0x008AE22C */ static void paint_monorail_track_right_quarter_turn_5_tiles( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_right_quarter_turn_5_tiles_paint( session, 3, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -730,7 +730,7 @@ static void paint_monorail_track_right_quarter_turn_5_tiles( /** rct2: 0x008AE21C */ static void paint_monorail_track_left_quarter_turn_5_tiles( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; paint_monorail_track_right_quarter_turn_5_tiles( @@ -740,7 +740,7 @@ static void paint_monorail_track_left_quarter_turn_5_tiles( /** rct2: 0x */ static void paint_monorail_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (direction == 2 || direction == 3) { @@ -844,7 +844,7 @@ static void paint_monorail_track_s_bend_left( /** rct2: 0x008AE24C */ static void paint_monorail_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (direction == 2 || direction == 3) { @@ -948,7 +948,7 @@ static void paint_monorail_track_s_bend_right( /** rct2: 0x008AE29C */ static void paint_monorail_track_right_quarter_turn_3_tiles( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_right_quarter_turn_3_tiles_paint( session, 3, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -985,7 +985,7 @@ static void paint_monorail_track_right_quarter_turn_3_tiles( /** rct2: 0x008AE28C */ static void paint_monorail_track_left_quarter_turn_3_tiles( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; paint_monorail_track_right_quarter_turn_3_tiles( @@ -997,7 +997,7 @@ static constexpr const int8_t paint_monorail_eighth_to_diag_index[] = { 0, 1, 2, /** rct2: 0x008AE31C */ static void paint_monorail_track_left_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { int8_t index = paint_monorail_eighth_to_diag_index[trackSequence]; if (index >= 0) @@ -1065,7 +1065,7 @@ static void paint_monorail_track_left_eighth_to_diag( /** rct2: 0x008AE32C */ static void paint_monorail_track_right_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { int8_t index = paint_monorail_eighth_to_diag_index[trackSequence]; if (index >= 0) @@ -1133,7 +1133,7 @@ static void paint_monorail_track_right_eighth_to_diag( /** rct2: 0x008AE33C */ static void paint_monorail_track_left_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { const uint8_t map[] = { 4, 2, 3, 1, 0 }; trackSequence = map[trackSequence]; @@ -1143,7 +1143,7 @@ static void paint_monorail_track_left_eighth_to_orthogonal( /** rct2: 0x008AE34C */ static void paint_monorail_track_right_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { const uint8_t map[] = { 4, 2, 3, 1, 0 }; trackSequence = map[trackSequence]; @@ -1167,7 +1167,7 @@ static constexpr const int32_t monorail_diag_blocked_segments[] = { SEGMENT_C4 | /** rct2: 0x008AE2AC */ static void paint_monorail_track_diag_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (monorail_diag_image_segment[direction][trackSequence]) { @@ -1190,7 +1190,7 @@ static void paint_monorail_track_diag_flat( /** rct2: 0x008AE2DC */ static void paint_monorail_track_diag_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (monorail_diag_image_segment[direction][trackSequence]) { @@ -1213,7 +1213,7 @@ static void paint_monorail_track_diag_25_deg_up( /** rct2: 0x008AE2BC */ static void paint_monorail_track_diag_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (monorail_diag_image_segment[direction][trackSequence]) { @@ -1236,7 +1236,7 @@ static void paint_monorail_track_diag_flat_to_25_deg_up( /** rct2: 0x008AE2CC */ static void paint_monorail_track_diag_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (monorail_diag_image_segment[direction][trackSequence]) { @@ -1259,7 +1259,7 @@ static void paint_monorail_track_diag_25_deg_up_to_flat( /** rct2: 0x008AE30C */ static void paint_monorail_track_diag_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (monorail_diag_image_segment[direction][trackSequence]) { @@ -1282,7 +1282,7 @@ static void paint_monorail_track_diag_25_deg_down( /** rct2: 0x008AE2EC */ static void paint_monorail_track_diag_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (monorail_diag_image_segment[direction][trackSequence]) { @@ -1306,7 +1306,7 @@ static void paint_monorail_track_diag_flat_to_25_deg_down( /** rct2: 0x008AE2FC */ static void paint_monorail_track_diag_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { if (monorail_diag_image_segment[direction][trackSequence]) { diff --git a/src/openrct2/ride/transport/SuspendedMonorail.cpp b/src/openrct2/ride/transport/SuspendedMonorail.cpp index 9359979e9b..c26951fb97 100644 --- a/src/openrct2/ride/transport/SuspendedMonorail.cpp +++ b/src/openrct2/ride/transport/SuspendedMonorail.cpp @@ -22,7 +22,7 @@ /** rct2: 0x008636F4 */ static void suspended_monorail_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -54,7 +54,7 @@ static void suspended_monorail_track_flat( /** rct2: 0x008637A4, 0x008637B4, 0x008637C4 */ static void suspended_monorail_track_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][3] = { { SPR_STATION_BASE_C_SW_NE, 25853, SPR_STATION_INVERTED_BAR_F_SW_NE }, @@ -81,7 +81,7 @@ static void suspended_monorail_track_station( /** rct2: 0x00863704 */ static void suspended_monorail_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -146,7 +146,7 @@ static void suspended_monorail_track_25_deg_up( /** rct2: 0x00863714 */ static void suspended_monorail_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -211,7 +211,7 @@ static void suspended_monorail_track_flat_to_25_deg_up( /** rct2: 0x00863724 */ static void suspended_monorail_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { @@ -276,7 +276,7 @@ static void suspended_monorail_track_25_deg_up_to_flat( /** rct2: 0x00863734 */ static void suspended_monorail_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { suspended_monorail_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -284,7 +284,7 @@ static void suspended_monorail_track_25_deg_down( /** rct2: 0x00863744 */ static void suspended_monorail_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { suspended_monorail_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -292,7 +292,7 @@ static void suspended_monorail_track_flat_to_25_deg_down( /** rct2: 0x00863754 */ static void suspended_monorail_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { suspended_monorail_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } @@ -300,7 +300,7 @@ static void suspended_monorail_track_25_deg_down_to_flat( /** rct2: 0x00863764 */ static void suspended_monorail_track_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -480,7 +480,7 @@ static void suspended_monorail_track_left_quarter_turn_5( /** rct2: 0x00863774 */ static void suspended_monorail_track_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; suspended_monorail_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -489,7 +489,7 @@ static void suspended_monorail_track_right_quarter_turn_5( /** rct2: 0x00863784 */ static void suspended_monorail_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -660,7 +660,7 @@ static void suspended_monorail_track_s_bend_left( /** rct2: 0x00863794 */ static void suspended_monorail_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -831,7 +831,7 @@ static void suspended_monorail_track_s_bend_right( /** rct2: 0x008637D4 */ static void suspended_monorail_track_left_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -950,7 +950,7 @@ static void suspended_monorail_track_left_quarter_turn_3( /** rct2: 0x008637E4 */ static void suspended_monorail_track_right_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; suspended_monorail_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement); @@ -959,7 +959,7 @@ static void suspended_monorail_track_right_quarter_turn_3( /** rct2: 0x00863864 */ static void suspended_monorail_track_left_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1122,7 +1122,7 @@ static void suspended_monorail_track_left_eighth_to_diag( /** rct2: 0x00863874 */ static void suspended_monorail_track_right_eighth_to_diag( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1285,7 +1285,7 @@ static void suspended_monorail_track_right_eighth_to_diag( /** rct2: 0x00863884 */ static void suspended_monorail_track_left_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; suspended_monorail_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -1294,7 +1294,7 @@ static void suspended_monorail_track_left_eighth_to_orthogonal( /** rct2: 0x00863894 */ static void suspended_monorail_track_right_eighth_to_orthogonal( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; suspended_monorail_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, tileElement); @@ -1303,7 +1303,7 @@ static void suspended_monorail_track_right_eighth_to_orthogonal( /** rct2: 0x008637F4 */ static void suspended_monorail_track_diag_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1386,7 +1386,7 @@ static void suspended_monorail_track_diag_flat( /** rct2: 0x00863824 */ static void suspended_monorail_track_diag_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1469,7 +1469,7 @@ static void suspended_monorail_track_diag_25_deg_up( /** rct2: 0x00863804 */ static void suspended_monorail_track_diag_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1552,7 +1552,7 @@ static void suspended_monorail_track_diag_flat_to_25_deg_up( /** rct2: 0x00863814 */ static void suspended_monorail_track_diag_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1635,7 +1635,7 @@ static void suspended_monorail_track_diag_25_deg_up_to_flat( /** rct2: 0x00863854 */ static void suspended_monorail_track_diag_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1718,7 +1718,7 @@ static void suspended_monorail_track_diag_25_deg_down( /** rct2: 0x00863834 */ static void suspended_monorail_track_diag_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { @@ -1798,7 +1798,7 @@ static void suspended_monorail_track_diag_flat_to_25_deg_down( /** rct2: 0x00863844 */ static void suspended_monorail_track_diag_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (trackSequence) { diff --git a/src/openrct2/ride/water/BoatHire.cpp b/src/openrct2/ride/water/BoatHire.cpp index 2e7211a444..ae23b6fea5 100644 --- a/src/openrct2/ride/water/BoatHire.cpp +++ b/src/openrct2/ride/water/BoatHire.cpp @@ -32,7 +32,7 @@ enum /** rct2: 0x008B0E40 */ static void paint_boat_hire_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; @@ -61,7 +61,7 @@ static void paint_boat_hire_track_flat( /** rct2: 0x008B0E50 */ static void paint_boat_hire_station( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { LocationXY16 position = session->MapPosition; Ride* ride = get_ride(rideIndex); @@ -87,7 +87,7 @@ static void paint_boat_hire_station( /** rct2: 0x008B0E80 */ static void paint_boat_hire_track_left_quarter_turn_1_tile( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; switch (direction) @@ -130,7 +130,7 @@ static void paint_boat_hire_track_left_quarter_turn_1_tile( /** rct2: 0x008B0E90 */ static void paint_boat_hire_track_right_quarter_turn_1_tile( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_boat_hire_track_left_quarter_turn_1_tile(session, rideIndex, trackSequence, (direction + 3) % 4, height, tileElement); } diff --git a/src/openrct2/ride/water/DingySlide.cpp b/src/openrct2/ride/water/DingySlide.cpp index e9a2f073f1..58b4e282fd 100644 --- a/src/openrct2/ride/water/DingySlide.cpp +++ b/src/openrct2/ride/water/DingySlide.cpp @@ -351,7 +351,7 @@ enum static void dinghy_slide_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[2][4][2] = { { @@ -389,7 +389,7 @@ static void dinghy_slide_track_flat( static void dinghy_slide_track_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_DINGHY_SLIDE_STATION_SW_NE, SPR_STATION_BASE_B_SW_NE }, @@ -419,7 +419,7 @@ static void dinghy_slide_track_station( static void dinghy_slide_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[2][4][2] = { { @@ -464,7 +464,7 @@ static void dinghy_slide_track_25_deg_up( static void dinghy_slide_track_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_DINGHY_SLIDE_60_DEG_SW_NE, SPR_DINGHY_SLIDE_60_DEG_FRONT_SW_NE }, @@ -500,7 +500,7 @@ static void dinghy_slide_track_60_deg_up( static void dinghy_slide_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[2][4][2] = { { @@ -545,7 +545,7 @@ static void dinghy_slide_track_flat_to_25_deg_up( static void dinghy_slide_track_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_DINGHY_SLIDE_25_DEG_TO_60_DEG_SW_NE, SPR_DINGHY_SLIDE_25_DEG_TO_60_DEG_FRONT_SW_NE }, @@ -581,7 +581,7 @@ static void dinghy_slide_track_25_deg_up_to_60_deg_up( static void dinghy_slide_track_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_DINGHY_SLIDE_60_DEG_TO_25_DEG_SW_NE, SPR_DINGHY_SLIDE_60_DEG_TO_25_DEG_FRONT_SW_NE }, @@ -617,7 +617,7 @@ static void dinghy_slide_track_60_deg_up_to_25_deg_up( static void dinghy_slide_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[2][4][2] = { { @@ -662,42 +662,42 @@ static void dinghy_slide_track_25_deg_up_to_flat( static void dinghy_slide_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { dinghy_slide_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } static void dinghy_slide_track_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { dinghy_slide_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } static void dinghy_slide_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { dinghy_slide_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } static void dinghy_slide_track_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { dinghy_slide_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } static void dinghy_slide_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { dinghy_slide_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } static void dinghy_slide_track_right_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const sprite_bb imageIds[4][5] = { { @@ -825,7 +825,7 @@ static void dinghy_slide_track_right_quarter_turn_5( static void dinghy_slide_track_left_quarter_turn_5( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; dinghy_slide_track_right_quarter_turn_5(session, rideIndex, trackSequence, (direction + 1) % 4, height, tileElement); @@ -833,14 +833,14 @@ static void dinghy_slide_track_left_quarter_turn_5( static void dinghy_slide_track_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { dinghy_slide_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } static void dinghy_slide_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][4][2] = { { { SPR_DINGHY_SLIDE_S_BEND_SW_SE_SW_SEQ_3, SPR_DINGHY_SLIDE_S_BEND_FRONT_NE_NW_NE_SEQ_0 }, @@ -935,7 +935,7 @@ static void dinghy_slide_track_s_bend_left( static void dinghy_slide_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][4][2] = { { { SPR_DINGHY_SLIDE_S_BEND_SW_NW_SW_SEQ_3, SPR_DINGHY_SLIDE_S_BEND_FRONT_NE_SE_NE_SEQ_0 }, @@ -1028,7 +1028,7 @@ static void dinghy_slide_track_s_bend_right( static void dinghy_slide_track_right_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const sprite_bb imageIds[4][3] = { { @@ -1109,7 +1109,7 @@ static void dinghy_slide_track_right_quarter_turn_3( static void dinghy_slide_track_left_quarter_turn_3( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; dinghy_slide_track_right_quarter_turn_3(session, rideIndex, trackSequence, (direction + 1) % 4, height, tileElement); @@ -1117,7 +1117,7 @@ static void dinghy_slide_track_left_quarter_turn_3( static void dinghy_slide_track_flat_covered( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_DINGHY_SLIDE_FLAT_COVERED_SW_NE, SPR_DINGHY_SLIDE_FLAT_COVERED_FRONT_SW_NE }, @@ -1146,7 +1146,7 @@ static void dinghy_slide_track_flat_covered( static void dinghy_slide_track_25_deg_up_covered( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_DINGHY_SLIDE_25_DEG_COVERED_SW_NE, SPR_DINGHY_SLIDE_25_DEG_COVERED_FRONT_SW_NE }, @@ -1182,7 +1182,7 @@ static void dinghy_slide_track_25_deg_up_covered( static void dinghy_slide_track_60_deg_up_covered( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_DINGHY_SLIDE_60_DEG_COVERED_SW_NE, SPR_DINGHY_SLIDE_60_DEG_COVERED_FRONT_SW_NE }, @@ -1218,7 +1218,7 @@ static void dinghy_slide_track_60_deg_up_covered( static void dinghy_slide_track_flat_to_25_deg_up_covered( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_DINGHY_SLIDE_FLAT_TO_25_DEG_COVERED_SW_NE, SPR_DINGHY_SLIDE_FLAT_TO_25_DEG_COVERED_FRONT_SW_NE }, @@ -1254,7 +1254,7 @@ static void dinghy_slide_track_flat_to_25_deg_up_covered( static void dinghy_slide_track_25_deg_up_to_60_deg_up_covered( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_DINGHY_SLIDE_25_DEG_TO_60_DEG_COVERED_SW_NE, SPR_DINGHY_SLIDE_25_DEG_TO_60_DEG_COVERED_FRONT_SW_NE }, @@ -1290,7 +1290,7 @@ static void dinghy_slide_track_25_deg_up_to_60_deg_up_covered( static void dinghy_slide_track_60_deg_up_to_25_deg_up_covered( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_DINGHY_SLIDE_60_DEG_TO_25_DEG_COVERED_SW_NE, SPR_DINGHY_SLIDE_60_DEG_TO_25_DEG_COVERED_FRONT_SW_NE }, @@ -1326,7 +1326,7 @@ static void dinghy_slide_track_60_deg_up_to_25_deg_up_covered( static void dinghy_slide_track_25_deg_up_to_flat_covered( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_DINGHY_SLIDE_25_DEG_TO_FLAT_COVERED_SW_NE, SPR_DINGHY_SLIDE_25_DEG_TO_FLAT_COVERED_FRONT_SW_NE }, @@ -1362,28 +1362,28 @@ static void dinghy_slide_track_25_deg_up_to_flat_covered( static void dinghy_slide_track_25_deg_down_covered( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { dinghy_slide_track_25_deg_up_covered(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } static void dinghy_slide_track_60_deg_down_covered( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { dinghy_slide_track_60_deg_up_covered(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } static void dinghy_slide_track_flat_to_25_deg_down_covered( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { dinghy_slide_track_25_deg_up_to_flat_covered(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } static void dinghy_slide_track_25_deg_down_to_60_deg_down_covered( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { dinghy_slide_track_60_deg_up_to_25_deg_up_covered( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -1391,14 +1391,14 @@ static void dinghy_slide_track_25_deg_down_to_60_deg_down_covered( static void dinghy_slide_track_25_deg_down_to_flat_covered( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { dinghy_slide_track_flat_to_25_deg_up_covered(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } static void dinghy_slide_track_right_quarter_turn_5_covered( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const sprite_bb imageIds[4][5] = { { @@ -1526,7 +1526,7 @@ static void dinghy_slide_track_right_quarter_turn_5_covered( static void dinghy_slide_track_left_quarter_turn_5_covered( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; dinghy_slide_track_right_quarter_turn_5_covered( @@ -1535,7 +1535,7 @@ static void dinghy_slide_track_left_quarter_turn_5_covered( static void dinghy_slide_track_s_bend_left_covered( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][4][2] = { { { SPR_DINGHY_SLIDE_S_BEND_COVERED_SW_SE_SW_SEQ_3, SPR_DINGHY_SLIDE_S_BEND_COVERED_FRONT_NE_NW_NE_SEQ_0 }, @@ -1630,7 +1630,7 @@ static void dinghy_slide_track_s_bend_left_covered( static void dinghy_slide_track_s_bend_right_covered( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][4][2] = { { { SPR_DINGHY_SLIDE_S_BEND_COVERED_SW_NW_SW_SEQ_3, SPR_DINGHY_SLIDE_S_BEND_COVERED_FRONT_NE_SE_NE_SEQ_0 }, @@ -1723,7 +1723,7 @@ static void dinghy_slide_track_s_bend_right_covered( static void dinghy_slide_track_right_quarter_turn_3_covered( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const sprite_bb imageIds[4][3] = { { @@ -1804,7 +1804,7 @@ static void dinghy_slide_track_right_quarter_turn_3_covered( static void dinghy_slide_track_left_quarter_turn_3_covered( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; dinghy_slide_track_right_quarter_turn_3_covered( @@ -1813,7 +1813,7 @@ static void dinghy_slide_track_left_quarter_turn_3_covered( static void dinghy_slide_track_60_deg_down_to_25_deg_down_covered( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { dinghy_slide_track_25_deg_up_to_60_deg_up_covered( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); diff --git a/src/openrct2/ride/water/LogFlume.cpp b/src/openrct2/ride/water/LogFlume.cpp index dca17ddd7f..95a6c4a857 100644 --- a/src/openrct2/ride/water/LogFlume.cpp +++ b/src/openrct2/ride/water/LogFlume.cpp @@ -163,7 +163,7 @@ static constexpr const uint32_t LogFlumeTrackFlatImageIds[4][2] = { static void paint_log_flume_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId = LogFlumeTrackFlatImageIds[direction][0] | session->TrackColours[SCHEME_TRACK]; uint32_t frontImageId = LogFlumeTrackFlatImageIds[direction][1] | session->TrackColours[SCHEME_TRACK]; @@ -184,7 +184,7 @@ static void paint_log_flume_track_flat( static void paint_log_flume_track_station( paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId = LogFlumeTrackFlatImageIds[direction][0] | session->TrackColours[SCHEME_TRACK]; sub_98197C_rotated(session, direction, imageId, 0, 0, 32, 20, 1, height, 0, 6, height + 3); @@ -221,7 +221,7 @@ static void paint_log_flume_track_station( static void paint_log_flume_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_LOG_FLUME_25_DEG_UP_SW_NE, SPR_LOG_FLUME_25_DEG_UP_FRONT_SW_NE }, @@ -256,7 +256,7 @@ static void paint_log_flume_track_25_deg_up( static void paint_log_flume_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_LOG_FLUME_FLAT_TO_25_DEG_UP_SW_NE, SPR_LOG_FLUME_FLAT_TO_25_DEG_UP_FRONT_SW_NE }, @@ -291,7 +291,7 @@ static void paint_log_flume_track_flat_to_25_deg_up( static void paint_log_flume_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_LOG_FLUME_25_DEG_UP_TO_FLAT_SW_NE, SPR_LOG_FLUME_25_DEG_UP_TO_FLAT_FRONT_SW_NE }, @@ -326,7 +326,7 @@ static void paint_log_flume_track_25_deg_up_to_flat( static void paint_log_flume_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_LOG_FLUME_25_DEG_DOWN_SW_NE, SPR_LOG_FLUME_25_DEG_UP_FRONT_NE_SW }, @@ -361,7 +361,7 @@ static void paint_log_flume_track_25_deg_down( static void paint_log_flume_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_LOG_FLUME_FLAT_TO_25_DEG_DOWN_SW_NE, SPR_LOG_FLUME_25_DEG_UP_TO_FLAT_FRONT_NE_SW }, @@ -396,7 +396,7 @@ static void paint_log_flume_track_flat_to_25_deg_down( static void paint_log_flume_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_LOG_FLUME_25_DEG_DOWN_TO_FLAT_SW_NE, SPR_LOG_FLUME_FLAT_TO_25_DEG_UP_FRONT_NE_SW }, @@ -431,7 +431,7 @@ static void paint_log_flume_track_25_deg_down_to_flat( static void paint_log_flume_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][4][2] = { { { SPR_LOG_FLUME_3_TURN_NE_NW_NE_SEQ_0, SPR_LOG_FLUME_3_TURN_FRONT_NE_NW_NE_SEQ_0 }, @@ -526,7 +526,7 @@ static void paint_log_flume_track_s_bend_left( static void paint_log_flume_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][4][2] = { { { SPR_LOG_FLUME_3_TURN_NE_SE_NE_SEQ_0, SPR_LOG_FLUME_3_TURN_FRONT_NE_SE_NE_SEQ_0 }, @@ -619,7 +619,7 @@ static void paint_log_flume_track_s_bend_right( static void paint_log_flume_track_left_quarter_turn_3_tiles( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][3] = { { SPR_LOG_FLUME_3_TURN_NW_SW_SEQ_0, SPR_LOG_FLUME_3_TURN_NW_SW_SEQ_2, SPR_LOG_FLUME_3_TURN_NW_SW_SEQ_3 }, @@ -686,7 +686,7 @@ static void paint_log_flume_track_left_quarter_turn_3_tiles( static void paint_log_flume_track_right_quarter_turn_3_tiles( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][3] = { { SPR_LOG_FLUME_3_TURN_NW_NE_SEQ_0, SPR_LOG_FLUME_3_TURN_NW_NE_SEQ_2, SPR_LOG_FLUME_3_TURN_NW_NE_SEQ_3 }, @@ -753,7 +753,7 @@ static void paint_log_flume_track_right_quarter_turn_3_tiles( static void paint_log_flume_track_on_ride_photo( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId = SPR_STATION_BASE_D | IMAGE_TYPE_REMAP; sub_98196C(session, imageId, 0, 0, 32, 32, 1, height); @@ -784,7 +784,7 @@ static void paint_log_flume_track_on_ride_photo( static void paint_log_flume_track_reverser( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][2] = { { SPR_LOG_FLUME_REVERSER_SW_NE, SPR_LOG_FLUME_REVERSER_FRONT_SW_NE }, diff --git a/src/openrct2/ride/water/RiverRapids.cpp b/src/openrct2/ride/water/RiverRapids.cpp index 29f06c7189..92a2dbe8b6 100644 --- a/src/openrct2/ride/water/RiverRapids.cpp +++ b/src/openrct2/ride/water/RiverRapids.cpp @@ -271,7 +271,7 @@ void vehicle_visual_river_rapids( /** rct2: 0x00757650 */ static void paint_river_rapids_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; @@ -314,7 +314,7 @@ static void paint_river_rapids_track_flat( /** rct2: 0x007576C0 */ static void paint_river_rapids_station( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { Ride* ride = get_ride(rideIndex); @@ -503,7 +503,7 @@ static void paint_river_rapids_track_25_deg_to_flat_b( /** rct2: 0x00757660 */ static void paint_river_rapids_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_river_rapids_track_25_deg(session, direction, height, river_rapids_track_pieces_25_deg_up); } @@ -511,7 +511,7 @@ static void paint_river_rapids_track_25_deg_up( /** rct2: 0x00757670 */ static void paint_river_rapids_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_river_rapids_track_25_deg_to_flat_b(session, direction, height, river_rapids_track_pieces_flat_to_25_deg_up); } @@ -519,7 +519,7 @@ static void paint_river_rapids_track_flat_to_25_deg_up( /** rct2: 0x00757680 */ static void paint_river_rapids_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_river_rapids_track_25_deg_to_flat_a(session, direction, height, river_rapids_track_pieces_25_deg_up_to_flat); } @@ -527,7 +527,7 @@ static void paint_river_rapids_track_25_deg_up_to_flat( /** rct2: 0x00757690 */ static void paint_river_rapids_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_river_rapids_track_25_deg(session, (direction + 2) % 4, height, river_rapids_track_pieces_25_deg_down); } @@ -535,7 +535,7 @@ static void paint_river_rapids_track_25_deg_down( /** rct2: 0x007576A0 */ static void paint_river_rapids_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_river_rapids_track_25_deg_to_flat_a( session, (direction + 2) % 4, height, river_rapids_track_pieces_flat_to_25_deg_down); @@ -544,7 +544,7 @@ static void paint_river_rapids_track_flat_to_25_deg_down( /** rct2: 0x007576B0 */ static void paint_river_rapids_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_river_rapids_track_25_deg_to_flat_b( session, (direction + 2) % 4, height, river_rapids_track_pieces_25_deg_down_to_flat); @@ -553,7 +553,7 @@ static void paint_river_rapids_track_25_deg_down_to_flat( /** rct2: 0x007576F0 */ static void paint_river_rapids_track_left_quarter_turn_1_tile( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; switch (direction) @@ -609,7 +609,7 @@ static void paint_river_rapids_track_left_quarter_turn_1_tile( /** rct2: 0x00757700 */ static void paint_river_rapids_track_right_quarter_turn_1_tile( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; @@ -666,7 +666,7 @@ static void paint_river_rapids_track_right_quarter_turn_1_tile( /** rct2: 0x00757710 */ static void paint_river_rapids_track_waterfall( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; @@ -729,7 +729,7 @@ static void paint_river_rapids_track_waterfall( /** rct2: 0x00757720 */ static void paint_river_rapids_track_rapids( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; @@ -770,7 +770,7 @@ static void paint_river_rapids_track_rapids( /** rct2: 0x00757740 */ static void paint_river_rapids_track_on_ride_photo( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_river_rapids_track_flat(session, rideIndex, trackSequence, direction, height, tileElement); track_paint_util_onride_photo_paint(session, direction, height + 13, tileElement); @@ -780,7 +780,7 @@ static void paint_river_rapids_track_on_ride_photo( /** rct2: 0x */ static void paint_river_rapids_track_whirlpool( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; diff --git a/src/openrct2/ride/water/SplashBoats.cpp b/src/openrct2/ride/water/SplashBoats.cpp index b89cd74a59..5b6cce5856 100644 --- a/src/openrct2/ride/water/SplashBoats.cpp +++ b/src/openrct2/ride/water/SplashBoats.cpp @@ -475,7 +475,7 @@ static constexpr const sprite_bb RiverRaftsRightQuarterTurn5_Side[4][5] = { static void paint_splash_boats_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId = SplashBoats25DegUpImageId[direction] | session->TrackColours[SCHEME_TRACK]; uint32_t frontImageId = SplashBoats25DegUpFrontImageId[direction] | session->TrackColours[SCHEME_TRACK]; @@ -500,7 +500,7 @@ static void paint_splash_boats_track_25_deg_up( static void paint_splash_boats_track_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId = SplashBoats60DegUpImageId[direction] | session->TrackColours[SCHEME_TRACK]; uint32_t frontImageId = SplashBoats60DegUpFrontImageId[direction] | session->TrackColours[SCHEME_TRACK]; @@ -525,7 +525,7 @@ static void paint_splash_boats_track_60_deg_up( static void paint_splash_boats_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId = SplashBoatsFlatTo25DegUpImageId[direction] | session->TrackColours[SCHEME_TRACK]; uint32_t frontImageId = SplashBoatsFlatTo25DegUpFrontImageId[direction] | session->TrackColours[SCHEME_TRACK]; @@ -550,7 +550,7 @@ static void paint_splash_boats_track_flat_to_25_deg_up( static void paint_splash_boats_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId = SplashBoats25DegUpToFlatImageId[direction] | session->TrackColours[SCHEME_TRACK]; uint32_t frontImageId = SplashBoats25DegUpToFlatFrontImageId[direction] | session->TrackColours[SCHEME_TRACK]; @@ -575,7 +575,7 @@ static void paint_splash_boats_track_25_deg_up_to_flat( static void paint_splash_boats_track_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId = SplashBoats25DegUpTo60DegUpImageId[direction] | session->TrackColours[SCHEME_TRACK]; uint32_t frontImageId = SplashBoats25DegUpTo60DegUpFrontImageId[direction] | session->TrackColours[SCHEME_TRACK]; @@ -600,7 +600,7 @@ static void paint_splash_boats_track_25_deg_up_to_60_deg_up( static void paint_splash_boats_track_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId = SplashBoats60DegUpTo25DegUpImageId[direction] | session->TrackColours[SCHEME_TRACK]; uint32_t frontImageId = SplashBoats60DegUpTo25DegUpFrontImageId[direction] | session->TrackColours[SCHEME_TRACK]; @@ -625,7 +625,7 @@ static void paint_splash_boats_track_60_deg_up_to_25_deg_up( static void paint_splash_boats_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId = SplashBoats25DegDownImageId[direction] | session->TrackColours[SCHEME_TRACK]; uint32_t frontImageId = SplashBoats25DegDownFrontImageId[direction] | session->TrackColours[SCHEME_TRACK]; @@ -651,14 +651,14 @@ static void paint_splash_boats_track_25_deg_down( static void paint_splash_boats_track_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_splash_boats_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } static void paint_splash_boats_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId = SplashBoatsFlatTo25DegDownImageId[direction] | session->TrackColours[SCHEME_TRACK]; uint32_t frontImageId = SplashBoatsFlatTo25DegDownFrontImageId[direction] | session->TrackColours[SCHEME_TRACK]; @@ -684,7 +684,7 @@ static void paint_splash_boats_track_flat_to_25_deg_down( static void paint_splash_boats_track_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_splash_boats_track_60_deg_up_to_25_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -692,7 +692,7 @@ static void paint_splash_boats_track_25_deg_down_to_60_deg_down( static void paint_splash_boats_track_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { paint_splash_boats_track_25_deg_up_to_60_deg_up( session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); @@ -700,7 +700,7 @@ static void paint_splash_boats_track_60_deg_down_to_25_deg_down( static void paint_splash_boats_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId = SplashBoats25DegDownToFlatImageId[direction] | session->TrackColours[SCHEME_TRACK]; uint32_t frontImageId = SplashBoats25DegDownToFlatFrontImageId[direction] | session->TrackColours[SCHEME_TRACK]; @@ -738,7 +738,7 @@ static void paint_splash_boats_track_25_deg_down_to_flat( /** rct2: 0x0089B170 */ static void paint_splash_boats_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { uint32_t imageId; @@ -781,7 +781,7 @@ static void paint_splash_boats_track_flat( /** rct2: 0x0089B1A0 */ static void paint_splash_boats_station( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { Ride* ride = get_ride(rideIndex); @@ -817,7 +817,7 @@ static void paint_splash_boats_station( /** rct2: 0x0089B1D0 */ static void paint_splash_boats_track_left_quarter_turn_5_tiles( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_right_quarter_turn_5_tiles_paint_2( session, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], RiverRaftsLeftQuarterTurn5_Top); @@ -898,7 +898,7 @@ static void paint_splash_boats_track_left_quarter_turn_5_tiles( /** rct2: 0x0089B1D0 */ static void paint_splash_boats_track_right_quarter_turn_5_tiles( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_right_quarter_turn_5_tiles_paint_2( session, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], RiverRaftsRightQuarterTurn5_Top); @@ -979,7 +979,7 @@ static void paint_splash_boats_track_right_quarter_turn_5_tiles( /** rct2: 0x0089B180 */ static void paint_splash_boats_track_s_bend_left( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][4][2] = { { { SPR_SPLASH_BOATS_S_BEND_TOP_NE_NW_NE_SEQ_0, SPR_SPLASH_BOATS_S_BEND_SIDE_NE_NW_NE_SEQ_0 }, @@ -1071,7 +1071,7 @@ static void paint_splash_boats_track_s_bend_left( /** rct2: 0x0089B190 */ static void paint_splash_boats_track_s_bend_right( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { static constexpr const uint32_t imageIds[4][4][2] = { { { SPR_SPLASH_BOATS_S_BEND_TOP_NE_SE_NE_SEQ_0, SPR_SPLASH_BOATS_S_BEND_SIDE_NE_SE_NE_SEQ_0 }, @@ -1162,7 +1162,7 @@ static void paint_splash_boats_track_s_bend_right( static void paint_splash_boats_track_on_ride_photo( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { switch (direction) { diff --git a/src/openrct2/ride/water/SubmarineRide.cpp b/src/openrct2/ride/water/SubmarineRide.cpp index 1adc5719e2..c957dd5832 100644 --- a/src/openrct2/ride/water/SubmarineRide.cpp +++ b/src/openrct2/ride/water/SubmarineRide.cpp @@ -76,7 +76,7 @@ void vehicle_visual_submarine( static void submarine_ride_paint_track_station( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { LocationXY16 position = session->MapPosition; Ride* ride = get_ride(rideIndex); @@ -109,7 +109,7 @@ static void submarine_ride_paint_track_station( static void submarine_ride_paint_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { LocationXY16 position = session->MapPosition; int32_t heightLower = height - 16; @@ -142,7 +142,7 @@ static void submarine_ride_paint_track_flat( static void submarine_ride_paint_track_left_quarter_turn_3_tiles( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_left_quarter_turn_3_tiles_paint( session, 3, height - 16, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -175,7 +175,7 @@ static void submarine_ride_paint_track_left_quarter_turn_3_tiles( static constexpr const uint8_t submarine_ride_right_quarter_turn_3_tiles_to_left_turn_map[] = { 3, 1, 2, 0 }; static void submarine_ride_paint_track_right_quarter_turn_3_tiles( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = submarine_ride_right_quarter_turn_3_tiles_to_left_turn_map[trackSequence]; submarine_ride_paint_track_left_quarter_turn_3_tiles( @@ -184,7 +184,7 @@ static void submarine_ride_paint_track_right_quarter_turn_3_tiles( static void submarine_ride_paint_track_left_quarter_turn_1_tile( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { track_paint_util_left_quarter_turn_1_tile_paint( session, 1, height - 16, 0, direction, session->TrackColours[SCHEME_TRACK], @@ -198,7 +198,7 @@ static void submarine_ride_paint_track_left_quarter_turn_1_tile( static void submarine_ride_paint_track_right_quarter_turn_1_tile( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { submarine_ride_paint_track_left_quarter_turn_1_tile( session, rideIndex, trackSequence, (direction + 3) % 4, height, tileElement); diff --git a/src/openrct2/ride/water/WaterCoaster.cpp b/src/openrct2/ride/water/WaterCoaster.cpp index ec13f0fb78..5973d244e4 100644 --- a/src/openrct2/ride/water/WaterCoaster.cpp +++ b/src/openrct2/ride/water/WaterCoaster.cpp @@ -14,7 +14,7 @@ static void water_rc_track_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_flat( @@ -24,7 +24,7 @@ static void water_rc_track_flat( static void water_rc_track_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_25_deg_up( @@ -34,7 +34,7 @@ static void water_rc_track_25_deg_up( static void water_rc_track_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_flat_to_25_deg_up( @@ -44,7 +44,7 @@ static void water_rc_track_flat_to_25_deg_up( static void water_rc_track_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_25_deg_up_to_flat( @@ -54,28 +54,28 @@ static void water_rc_track_25_deg_up_to_flat( static void water_rc_track_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { water_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } static void water_rc_track_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { water_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } static void water_rc_track_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { water_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement); } static void water_rc_track_diag_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_diag_flat( @@ -85,7 +85,7 @@ static void water_rc_track_diag_flat( static void water_rc_track_diag_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_diag_25_deg_up( @@ -95,7 +95,7 @@ static void water_rc_track_diag_25_deg_up( static void water_rc_track_diag_flat_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_diag_flat_to_25_deg_up( @@ -105,7 +105,7 @@ static void water_rc_track_diag_flat_to_25_deg_up( static void water_rc_track_diag_25_deg_up_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_diag_25_deg_up_to_flat( @@ -115,7 +115,7 @@ static void water_rc_track_diag_25_deg_up_to_flat( static void water_rc_track_diag_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_diag_25_deg_down( @@ -125,7 +125,7 @@ static void water_rc_track_diag_25_deg_down( static void water_rc_track_diag_flat_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_diag_flat_to_25_deg_down( @@ -135,7 +135,7 @@ static void water_rc_track_diag_flat_to_25_deg_down( static void water_rc_track_diag_25_deg_down_to_flat( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { bool isChained = tileElement->AsTrack()->HasChain(); junior_rc_paint_track_diag_25_deg_down_to_flat( @@ -145,21 +145,21 @@ static void water_rc_track_diag_25_deg_down_to_flat( static void water_rc_track_station( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { junior_rc_paint_station(session, rideIndex, trackSequence, direction, height, tileElement, RIDE_TYPE_WATER_COASTER); } static void water_rc_track_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { junior_rc_paint_track_60_deg_up(session, rideIndex, trackSequence, direction, height, tileElement, JUNIOR_RC_CHAIN_NONE); } static void water_rc_track_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { junior_rc_paint_track_25_deg_up_to_60_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, JUNIOR_RC_CHAIN_NONE); @@ -167,7 +167,7 @@ static void water_rc_track_25_deg_up_to_60_deg_up( static void water_rc_track_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { junior_rc_paint_track_60_deg_up_to_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, JUNIOR_RC_CHAIN_NONE); @@ -175,21 +175,21 @@ static void water_rc_track_60_deg_up_to_25_deg_up( static void water_rc_track_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { water_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } static void water_rc_track_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { water_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } static void water_rc_track_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { water_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement); } @@ -198,7 +198,7 @@ static void water_rc_track_60_deg_down_to_25_deg_down( static void water_rc_track_left_quarter_turn_5_tiles_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { junior_rc_paint_track_left_quarter_turn_5_tiles_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, JUNIOR_RC_CHAIN_NONE); @@ -206,7 +206,7 @@ static void water_rc_track_left_quarter_turn_5_tiles_25_deg_up( static void water_rc_track_right_quarter_turn_5_tiles_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { junior_rc_paint_track_right_quarter_turn_5_tiles_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, JUNIOR_RC_CHAIN_NONE); @@ -216,7 +216,7 @@ static constexpr const uint8_t water_rc_left_quarter_turn_5_tiles_to_right_turn_ static void water_rc_track_left_quarter_turn_5_tiles_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { water_rc_track_right_quarter_turn_5_tiles_25_deg_up( session, rideIndex, water_rc_left_quarter_turn_5_tiles_to_right_turn_map[trackSequence], (direction + 1) % 4, height, @@ -225,7 +225,7 @@ static void water_rc_track_left_quarter_turn_5_tiles_25_deg_down( static void water_rc_track_right_quarter_turn_5_tiles_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { water_rc_track_left_quarter_turn_5_tiles_25_deg_up( session, rideIndex, water_rc_left_quarter_turn_5_tiles_to_right_turn_map[trackSequence], (direction + 3) % 4, height, @@ -236,7 +236,7 @@ static void water_rc_track_right_quarter_turn_5_tiles_25_deg_down( static void water_rc_track_right_quarter_turn_3_tiles_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, JUNIOR_RC_CHAIN_NONE); @@ -244,7 +244,7 @@ static void water_rc_track_right_quarter_turn_3_tiles_25_deg_up( static void water_rc_track_right_quarter_turn_3_tiles_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, JUNIOR_RC_CHAIN_NONE); @@ -254,7 +254,7 @@ static constexpr const uint8_t water_rc_left_quarter_turn_3_tiles_to_right_turn_ static void water_rc_track_left_quarter_turn_3_tiles_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = water_rc_left_quarter_turn_3_tiles_to_right_turn_map[trackSequence]; water_rc_track_right_quarter_turn_3_tiles_25_deg_down( @@ -263,7 +263,7 @@ static void water_rc_track_left_quarter_turn_3_tiles_25_deg_up( static void water_rc_track_left_quarter_turn_3_tiles_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { trackSequence = water_rc_left_quarter_turn_3_tiles_to_right_turn_map[trackSequence]; water_rc_track_right_quarter_turn_3_tiles_25_deg_up( @@ -272,7 +272,7 @@ static void water_rc_track_left_quarter_turn_3_tiles_25_deg_down( static void water_rc_track_diag_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { junior_rc_paint_track_diag_60_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, JUNIOR_RC_CHAIN_NONE); @@ -280,7 +280,7 @@ static void water_rc_track_diag_60_deg_up( static void water_rc_track_diag_25_deg_up_to_60_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { junior_rc_paint_track_diag_25_deg_up_to_60_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, JUNIOR_RC_CHAIN_NONE); @@ -288,7 +288,7 @@ static void water_rc_track_diag_25_deg_up_to_60_deg_up( static void water_rc_track_diag_60_deg_up_to_25_deg_up( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { junior_rc_paint_track_diag_60_deg_up_to_25_deg_up( session, rideIndex, trackSequence, direction, height, tileElement, JUNIOR_RC_CHAIN_NONE); @@ -296,7 +296,7 @@ static void water_rc_track_diag_60_deg_up_to_25_deg_up( static void water_rc_track_diag_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { junior_rc_paint_track_diag_60_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, JUNIOR_RC_CHAIN_NONE); @@ -304,7 +304,7 @@ static void water_rc_track_diag_60_deg_down( static void water_rc_track_diag_25_deg_down_to_60_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { junior_rc_paint_track_diag_25_deg_down_to_60_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, JUNIOR_RC_CHAIN_NONE); @@ -312,7 +312,7 @@ static void water_rc_track_diag_25_deg_down_to_60_deg_down( static void water_rc_track_diag_60_deg_down_to_25_deg_down( paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height, - const rct_tile_element* tileElement) + const TileElement* tileElement) { junior_rc_paint_track_diag_60_deg_down_to_25_deg_down( session, rideIndex, trackSequence, direction, height, tileElement, JUNIOR_RC_CHAIN_NONE); diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp index e558cb51ad..4cbf02899d 100644 --- a/src/openrct2/scenario/Scenario.cpp +++ b/src/openrct2/scenario/Scenario.cpp @@ -674,13 +674,13 @@ bool scenario_prepare_for_save() void scenario_fix_ghosts(rct_s6_data* s6) { // Remove all ghost elements - rct_tile_element* destinationElement = s6->tile_elements; + TileElement* destinationElement = s6->tile_elements; for (int32_t y = 0; y < MAXIMUM_MAP_SIZE_TECHNICAL; y++) { for (int32_t x = 0; x < MAXIMUM_MAP_SIZE_TECHNICAL; x++) { - rct_tile_element* originalElement = map_get_first_element_at(x, y); + TileElement* originalElement = map_get_first_element_at(x, y); do { if (originalElement->flags & TILE_ELEMENT_FLAG_GHOST) diff --git a/src/openrct2/scenario/Scenario.h b/src/openrct2/scenario/Scenario.h index 1f7d13b233..045b8fb24d 100644 --- a/src/openrct2/scenario/Scenario.h +++ b/src/openrct2/scenario/Scenario.h @@ -104,7 +104,7 @@ struct rct_s6_data uint32_t scenario_srand_1; // SC6[5] - rct_tile_element tile_elements[RCT2_MAX_TILE_ELEMENTS]; + TileElement tile_elements[RCT2_MAX_TILE_ELEMENTS]; // SC6[6] uint32_t next_free_tile_element_pointer_index; diff --git a/src/openrct2/world/Banner.cpp b/src/openrct2/world/Banner.cpp index 4948652f28..790066b530 100644 --- a/src/openrct2/world/Banner.cpp +++ b/src/openrct2/world/Banner.cpp @@ -38,7 +38,7 @@ rct_banner gBanners[MAX_BANNERS]; */ static uint8_t banner_get_ride_index_at(int32_t x, int32_t y, int32_t z) { - rct_tile_element* tileElement = map_get_first_element_at(x >> 5, y >> 5); + TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5); uint8_t resultRideIndex = RIDE_ID_NULL; do { @@ -105,7 +105,7 @@ static money32 BannerRemove(int16_t x, int16_t y, uint8_t baseHeight, uint8_t di network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord); } - tile_element_remove_banner_entry((rct_tile_element*)tileElement); + tile_element_remove_banner_entry((TileElement*)tileElement); map_invalidate_tile_zoom1(x, y, z, z + 32); tileElement->Remove(); } @@ -132,7 +132,7 @@ static money32 BannerSetColour(int16_t x, int16_t y, uint8_t baseHeight, uint8_t if (flags & GAME_COMMAND_FLAG_APPLY) { - rct_tile_element* tileElement = map_get_first_element_at(x / 32, y / 32); + TileElement* tileElement = map_get_first_element_at(x / 32, y / 32); bool found = false; do @@ -187,7 +187,7 @@ static money32 BannerPlace( return MONEY32_UNDEFINED; } - rct_tile_element* tileElement = map_get_first_element_at(x / 32, y / 32); + TileElement* tileElement = map_get_first_element_at(x / 32, y / 32); bool pathFound = false; do @@ -241,7 +241,7 @@ static money32 BannerPlace( network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord); } - rct_tile_element* newTileElement = tile_element_insert(x / 32, y / 32, baseHeight, 0); + TileElement* newTileElement = tile_element_insert(x / 32, y / 32, baseHeight, 0); assert(newTileElement != nullptr); gBanners[*bannerIndex].type = type; gBanners[*bannerIndex].colour = colour; @@ -283,7 +283,7 @@ static money32 BannerSetStyle(BannerIndex bannerIndex, uint8_t colour, uint8_t t rct_banner* banner = &gBanners[bannerIndex]; - rct_tile_element* tileElement = banner_get_tile_element(bannerIndex); + TileElement* tileElement = banner_get_tile_element(bannerIndex); if (tileElement == nullptr) { @@ -395,10 +395,10 @@ BannerIndex create_new_banner(uint8_t flags) return bannerIndex; } -rct_tile_element* banner_get_tile_element(BannerIndex bannerIndex) +TileElement* banner_get_tile_element(BannerIndex bannerIndex) { rct_banner* banner = &gBanners[bannerIndex]; - rct_tile_element* tileElement = map_get_first_element_at(banner->x, banner->y); + TileElement* tileElement = map_get_first_element_at(banner->x, banner->y); do { if (tile_element_get_banner_index(tileElement) == bannerIndex) @@ -459,7 +459,7 @@ void banner_reset_broken_index() { for (BannerIndex bannerIndex = 0; bannerIndex < MAX_BANNERS; bannerIndex++) { - rct_tile_element* tileElement = banner_get_tile_element(bannerIndex); + TileElement* tileElement = banner_get_tile_element(bannerIndex); if (tileElement == nullptr) gBanners[bannerIndex].type = BANNER_NULL; } @@ -469,7 +469,7 @@ void fix_duplicated_banners() { // For each banner in the map, check if the banner index is in use already, and if so, create a new entry for it bool activeBanners[Util::CountOf(gBanners)]{}; - rct_tile_element* tileElement; + TileElement* tileElement; for (int y = 0; y < MAXIMUM_MAP_SIZE_TECHNICAL; y++) { for (int x = 0; x < MAXIMUM_MAP_SIZE_TECHNICAL; x++) diff --git a/src/openrct2/world/Banner.h b/src/openrct2/world/Banner.h index 24c28a21a6..bf7c4d89e5 100644 --- a/src/openrct2/world/Banner.h +++ b/src/openrct2/world/Banner.h @@ -46,7 +46,7 @@ extern rct_banner gBanners[MAX_BANNERS]; void banner_init(); BannerIndex create_new_banner(uint8_t flags); -rct_tile_element* banner_get_tile_element(BannerIndex bannerIndex); +TileElement* banner_get_tile_element(BannerIndex bannerIndex); uint8_t banner_get_closest_ride_index(int32_t x, int32_t y, int32_t z); void banner_reset_broken_index(); void fix_duplicated_banners(); diff --git a/src/openrct2/world/Duck.cpp b/src/openrct2/world/Duck.cpp index 8f35e959fd..ad22a7e889 100644 --- a/src/openrct2/world/Duck.cpp +++ b/src/openrct2/world/Duck.cpp @@ -122,7 +122,7 @@ void rct_duck::UpdateFlyToWater() int32_t newY = y + DuckMoveOffset[direction].y; int32_t manhattanDistanceN = abs(target_x - newX) + abs(target_y - newY); - rct_tile_element* tileElement = map_get_surface_element_at({ target_x, target_y }); + TileElement* tileElement = map_get_surface_element_at({ target_x, target_y }); int32_t waterHeight = tileElement->AsSurface()->GetWaterHeight(); if (waterHeight == 0) { diff --git a/src/openrct2/world/Entrance.cpp b/src/openrct2/world/Entrance.cpp index 5fbd2f5495..ad52187c4a 100644 --- a/src/openrct2/world/Entrance.cpp +++ b/src/openrct2/world/Entrance.cpp @@ -262,7 +262,7 @@ static money32 RideEntranceExitPlace( coord.z = tile_element_height(coord.x, coord.y); network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord); - rct_tile_element* tileElement = tile_element_insert(x / 32, y / 32, z / 8, 0xF); + TileElement* tileElement = tile_element_insert(x / 32, y / 32, z / 8, 0xF); assert(tileElement != nullptr); tileElement->SetType(TILE_ELEMENT_TYPE_ENTRANCE); tileElement->SetDirection(direction); @@ -350,7 +350,7 @@ static money32 RideEntranceExitRemove(int16_t x, int16_t y, uint8_t rideIndex, u invalidate_test_results(rideIndex); bool found = false; - rct_tile_element* tileElement = map_get_first_element_at(x / 32, y / 32); + TileElement* tileElement = map_get_first_element_at(x / 32, y / 32); if (tileElement == nullptr) { log_warning("Invalid coordinates for entrance/exit removal x = %d, y = %d", x, y); @@ -542,7 +542,7 @@ void game_command_remove_ride_entrance_or_exit( * Replaces the outer hedge walls for an entrance placement removal. * rct2: 0x00666D6F */ -void maze_entrance_hedge_replacement(int32_t x, int32_t y, rct_tile_element* tileElement) +void maze_entrance_hedge_replacement(int32_t x, int32_t y, TileElement* tileElement) { int32_t direction = tileElement->GetDirection(); x += CoordsDirectionDelta[direction].x; @@ -578,7 +578,7 @@ void maze_entrance_hedge_replacement(int32_t x, int32_t y, rct_tile_element* til * Removes the hedge walls for an entrance placement. * rct2: 0x00666CBE */ -void maze_entrance_hedge_removal(int32_t x, int32_t y, rct_tile_element* tileElement) +void maze_entrance_hedge_removal(int32_t x, int32_t y, TileElement* tileElement) { int32_t direction = tileElement->GetDirection(); x += CoordsDirectionDelta[direction].x; diff --git a/src/openrct2/world/Entrance.h b/src/openrct2/world/Entrance.h index 582aef5e59..93591e32d8 100644 --- a/src/openrct2/world/Entrance.h +++ b/src/openrct2/world/Entrance.h @@ -27,7 +27,7 @@ assert_struct_size(rct_entrance_type, 8); void game_command_remove_park_entrance( int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, int32_t* esi, int32_t* edi, int32_t* ebp); -struct rct_tile_element; +struct TileElement; extern bool gParkEntranceGhostExists; extern LocationXYZ16 gParkEntranceGhostPosition; @@ -45,8 +45,8 @@ money32 park_entrance_place_ghost(int32_t x, int32_t y, int32_t z, int32_t direc money32 place_park_entrance(int16_t x, int16_t y, int16_t z, uint8_t direction); void reset_park_entrance(); -void maze_entrance_hedge_replacement(int32_t x, int32_t y, rct_tile_element* tileElement); -void maze_entrance_hedge_removal(int32_t x, int32_t y, rct_tile_element* tileElement); +void maze_entrance_hedge_replacement(int32_t x, int32_t y, TileElement* tileElement); +void maze_entrance_hedge_removal(int32_t x, int32_t y, TileElement* tileElement); void fix_park_entrance_locations(); diff --git a/src/openrct2/world/Footpath.cpp b/src/openrct2/world/Footpath.cpp index 8ba4632ab2..35e0e4a755 100644 --- a/src/openrct2/world/Footpath.cpp +++ b/src/openrct2/world/Footpath.cpp @@ -32,7 +32,7 @@ #include -void footpath_update_queue_entrance_banner(int32_t x, int32_t y, rct_tile_element* tileElement); +void footpath_update_queue_entrance_banner(int32_t x, int32_t y, TileElement* tileElement); uint8_t gFootpathProvisionalFlags; LocationXYZ16 gFootpathProvisionalPosition; @@ -96,14 +96,14 @@ static constexpr const uint8_t connected_path_count[] = { 4, // 0b1111 }; -int32_t entrance_get_directions(const rct_tile_element* tileElement) +int32_t entrance_get_directions(const TileElement* tileElement) { uint8_t entranceType = tileElement->AsEntrance()->GetEntranceType(); uint8_t sequence = tileElement->AsEntrance()->GetSequenceIndex(); return EntranceDirections[(entranceType * 8) + sequence]; } -static bool entrance_has_direction(rct_tile_element* tileElement, int32_t direction) +static bool entrance_has_direction(TileElement* tileElement, int32_t direction) { return entrance_get_directions(tileElement) & (1 << (direction & 3)); } @@ -137,9 +137,9 @@ static void automatically_set_peep_spawn(CoordsXYZ location) peepSpawn->z = location.z; } -rct_tile_element* map_get_footpath_element(int32_t x, int32_t y, int32_t z) +TileElement* map_get_footpath_element(int32_t x, int32_t y, int32_t z) { - rct_tile_element* tileElement; + TileElement* tileElement; tileElement = map_get_first_element_at(x, y); do @@ -151,9 +151,9 @@ rct_tile_element* map_get_footpath_element(int32_t x, int32_t y, int32_t z) return nullptr; } -static rct_tile_element* map_get_footpath_element_slope(int32_t x, int32_t y, int32_t z, int32_t slope) +static TileElement* map_get_footpath_element_slope(int32_t x, int32_t y, int32_t z, int32_t slope) { - rct_tile_element* tileElement; + TileElement* tileElement; bool isSloped = slope & FOOTPATH_PROPERTIES_FLAG_IS_SLOPED; tileElement = map_get_first_element_at(x, y); @@ -170,7 +170,7 @@ static rct_tile_element* map_get_footpath_element_slope(int32_t x, int32_t y, in return nullptr; } -static void loc_6A6620(int32_t flags, int32_t x, int32_t y, rct_tile_element* tileElement) +static void loc_6A6620(int32_t flags, int32_t x, int32_t y, TileElement* tileElement) { if (tileElement->AsPath()->IsSloped() && !(flags & GAME_COMMAND_FLAG_GHOST)) { @@ -195,7 +195,7 @@ static constexpr const uint8_t byte_98D7EC[] = { 207, 159, 63, 111 }; static money32 footpath_element_insert( int32_t type, int32_t x, int32_t y, int32_t z, int32_t slope, int32_t flags, uint8_t pathItemType) { - rct_tile_element* tileElement; + TileElement* tileElement; EntranceElement* entranceElement; int32_t bl, zHigh; bool entrancePath = false, entranceIsSamePath = false; @@ -301,7 +301,7 @@ static money32 footpath_element_insert( } static money32 footpath_element_update( - int32_t x, int32_t y, rct_tile_element* tileElement, int32_t type, int32_t flags, uint8_t pathItemType) + int32_t x, int32_t y, TileElement* tileElement, int32_t type, int32_t flags, uint8_t pathItemType) { const int32_t newFootpathType = (type & (FOOTPATH_PROPERTIES_TYPE_MASK >> 4)); const bool newPathIsQueue = ((type >> 7) == 1); @@ -423,7 +423,7 @@ static money32 footpath_place_real( int32_t type, int32_t x, int32_t y, int32_t z, int32_t slope, int32_t flags, uint8_t pathItemType, bool clearDirection, int32_t direction) { - rct_tile_element* tileElement; + TileElement* tileElement; gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LANDSCAPING; gCommandPosition.x = x + 16; @@ -507,7 +507,7 @@ static money32 footpath_place_real( * * rct2: 0x006BA23E */ -void remove_banners_at_element(int32_t x, int32_t y, rct_tile_element* tileElement) +void remove_banners_at_element(int32_t x, int32_t y, TileElement* tileElement) { while (!(tileElement++)->IsLastForTile()) { @@ -537,7 +537,7 @@ void game_command_place_footpath( static money32 footpath_place_from_track( int32_t type, int32_t x, int32_t y, int32_t z, int32_t slope, int32_t edges, int32_t flags) { - rct_tile_element* tileElement; + TileElement* tileElement; EntranceElement* entranceElement; bool entrancePath = false, entranceIsSamePath = false; @@ -831,10 +831,10 @@ void footpath_provisional_update() * tileElement: edx */ void footpath_get_coordinates_from_pos( - int32_t screenX, int32_t screenY, int32_t* x, int32_t* y, int32_t* direction, rct_tile_element** tileElement) + int32_t screenX, int32_t screenY, int32_t* x, int32_t* y, int32_t* direction, TileElement** tileElement) { int32_t z = 0, interactionType; - rct_tile_element* myTileElement; + TileElement* myTileElement; rct_viewport* viewport; LocationXY16 position = {}; @@ -930,7 +930,7 @@ void footpath_get_coordinates_from_pos( * tileElement: edx */ void footpath_bridge_get_info_from_pos( - int32_t screenX, int32_t screenY, int32_t* x, int32_t* y, int32_t* direction, rct_tile_element** tileElement) + int32_t screenX, int32_t screenY, int32_t* x, int32_t* y, int32_t* direction, TileElement** tileElement) { // First check if we point at an entrance or exit. In that case, we would want the path coming from the entrance/exit. int32_t interactionType; @@ -1039,7 +1039,7 @@ void footpath_interrupt_peeps(int32_t x, int32_t y, int32_t z) */ bool fence_in_the_way(int32_t x, int32_t y, int32_t z0, int32_t z1, int32_t direction) { - rct_tile_element* tileElement; + TileElement* tileElement; tileElement = map_get_first_element_at(x >> 5, y >> 5); if (tileElement == nullptr) @@ -1062,14 +1062,14 @@ bool fence_in_the_way(int32_t x, int32_t y, int32_t z0, int32_t z1, int32_t dire return false; } -static rct_tile_element* footpath_connect_corners_get_neighbour(int32_t x, int32_t y, int32_t z, int32_t requireEdges) +static TileElement* footpath_connect_corners_get_neighbour(int32_t x, int32_t y, int32_t z, int32_t requireEdges) { if (!map_is_location_valid({ x, y })) { return nullptr; } - rct_tile_element* tileElement = map_get_first_element_at(x >> 5, y >> 5); + TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5); do { if (tileElement->GetType() != TILE_ELEMENT_TYPE_PATH) @@ -1095,9 +1095,9 @@ static rct_tile_element* footpath_connect_corners_get_neighbour(int32_t x, int32 * * rct2: 0x006A70EB */ -static void footpath_connect_corners(int32_t initialX, int32_t initialY, rct_tile_element* initialTileElement) +static void footpath_connect_corners(int32_t initialX, int32_t initialY, TileElement* initialTileElement) { - rct_tile_element* tileElement[4]; + TileElement* tileElement[4]; if (initialTileElement->AsPath()->IsQueue()) return; @@ -1236,9 +1236,9 @@ static void neighbour_list_sort(rct_neighbour_list* neighbourList) qsort(neighbourList->items, neighbourList->count, sizeof(rct_neighbour), rct_neighbour_compare); } -static rct_tile_element* footpath_get_element(int32_t x, int32_t y, int32_t z0, int32_t z1, int32_t direction) +static TileElement* footpath_get_element(int32_t x, int32_t y, int32_t z0, int32_t z1, int32_t direction) { - rct_tile_element* tileElement; + TileElement* tileElement; int32_t slope; tileElement = map_get_first_element_at(x >> 5, y >> 5); @@ -1273,7 +1273,7 @@ static rct_tile_element* footpath_get_element(int32_t x, int32_t y, int32_t z0, } static bool sub_footpath_disconnect_queue_from_path( - int32_t x, int32_t y, rct_tile_element* tileElement, int32_t action, int32_t direction) + int32_t x, int32_t y, TileElement* tileElement, int32_t action, int32_t direction) { if (((tileElement->AsPath()->GetEdges() & (1 << direction)) == 0) ^ (action < 0)) return false; @@ -1283,7 +1283,7 @@ static bool sub_footpath_disconnect_queue_from_path( int32_t x1 = x + CoordsDirectionDelta[direction].x; int32_t y1 = y + CoordsDirectionDelta[direction].y; int32_t z = tileElement->base_height; - rct_tile_element* otherTileElement = footpath_get_element(x1, y1, z - 2, z, direction); + TileElement* otherTileElement = footpath_get_element(x1, y1, z - 2, z, direction); if (otherTileElement != nullptr && !otherTileElement->AsPath()->IsQueue()) { tileElement->AsPath()->SetSlopeDirection(0); @@ -1306,7 +1306,7 @@ static bool sub_footpath_disconnect_queue_from_path( return false; } -static bool footpath_disconnect_queue_from_path(int32_t x, int32_t y, rct_tile_element* tileElement, int32_t action) +static bool footpath_disconnect_queue_from_path(int32_t x, int32_t y, TileElement* tileElement, int32_t action) { if (!tileElement->AsPath()->IsQueue()) return false; @@ -1341,7 +1341,7 @@ static bool footpath_disconnect_queue_from_path(int32_t x, int32_t y, rct_tile_e * rct2: 0x006A6D7E */ static void loc_6A6D7E( - int32_t initialX, int32_t initialY, int32_t z, int32_t direction, rct_tile_element* initialTileElement, int32_t flags, + int32_t initialX, int32_t initialY, int32_t z, int32_t direction, TileElement* initialTileElement, int32_t flags, bool query, rct_neighbour_list* neighbourList) { int32_t x = initialX + CoordsDirectionDelta[direction].x; @@ -1355,7 +1355,7 @@ static void loc_6A6D7E( } else { - rct_tile_element* tileElement = map_get_first_element_at(x >> 5, y >> 5); + TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5); do { switch (tileElement->GetType()) @@ -1495,7 +1495,7 @@ loc_6A6FD2: } static void loc_6A6C85( - int32_t x, int32_t y, int32_t direction, rct_tile_element* tileElement, int32_t flags, bool query, + int32_t x, int32_t y, int32_t direction, TileElement* tileElement, int32_t flags, bool query, rct_neighbour_list* neighbourList) { if (query && fence_in_the_way(x, y, tileElement->base_height, tileElement->clearance_height, direction)) @@ -1552,7 +1552,7 @@ static void loc_6A6C85( * * rct2: 0x006A6C66 */ -void footpath_connect_edges(int32_t x, int32_t y, rct_tile_element* tileElement, int32_t flags) +void footpath_connect_edges(int32_t x, int32_t y, TileElement* tileElement, int32_t flags) { rct_neighbour_list neighbourList; rct_neighbour neighbour; @@ -1614,9 +1614,9 @@ void footpath_connect_edges(int32_t x, int32_t y, rct_tile_element* tileElement, * rct2: 0x006A742F */ void footpath_chain_ride_queue( - int32_t rideIndex, int32_t entranceIndex, int32_t x, int32_t y, rct_tile_element* tileElement, int32_t direction) + int32_t rideIndex, int32_t entranceIndex, int32_t x, int32_t y, TileElement* tileElement, int32_t direction) { - rct_tile_element *lastPathElement, *lastQueuePathElement; + TileElement *lastPathElement, *lastQueuePathElement; int32_t lastPathX = x, lastPathY = y, lastPathDirection = direction; lastPathElement = nullptr; @@ -1765,7 +1765,7 @@ void footpath_update_queue_chains() if (location.isNull()) continue; - rct_tile_element* tileElement = map_get_first_element_at(location.x, location.y); + TileElement* tileElement = map_get_first_element_at(location.x, location.y); do { if (tileElement->GetType() != TILE_ELEMENT_TYPE_ENTRANCE) @@ -1788,7 +1788,7 @@ void footpath_update_queue_chains() */ static void footpath_fix_ownership(int32_t x, int32_t y) { - const rct_tile_element* surfaceElement = map_get_surface_element_at({ x, y }); + const TileElement* surfaceElement = map_get_surface_element_at({ x, y }); uint16_t ownership; // Unlikely to be NULL unless deliberate. @@ -1839,7 +1839,7 @@ static int32_t footpath_is_connected_to_map_edge_recurse( int32_t x, int32_t y, int32_t z, int32_t direction, int32_t flags, int32_t level, int32_t distanceFromJunction, int32_t junctionTolerance) { - rct_tile_element* tileElement; + TileElement* tileElement; int32_t edges, slopeDirection; x += CoordsDirectionDelta[direction].x; @@ -2116,7 +2116,7 @@ void PathElement::SetQueueBannerDirection(uint8_t direction) */ static void footpath_clear_wide(int32_t x, int32_t y) { - rct_tile_element* tileElement = map_get_first_element_at(x / 32, y / 32); + TileElement* tileElement = map_get_first_element_at(x / 32, y / 32); do { if (tileElement->GetType() != TILE_ELEMENT_TYPE_PATH) @@ -2131,9 +2131,9 @@ static void footpath_clear_wide(int32_t x, int32_t y) * returns footpath element if it can be made wide * returns NULL if it can not be made wide */ -static rct_tile_element* footpath_can_be_wide(int32_t x, int32_t y, uint8_t height) +static TileElement* footpath_can_be_wide(int32_t x, int32_t y, uint8_t height) { - rct_tile_element* tileElement = map_get_first_element_at(x / 32, y / 32); + TileElement* tileElement = map_get_first_element_at(x / 32, y / 32); do { if (tileElement->GetType() != TILE_ELEMENT_TYPE_PATH) @@ -2184,7 +2184,7 @@ void footpath_update_path_wide_flags(int32_t x, int32_t y) // footpath_clear_wide(x, y); // y -= 0x20; - rct_tile_element* tileElement = map_get_first_element_at(x / 32, y / 32); + TileElement* tileElement = map_get_first_element_at(x / 32, y / 32); do { if (tileElement->GetType() != TILE_ELEMENT_TYPE_PATH) @@ -2203,7 +2203,7 @@ void footpath_update_path_wide_flags(int32_t x, int32_t y) // pathList is a list of elements, set by sub_6A8ACF adjacent to x,y // Spanned from 0x00F3EFA8 to 0x00F3EFC7 (8 elements) in the original - rct_tile_element* pathList[8]; + TileElement* pathList[8]; x -= 0x20; y -= 0x20; @@ -2361,7 +2361,7 @@ bool footpath_is_blocked_by_vehicle(const TileCoordsXYZ& position) * * rct2: 0x006A7642 */ -void footpath_update_queue_entrance_banner(int32_t x, int32_t y, rct_tile_element* tileElement) +void footpath_update_queue_entrance_banner(int32_t x, int32_t y, TileElement* tileElement) { int32_t elementType = tileElement->GetType(); switch (elementType) @@ -2395,7 +2395,7 @@ void footpath_update_queue_entrance_banner(int32_t x, int32_t y, rct_tile_elemen * rct2: 0x006A6B7F */ static void footpath_remove_edges_towards_here( - int32_t x, int32_t y, int32_t z, int32_t direction, rct_tile_element* tileElement, bool isQueue) + int32_t x, int32_t y, int32_t z, int32_t direction, TileElement* tileElement, bool isQueue) { if (tileElement->AsPath()->IsQueue()) { @@ -2446,7 +2446,7 @@ static void footpath_remove_edges_towards(int32_t x, int32_t y, int32_t z0, int3 return; } - rct_tile_element* tileElement = map_get_first_element_at(x >> 5, y >> 5); + TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5); do { if (tileElement->GetType() != TILE_ELEMENT_TYPE_PATH) @@ -2481,9 +2481,9 @@ static void footpath_remove_edges_towards(int32_t x, int32_t y, int32_t z0, int3 // Returns true when there is an element at the given coordinates that want to connect to a path with the given direction (ride // entrances and exits, shops, paths). -bool tile_element_wants_path_connection_towards(TileCoordsXYZD coords, const rct_tile_element* const elementToBeRemoved) +bool tile_element_wants_path_connection_towards(TileCoordsXYZD coords, const TileElement* const elementToBeRemoved) { - rct_tile_element* tileElement = map_get_first_element_at(coords.x, coords.y); + TileElement* tileElement = map_get_first_element_at(coords.x, coords.y); do { // Don't check the element that gets removed @@ -2548,7 +2548,7 @@ bool tile_element_wants_path_connection_towards(TileCoordsXYZD coords, const rct } // fix up the corners around the given path element that gets removed -static void footpath_fix_corners_around(int32_t x, int32_t y, rct_tile_element* pathElement) +static void footpath_fix_corners_around(int32_t x, int32_t y, TileElement* pathElement) { // A mask for the paths' corners of each possible neighbour static constexpr uint8_t cornersTouchingTile[3][3] = { @@ -2569,7 +2569,7 @@ static void footpath_fix_corners_around(int32_t x, int32_t y, rct_tile_element* if (xOffset == 0 && yOffset == 0) continue; - rct_tile_element* tileElement = map_get_first_element_at(x + xOffset, y + yOffset); + TileElement* tileElement = map_get_first_element_at(x + xOffset, y + yOffset); do { if (tileElement->GetType() != TILE_ELEMENT_TYPE_PATH) @@ -2593,7 +2593,7 @@ static void footpath_fix_corners_around(int32_t x, int32_t y, rct_tile_element* * @param x x-coordinate in units (not tiles) * @param y y-coordinate in units (not tiles) */ -void footpath_remove_edges_at(int32_t x, int32_t y, rct_tile_element* tileElement) +void footpath_remove_edges_at(int32_t x, int32_t y, TileElement* tileElement) { if (tileElement->GetType() == TILE_ELEMENT_TYPE_TRACK) { diff --git a/src/openrct2/world/Footpath.h b/src/openrct2/world/Footpath.h index f8960b5090..6c837f64d0 100644 --- a/src/openrct2/world/Footpath.h +++ b/src/openrct2/world/Footpath.h @@ -36,7 +36,7 @@ struct rct_footpath_entry assert_struct_size(rct_footpath_entry, 13); #pragma pack(pop) -// Masks for values stored in rct_tile_element.type +// Masks for values stored in TileElement.type enum { FOOTPATH_ELEMENT_TYPE_FLAG_IS_QUEUE = (1 << 0), @@ -44,7 +44,7 @@ enum FOOTPATH_ELEMENT_TYPE_DIRECTION_MASK = (1 << 6) | (1 << 7), }; -// Masks and flags for values stored in rct_tile_element.properties.path.type +// Masks and flags for values stored in TileElement.properties.path.type enum { FOOTPATH_PROPERTIES_SLOPE_DIRECTION_MASK = (1 << 0) | (1 << 1), @@ -53,14 +53,14 @@ enum FOOTPATH_PROPERTIES_TYPE_MASK = (1 << 4) | (1 << 5) | (1 << 6) | (1 << 7), }; -// Masks and flags for values stored in in rct_tile_element.properties.path.edges +// Masks and flags for values stored in in TileElement.properties.path.edges enum { FOOTPATH_PROPERTIES_EDGES_EDGES_MASK = (1 << 0) | (1 << 1) | (1 << 2) | (1 << 3), FOOTPATH_PROPERTIES_EDGES_CORNERS_MASK = (1 << 4) | (1 << 5) | (1 << 6) | (1 << 7), }; -// Masks and flags for values stored in in rct_tile_element.properties.path.additions +// Masks and flags for values stored in in TileElement.properties.path.additions enum { FOOTPATH_PROPERTIES_ADDITIONS_TYPE_MASK = (1 << 0) | (1 << 1) | (1 << 2) | (1 << 3), @@ -125,7 +125,7 @@ extern const LocationXY16 word_981D6C[4]; extern const LocationXY16 BinUseOffsets[4]; extern const LocationXY16 BenchUseOffsets[8]; -rct_tile_element* map_get_footpath_element(int32_t x, int32_t y, int32_t z); +TileElement* map_get_footpath_element(int32_t x, int32_t y, int32_t z); void footpath_interrupt_peeps(int32_t x, int32_t y, int32_t z); void game_command_place_footpath( int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, int32_t* esi, int32_t* edi, int32_t* ebp); @@ -140,23 +140,23 @@ money32 footpath_remove(int32_t x, int32_t y, int32_t z, int32_t flags); money32 footpath_provisional_set(int32_t type, int32_t x, int32_t y, int32_t z, int32_t slope); void footpath_provisional_remove(); void footpath_provisional_update(); -void remove_banners_at_element(int32_t x, int32_t y, rct_tile_element* tileElement); +void remove_banners_at_element(int32_t x, int32_t y, TileElement* tileElement); void footpath_get_coordinates_from_pos( - int32_t screenX, int32_t screenY, int32_t* x, int32_t* y, int32_t* direction, rct_tile_element** tileElement); + int32_t screenX, int32_t screenY, int32_t* x, int32_t* y, int32_t* direction, TileElement** tileElement); void footpath_bridge_get_info_from_pos( - int32_t screenX, int32_t screenY, int32_t* x, int32_t* y, int32_t* direction, rct_tile_element** tileElement); + int32_t screenX, int32_t screenY, int32_t* x, int32_t* y, int32_t* direction, TileElement** tileElement); void footpath_remove_litter(int32_t x, int32_t y, int32_t z); -void footpath_connect_edges(int32_t x, int32_t y, rct_tile_element* tileElement, int32_t flags); +void footpath_connect_edges(int32_t x, int32_t y, TileElement* tileElement, int32_t flags); void footpath_update_queue_chains(); bool fence_in_the_way(int32_t x, int32_t y, int32_t z0, int32_t z1, int32_t direction); void footpath_chain_ride_queue( - int32_t rideIndex, int32_t entranceIndex, int32_t x, int32_t y, rct_tile_element* tileElement, int32_t direction); + int32_t rideIndex, int32_t entranceIndex, int32_t x, int32_t y, TileElement* tileElement, int32_t direction); void footpath_update_path_wide_flags(int32_t x, int32_t y); bool footpath_is_blocked_by_vehicle(const TileCoordsXYZ& position); int32_t footpath_is_connected_to_map_edge(int32_t x, int32_t y, int32_t z, int32_t direction, int32_t flags); -void footpath_remove_edges_at(int32_t x, int32_t y, rct_tile_element* tileElement); -int32_t entrance_get_directions(const rct_tile_element* tileElement); +void footpath_remove_edges_at(int32_t x, int32_t y, TileElement* tileElement); +int32_t entrance_get_directions(const TileElement* tileElement); rct_footpath_entry* get_footpath_entry(int32_t entryIndex); diff --git a/src/openrct2/world/Fountain.cpp b/src/openrct2/world/Fountain.cpp index 8324cc4fdc..faeabd959a 100644 --- a/src/openrct2/world/Fountain.cpp +++ b/src/openrct2/world/Fountain.cpp @@ -80,7 +80,7 @@ static void jumping_fountain_random( static void jumping_fountain_create_next( const rct_jumping_fountain* jumpingFountain, int32_t x, int32_t y, int32_t z, int32_t direction); -void jumping_fountain_begin(int32_t type, int32_t x, int32_t y, const rct_tile_element* tileElement) +void jumping_fountain_begin(int32_t type, int32_t x, int32_t y, const TileElement* tileElement) { int32_t randomIndex; int32_t z = tileElement->base_height * 8; @@ -252,7 +252,7 @@ static bool is_jumping_fountain(int32_t type, int32_t x, int32_t y, int32_t z) int32_t pathBitFlagMask = type == JUMPING_FOUNTAIN_TYPE_SNOW ? PATH_BIT_FLAG_JUMPING_FOUNTAIN_SNOW : PATH_BIT_FLAG_JUMPING_FOUNTAIN_WATER; - rct_tile_element* tileElement = map_get_first_element_at(x >> 5, y >> 5); + TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5); do { if (tileElement->GetType() != TILE_ELEMENT_TYPE_PATH) diff --git a/src/openrct2/world/Fountain.h b/src/openrct2/world/Fountain.h index 6980400623..c0d1a4abef 100644 --- a/src/openrct2/world/Fountain.h +++ b/src/openrct2/world/Fountain.h @@ -19,7 +19,7 @@ enum JUMPING_FOUNTAIN_TYPE_SNOW }; -void jumping_fountain_begin(int32_t type, int32_t x, int32_t y, const rct_tile_element* tileElement); +void jumping_fountain_begin(int32_t type, int32_t x, int32_t y, const TileElement* tileElement); void jumping_fountain_create( int32_t type, int32_t x, int32_t y, int32_t z, int32_t direction, int32_t flags, int32_t iteration); void jumping_fountain_update(rct_jumping_fountain* jumpingFountain); diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp index 6179d11753..5c8ef4027c 100644 --- a/src/openrct2/world/Map.cpp +++ b/src/openrct2/world/Map.cpp @@ -93,12 +93,12 @@ int16_t gMapSize; int16_t gMapSizeMaxXY; int16_t gMapBaseZ; -rct_tile_element gTileElements[MAX_TILE_TILE_ELEMENT_POINTERS * 3]; -rct_tile_element* gTileElementTilePointers[MAX_TILE_TILE_ELEMENT_POINTERS]; +TileElement gTileElements[MAX_TILE_TILE_ELEMENT_POINTERS * 3]; +TileElement* gTileElementTilePointers[MAX_TILE_TILE_ELEMENT_POINTERS]; LocationXY16 gMapSelectionTiles[300]; PeepSpawn gPeepSpawns[MAX_PEEP_SPAWNS]; -rct_tile_element* gNextFreeTileElement; +TileElement* gNextFreeTileElement; uint32_t gNextFreeTileElementPointerIndex; bool gLandMountainMode; @@ -213,7 +213,7 @@ void tile_element_iterator_restart_for_tile(tile_element_iterator* it) it->element = nullptr; } -rct_tile_element* map_get_first_element_at(int32_t x, int32_t y) +TileElement* map_get_first_element_at(int32_t x, int32_t y) { if (x < 0 || y < 0 || x > (MAXIMUM_MAP_SIZE_TECHNICAL - 1) || y > (MAXIMUM_MAP_SIZE_TECHNICAL - 1)) { @@ -223,9 +223,9 @@ rct_tile_element* map_get_first_element_at(int32_t x, int32_t y) return gTileElementTilePointers[x + y * MAXIMUM_MAP_SIZE_TECHNICAL]; } -rct_tile_element* map_get_nth_element_at(int32_t x, int32_t y, int32_t n) +TileElement* map_get_nth_element_at(int32_t x, int32_t y, int32_t n) { - rct_tile_element* tileElement = map_get_first_element_at(x, y); + TileElement* tileElement = map_get_first_element_at(x, y); if (tileElement == nullptr) { return nullptr; @@ -250,7 +250,7 @@ rct_tile_element* map_get_nth_element_at(int32_t x, int32_t y, int32_t n) return nullptr; } -void map_set_tile_elements(int32_t x, int32_t y, rct_tile_element* elements) +void map_set_tile_elements(int32_t x, int32_t y, TileElement* elements) { if (x < 0 || y < 0 || x > (MAXIMUM_MAP_SIZE_TECHNICAL - 1) || y > (MAXIMUM_MAP_SIZE_TECHNICAL - 1)) { @@ -260,9 +260,9 @@ void map_set_tile_elements(int32_t x, int32_t y, rct_tile_element* elements) gTileElementTilePointers[x + y * MAXIMUM_MAP_SIZE_TECHNICAL] = elements; } -rct_tile_element* map_get_surface_element_at(int32_t x, int32_t y) +TileElement* map_get_surface_element_at(int32_t x, int32_t y) { - rct_tile_element* tileElement = map_get_first_element_at(x, y); + TileElement* tileElement = map_get_first_element_at(x, y); if (tileElement == nullptr) return nullptr; @@ -279,14 +279,14 @@ rct_tile_element* map_get_surface_element_at(int32_t x, int32_t y) return tileElement; } -rct_tile_element* map_get_surface_element_at(const CoordsXY coords) +TileElement* map_get_surface_element_at(const CoordsXY coords) { return map_get_surface_element_at(coords.x / 32, coords.y / 32); } -rct_tile_element* map_get_path_element_at(int32_t x, int32_t y, int32_t z) +TileElement* map_get_path_element_at(int32_t x, int32_t y, int32_t z) { - rct_tile_element* tileElement = map_get_first_element_at(x, y); + TileElement* tileElement = map_get_first_element_at(x, y); if (tileElement == nullptr) return nullptr; @@ -309,7 +309,7 @@ rct_tile_element* map_get_path_element_at(int32_t x, int32_t y, int32_t z) BannerElement* map_get_banner_element_at(int32_t x, int32_t y, int32_t z, uint8_t position) { - rct_tile_element* tileElement = map_get_first_element_at(x, y); + TileElement* tileElement = map_get_first_element_at(x, y); if (tileElement == nullptr) return nullptr; @@ -341,7 +341,7 @@ void map_init(int32_t size) for (int32_t i = 0; i < MAX_TILE_TILE_ELEMENT_POINTERS; i++) { - rct_tile_element* tile_element = &gTileElements[i]; + TileElement* tile_element = &gTileElements[i]; tile_element->ClearAs(TILE_ELEMENT_TYPE_SURFACE); tile_element->flags = TILE_ELEMENT_FLAG_LAST_TILE; tile_element->base_height = 14; @@ -384,7 +384,7 @@ void map_count_remaining_land_rights() { for (int32_t y = 0; y < MAXIMUM_MAP_SIZE_TECHNICAL; y++) { - rct_tile_element* element = map_get_surface_element_at(x, y); + TileElement* element = map_get_surface_element_at(x, y); // Surface elements are sometimes hacked out to save some space for other map elements if (element == nullptr) { @@ -441,8 +441,8 @@ void map_update_tile_pointers() gTileElementTilePointers[i] = TILE_UNDEFINED_TILE_ELEMENT; } - rct_tile_element* tileElement = gTileElements; - rct_tile_element** tile = gTileElementTilePointers; + TileElement* tileElement = gTileElements; + TileElement** tile = gTileElementTilePointers; for (y = 0; y < MAXIMUM_MAP_SIZE_TECHNICAL; y++) { for (x = 0; x < MAXIMUM_MAP_SIZE_TECHNICAL; x++) @@ -466,7 +466,7 @@ void map_update_tile_pointers() */ int32_t tile_element_height(int32_t x, int32_t y) { - rct_tile_element* tileElement; + TileElement* tileElement; // Off the map if ((unsigned)x >= 8192 || (unsigned)y >= 8192) @@ -622,7 +622,7 @@ int32_t tile_element_height(int32_t x, int32_t y) */ bool map_coord_is_connected(int32_t x, int32_t y, int32_t z, uint8_t faceDirection) { - rct_tile_element* tileElement = map_get_first_element_at(x, y); + TileElement* tileElement = map_get_first_element_at(x, y); do { @@ -747,7 +747,7 @@ bool map_is_location_owned(int32_t x, int32_t y, int32_t z) // This check is to avoid throwing lots of messages in logs. if (map_is_location_valid({ x, y })) { - rct_tile_element* tileElement = map_get_surface_element_at({ x, y }); + TileElement* tileElement = map_get_surface_element_at({ x, y }); if (tileElement != nullptr) { if (tileElement->AsSurface()->GetOwnership() & OWNERSHIP_OWNED) @@ -774,7 +774,7 @@ bool map_is_location_in_park(const CoordsXY coords) { if (map_is_location_valid(coords)) { - rct_tile_element* tileElement = map_get_surface_element_at(coords); + TileElement* tileElement = map_get_surface_element_at(coords); if (tileElement == nullptr) return false; if (tileElement->AsSurface()->GetOwnership() & OWNERSHIP_OWNED) @@ -789,7 +789,7 @@ bool map_is_location_owned_or_has_rights(int32_t x, int32_t y) { if (map_is_location_valid({ x, y })) { - rct_tile_element* tileElement = map_get_surface_element_at({ x, y }); + TileElement* tileElement = map_get_surface_element_at({ x, y }); if (tileElement == nullptr) { return false; @@ -830,7 +830,7 @@ void game_command_remove_large_scenery( } bool element_found = false; - rct_tile_element* tileElement = map_get_first_element_at(x / 32, y / 32); + TileElement* tileElement = map_get_first_element_at(x / 32, y / 32); if (tileElement == nullptr) { log_warning("Invalid game command for scenery removal, x = %d, y = %d", x, y); @@ -915,7 +915,7 @@ void game_command_remove_large_scenery( continue; } - rct_tile_element* sceneryElement = map_get_first_element_at(currentTile.x / 32, currentTile.y / 32); + TileElement* sceneryElement = map_get_first_element_at(currentTile.x / 32, currentTile.y / 32); element_found = false; do { @@ -985,7 +985,7 @@ void game_command_set_large_scenery_colour( gCommandPosition.y = y + 16; gCommandPosition.z = z; - rct_tile_element* tile_element = map_get_large_scenery_segment(x, y, base_height, tile_element_direction, tileIndex); + TileElement* tile_element = map_get_large_scenery_segment(x, y, base_height, tile_element_direction, tileIndex); if (tile_element == nullptr) { @@ -1034,7 +1034,7 @@ void game_command_set_large_scenery_colour( if (flags & GAME_COMMAND_FLAG_APPLY) { - rct_tile_element* tileElement = map_get_large_scenery_segment( + TileElement* tileElement = map_get_large_scenery_segment( currentTile.x, currentTile.y, base_height, tile_element_direction, i); tileElement->AsLargeScenery()->SetPrimaryColour(colour1); @@ -1058,7 +1058,7 @@ static money32 map_clear_scenery_from_tile(int32_t x, int32_t y, int32_t clear, { int32_t type; money32 cost, totalCost; - rct_tile_element* tileElement; + TileElement* tileElement; totalCost = 0; @@ -1153,7 +1153,7 @@ restart_from_beginning: */ static void map_reset_clear_large_scenery_flag() { - rct_tile_element* tileElement; + TileElement* tileElement; // TODO: Improve efficiency of this for (int32_t y = 0; y < MAXIMUM_MAP_SIZE_TECHNICAL; y++) { @@ -1298,7 +1298,7 @@ static money32 map_change_surface_style( continue; } - rct_tile_element* tileElement = map_get_surface_element_at({ x, y }); + TileElement* tileElement = map_get_surface_element_at({ x, y }); if (surfaceStyle != 0xFF) { @@ -1436,7 +1436,7 @@ static constexpr const uint8_t tile_element_lower_styles[9][32] = { * rct2: 0x00663CB9 */ static int32_t map_set_land_height_clear_func( - rct_tile_element** tile_element, [[maybe_unused]] int32_t x, [[maybe_unused]] int32_t y, [[maybe_unused]] uint8_t flags, + TileElement** tile_element, [[maybe_unused]] int32_t x, [[maybe_unused]] int32_t y, [[maybe_unused]] uint8_t flags, [[maybe_unused]] money32* price) { if ((*tile_element)->GetType() == TILE_ELEMENT_TYPE_SURFACE) @@ -1496,7 +1496,7 @@ static int32_t map_get_corner_height(int32_t z, int32_t slope, int32_t direction return z; } -static int32_t tile_element_get_corner_height(const rct_tile_element* tileElement, int32_t direction) +static int32_t tile_element_get_corner_height(const TileElement* tileElement, int32_t direction) { int32_t z = tileElement->base_height; int32_t slope = tileElement->AsSurface()->GetSlope(); @@ -1505,7 +1505,7 @@ static int32_t tile_element_get_corner_height(const rct_tile_element* tileElemen static money32 map_set_land_height(int32_t flags, int32_t x, int32_t y, int32_t height, int32_t style) { - rct_tile_element* tileElement; + TileElement* tileElement; if (game_is_paused() && !gCheatsBuildInPauseMode) { @@ -1625,7 +1625,7 @@ static money32 map_set_land_height(int32_t flags, int32_t x, int32_t y, int32_t } uint8_t zCorner = height; // z position of highest corner of tile - rct_tile_element* surfaceElement = map_get_surface_element_at({ x, y }); + TileElement* surfaceElement = map_get_surface_element_at({ x, y }); if (surfaceElement->AsSurface()->HasTrackThatNeedsWater()) { uint32_t waterHeight = surfaceElement->AsSurface()->GetWaterHeight(); @@ -1796,7 +1796,7 @@ static uint8_t map_get_lowest_land_height(int32_t xMin, int32_t xMax, int32_t yM { for (int32_t xi = xMin; xi <= xMax; xi += 32) { - rct_tile_element* tile_element = map_get_surface_element_at({ xi, yi }); + TileElement* tile_element = map_get_surface_element_at({ xi, yi }); if (tile_element != nullptr && min_height > tile_element->base_height) { min_height = tile_element->base_height; @@ -1818,7 +1818,7 @@ static uint8_t map_get_highest_land_height(int32_t xMin, int32_t xMax, int32_t y { for (int32_t xi = xMin; xi <= xMax; xi += 32) { - rct_tile_element* tile_element = map_get_surface_element_at({ xi, yi }); + TileElement* tile_element = map_get_surface_element_at({ xi, yi }); if (tile_element != nullptr) { uint8_t base_height = tile_element->base_height; @@ -1862,7 +1862,7 @@ static money32 raise_land( { for (int32_t x_coord = point_a_x; x_coord <= point_b_x; x_coord += 32) { - rct_tile_element* tile_element = map_get_surface_element_at(x_coord / 32, y_coord / 32); + TileElement* tile_element = map_get_surface_element_at(x_coord / 32, y_coord / 32); if (tile_element != nullptr) { uint8_t height = tile_element->base_height; @@ -1924,7 +1924,7 @@ static money32 lower_land( { for (int32_t x_coord = point_a_x; x_coord <= point_b_x; x_coord += 32) { - rct_tile_element* tile_element = map_get_surface_element_at(x_coord / 32, y_coord / 32); + TileElement* tile_element = map_get_surface_element_at(x_coord / 32, y_coord / 32); if (tile_element != nullptr) { uint8_t height = tile_element->base_height; @@ -1979,7 +1979,7 @@ money32 raise_water(int16_t x0, int16_t y0, int16_t x1, int16_t y1, uint8_t flag { for (int32_t xi = x0; xi <= x1; xi += 32) { - rct_tile_element* tile_element = map_get_surface_element_at({ xi, yi }); + TileElement* tile_element = map_get_surface_element_at({ xi, yi }); if (tile_element != nullptr) { uint8_t height = tile_element->base_height; @@ -1995,7 +1995,7 @@ money32 raise_water(int16_t x0, int16_t y0, int16_t x1, int16_t y1, uint8_t flag { for (int32_t xi = x0; xi <= x1; xi += 32) { - rct_tile_element* tile_element = map_get_surface_element_at({ xi, yi }); + TileElement* tile_element = map_get_surface_element_at({ xi, yi }); if (tile_element != nullptr) { if (tile_element->base_height <= max_height) @@ -2073,7 +2073,7 @@ money32 lower_water(int16_t x0, int16_t y0, int16_t x1, int16_t y1, uint8_t flag { for (int32_t xi = x0; xi <= x1; xi += 32) { - rct_tile_element* tile_element = map_get_surface_element_at({ xi, yi }); + TileElement* tile_element = map_get_surface_element_at({ xi, yi }); if (tile_element != nullptr) { uint8_t height = tile_element->AsSurface()->GetWaterHeight(); @@ -2091,7 +2091,7 @@ money32 lower_water(int16_t x0, int16_t y0, int16_t x1, int16_t y1, uint8_t flag { for (int32_t xi = x0; xi <= x1; xi += 32) { - rct_tile_element* tile_element = map_get_surface_element_at({ xi, yi }); + TileElement* tile_element = map_get_surface_element_at({ xi, yi }); if (tile_element != nullptr) { uint8_t height = tile_element->AsSurface()->GetWaterHeight(); @@ -2169,7 +2169,7 @@ void game_command_lower_land( } static money32 smooth_land_tile( - int32_t direction, uint8_t flags, int32_t x, int32_t y, rct_tile_element* tileElement, bool raiseLand) + int32_t direction, uint8_t flags, int32_t x, int32_t y, TileElement* tileElement, bool raiseLand) { int32_t targetBaseZ = tileElement->base_height; int32_t slope = tileElement->AsSurface()->GetSlope(); @@ -2200,7 +2200,7 @@ static money32 smooth_land_row_by_edge( { uint8_t shouldContinue = 0xF; int32_t landChangePerTile = raiseLand ? -2 : 2; - rct_tile_element *tileElement, *nextTileElement; + TileElement *tileElement, *nextTileElement; money32 totalCost = 0; money32 result; @@ -2341,7 +2341,7 @@ static money32 smooth_land_row_by_corner( int32_t checkDirection, bool raiseLand) { bool shouldContinue = true; - rct_tile_element *tileElement, *nextTileElement; + TileElement *tileElement, *nextTileElement; money32 totalCost = 0; money32 result; int32_t landChangePerTile; @@ -2464,28 +2464,28 @@ static money32 smooth_land( // Smooth the 4 corners { // top-left - rct_tile_element* tileElement = map_get_surface_element_at({ mapLeft, mapTop }); + TileElement* tileElement = map_get_surface_element_at({ mapLeft, mapTop }); int32_t z = std::clamp((uint8_t)tile_element_get_corner_height(tileElement, 2), minHeight, maxHeight); totalCost += smooth_land_row_by_corner(flags, mapLeft, mapTop, z, -32, -32, 0, 2, raiseLand); } { // bottom-left - rct_tile_element* tileElement = map_get_surface_element_at(mapLeft >> 5, mapBottom >> 5); + TileElement* tileElement = map_get_surface_element_at(mapLeft >> 5, mapBottom >> 5); int32_t z = std::clamp((uint8_t)tile_element_get_corner_height(tileElement, 3), minHeight, maxHeight); totalCost += smooth_land_row_by_corner(flags, mapLeft, mapBottom, z, -32, 32, 1, 3, raiseLand); } { // bottom-right - rct_tile_element* tileElement = map_get_surface_element_at(mapRight >> 5, mapBottom >> 5); + TileElement* tileElement = map_get_surface_element_at(mapRight >> 5, mapBottom >> 5); int32_t z = std::clamp((uint8_t)tile_element_get_corner_height(tileElement, 0), minHeight, maxHeight); totalCost += smooth_land_row_by_corner(flags, mapRight, mapBottom, z, 32, 32, 2, 0, raiseLand); } { // top-right - rct_tile_element* tileElement = map_get_surface_element_at(mapRight >> 5, mapTop >> 5); + TileElement* tileElement = map_get_surface_element_at(mapRight >> 5, mapTop >> 5); int32_t z = std::clamp((uint8_t)tile_element_get_corner_height(tileElement, 1), minHeight, maxHeight); totalCost += smooth_land_row_by_corner(flags, mapRight, mapTop, z, 32, -32, 3, 1, raiseLand); } // Smooth the edges - rct_tile_element* tileElement = nullptr; + TileElement* tileElement = nullptr; int32_t z1, z2; for (int32_t y = mapTop; y <= mapBottom; y += 32) { @@ -2519,7 +2519,7 @@ static money32 smooth_land( case MAP_SELECT_TYPE_CORNER_2: case MAP_SELECT_TYPE_CORNER_3: { - rct_tile_element* tileElement = map_get_surface_element_at({ mapLeft, mapTop }); + TileElement* tileElement = map_get_surface_element_at({ mapLeft, mapTop }); uint8_t newBaseZ = tileElement->base_height; uint8_t newSlope = tileElement->AsSurface()->GetSlope(); @@ -2597,7 +2597,7 @@ static money32 smooth_land( { // TODO: Handle smoothing by edge // Get the two corners to raise - rct_tile_element* surfaceElement = map_get_surface_element_at({ mapLeft, mapTop }); + TileElement* surfaceElement = map_get_surface_element_at({ mapLeft, mapTop }); uint8_t newBaseZ = surfaceElement->base_height; uint8_t oldSlope = surfaceElement->AsSurface()->GetSlope(); uint8_t newSlope = oldSlope; @@ -2795,7 +2795,7 @@ void game_command_set_water_height( wall_remove_at_z(x, y, element_height); } - rct_tile_element* tile_element = map_get_surface_element_at({ x, y }); + TileElement* tile_element = map_get_surface_element_at({ x, y }); int32_t zHigh = tile_element->base_height; int32_t zLow = base_height; if (tile_element->AsSurface()->GetWaterHeight() > 0) @@ -2937,7 +2937,7 @@ void game_command_place_large_scenery( continue; } - rct_tile_element* tile_element = map_get_surface_element_at({ curTile.x, curTile.y }); + TileElement* tile_element = map_get_surface_element_at({ curTile.x, curTile.y }); if (tile_element != nullptr) { int32_t height = tile_element->base_height * 8; @@ -3052,7 +3052,7 @@ void game_command_place_large_scenery( network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord); } - rct_tile_element* new_tile_element = tile_element_insert(curTile.x / 32, curTile.y / 32, zLow, F43887); + TileElement* new_tile_element = tile_element_insert(curTile.x / 32, curTile.y / 32, zLow, F43887); assert(new_tile_element != nullptr); map_animation_create(MAP_ANIMATION_TYPE_LARGE_SCENERY, curTile.x, curTile.y, zLow); @@ -3099,7 +3099,7 @@ void game_command_place_large_scenery( * * rct2: 0x0068B280 */ -void tile_element_remove(rct_tile_element* tileElement) +void tile_element_remove(TileElement* tileElement) { // Replace Nth element by (N+1)th element. // This loop will make tileElement point to the old last element position, @@ -3258,9 +3258,9 @@ void map_reorganise_elements() { context_setcurrentcursor(CURSOR_ZZZ); - rct_tile_element* new_tile_elements = (rct_tile_element*)malloc( - 3 * (MAXIMUM_MAP_SIZE_TECHNICAL * MAXIMUM_MAP_SIZE_TECHNICAL) * sizeof(rct_tile_element)); - rct_tile_element* new_elements_pointer = new_tile_elements; + TileElement* new_tile_elements = (TileElement*)malloc( + 3 * (MAXIMUM_MAP_SIZE_TECHNICAL * MAXIMUM_MAP_SIZE_TECHNICAL) * sizeof(TileElement)); + TileElement* new_elements_pointer = new_tile_elements; if (new_tile_elements == nullptr) { @@ -3274,22 +3274,22 @@ void map_reorganise_elements() { for (int32_t x = 0; x < MAXIMUM_MAP_SIZE_TECHNICAL; x++) { - rct_tile_element* startElement = map_get_first_element_at(x, y); - rct_tile_element* endElement = startElement; + TileElement* startElement = map_get_first_element_at(x, y); + TileElement* endElement = startElement; while (!(endElement++)->IsLastForTile()) ; num_elements = (uint32_t)(endElement - startElement); - memcpy(new_elements_pointer, startElement, num_elements * sizeof(rct_tile_element)); + memcpy(new_elements_pointer, startElement, num_elements * sizeof(TileElement)); new_elements_pointer += num_elements; } } num_elements = (uint32_t)(new_elements_pointer - new_tile_elements); - memcpy(gTileElements, new_tile_elements, num_elements * sizeof(rct_tile_element)); + memcpy(gTileElements, new_tile_elements, num_elements * sizeof(TileElement)); memset( gTileElements + num_elements, 0, - (3 * (MAXIMUM_MAP_SIZE_TECHNICAL * MAXIMUM_MAP_SIZE_TECHNICAL) - num_elements) * sizeof(rct_tile_element)); + (3 * (MAXIMUM_MAP_SIZE_TECHNICAL * MAXIMUM_MAP_SIZE_TECHNICAL) - num_elements) * sizeof(TileElement)); free(new_tile_elements); @@ -3332,9 +3332,9 @@ bool map_check_free_elements_and_reorganise(int32_t numElements) * * rct2: 0x0068B1F6 */ -rct_tile_element* tile_element_insert(int32_t x, int32_t y, int32_t z, int32_t flags) +TileElement* tile_element_insert(int32_t x, int32_t y, int32_t z, int32_t flags) { - rct_tile_element *originalTileElement, *newTileElement, *insertedElement; + TileElement *originalTileElement, *newTileElement, *insertedElement; if (!map_check_free_elements_and_reorganise(1)) { @@ -3396,7 +3396,7 @@ rct_tile_element* tile_element_insert(int32_t x, int32_t y, int32_t z, int32_t f * * rct2: 0x0068BB18 */ -void map_obstruction_set_error_text(rct_tile_element* tileElement) +void map_obstruction_set_error_text(TileElement* tileElement) { rct_string_id errorStringId; Ride* ride; @@ -3482,7 +3482,7 @@ bool map_can_construct_with_clear_at( return true; } - rct_tile_element* tileElement = map_get_first_element_at(x / 32, y / 32); + TileElement* tileElement = map_get_first_element_at(x / 32, y / 32); do { if (tileElement->GetType() != TILE_ELEMENT_TYPE_SURFACE) @@ -3663,7 +3663,7 @@ void map_update_tiles() interleaved_xy >>= 1; } - rct_tile_element* tileElement = map_get_surface_element_at(x, y); + TileElement* tileElement = map_get_surface_element_at(x, y); if (tileElement != nullptr) { tileElement->AsSurface()->UpdateGrassLength({ x * 32, y * 32 }); @@ -3825,9 +3825,9 @@ void map_extend_boundary_surface() * Clears the provided element properly from a certain tile, and updates * the pointer (when needed) passed to this function to point to the next element. */ -static void clear_element_at(int32_t x, int32_t y, rct_tile_element** elementPtr) +static void clear_element_at(int32_t x, int32_t y, TileElement** elementPtr) { - rct_tile_element* element = *elementPtr; + TileElement* element = *elementPtr; switch (element->GetType()) { case TILE_ELEMENT_TYPE_SURFACE: @@ -3904,7 +3904,7 @@ static void clear_elements_at(int32_t x, int32_t y) } } - rct_tile_element* tileElement = map_get_first_element_at(x >> 5, y >> 5); + TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5); // Remove all elements except the last one while (!tileElement->IsLastForTile()) @@ -3916,7 +3916,7 @@ static void clear_elements_at(int32_t x, int32_t y) int32_t map_get_highest_z(int32_t tileX, int32_t tileY) { - rct_tile_element* tileElement; + TileElement* tileElement; uint32_t z; tileElement = map_get_surface_element_at(tileX, tileY); @@ -3935,9 +3935,9 @@ int32_t map_get_highest_z(int32_t tileX, int32_t tileY) return z; } -rct_tile_element* map_get_large_scenery_segment(int32_t x, int32_t y, int32_t z, int32_t direction, int32_t sequence) +TileElement* map_get_large_scenery_segment(int32_t x, int32_t y, int32_t z, int32_t direction, int32_t sequence) { - rct_tile_element* tileElement = map_get_first_element_at(x >> 5, y >> 5); + TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5); if (tileElement == nullptr) { return nullptr; @@ -3960,7 +3960,7 @@ rct_tile_element* map_get_large_scenery_segment(int32_t x, int32_t y, int32_t z, EntranceElement* map_get_park_entrance_element_at(int32_t x, int32_t y, int32_t z, bool ghost) { - rct_tile_element* tileElement = map_get_first_element_at(x >> 5, y >> 5); + TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5); if (tileElement != nullptr) { do @@ -3985,7 +3985,7 @@ EntranceElement* map_get_park_entrance_element_at(int32_t x, int32_t y, int32_t EntranceElement* map_get_ride_entrance_element_at(int32_t x, int32_t y, int32_t z, bool ghost) { - rct_tile_element* tileElement = map_get_first_element_at(x >> 5, y >> 5); + TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5); if (tileElement != nullptr) { do @@ -4010,7 +4010,7 @@ EntranceElement* map_get_ride_entrance_element_at(int32_t x, int32_t y, int32_t EntranceElement* map_get_ride_exit_element_at(int32_t x, int32_t y, int32_t z, bool ghost) { - rct_tile_element* tileElement = map_get_first_element_at(x >> 5, y >> 5); + TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5); if (tileElement != nullptr) { do @@ -4033,9 +4033,9 @@ EntranceElement* map_get_ride_exit_element_at(int32_t x, int32_t y, int32_t z, b return nullptr; } -rct_tile_element* map_get_small_scenery_element_at(int32_t x, int32_t y, int32_t z, int32_t type, uint8_t quadrant) +TileElement* map_get_small_scenery_element_at(int32_t x, int32_t y, int32_t z, int32_t type, uint8_t quadrant) { - rct_tile_element* tileElement = map_get_first_element_at(x >> 5, y >> 5); + TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5); if (tileElement != nullptr) { do @@ -4057,9 +4057,9 @@ rct_tile_element* map_get_small_scenery_element_at(int32_t x, int32_t y, int32_t bool map_large_scenery_get_origin( int32_t x, int32_t y, int32_t z, int32_t direction, int32_t sequence, int32_t* outX, int32_t* outY, int32_t* outZ, - rct_tile_element** outElement) + TileElement** outElement) { - rct_tile_element* tileElement; + TileElement* tileElement; rct_scenery_entry* sceneryEntry; rct_large_scenery_tile* tile; int16_t offsetX, offsetY; @@ -4090,7 +4090,7 @@ bool map_large_scenery_get_origin( bool sign_set_colour( int32_t x, int32_t y, int32_t z, int32_t direction, int32_t sequence, uint8_t mainColour, uint8_t textColour) { - rct_tile_element* tileElement; + TileElement* tileElement; rct_scenery_entry* sceneryEntry; rct_large_scenery_tile *sceneryTiles, *tile; int16_t offsetX, offsetY; @@ -4246,7 +4246,7 @@ void map_invalidate_tile_full(int32_t x, int32_t y) map_invalidate_tile(x, y, 0, 2080); } -void map_invalidate_element(int32_t x, int32_t y, rct_tile_element* tileElement) +void map_invalidate_element(int32_t x, int32_t y, TileElement* tileElement) { map_invalidate_tile(x, y, tileElement->base_height * 8, tileElement->clearance_height * 8); } @@ -4298,7 +4298,7 @@ int32_t map_get_tile_quadrant(int32_t mapX, int32_t mapY) */ bool map_surface_is_blocked(int16_t x, int16_t y) { - rct_tile_element* tileElement; + TileElement* tileElement; if (x >= 8192 || y >= 8192) return true; @@ -4376,7 +4376,7 @@ void game_command_set_sign_style( if (*ebp == 0) { // small sign - rct_tile_element* tileElement = map_get_first_element_at(x / 32, y / 32); + TileElement* tileElement = map_get_first_element_at(x / 32, y / 32); bool wall_found = false; do { @@ -4410,7 +4410,7 @@ void game_command_set_sign_style( } else { // large sign - rct_tile_element* tileElement = banner_get_tile_element(bannerId); + TileElement* tileElement = banner_get_tile_element(bannerId); if (tileElement == nullptr || tileElement->GetType() != TILE_ELEMENT_TYPE_LARGE_SCENERY) { gGameCommandErrorText = STR_ERR_CANT_SET_BANNER_TEXT; @@ -4477,7 +4477,7 @@ void game_command_modify_tile( } case TILE_INSPECTOR_ANY_PASTE: { - rct_tile_element elementToPaste; + TileElement elementToPaste; const int32_t data[] = { *edx, *edi }; assert_struct_size(data, sizeof(elementToPaste)); memcpy(&elementToPaste, data, 8); @@ -4605,9 +4605,9 @@ void game_command_modify_tile( * @param y y units, not tiles. * @param z Base height. */ -rct_tile_element* map_get_track_element_at(int32_t x, int32_t y, int32_t z) +TileElement* map_get_track_element_at(int32_t x, int32_t y, int32_t z) { - rct_tile_element* tileElement = map_get_first_element_at(x >> 5, y >> 5); + TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5); do { if (tileElement->GetType() != TILE_ELEMENT_TYPE_TRACK) @@ -4627,9 +4627,9 @@ rct_tile_element* map_get_track_element_at(int32_t x, int32_t y, int32_t z) * @param y y units, not tiles. * @param z Base height. */ -rct_tile_element* map_get_track_element_at_of_type(int32_t x, int32_t y, int32_t z, int32_t trackType) +TileElement* map_get_track_element_at_of_type(int32_t x, int32_t y, int32_t z, int32_t trackType) { - rct_tile_element* tileElement = map_get_first_element_at(x >> 5, y >> 5); + TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5); do { if (tileElement->GetType() != TILE_ELEMENT_TYPE_TRACK) @@ -4651,9 +4651,9 @@ rct_tile_element* map_get_track_element_at_of_type(int32_t x, int32_t y, int32_t * @param y y units, not tiles. * @param z Base height. */ -rct_tile_element* map_get_track_element_at_of_type_seq(int32_t x, int32_t y, int32_t z, int32_t trackType, int32_t sequence) +TileElement* map_get_track_element_at_of_type_seq(int32_t x, int32_t y, int32_t z, int32_t trackType, int32_t sequence) { - rct_tile_element* tileElement = map_get_first_element_at(x >> 5, y >> 5); + TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5); do { if (tileElement == nullptr) @@ -4679,10 +4679,9 @@ rct_tile_element* map_get_track_element_at_of_type_seq(int32_t x, int32_t y, int * @param y y units, not tiles. * @param z Base height. */ -rct_tile_element* map_get_track_element_at_of_type_from_ride( - int32_t x, int32_t y, int32_t z, int32_t trackType, int32_t rideIndex) +TileElement* map_get_track_element_at_of_type_from_ride(int32_t x, int32_t y, int32_t z, int32_t trackType, int32_t rideIndex) { - rct_tile_element* tileElement = map_get_first_element_at(x >> 5, y >> 5); + TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5); do { if (tileElement->GetType() != TILE_ELEMENT_TYPE_TRACK) @@ -4706,9 +4705,9 @@ rct_tile_element* map_get_track_element_at_of_type_from_ride( * @param y y units, not tiles. * @param z Base height. */ -rct_tile_element* map_get_track_element_at_from_ride(int32_t x, int32_t y, int32_t z, int32_t rideIndex) +TileElement* map_get_track_element_at_from_ride(int32_t x, int32_t y, int32_t z, int32_t rideIndex) { - rct_tile_element* tileElement = map_get_first_element_at(x >> 5, y >> 5); + TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5); do { if (tileElement->GetType() != TILE_ELEMENT_TYPE_TRACK) @@ -4731,10 +4730,10 @@ rct_tile_element* map_get_track_element_at_from_ride(int32_t x, int32_t y, int32 * @param z Base height. * @param direction The direction (0 - 3). */ -rct_tile_element* map_get_track_element_at_with_direction_from_ride( +TileElement* map_get_track_element_at_with_direction_from_ride( int32_t x, int32_t y, int32_t z, int32_t direction, int32_t rideIndex) { - rct_tile_element* tileElement = map_get_first_element_at(x >> 5, y >> 5); + TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5); do { if (tileElement->GetType() != TILE_ELEMENT_TYPE_TRACK) @@ -4775,9 +4774,9 @@ void map_offset_with_rotation(int16_t* x, int16_t* y, int16_t offsetX, int16_t o } } -rct_tile_element* map_get_wall_element_at(int32_t x, int32_t y, int32_t z, int32_t direction) +TileElement* map_get_wall_element_at(int32_t x, int32_t y, int32_t z, int32_t direction) { - rct_tile_element* tileElement = map_get_first_element_at(x >> 5, y >> 5); + TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5); do { if (tileElement->GetType() != TILE_ELEMENT_TYPE_WALL) @@ -4807,7 +4806,7 @@ uint32_t map_get_available_peep_spawn_index_list(uint32_t* peepSpawnIndexList) uint16_t check_max_allowable_land_rights_for_tile(uint8_t x, uint8_t y, uint8_t base_z) { - rct_tile_element* tileElement = map_get_first_element_at(x, y); + TileElement* tileElement = map_get_first_element_at(x, y); uint16_t destOwnership = OWNERSHIP_OWNED; // Sometimes done deliberately. @@ -4843,7 +4842,7 @@ void FixLandOwnershipTiles(std::initializer_list tiles) void FixLandOwnershipTilesWithOwnership(std::initializer_list tiles, uint8_t ownership) { - rct_tile_element* currentElement; + TileElement* currentElement; for (const TileCoordsXY* tile = tiles.begin(); tile != tiles.end(); ++tile) { currentElement = map_get_surface_element_at((*tile).x, (*tile).y); diff --git a/src/openrct2/world/Map.h b/src/openrct2/world/Map.h index 0e14b37244..63d50a0674 100644 --- a/src/openrct2/world/Map.h +++ b/src/openrct2/world/Map.h @@ -40,7 +40,7 @@ typedef CoordsXYZD PeepSpawn; struct CoordsXYE { int32_t x, y; - rct_tile_element* element; + TileElement* element; }; enum @@ -102,13 +102,13 @@ extern uint8_t gMapSelectArrowDirection; extern uint8_t gMapGroundFlags; -extern rct_tile_element gTileElements[MAX_TILE_TILE_ELEMENT_POINTERS * 3]; -extern rct_tile_element* gTileElementTilePointers[MAX_TILE_TILE_ELEMENT_POINTERS]; +extern TileElement gTileElements[MAX_TILE_TILE_ELEMENT_POINTERS * 3]; +extern TileElement* gTileElementTilePointers[MAX_TILE_TILE_ELEMENT_POINTERS]; extern LocationXY16 gMapSelectionTiles[300]; extern PeepSpawn gPeepSpawns[MAX_PEEP_SPAWNS]; -extern rct_tile_element* gNextFreeTileElement; +extern TileElement* gNextFreeTileElement; extern uint32_t gNextFreeTileElementPointerIndex; // Used in the land tool window to enable mountain tool / land smoothing @@ -131,16 +131,16 @@ void map_init(int32_t size); void map_count_remaining_land_rights(); void map_strip_ghost_flag_from_elements(); void map_update_tile_pointers(); -rct_tile_element* map_get_first_element_at(int32_t x, int32_t y); -rct_tile_element* map_get_nth_element_at(int32_t x, int32_t y, int32_t n); -void map_set_tile_elements(int32_t x, int32_t y, rct_tile_element* elements); +TileElement* map_get_first_element_at(int32_t x, int32_t y); +TileElement* map_get_nth_element_at(int32_t x, int32_t y, int32_t n); +void map_set_tile_elements(int32_t x, int32_t y, TileElement* elements); int32_t map_height_from_slope(CoordsXY coords, int32_t slope, bool isSloped); BannerElement* map_get_banner_element_at(int32_t x, int32_t y, int32_t z, uint8_t direction); -rct_tile_element* map_get_surface_element_at(int32_t x, int32_t y); -rct_tile_element* map_get_surface_element_at(CoordsXY coords); -rct_tile_element* map_get_path_element_at(int32_t x, int32_t y, int32_t z); -rct_tile_element* map_get_wall_element_at(int32_t x, int32_t y, int32_t z, int32_t direction); -rct_tile_element* map_get_small_scenery_element_at(int32_t x, int32_t y, int32_t z, int32_t type, uint8_t quadrant); +TileElement* map_get_surface_element_at(int32_t x, int32_t y); +TileElement* map_get_surface_element_at(CoordsXY coords); +TileElement* map_get_path_element_at(int32_t x, int32_t y, int32_t z); +TileElement* map_get_wall_element_at(int32_t x, int32_t y, int32_t z, int32_t direction); +TileElement* map_get_small_scenery_element_at(int32_t x, int32_t y, int32_t z, int32_t type, uint8_t quadrant); EntranceElement* map_get_park_entrance_element_at(int32_t x, int32_t y, int32_t z, bool ghost); EntranceElement* map_get_ride_entrance_element_at(int32_t x, int32_t y, int32_t z, bool ghost); EntranceElement* map_get_ride_exit_element_at(int32_t x, int32_t y, int32_t z, bool ghost); @@ -156,7 +156,7 @@ bool map_is_location_owned(int32_t x, int32_t y, int32_t z); bool map_is_location_in_park(CoordsXY coords); bool map_is_location_owned_or_has_rights(int32_t x, int32_t y); bool map_surface_is_blocked(int16_t x, int16_t y); -void tile_element_remove(rct_tile_element* tileElement); +void tile_element_remove(TileElement* tileElement); void map_remove_all_rides(); void map_invalidate_map_selection_tiles(); void map_get_bounding_box( @@ -164,12 +164,12 @@ void map_get_bounding_box( void map_invalidate_selection_rect(); void map_reorganise_elements(); bool map_check_free_elements_and_reorganise(int32_t num_elements); -rct_tile_element* tile_element_insert(int32_t x, int32_t y, int32_t z, int32_t flags); +TileElement* tile_element_insert(int32_t x, int32_t y, int32_t z, int32_t flags); -using CLEAR_FUNC = int32_t (*)(rct_tile_element** tile_element, int32_t x, int32_t y, uint8_t flags, money32* price); +using CLEAR_FUNC = int32_t (*)(TileElement** tile_element, int32_t x, int32_t y, uint8_t flags, money32* price); -int32_t map_place_non_scenery_clear_func(rct_tile_element** tile_element, int32_t x, int32_t y, uint8_t flags, money32* price); -int32_t map_place_scenery_clear_func(rct_tile_element** tile_element, int32_t x, int32_t y, uint8_t flags, money32* price); +int32_t map_place_non_scenery_clear_func(TileElement** tile_element, int32_t x, int32_t y, uint8_t flags, money32* price); +int32_t map_place_scenery_clear_func(TileElement** tile_element, int32_t x, int32_t y, uint8_t flags, money32* price); bool map_can_construct_with_clear_at( int32_t x, int32_t y, int32_t zLow, int32_t zHigh, CLEAR_FUNC clearFunc, uint8_t bl, uint8_t flags, money32* price, uint8_t crossingMode); @@ -233,7 +233,7 @@ struct tile_element_iterator { int32_t x; int32_t y; - rct_tile_element* element; + TileElement* element; }; #ifdef PLATFORM_32BIT assert_struct_size(tile_element_iterator, 12); @@ -247,7 +247,7 @@ void wall_remove_intersecting_walls(int32_t x, int32_t y, int32_t z0, int32_t z1 void map_update_tiles(); int32_t map_get_highest_z(int32_t tileX, int32_t tileY); -bool tile_element_wants_path_connection_towards(TileCoordsXYZD coords, const rct_tile_element* const elementToBeRemoved); +bool tile_element_wants_path_connection_towards(TileCoordsXYZD coords, const TileElement* const elementToBeRemoved); void map_remove_out_of_range_elements(); void map_extend_boundary_surface(); @@ -261,7 +261,7 @@ void map_invalidate_tile(int32_t x, int32_t y, int32_t z0, int32_t z1); void map_invalidate_tile_zoom1(int32_t x, int32_t y, int32_t z0, int32_t z1); void map_invalidate_tile_zoom0(int32_t x, int32_t y, int32_t z0, int32_t z1); void map_invalidate_tile_full(int32_t x, int32_t y); -void map_invalidate_element(int32_t x, int32_t y, rct_tile_element* tileElement); +void map_invalidate_element(int32_t x, int32_t y, TileElement* tileElement); void map_invalidate_region(const LocationXY16& mins, const LocationXY16& maxs); int32_t map_get_tile_side(int32_t mapX, int32_t mapY); @@ -269,25 +269,24 @@ int32_t map_get_tile_quadrant(int32_t mapX, int32_t mapY); void map_clear_all_elements(); -rct_tile_element* map_get_large_scenery_segment(int32_t x, int32_t y, int32_t z, int32_t direction, int32_t sequence); +TileElement* map_get_large_scenery_segment(int32_t x, int32_t y, int32_t z, int32_t direction, int32_t sequence); bool map_large_scenery_get_origin( int32_t x, int32_t y, int32_t z, int32_t direction, int32_t sequence, int32_t* outX, int32_t* outY, int32_t* outZ, - rct_tile_element** outElement); + TileElement** outElement); void map_offset_with_rotation(int16_t* x, int16_t* y, int16_t offsetX, int16_t offsetY, uint8_t rotation); CoordsXY translate_3d_to_2d_with_z(int32_t rotation, CoordsXYZ pos); -rct_tile_element* map_get_track_element_at(int32_t x, int32_t y, int32_t z); -rct_tile_element* map_get_track_element_at_of_type(int32_t x, int32_t y, int32_t z, int32_t trackType); -rct_tile_element* map_get_track_element_at_of_type_seq(int32_t x, int32_t y, int32_t z, int32_t trackType, int32_t sequence); -rct_tile_element* map_get_track_element_at_of_type_from_ride( - int32_t x, int32_t y, int32_t z, int32_t trackType, int32_t rideIndex); -rct_tile_element* map_get_track_element_at_from_ride(int32_t x, int32_t y, int32_t z, int32_t rideIndex); -rct_tile_element* map_get_track_element_at_with_direction_from_ride( +TileElement* map_get_track_element_at(int32_t x, int32_t y, int32_t z); +TileElement* map_get_track_element_at_of_type(int32_t x, int32_t y, int32_t z, int32_t trackType); +TileElement* map_get_track_element_at_of_type_seq(int32_t x, int32_t y, int32_t z, int32_t trackType, int32_t sequence); +TileElement* map_get_track_element_at_of_type_from_ride(int32_t x, int32_t y, int32_t z, int32_t trackType, int32_t rideIndex); +TileElement* map_get_track_element_at_from_ride(int32_t x, int32_t y, int32_t z, int32_t rideIndex); +TileElement* map_get_track_element_at_with_direction_from_ride( int32_t x, int32_t y, int32_t z, int32_t direction, int32_t rideIndex); bool map_is_location_at_edge(int32_t x, int32_t y); -void map_obstruction_set_error_text(rct_tile_element* tileElement); +void map_obstruction_set_error_text(TileElement* tileElement); uint32_t map_get_available_peep_spawn_index_list(uint32_t* peepSpawnIndexList); uint16_t check_max_allowable_land_rights_for_tile(uint8_t x, uint8_t y, uint8_t base_z); diff --git a/src/openrct2/world/MapAnimation.cpp b/src/openrct2/world/MapAnimation.cpp index 0a3a4294c3..8cd1c4557a 100644 --- a/src/openrct2/world/MapAnimation.cpp +++ b/src/openrct2/world/MapAnimation.cpp @@ -103,7 +103,7 @@ void map_animation_invalidate_all() */ static bool map_animation_invalidate_ride_entrance(int32_t x, int32_t y, int32_t baseZ) { - rct_tile_element* tileElement; + TileElement* tileElement; Ride* ride; const rct_ride_entrance_definition* entranceDefinition; @@ -134,7 +134,7 @@ static bool map_animation_invalidate_ride_entrance(int32_t x, int32_t y, int32_t */ static bool map_animation_invalidate_queue_banner(int32_t x, int32_t y, int32_t baseZ) { - rct_tile_element* tileElement; + TileElement* tileElement; tileElement = map_get_first_element_at(x >> 5, y >> 5); do @@ -166,7 +166,7 @@ static bool map_animation_invalidate_queue_banner(int32_t x, int32_t y, int32_t */ static bool map_animation_invalidate_small_scenery(int32_t x, int32_t y, int32_t baseZ) { - rct_tile_element* tileElement; + TileElement* tileElement; rct_scenery_entry* sceneryEntry; rct_sprite* sprite; rct_peep* peep; @@ -237,7 +237,7 @@ static bool map_animation_invalidate_small_scenery(int32_t x, int32_t y, int32_t */ static bool map_animation_invalidate_park_entrance(int32_t x, int32_t y, int32_t baseZ) { - rct_tile_element* tileElement; + TileElement* tileElement; tileElement = map_get_first_element_at(x >> 5, y >> 5); do @@ -265,7 +265,7 @@ static bool map_animation_invalidate_park_entrance(int32_t x, int32_t y, int32_t */ static bool map_animation_invalidate_track_waterfall(int32_t x, int32_t y, int32_t baseZ) { - rct_tile_element* tileElement; + TileElement* tileElement; tileElement = map_get_first_element_at(x >> 5, y >> 5); do @@ -292,7 +292,7 @@ static bool map_animation_invalidate_track_waterfall(int32_t x, int32_t y, int32 */ static bool map_animation_invalidate_track_rapids(int32_t x, int32_t y, int32_t baseZ) { - rct_tile_element* tileElement; + TileElement* tileElement; tileElement = map_get_first_element_at(x >> 5, y >> 5); do @@ -319,7 +319,7 @@ static bool map_animation_invalidate_track_rapids(int32_t x, int32_t y, int32_t */ static bool map_animation_invalidate_track_onridephoto(int32_t x, int32_t y, int32_t baseZ) { - rct_tile_element* tileElement; + TileElement* tileElement; tileElement = map_get_first_element_at(x >> 5, y >> 5); do @@ -359,7 +359,7 @@ static bool map_animation_invalidate_track_onridephoto(int32_t x, int32_t y, int */ static bool map_animation_invalidate_track_whirlpool(int32_t x, int32_t y, int32_t baseZ) { - rct_tile_element* tileElement; + TileElement* tileElement; tileElement = map_get_first_element_at(x >> 5, y >> 5); do @@ -386,7 +386,7 @@ static bool map_animation_invalidate_track_whirlpool(int32_t x, int32_t y, int32 */ static bool map_animation_invalidate_track_spinningtunnel(int32_t x, int32_t y, int32_t baseZ) { - rct_tile_element* tileElement; + TileElement* tileElement; tileElement = map_get_first_element_at(x >> 5, y >> 5); do @@ -423,7 +423,7 @@ static bool map_animation_invalidate_remove( */ static bool map_animation_invalidate_banner(int32_t x, int32_t y, int32_t baseZ) { - rct_tile_element* tileElement; + TileElement* tileElement; tileElement = map_get_first_element_at(x >> 5, y >> 5); do @@ -447,7 +447,7 @@ static bool map_animation_invalidate_banner(int32_t x, int32_t y, int32_t baseZ) */ static bool map_animation_invalidate_large_scenery(int32_t x, int32_t y, int32_t baseZ) { - rct_tile_element* tileElement; + TileElement* tileElement; rct_scenery_entry* sceneryEntry; bool wasInvalidated = false; @@ -477,7 +477,7 @@ static bool map_animation_invalidate_large_scenery(int32_t x, int32_t y, int32_t */ static bool map_animation_invalidate_wall_door(int32_t x, int32_t y, int32_t baseZ) { - rct_tile_element* tileElement; + TileElement* tileElement; rct_scenery_entry* sceneryEntry; if (gCurrentTicks & 1) @@ -540,7 +540,7 @@ static bool map_animation_invalidate_wall_door(int32_t x, int32_t y, int32_t bas */ static bool map_animation_invalidate_wall(int32_t x, int32_t y, int32_t baseZ) { - rct_tile_element* tileElement; + TileElement* tileElement; rct_scenery_entry* sceneryEntry; bool wasInvalidated = false; diff --git a/src/openrct2/world/MapGen.cpp b/src/openrct2/world/MapGen.cpp index 0aec0eb7a2..79352cfe58 100644 --- a/src/openrct2/world/MapGen.cpp +++ b/src/openrct2/world/MapGen.cpp @@ -111,7 +111,7 @@ static void set_height(int32_t x, int32_t y, int32_t height) void mapgen_generate_blank(mapgen_settings* settings) { int32_t x, y; - rct_tile_element* tileElement; + TileElement* tileElement; map_clear_all_elements(); @@ -134,7 +134,7 @@ void mapgen_generate_blank(mapgen_settings* settings) void mapgen_generate(mapgen_settings* settings) { int32_t x, y, mapSize, floorTexture, wallTexture, waterLevel; - rct_tile_element* tileElement; + TileElement* tileElement; util_srand((int32_t)platform_get_ticks()); @@ -234,7 +234,7 @@ void mapgen_generate(mapgen_settings* settings) static void mapgen_place_tree(int32_t type, int32_t x, int32_t y) { int32_t surfaceZ; - rct_tile_element* tileElement; + TileElement* tileElement; rct_scenery_entry* sceneryEntry = get_small_scenery_entry(type); if (sceneryEntry == nullptr) { @@ -314,7 +314,7 @@ static void mapgen_place_trees() { for (int32_t x = 1; x < gMapSize - 1; x++) { - rct_tile_element* tileElement = map_get_surface_element_at(x, y); + TileElement* tileElement = map_get_surface_element_at(x, y); // Exclude water tiles if (tileElement->AsSurface()->GetWaterHeight() > 0) @@ -348,7 +348,7 @@ static void mapgen_place_trees() pos = availablePositions[i]; int32_t type = -1; - rct_tile_element* tileElement = map_get_surface_element_at(pos.x, pos.y); + TileElement* tileElement = map_get_surface_element_at(pos.x, pos.y); switch (tileElement->AsSurface()->GetSurfaceStyle()) { case TERRAIN_GRASS: @@ -389,7 +389,7 @@ static void mapgen_place_trees() static void mapgen_set_water_level(int32_t waterLevel) { int32_t x, y, mapSize; - rct_tile_element* tileElement; + TileElement* tileElement; mapSize = gMapSize; @@ -443,7 +443,7 @@ static void mapgen_smooth_height(int32_t iterations) static void mapgen_set_height() { int32_t x, y, heightX, heightY, mapSize; - rct_tile_element* tileElement; + TileElement* tileElement; mapSize = _heightSize / 2; for (y = 1; y < mapSize - 1; y++) @@ -819,7 +819,7 @@ void mapgen_generate_from_heightmap(mapgen_settings* settings) for (uint32_t x = 0; x < _heightMapData.width; x++) { // The x and y axis are flipped in the world, so this uses y for x and x for y. - rct_tile_element* const surfaceElement = map_get_surface_element_at(y + 1, x + 1); + TileElement* const surfaceElement = map_get_surface_element_at(y + 1, x + 1); // Read value from bitmap, and convert its range uint8_t value = dest[x + y * _heightMapData.width]; diff --git a/src/openrct2/world/MapHelpers.cpp b/src/openrct2/world/MapHelpers.cpp index e18bba58f7..dd49bb6fe9 100644 --- a/src/openrct2/world/MapHelpers.cpp +++ b/src/openrct2/world/MapHelpers.cpp @@ -21,7 +21,7 @@ int32_t map_smooth(int32_t l, int32_t t, int32_t r, int32_t b) { int32_t i, x, y, count, doubleCorner, raisedLand = 0; uint8_t highest, cornerHeights[4]; - rct_tile_element *tileElement, *tileElement2; + TileElement *tileElement, *tileElement2; for (y = t; y < b; y++) { for (x = l; x < r; x++) @@ -201,7 +201,7 @@ int32_t map_smooth(int32_t l, int32_t t, int32_t r, int32_t b) */ int32_t tile_smooth(int32_t x, int32_t y) { - rct_tile_element* const surfaceElement = map_get_surface_element_at(x, y); + TileElement* const surfaceElement = map_get_surface_element_at(x, y); // +-----+-----+-----+ // | W | NW | N | @@ -240,7 +240,7 @@ int32_t tile_smooth(int32_t x, int32_t y) continue; // Get neighbour height. If the element is not valid (outside of map) assume the same height - rct_tile_element* neighbour_element = map_get_surface_element_at(x + x_offset, y + y_offset); + TileElement* neighbour_element = map_get_surface_element_at(x + x_offset, y + y_offset); neighbourHeightOffset.baseheight[index] = neighbour_element ? neighbour_element->base_height : surfaceElement->base_height; diff --git a/src/openrct2/world/Park.cpp b/src/openrct2/world/Park.cpp index 04fbf2a68a..e5423de6ff 100644 --- a/src/openrct2/world/Park.cpp +++ b/src/openrct2/world/Park.cpp @@ -169,7 +169,7 @@ void update_park_fences(const CoordsXY coords) if (map_is_edge(coords)) return; - rct_tile_element* surfaceElement = map_get_surface_element_at(coords); + TileElement* surfaceElement = map_get_surface_element_at(coords); if (surfaceElement == nullptr) return; @@ -178,7 +178,7 @@ void update_park_fences(const CoordsXY coords) { bool fenceRequired = true; - rct_tile_element* tileElement = map_get_first_element_at(coords.x / 32, coords.y / 32); + TileElement* tileElement = map_get_first_element_at(coords.x / 32, coords.y / 32); // If an entrance element do not place flags around surface do { @@ -355,7 +355,7 @@ static money32 map_buy_land_rights_for_tile(int32_t x, int32_t y, int32_t settin return 0; } - rct_tile_element* tileElement = map_get_first_element_at(x / 32, y / 32); + TileElement* tileElement = map_get_first_element_at(x / 32, y / 32); do { if (tileElement->GetType() == TILE_ELEMENT_TYPE_ENTRANCE diff --git a/src/openrct2/world/Scenery.cpp b/src/openrct2/world/Scenery.cpp index 2fa66c9a91..bd02acefd6 100644 --- a/src/openrct2/world/Scenery.cpp +++ b/src/openrct2/world/Scenery.cpp @@ -37,7 +37,7 @@ colour_t gWindowScenerySecondaryColour; colour_t gWindowSceneryTertiaryColour; bool gWindowSceneryEyedropperEnabled; -rct_tile_element* gSceneryTileElement; +TileElement* gSceneryTileElement; uint8_t gSceneryQuadrant; money32 gSceneryPlaceCost; @@ -69,7 +69,7 @@ const LocationXY8 ScenerySubTileOffsets[] = { { 7, 7 }, { 7, 23 }, { 23, 23 }, { void scenery_update_tile(int32_t x, int32_t y) { - rct_tile_element* tileElement; + TileElement* tileElement; tileElement = map_get_first_element_at(x >> 5, y >> 5); do @@ -111,9 +111,9 @@ void scenery_update_tile(int32_t x, int32_t y) * * rct2: 0x006E33D9 */ -void scenery_update_age(int32_t x, int32_t y, rct_tile_element* tileElement) +void scenery_update_age(int32_t x, int32_t y, TileElement* tileElement) { - rct_tile_element* tileElementAbove; + TileElement* tileElementAbove; rct_scenery_entry* sceneryEntry; sceneryEntry = tileElement->AsSmallScenery()->GetEntry(); @@ -193,7 +193,7 @@ void scenery_remove_ghost_tool_placement() if (gSceneryGhostType & SCENERY_ENTRY_FLAG_1) { gSceneryGhostType &= ~SCENERY_ENTRY_FLAG_1; - rct_tile_element* tileElement = map_get_first_element_at(x / 32, y / 32); + TileElement* tileElement = map_get_first_element_at(x / 32, y / 32); do { diff --git a/src/openrct2/world/Scenery.h b/src/openrct2/world/Scenery.h index e8157ded05..5ff14fdb36 100644 --- a/src/openrct2/world/Scenery.h +++ b/src/openrct2/world/Scenery.h @@ -265,7 +265,7 @@ extern colour_t gWindowScenerySecondaryColour; extern colour_t gWindowSceneryTertiaryColour; extern bool gWindowSceneryEyedropperEnabled; -extern rct_tile_element* gSceneryTileElement; +extern TileElement* gSceneryTileElement; extern uint8_t gSceneryQuadrant; extern money32 gSceneryPlaceCost; @@ -296,7 +296,7 @@ extern money32 gClearSceneryCost; void init_scenery(); void scenery_update_tile(int32_t x, int32_t y); -void scenery_update_age(int32_t x, int32_t y, rct_tile_element* tileElement); +void scenery_update_age(int32_t x, int32_t y, TileElement* tileElement); void scenery_set_default_placement_configuration(); void scenery_remove_ghost_tool_placement(); diff --git a/src/openrct2/world/SmallScenery.cpp b/src/openrct2/world/SmallScenery.cpp index 526804ce8a..d58a8bd8f4 100644 --- a/src/openrct2/world/SmallScenery.cpp +++ b/src/openrct2/world/SmallScenery.cpp @@ -71,7 +71,7 @@ static money32 SmallSceneryRemove( } bool sceneryFound = false; - rct_tile_element* tileElement = map_get_first_element_at(x / 32, y / 32); + TileElement* tileElement = map_get_first_element_at(x / 32, y / 32); do { if (tileElement->GetType() != TILE_ELEMENT_TYPE_SMALL_SCENERY) @@ -130,7 +130,7 @@ static money32 SmallScenerySetColour( } } - rct_tile_element* tileElement = map_get_small_scenery_element_at(x, y, baseHeight, sceneryType, quadrant); + TileElement* tileElement = map_get_small_scenery_element_at(x, y, baseHeight, sceneryType, quadrant); if (tileElement == nullptr) { @@ -258,7 +258,7 @@ static money32 SmallSceneryPlace( } } - rct_tile_element* surfaceElement = map_get_surface_element_at({ x, y }); + TileElement* surfaceElement = map_get_surface_element_at({ x, y }); if (surfaceElement != nullptr && !gCheatsDisableClearanceChecks && surfaceElement->AsSurface()->GetWaterHeight() > 0) { @@ -379,7 +379,7 @@ static money32 SmallSceneryPlace( network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord); } - rct_tile_element* newElement = tile_element_insert(x / 32, y / 32, zLow, collisionQuadrants); + TileElement* newElement = tile_element_insert(x / 32, y / 32, zLow, collisionQuadrants); assert(newElement != nullptr); gSceneryTileElement = newElement; newElement->SetType(TILE_ELEMENT_TYPE_SMALL_SCENERY); @@ -439,7 +439,7 @@ void game_command_set_scenery_colour( * * rct2: 0x006E0D6E, 0x006B8D88 */ -int32_t map_place_scenery_clear_func(rct_tile_element** tile_element, int32_t x, int32_t y, uint8_t flags, money32* price) +int32_t map_place_scenery_clear_func(TileElement** tile_element, int32_t x, int32_t y, uint8_t flags, money32* price) { if ((*tile_element)->GetType() != TILE_ELEMENT_TYPE_SMALL_SCENERY) return 1; @@ -476,7 +476,7 @@ int32_t map_place_scenery_clear_func(rct_tile_element** tile_element, int32_t x, * * rct2: 0x006C5A4F, 0x006CDE57, 0x006A6733, 0x0066637E */ -int32_t map_place_non_scenery_clear_func(rct_tile_element** tile_element, int32_t x, int32_t y, uint8_t flags, money32* price) +int32_t map_place_non_scenery_clear_func(TileElement** tile_element, int32_t x, int32_t y, uint8_t flags, money32* price) { if ((*tile_element)->GetType() != TILE_ELEMENT_TYPE_SMALL_SCENERY) return 1; diff --git a/src/openrct2/world/Sprite.cpp b/src/openrct2/world/Sprite.cpp index 5531ad559f..ff331a85d6 100644 --- a/src/openrct2/world/Sprite.cpp +++ b/src/openrct2/world/Sprite.cpp @@ -681,7 +681,7 @@ void sprite_remove(rct_sprite* sprite) static bool litter_can_be_at(int32_t x, int32_t y, int32_t z) { - rct_tile_element* tileElement; + TileElement* tileElement; if (!map_is_location_owned(x & 0xFFE0, y & 0xFFE0, z)) return false; diff --git a/src/openrct2/world/Surface.cpp b/src/openrct2/world/Surface.cpp index a2afe87f29..01ef70ed09 100644 --- a/src/openrct2/world/Surface.cpp +++ b/src/openrct2/world/Surface.cpp @@ -132,7 +132,7 @@ void SurfaceElement::UpdateGrassLength(CoordsXY coords) z1 += 2; // Check objects above grass - rct_tile_element* tileElementAbove = (rct_tile_element*)this; + TileElement* tileElementAbove = (TileElement*)this; for (;;) { if (tileElementAbove->flags & TILE_ELEMENT_FLAG_LAST_TILE) diff --git a/src/openrct2/world/Surface.h b/src/openrct2/world/Surface.h index 8e030517ac..21b601f9bd 100644 --- a/src/openrct2/world/Surface.h +++ b/src/openrct2/world/Surface.h @@ -103,14 +103,13 @@ enum }; // Surface -#define TILE_ELEMENT_SURFACE_DIAGONAL_FLAG 0x10 // in rct_tile_element.properties.surface.slope -#define TILE_ELEMENT_SURFACE_RAISED_CORNERS_MASK 0x0F // in rct_tile_element.properties.surface.slope +#define TILE_ELEMENT_SURFACE_DIAGONAL_FLAG 0x10 // in TileElement.properties.surface.slope +#define TILE_ELEMENT_SURFACE_RAISED_CORNERS_MASK 0x0F // in TileElement.properties.surface.slope #define TILE_ELEMENT_SURFACE_SLOPE_MASK \ - (TILE_ELEMENT_SURFACE_DIAGONAL_FLAG \ - | TILE_ELEMENT_SURFACE_RAISED_CORNERS_MASK) // in rct_tile_element.properties.surface.slope -#define TILE_ELEMENT_SURFACE_EDGE_STYLE_MASK 0xE0 // in rct_tile_element.properties.surface.slope -#define TILE_ELEMENT_SURFACE_WATER_HEIGHT_MASK 0x1F // in rct_tile_element.properties.surface.terrain -#define TILE_ELEMENT_SURFACE_TERRAIN_MASK 0xE0 // in rct_tile_element.properties.surface.terrain + (TILE_ELEMENT_SURFACE_DIAGONAL_FLAG | TILE_ELEMENT_SURFACE_RAISED_CORNERS_MASK) // in TileElement.properties.surface.slope +#define TILE_ELEMENT_SURFACE_EDGE_STYLE_MASK 0xE0 // in TileElement.properties.surface.slope +#define TILE_ELEMENT_SURFACE_WATER_HEIGHT_MASK 0x1F // in TileElement.properties.surface.terrain +#define TILE_ELEMENT_SURFACE_TERRAIN_MASK 0xE0 // in TileElement.properties.surface.terrain #define TILE_ELEMENT_SURFACE_OWNERSHIP_MASK 0xF0 #define TILE_ELEMENT_SURFACE_PARK_FENCE_MASK 0x0F diff --git a/src/openrct2/world/TileElement.cpp b/src/openrct2/world/TileElement.cpp index ee1ee74b7c..d70b977523 100644 --- a/src/openrct2/world/TileElement.cpp +++ b/src/openrct2/world/TileElement.cpp @@ -54,7 +54,7 @@ bool TileElementBase::IsGhost() const return (this->flags & TILE_ELEMENT_FLAG_GHOST) != 0; } -bool tile_element_is_underground(rct_tile_element* tileElement) +bool tile_element_is_underground(TileElement* tileElement) { do { @@ -65,7 +65,7 @@ bool tile_element_is_underground(rct_tile_element* tileElement) return true; } -BannerIndex tile_element_get_banner_index(rct_tile_element* tileElement) +BannerIndex tile_element_get_banner_index(TileElement* tileElement) { rct_scenery_entry* sceneryEntry; @@ -90,7 +90,7 @@ BannerIndex tile_element_get_banner_index(rct_tile_element* tileElement) } } -void tile_element_set_banner_index(rct_tile_element* tileElement, BannerIndex bannerIndex) +void tile_element_set_banner_index(TileElement* tileElement, BannerIndex bannerIndex) { switch (tileElement->GetType()) { @@ -109,7 +109,7 @@ void tile_element_set_banner_index(rct_tile_element* tileElement, BannerIndex ba } } -void tile_element_remove_banner_entry(rct_tile_element* tileElement) +void tile_element_remove_banner_entry(TileElement* tileElement) { BannerIndex bannerIndex = tile_element_get_banner_index(tileElement); if (bannerIndex == BANNER_INDEX_NULL) @@ -125,7 +125,7 @@ void tile_element_remove_banner_entry(rct_tile_element* tileElement) } } -uint8_t tile_element_get_ride_index(const rct_tile_element* tileElement) +uint8_t tile_element_get_ride_index(const TileElement* tileElement) { switch (tileElement->GetType()) { @@ -140,7 +140,7 @@ uint8_t tile_element_get_ride_index(const rct_tile_element* tileElement) } } -void rct_tile_element::ClearAs(uint8_t newType) +void TileElement::ClearAs(uint8_t newType) { type = newType; flags = 0; @@ -151,5 +151,5 @@ void rct_tile_element::ClearAs(uint8_t newType) void TileElementBase::Remove() { - tile_element_remove((rct_tile_element*)this); + tile_element_remove((TileElement*)this); } diff --git a/src/openrct2/world/TileElement.h b/src/openrct2/world/TileElement.h index 4d91053cb9..c6dfdcf1c9 100644 --- a/src/openrct2/world/TileElement.h +++ b/src/openrct2/world/TileElement.h @@ -76,7 +76,7 @@ struct TileElementBase * Map element structure * size: 0x08 */ -struct rct_tile_element : public TileElementBase +struct TileElement : public TileElementBase { uint8_t pad_04[4]; @@ -125,7 +125,7 @@ public: void ClearAs(uint8_t newType); }; -assert_struct_size(rct_tile_element, 8); +assert_struct_size(TileElement, 8); struct SurfaceElement : TileElementBase { @@ -511,11 +511,11 @@ enum #define MAP_ELEM_TRACK_SEQUENCE_SEQUENCE_MASK 0b00001111 #define MAP_ELEM_TRACK_SEQUENCE_TAKING_PHOTO_MASK 0b11110000 -BannerIndex tile_element_get_banner_index(rct_tile_element* tileElement); -bool tile_element_is_underground(rct_tile_element* tileElement); +BannerIndex tile_element_get_banner_index(TileElement* tileElement); +bool tile_element_is_underground(TileElement* tileElement); // ~Oli414: The banner functions should probably be part of banner. -void tile_element_set_banner_index(rct_tile_element* tileElement, BannerIndex bannerIndex); -void tile_element_remove_banner_entry(rct_tile_element* tileElement); +void tile_element_set_banner_index(TileElement* tileElement, BannerIndex bannerIndex); +void tile_element_remove_banner_entry(TileElement* tileElement); -uint8_t tile_element_get_ride_index(const rct_tile_element* tileElement); +uint8_t tile_element_get_ride_index(const TileElement* tileElement); diff --git a/src/openrct2/world/TileInspector.cpp b/src/openrct2/world/TileInspector.cpp index e630252f3a..1865257973 100644 --- a/src/openrct2/world/TileInspector.cpp +++ b/src/openrct2/world/TileInspector.cpp @@ -36,8 +36,8 @@ int32_t windowTileInspectorSelectedIndex; static bool map_swap_elements_at(int32_t x, int32_t y, int16_t first, int16_t second) { - rct_tile_element* const firstElement = map_get_nth_element_at(x, y, first); - rct_tile_element* const secondElement = map_get_nth_element_at(x, y, second); + TileElement* const firstElement = map_get_nth_element_at(x, y, first); + TileElement* const secondElement = map_get_nth_element_at(x, y, second); if (firstElement == nullptr) { @@ -56,7 +56,7 @@ static bool map_swap_elements_at(int32_t x, int32_t y, int16_t first, int16_t se } // Swap their memory - rct_tile_element temp = *firstElement; + TileElement temp = *firstElement; *firstElement = *secondElement; *secondElement = temp; @@ -86,7 +86,7 @@ int32_t tile_inspector_insert_corrupt_at(int32_t x, int32_t y, int16_t elementIn if (flags & GAME_COMMAND_FLAG_APPLY) { // Create new corrupt element - rct_tile_element* corruptElement = tile_element_insert(x, y, -1, 0); // Ugly hack: -1 guarantees this to be placed first + TileElement* corruptElement = tile_element_insert(x, y, -1, 0); // Ugly hack: -1 guarantees this to be placed first if (corruptElement == nullptr) { log_warning("Failed to insert corrupt element."); @@ -95,7 +95,7 @@ int32_t tile_inspector_insert_corrupt_at(int32_t x, int32_t y, int16_t elementIn corruptElement->SetType(TILE_ELEMENT_TYPE_CORRUPT); // Set the base height to be the same as the selected element - rct_tile_element* const selectedElement = map_get_nth_element_at(x, y, elementIndex + 1); + TileElement* const selectedElement = map_get_nth_element_at(x, y, elementIndex + 1); if (!selectedElement) { return MONEY32_UNDEFINED; @@ -149,7 +149,7 @@ int32_t tile_inspector_remove_element_at(int32_t x, int32_t y, int16_t elementIn if (flags & GAME_COMMAND_FLAG_APPLY) { // Forcefully remove the element - rct_tile_element* const tileElement = map_get_nth_element_at(x, y, elementIndex); + TileElement* const tileElement = map_get_nth_element_at(x, y, elementIndex); if (!tileElement) { return MONEY32_UNDEFINED; @@ -214,7 +214,7 @@ int32_t tile_inspector_rotate_element_at(int32_t x, int32_t y, int32_t elementIn { uint8_t newRotation, pathEdges, pathCorners; - rct_tile_element* const tileElement = map_get_nth_element_at(x, y, elementIndex); + TileElement* const tileElement = map_get_nth_element_at(x, y, elementIndex); if (!tileElement) { return MONEY32_UNDEFINED; @@ -284,7 +284,7 @@ int32_t tile_inspector_rotate_element_at(int32_t x, int32_t y, int32_t elementIn return 0; } -int32_t tile_inspector_paste_element_at(int32_t x, int32_t y, rct_tile_element element, int32_t flags) +int32_t tile_inspector_paste_element_at(int32_t x, int32_t y, TileElement element, int32_t flags) { // Make sure there is enough space for the new element if (!map_check_free_elements_and_reorganise(1)) @@ -327,7 +327,7 @@ int32_t tile_inspector_paste_element_at(int32_t x, int32_t y, rct_tile_element e } } - rct_tile_element* const pastedElement = tile_element_insert(x, y, element.base_height, 0); + TileElement* const pastedElement = tile_element_insert(x, y, element.base_height, 0); bool lastForTile = pastedElement->IsLastForTile(); *pastedElement = element; @@ -363,11 +363,11 @@ int32_t tile_inspector_sort_elements_at(int32_t x, int32_t y, int32_t flags) { if (flags & GAME_COMMAND_FLAG_APPLY) { - const rct_tile_element* const firstElement = map_get_first_element_at(x, y); + const TileElement* const firstElement = map_get_first_element_at(x, y); // Count elements on tile int32_t numElement = 0; - const rct_tile_element* elementIterator = firstElement; + const TileElement* elementIterator = firstElement; do { numElement++; @@ -377,8 +377,8 @@ int32_t tile_inspector_sort_elements_at(int32_t x, int32_t y, int32_t flags) for (int32_t loopStart = 1; loopStart < numElement; loopStart++) { int32_t currentId = loopStart; - const rct_tile_element* currentElement = firstElement + currentId; - const rct_tile_element* otherElement = currentElement - 1; + const TileElement* currentElement = firstElement + currentId; + const TileElement* otherElement = currentElement - 1; // While current element's base height is lower, or (when their baseheight is the same) the other map element's // clearance height is lower... @@ -418,7 +418,7 @@ int32_t tile_inspector_sort_elements_at(int32_t x, int32_t y, int32_t flags) int32_t tile_inspector_any_base_height_offset(int32_t x, int32_t y, int16_t elementIndex, int8_t heightOffset, int32_t flags) { - rct_tile_element* const tileElement = map_get_nth_element_at(x, y, elementIndex); + TileElement* const tileElement = map_get_nth_element_at(x, y, elementIndex); if (tileElement == nullptr) return MONEY32_UNDEFINED; @@ -470,7 +470,7 @@ int32_t tile_inspector_any_base_height_offset(int32_t x, int32_t y, int16_t elem int32_t tile_inspector_surface_show_park_fences(int32_t x, int32_t y, bool showFences, int32_t flags) { - rct_tile_element* const surfaceelement = map_get_surface_element_at(x, y); + TileElement* const surfaceelement = map_get_surface_element_at(x, y); // No surface element on tile if (surfaceelement == nullptr) @@ -498,7 +498,7 @@ int32_t tile_inspector_surface_show_park_fences(int32_t x, int32_t y, bool showF int32_t tile_inspector_surface_toggle_corner(int32_t x, int32_t y, int32_t cornerIndex, int32_t flags) { - rct_tile_element* const surfaceElement = map_get_surface_element_at(x, y); + TileElement* const surfaceElement = map_get_surface_element_at(x, y); // No surface element on tile if (surfaceElement == nullptr) @@ -565,7 +565,7 @@ int32_t tile_inspector_surface_toggle_corner(int32_t x, int32_t y, int32_t corne int32_t tile_inspector_surface_toggle_diagonal(int32_t x, int32_t y, int32_t flags) { - rct_tile_element* const surfaceElement = map_get_surface_element_at(x, y); + TileElement* const surfaceElement = map_get_surface_element_at(x, y); // No surface element on tile if (surfaceElement == nullptr) @@ -603,7 +603,7 @@ int32_t tile_inspector_surface_toggle_diagonal(int32_t x, int32_t y, int32_t fla int32_t tile_inspector_path_set_sloped(int32_t x, int32_t y, int32_t elementIndex, bool sloped, int32_t flags) { - rct_tile_element* const pathElement = map_get_nth_element_at(x, y, elementIndex); + TileElement* const pathElement = map_get_nth_element_at(x, y, elementIndex); if (pathElement == nullptr || pathElement->GetType() != TILE_ELEMENT_TYPE_PATH) return MONEY32_UNDEFINED; @@ -627,7 +627,7 @@ int32_t tile_inspector_path_set_sloped(int32_t x, int32_t y, int32_t elementInde int32_t tile_inspector_path_toggle_edge(int32_t x, int32_t y, int32_t elementIndex, int32_t edgeIndex, int32_t flags) { - rct_tile_element* const pathElement = map_get_nth_element_at(x, y, elementIndex); + TileElement* const pathElement = map_get_nth_element_at(x, y, elementIndex); if (pathElement == nullptr || pathElement->GetType() != TILE_ELEMENT_TYPE_PATH) return MONEY32_UNDEFINED; @@ -652,7 +652,7 @@ int32_t tile_inspector_path_toggle_edge(int32_t x, int32_t y, int32_t elementInd int32_t tile_inspector_entrance_make_usable(int32_t x, int32_t y, int32_t elementIndex, int32_t flags) { - rct_tile_element* const entranceElement = map_get_nth_element_at(x, y, elementIndex); + TileElement* const entranceElement = map_get_nth_element_at(x, y, elementIndex); if (entranceElement == nullptr || entranceElement->GetType() != TILE_ELEMENT_TYPE_ENTRANCE) return MONEY32_UNDEFINED; @@ -691,7 +691,7 @@ int32_t tile_inspector_entrance_make_usable(int32_t x, int32_t y, int32_t elemen int32_t tile_inspector_wall_set_slope(int32_t x, int32_t y, int32_t elementIndex, int32_t slopeValue, int32_t flags) { - rct_tile_element* const wallElement = map_get_nth_element_at(x, y, elementIndex); + TileElement* const wallElement = map_get_nth_element_at(x, y, elementIndex); if (wallElement == nullptr || wallElement->GetType() != TILE_ELEMENT_TYPE_WALL) return MONEY32_UNDEFINED; @@ -718,7 +718,7 @@ int32_t tile_inspector_wall_set_slope(int32_t x, int32_t y, int32_t elementIndex // Broxzier: Copied from track_remove and stripped of unneeded code, but I think this should be smaller int32_t tile_inspector_track_base_height_offset(int32_t x, int32_t y, int32_t elementIndex, int8_t offset, int32_t flags) { - rct_tile_element* const trackElement = map_get_nth_element_at(x, y, elementIndex); + TileElement* const trackElement = map_get_nth_element_at(x, y, elementIndex); if (offset == 0) return 0; @@ -791,7 +791,7 @@ int32_t tile_inspector_track_base_height_offset(int32_t x, int32_t y, int32_t el map_invalidate_tile_full(elemX, elemY); bool found = false; - rct_tile_element* tileElement = map_get_first_element_at(elemX >> 5, elemY >> 5); + TileElement* tileElement = map_get_first_element_at(elemX >> 5, elemY >> 5); do { if (tileElement->base_height != elemZ / 8) @@ -843,7 +843,7 @@ int32_t tile_inspector_track_base_height_offset(int32_t x, int32_t y, int32_t el int32_t tile_inspector_track_set_chain( int32_t x, int32_t y, int32_t elementIndex, bool entireTrackBlock, bool setChain, int32_t flags) { - rct_tile_element* const trackElement = map_get_nth_element_at(x, y, elementIndex); + TileElement* const trackElement = map_get_nth_element_at(x, y, elementIndex); if (trackElement == nullptr || trackElement->GetType() != TILE_ELEMENT_TYPE_TRACK) return MONEY32_UNDEFINED; @@ -924,7 +924,7 @@ int32_t tile_inspector_track_set_chain( map_invalidate_tile_full(elemX, elemY); bool found = false; - rct_tile_element* tileElement = map_get_first_element_at(elemX >> 5, elemY >> 5); + TileElement* tileElement = map_get_first_element_at(elemX >> 5, elemY >> 5); do { if (tileElement->base_height != elemZ / 8) @@ -976,7 +976,7 @@ int32_t tile_inspector_track_set_chain( int32_t tile_inspector_scenery_set_quarter_location( int32_t x, int32_t y, int32_t elementIndex, int32_t quarterIndex, int32_t flags) { - rct_tile_element* const tileElement = map_get_nth_element_at(x, y, elementIndex); + TileElement* const tileElement = map_get_nth_element_at(x, y, elementIndex); if (tileElement == nullptr || tileElement->GetType() != TILE_ELEMENT_TYPE_SMALL_SCENERY) return MONEY32_UNDEFINED; @@ -1003,7 +1003,7 @@ int32_t tile_inspector_scenery_set_quarter_location( int32_t tile_inspector_scenery_set_quarter_collision( int32_t x, int32_t y, int32_t elementIndex, int32_t quarterIndex, int32_t flags) { - rct_tile_element* const tileElement = map_get_nth_element_at(x, y, elementIndex); + TileElement* const tileElement = map_get_nth_element_at(x, y, elementIndex); if (tileElement == nullptr || tileElement->GetType() != TILE_ELEMENT_TYPE_SMALL_SCENERY) return MONEY32_UNDEFINED; @@ -1024,7 +1024,7 @@ int32_t tile_inspector_scenery_set_quarter_collision( int32_t tile_inspector_banner_toggle_blocking_edge(int32_t x, int32_t y, int32_t elementIndex, int32_t edgeIndex, int32_t flags) { - rct_tile_element* const bannerElement = map_get_nth_element_at(x, y, elementIndex); + TileElement* const bannerElement = map_get_nth_element_at(x, y, elementIndex); if (bannerElement == nullptr || bannerElement->GetType() != TILE_ELEMENT_TYPE_BANNER) return MONEY32_UNDEFINED; @@ -1046,7 +1046,7 @@ int32_t tile_inspector_banner_toggle_blocking_edge(int32_t x, int32_t y, int32_t int32_t tile_inspector_corrupt_clamp(int32_t x, int32_t y, int32_t elementIndex, int32_t flags) { - rct_tile_element* const corruptElement = map_get_nth_element_at(x, y, elementIndex); + TileElement* const corruptElement = map_get_nth_element_at(x, y, elementIndex); if (corruptElement == nullptr || corruptElement->GetType() != TILE_ELEMENT_TYPE_CORRUPT) return MONEY32_UNDEFINED; @@ -1056,7 +1056,7 @@ int32_t tile_inspector_corrupt_clamp(int32_t x, int32_t y, int32_t elementIndex, if (flags & GAME_COMMAND_FLAG_APPLY) { - rct_tile_element* const nextElement = corruptElement + 1; + TileElement* const nextElement = corruptElement + 1; corruptElement->base_height = corruptElement->clearance_height = nextElement->base_height; if ((uint32_t)x == windowTileInspectorTileX && (uint32_t)y == windowTileInspectorTileY) diff --git a/src/openrct2/world/TileInspector.h b/src/openrct2/world/TileInspector.h index 63aed0a870..426a7617fe 100644 --- a/src/openrct2/world/TileInspector.h +++ b/src/openrct2/world/TileInspector.h @@ -54,7 +54,7 @@ int32_t tile_inspector_insert_corrupt_at(int32_t x, int32_t y, int16_t elementIn int32_t tile_inspector_remove_element_at(int32_t x, int32_t y, int16_t elementIndex, int32_t flags); int32_t tile_inspector_swap_elements_at(int32_t x, int32_t y, int16_t first, int16_t second, int32_t flags); int32_t tile_inspector_rotate_element_at(int32_t x, int32_t y, int32_t elementIndex, int32_t flags); -int32_t tile_inspector_paste_element_at(int32_t x, int32_t y, rct_tile_element element, int32_t flags); +int32_t tile_inspector_paste_element_at(int32_t x, int32_t y, TileElement element, int32_t flags); int32_t tile_inspector_sort_elements_at(int32_t x, int32_t y, int32_t flags); int32_t tile_inspector_any_base_height_offset(int32_t x, int32_t y, int16_t elementIndex, int8_t heightOffset, int32_t flags); int32_t tile_inspector_surface_show_park_fences(int32_t x, int32_t y, bool enabled, int32_t flags); diff --git a/src/openrct2/world/Wall.cpp b/src/openrct2/world/Wall.cpp index bab1de7cb2..28f7e9bead 100644 --- a/src/openrct2/world/Wall.cpp +++ b/src/openrct2/world/Wall.cpp @@ -60,7 +60,7 @@ static bool TrackIsAllowedWallEdges(uint8_t rideType, uint8_t trackType, uint8_t * rct2: 0x006E5CBA */ static bool WallCheckObstructionWithTrack( - rct_scenery_entry* wall, int32_t z0, int32_t edge, rct_tile_element* trackElement, bool* wallAcrossTrack) + rct_scenery_entry* wall, int32_t z0, int32_t edge, TileElement* trackElement, bool* wallAcrossTrack) { int32_t trackType = trackElement->AsTrack()->GetTrackType(); int32_t sequence = trackElement->AsTrack()->GetSequenceIndex(); @@ -171,7 +171,7 @@ static bool WallCheckObstruction( return false; } - rct_tile_element* tileElement = map_get_first_element_at(x / 32, y / 32); + TileElement* tileElement = map_get_first_element_at(x / 32, y / 32); do { int32_t elementType = tileElement->GetType(); @@ -333,7 +333,7 @@ static money32 WallPlace( uint8_t edgeSlope = 0; if (position.z == 0) { - rct_tile_element* surfaceElement = map_get_surface_element_at({ position.x, position.y }); + TileElement* surfaceElement = map_get_surface_element_at({ position.x, position.y }); if (surfaceElement == nullptr) { return MONEY32_UNDEFINED; @@ -349,7 +349,7 @@ static money32 WallPlace( } } - rct_tile_element* surfaceElement = map_get_surface_element_at({ position.x, position.y }); + TileElement* surfaceElement = map_get_surface_element_at({ position.x, position.y }); if (surfaceElement == nullptr) { return MONEY32_UNDEFINED; @@ -506,7 +506,7 @@ static money32 WallPlace( network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord); } - rct_tile_element* tileElement = tile_element_insert(position.x / 32, position.y / 32, position.z / 8, 0); + TileElement* tileElement = tile_element_insert(position.x / 32, position.y / 32, position.z / 8, 0); assert(tileElement != nullptr); map_animation_create(MAP_ANIMATION_TYPE_WALL, position.x, position.y, position.z / 8); @@ -571,7 +571,7 @@ static money32 WallSetColour( return MONEY32_UNDEFINED; } - rct_tile_element* wallElement = map_get_wall_element_at(x, y, baseHeight, direction); + TileElement* wallElement = map_get_wall_element_at(x, y, baseHeight, direction); if (wallElement == nullptr) { return 0; @@ -604,7 +604,7 @@ static money32 WallSetColour( */ void wall_remove_at(int32_t x, int32_t y, int32_t z0, int32_t z1) { - rct_tile_element* tileElement; + TileElement* tileElement; z0 /= 8; z1 /= 8; @@ -641,7 +641,7 @@ void wall_remove_at_z(int32_t x, int32_t y, int32_t z) */ void wall_remove_intersecting_walls(int32_t x, int32_t y, int32_t z0, int32_t z1, int32_t direction) { - rct_tile_element* tileElement; + TileElement* tileElement; tileElement = map_get_first_element_at(x >> 5, y >> 5); do diff --git a/test/testpaint/Compat.cpp b/test/testpaint/Compat.cpp index d505755f74..2cd760eb30 100644 --- a/test/testpaint/Compat.cpp +++ b/test/testpaint/Compat.cpp @@ -21,7 +21,7 @@ #include #define gRideEntries RCT2_ADDRESS(0x009ACFA4, rct_ride_entry*) -#define gTileElementTilePointers RCT2_ADDRESS(0x013CE9A4, rct_tile_element*) +#define gTileElementTilePointers RCT2_ADDRESS(0x013CE9A4, TileElement*) rct_sprite* sprite_list = RCT2_ADDRESS(0x010E63BC, rct_sprite); Ride gRideList[MAX_RIDES]; @@ -95,25 +95,25 @@ LocationXY16 gMapSelectPositionB; LocationXYZ16 gMapSelectArrowPosition; uint8_t gMapSelectArrowDirection; -void entrance_paint(paint_session* session, uint8_t direction, int height, const rct_tile_element* tile_element) +void entrance_paint(paint_session* session, uint8_t direction, int height, const TileElement* tile_element) { } -void banner_paint(paint_session* session, uint8_t direction, int height, const rct_tile_element* tile_element) +void banner_paint(paint_session* session, uint8_t direction, int height, const TileElement* tile_element) { } -void surface_paint(paint_session* session, uint8_t direction, uint16_t height, const rct_tile_element* tileElement) +void surface_paint(paint_session* session, uint8_t direction, uint16_t height, const TileElement* tileElement) { } -void path_paint(paint_session* session, uint16_t height, const rct_tile_element* tileElement) +void path_paint(paint_session* session, uint16_t height, const TileElement* tileElement) { } -void scenery_paint(paint_session* session, uint8_t direction, int height, const rct_tile_element* tileElement) +void scenery_paint(paint_session* session, uint8_t direction, int height, const TileElement* tileElement) { } -void fence_paint(paint_session* session, uint8_t direction, int height, const rct_tile_element* tileElement) +void fence_paint(paint_session* session, uint8_t direction, int height, const TileElement* tileElement) { } -void large_scenery_paint(paint_session* session, uint8_t direction, uint16_t height, const rct_tile_element* tileElement) +void large_scenery_paint(paint_session* session, uint8_t direction, uint16_t height, const TileElement* tileElement) { } @@ -164,7 +164,7 @@ uint8_t TileElementBase::GetType() const return this->type & TILE_ELEMENT_TYPE_MASK; } -rct_tile_element* map_get_first_element_at(int x, int y) +TileElement* map_get_first_element_at(int x, int y) { if (x < 0 || y < 0 || x > 255 || y > 255) { diff --git a/test/testpaint/TestPaint.hpp b/test/testpaint/TestPaint.hpp index cb41517c21..34315529c8 100644 --- a/test/testpaint/TestPaint.hpp +++ b/test/testpaint/TestPaint.hpp @@ -35,7 +35,7 @@ #define gRightTunnels RCT2_ADDRESS(0x009E30B6, tunnel_entry) #define gRightTunnelCount RCT2_GLOBAL(0x0141F56B, uint8_t) #define gVerticalTunnelHeight RCT2_GLOBAL(0x009E323C, uint8_t) -#define gSurfaceElement RCT2_GLOBAL(0x009E3250, rct_tile_element*) +#define gSurfaceElement RCT2_GLOBAL(0x009E3250, TileElement*) #define gDidPassSurface RCT2_GLOBAL(0x009DE57C, bool) #define g141E9DB RCT2_GLOBAL(0x0141E9DB, uint8_t) #define gUnk141E9DC RCT2_GLOBAL(0x0141E9DC, uint16_t) diff --git a/test/testpaint/TestTrack.cpp b/test/testpaint/TestTrack.cpp index acdb2bae8a..86eb8aa508 100644 --- a/test/testpaint/TestTrack.cpp +++ b/test/testpaint/TestTrack.cpp @@ -42,8 +42,8 @@ public: virtual std::string VariantName(uint8_t rideType, uint8_t trackType, int variant) abstract; virtual void ApplyTo( - uint8_t rideType, uint8_t trackType, int variant, rct_tile_element* tileElement, rct_tile_element* surfaceElement, - Ride* ride, rct_ride_entry* rideEntry) abstract; + uint8_t rideType, uint8_t trackType, int variant, TileElement* tileElement, TileElement* surfaceElement, Ride* ride, + rct_ride_entry* rideEntry) abstract; }; class CableLiftFilter : public ITestTrackFilter @@ -65,8 +65,8 @@ public: } virtual void ApplyTo( - uint8_t rideType, uint8_t trackType, int variant, rct_tile_element* tileElement, rct_tile_element* surfaceElement, - Ride* ride, rct_ride_entry* rideEntry) override + uint8_t rideType, uint8_t trackType, int variant, TileElement* tileElement, TileElement* surfaceElement, Ride* ride, + rct_ride_entry* rideEntry) override { if (variant == 0) { @@ -98,8 +98,8 @@ public: } virtual void ApplyTo( - uint8_t rideType, uint8_t trackType, int variant, rct_tile_element* tileElement, rct_tile_element* surfaceElement, - Ride* ride, rct_ride_entry* rideEntry) override + uint8_t rideType, uint8_t trackType, int variant, TileElement* tileElement, TileElement* surfaceElement, Ride* ride, + rct_ride_entry* rideEntry) override { if (variant == 0) { @@ -137,8 +137,8 @@ public: } virtual void ApplyTo( - uint8_t rideType, uint8_t trackType, int variant, rct_tile_element* tileElement, rct_tile_element* surfaceElement, - Ride* ride, rct_ride_entry* rideEntry) override + uint8_t rideType, uint8_t trackType, int variant, TileElement* tileElement, TileElement* surfaceElement, Ride* ride, + rct_ride_entry* rideEntry) override { if (variant == 0) { @@ -176,8 +176,8 @@ public: } virtual void ApplyTo( - uint8_t rideType, uint8_t trackType, int variant, rct_tile_element* tileElement, rct_tile_element* surfaceElement, - Ride* ride, rct_ride_entry* rideEntry) override + uint8_t rideType, uint8_t trackType, int variant, TileElement* tileElement, TileElement* surfaceElement, Ride* ride, + rct_ride_entry* rideEntry) override { ride->entrance_style = variant; RCT2_Rides[0].entrance_style = variant; @@ -185,8 +185,7 @@ public: }; static void CallOriginal( - uint8_t rideType, uint8_t trackType, uint8_t direction, uint8_t trackSequence, uint16_t height, - rct_tile_element* tileElement) + uint8_t rideType, uint8_t trackType, uint8_t direction, uint8_t trackSequence, uint16_t height, TileElement* tileElement) { uint32_t* trackDirectionList = (uint32_t*)RideTypeTrackPaintFunctionsOld[rideType][trackType]; const uint8_t rideIndex = 0; @@ -198,8 +197,7 @@ static void CallOriginal( } static void CallNew( - uint8_t rideType, uint8_t trackType, uint8_t direction, uint8_t trackSequence, uint16_t height, - rct_tile_element* tileElement) + uint8_t rideType, uint8_t trackType, uint8_t direction, uint8_t trackSequence, uint16_t height, TileElement* tileElement) { TRACK_PAINT_FUNCTION_GETTER newPaintFunctionGetter = RideTypeTrackPaintFunctions[rideType]; TRACK_PAINT_FUNCTION newPaintFunction = newPaintFunctionGetter(trackType, direction); @@ -269,14 +267,14 @@ static uint8_t TestTrackElementPaintCalls(uint8_t rideType, uint8_t trackType, u { uint16_t height = 3 * 16; - rct_tile_element tileElement = {}; + TileElement tileElement = {}; tileElement.SetType(TILE_ELEMENT_TYPE_TRACK); tileElement.flags |= TILE_ELEMENT_FLAG_LAST_TILE; tileElement.AsTrack()->SetTrackType(trackType); tileElement.base_height = height / 16; g_currently_drawn_item = &tileElement; - rct_tile_element surfaceElement = {}; + TileElement surfaceElement = {}; surfaceElement.type = TILE_ELEMENT_TYPE_SURFACE; surfaceElement.base_height = 2; gSurfaceElement = &surfaceElement; @@ -432,14 +430,14 @@ static uint8_t TestTrackElementSegmentSupportHeight( { uint16_t height = 3 * 16; - rct_tile_element tileElement = {}; + TileElement tileElement = {}; tileElement.SetType(TILE_ELEMENT_TYPE_TRACK); tileElement.flags |= TILE_ELEMENT_FLAG_LAST_TILE; tileElement.AsTrack()->SetTrackType(trackType); tileElement.base_height = height / 16; g_currently_drawn_item = &tileElement; - rct_tile_element surfaceElement = {}; + TileElement surfaceElement = {}; surfaceElement.type = TILE_ELEMENT_TYPE_SURFACE; surfaceElement.base_height = 2; gSurfaceElement = &surfaceElement; @@ -519,14 +517,14 @@ static uint8_t TestTrackElementGeneralSupportHeight( { uint16_t height = 3 * 16; - rct_tile_element tileElement = {}; + TileElement tileElement = {}; tileElement.SetType(TILE_ELEMENT_TYPE_TRACK); tileElement.flags |= TILE_ELEMENT_FLAG_LAST_TILE; tileElement.AsTrack()->SetTrackType(trackType); tileElement.base_height = height / 16; g_currently_drawn_item = &tileElement; - rct_tile_element surfaceElement = {}; + TileElement surfaceElement = {}; surfaceElement.type = TILE_ELEMENT_TYPE_SURFACE; surfaceElement.base_height = 2; gSurfaceElement = &surfaceElement; @@ -620,14 +618,14 @@ static uint8_t TestTrackElementSideTunnels(uint8_t rideType, uint8_t trackType, { uint16_t height = 3 * 16; - rct_tile_element tileElement = {}; + TileElement tileElement = {}; tileElement.SetType(TILE_ELEMENT_TYPE_TRACK); tileElement.flags |= TILE_ELEMENT_FLAG_LAST_TILE; tileElement.AsTrack()->SetTrackType(trackType); tileElement.base_height = height / 16; g_currently_drawn_item = &tileElement; - rct_tile_element surfaceElement = {}; + TileElement surfaceElement = {}; surfaceElement.type = TILE_ELEMENT_TYPE_SURFACE; surfaceElement.base_height = 2; gSurfaceElement = &surfaceElement; @@ -748,14 +746,14 @@ static uint8_t TestTrackElementVerticalTunnels(uint8_t rideType, uint8_t trackTy { uint16_t height = 3 * 16; - rct_tile_element tileElement = {}; + TileElement tileElement = {}; tileElement.SetType(TILE_ELEMENT_TYPE_TRACK); tileElement.flags |= TILE_ELEMENT_FLAG_LAST_TILE; tileElement.AsTrack()->SetTrackType(trackType); tileElement.base_height = height / 16; g_currently_drawn_item = &tileElement; - rct_tile_element surfaceElement = {}; + TileElement surfaceElement = {}; surfaceElement.type = TILE_ELEMENT_TYPE_SURFACE; surfaceElement.base_height = 2; gSurfaceElement = &surfaceElement; diff --git a/test/testpaint/generate.cpp b/test/testpaint/generate.cpp index beda8bd256..dc06733518 100644 --- a/test/testpaint/generate.cpp +++ b/test/testpaint/generate.cpp @@ -127,7 +127,7 @@ private: 0, "static void " + _rideName + "_track_station(uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int height, " - "rct_tile_element * tileElement)"); + "TileElement * tileElement)"); WriteLine(0, "{"); WriteLine(0, "}"); WriteLine(); @@ -141,7 +141,7 @@ private: WriteLine( 0, "static void " + GetTrackFunctionName(trackType) - + "(uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int height, rct_tile_element * tileElement)"); + + "(uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int height, TileElement * tileElement)"); WriteLine(0, "{"); if (!GenerateMirrorCall(1, trackType)) { @@ -444,7 +444,7 @@ private: support_height generalSupports[4] = {}; for (int direction = 0; direction < 4; direction++) { - rct_tile_element tileElement = {}; + TileElement tileElement = {}; tileElement.SetType(TILE_ELEMENT_TYPE_TRACK); tileElement.flags |= TILE_ELEMENT_FLAG_LAST_TILE; tileElement.AsTrack()->SetTrackType(trackType); @@ -783,8 +783,8 @@ private: } bool GetTunnelCalls( - int trackType, int direction, int trackSequence, int height, rct_tile_element* tileElement, - TunnelCall tileTunnelCalls[4][4], int16_t verticalTunnelHeights[4]) + int trackType, int direction, int trackSequence, int height, TileElement* tileElement, TunnelCall tileTunnelCalls[4][4], + int16_t verticalTunnelHeights[4]) { TestPaint::ResetTunnels(); @@ -1083,7 +1083,7 @@ private: return true; } - void CallOriginal(int trackType, int direction, int trackSequence, int height, rct_tile_element* tileElement) + void CallOriginal(int trackType, int direction, int trackSequence, int height, TileElement* tileElement) { TestPaint::ResetEnvironment(); TestPaint::ResetSupportHeights(); diff --git a/test/tests/TileElements.cpp b/test/tests/TileElements.cpp index 182ada1d68..738f3c2971 100644 --- a/test/tests/TileElements.cpp +++ b/test/tests/TileElements.cpp @@ -45,7 +45,7 @@ std::shared_ptr TileElementWantsFootpathConnection::_context; TEST_F(TileElementWantsFootpathConnection, FlatPath) { // Flat paths want to connect to other paths in any direction - const rct_tile_element* const pathElement = map_get_footpath_element(19, 18, 14); + const TileElement* const pathElement = map_get_footpath_element(19, 18, 14); ASSERT_NE(pathElement, nullptr); EXPECT_TRUE(tile_element_wants_path_connection_towards({ 19, 18, 14, 0 }, nullptr)); EXPECT_TRUE(tile_element_wants_path_connection_towards({ 19, 18, 14, 1 }, nullptr)); @@ -57,7 +57,7 @@ TEST_F(TileElementWantsFootpathConnection, FlatPath) TEST_F(TileElementWantsFootpathConnection, SlopedPath) { // Sloped paths only want to connect in two directions, of which is one at a higher offset - const rct_tile_element* const slopedPathElement = map_get_footpath_element(18, 18, 14); + const TileElement* const slopedPathElement = map_get_footpath_element(18, 18, 14); ASSERT_NE(slopedPathElement, nullptr); ASSERT_TRUE(slopedPathElement->AsPath()->IsSloped()); // Bottom and top of sloped path want a path connection @@ -76,7 +76,7 @@ TEST_F(TileElementWantsFootpathConnection, SlopedPath) TEST_F(TileElementWantsFootpathConnection, Stall) { // Stalls usually have one path direction flag, but can have multiple (info kiosk for example) - const rct_tile_element* const stallElement = map_get_track_element_at(19 << 5, 15 << 5, 14); + const TileElement* const stallElement = map_get_track_element_at(19 << 5, 15 << 5, 14); ASSERT_NE(stallElement, nullptr); EXPECT_TRUE(tile_element_wants_path_connection_towards({ 19, 15, 14, 0 }, nullptr)); EXPECT_FALSE(tile_element_wants_path_connection_towards({ 19, 15, 14, 1 }, nullptr));