From ce8d9cc71bc0e176dc130d88d05544fb6b47cdf3 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Tue, 31 Oct 2017 12:57:40 +0100 Subject: [PATCH] Rename map_element to tile_element --- OpenRCT2.xcodeproj/project.pbxproj | 18 +- src/openrct2-ui/windows/Banner.cpp | 20 +- src/openrct2-ui/windows/DebugPaint.cpp | 2 +- src/openrct2-ui/windows/Footpath.cpp | 30 +- src/openrct2-ui/windows/Guest.cpp | 4 +- src/openrct2-ui/windows/Map.cpp | 70 +- src/openrct2-ui/windows/Sign.cpp | 72 +- src/openrct2-ui/windows/Staff.cpp | 2 +- src/openrct2-ui/windows/StaffList.cpp | 2 +- .../windows/TitleCommandEditor.cpp | 2 +- src/openrct2-ui/windows/TrackDesignPlace.cpp | 2 +- src/openrct2-ui/windows/Viewport.cpp | 2 +- .../actions/PlaceParkEntranceAction.hpp | 10 +- src/openrct2/actions/RideDemolishAction.hpp | 2 +- src/openrct2/actions/RideSetName.hpp | 2 +- src/openrct2/actions/RideSetStatus.hpp | 2 +- src/openrct2/audio/Audio.cpp | 2 +- src/openrct2/cheats.c | 34 +- src/openrct2/drawing/lightfx.c | 6 +- src/openrct2/game.c | 6 +- src/openrct2/input.c | 2 +- src/openrct2/interface/Screenshot.cpp | 6 +- src/openrct2/interface/console.c | 14 +- src/openrct2/interface/viewport.c | 16 +- src/openrct2/interface/viewport.h | 10 +- src/openrct2/interface/viewport_interaction.c | 56 +- src/openrct2/interface/window.c | 8 +- src/openrct2/interface/window.h | 2 +- src/openrct2/localisation/string_ids.h | 2 +- src/openrct2/management/NewsItem.cpp | 4 +- src/openrct2/paint/Paint.cpp | 38 +- src/openrct2/paint/paint.h | 6 +- src/openrct2/paint/supports.c | 2 +- .../{map_element => tile_element}/banner.c | 18 +- .../{map_element => tile_element}/entrance.c | 38 +- .../{map_element => tile_element}/fence.c | 44 +- .../{map_element => tile_element}/path.c | 136 +-- .../{map_element => tile_element}/scenery.c | 14 +- .../scenery_multiple.c | 10 +- .../{map_element => tile_element}/surface.c | 44 +- .../{map_element => tile_element}/surface.h | 0 .../tile_element.c} | 72 +- .../tile_element.h} | 22 +- src/openrct2/peep/Peep.cpp | 702 ++++++------- src/openrct2/peep/Peep.h | 2 +- src/openrct2/peep/Staff.cpp | 52 +- src/openrct2/peep/Staff.h | 2 +- src/openrct2/rct1.h | 4 +- src/openrct2/rct1/S4Importer.cpp | 132 +-- src/openrct2/rct2.h | 2 +- src/openrct2/rct2/S6Exporter.cpp | 10 +- src/openrct2/rct2/S6Importer.cpp | 12 +- src/openrct2/rct2/addresses.h | 12 +- src/openrct2/ride/CableLift.cpp | 4 +- src/openrct2/ride/Station.cpp | 26 +- src/openrct2/ride/Track.cpp | 116 +-- src/openrct2/ride/Track.h | 32 +- src/openrct2/ride/TrackDesign.cpp | 92 +- src/openrct2/ride/TrackDesign.h | 4 +- src/openrct2/ride/Vehicle.cpp | 100 +- .../coaster/AirPoweredVerticalCoaster.cpp | 38 +- .../ride/coaster/BobsleighCoaster.cpp | 88 +- .../ride/coaster/BolligerMabillardTrack.cpp | 360 +++---- .../ride/coaster/BolligerMabillardTrack.h | 358 +++---- .../ride/coaster/CompactInvertedCoaster.cpp | 222 ++-- .../ride/coaster/CorkscrewRollerCoaster.cpp | 220 ++-- .../ride/coaster/FlyingRollerCoaster.cpp | 286 +++--- src/openrct2/ride/coaster/GigaCoaster.cpp | 278 ++--- .../ride/coaster/HeartlineTwisterCoaster.cpp | 38 +- .../ride/coaster/InvertedHairpinCoaster.cpp | 58 +- .../ride/coaster/InvertedImpulseCoaster.cpp | 50 +- .../ride/coaster/InvertedRollerCoaster.cpp | 290 +++--- .../ride/coaster/JuniorRollerCoaster.cpp | 262 ++--- .../ride/coaster/JuniorRollerCoaster.h | 60 +- .../ride/coaster/LayDownRollerCoaster.cpp | 226 ++--- .../ride/coaster/LimLaunchedRollerCoaster.cpp | 52 +- .../ride/coaster/LoopingRollerCoaster.cpp | 272 ++--- src/openrct2/ride/coaster/MineRide.cpp | 142 +-- .../ride/coaster/MineTrainCoaster.cpp | 186 ++-- .../ride/coaster/MiniRollerCoaster.cpp | 272 ++--- .../ride/coaster/MiniSuspendedCoaster.cpp | 52 +- .../coaster/MultiDimensionRollerCoaster.cpp | 198 ++-- .../ride/coaster/ReverseFreefallCoaster.cpp | 10 +- .../ride/coaster/ReverserRollerCoaster.cpp | 36 +- .../coaster/SideFrictionRollerCoaster.cpp | 54 +- .../ride/coaster/StandUpRollerCoaster.cpp | 202 ++-- src/openrct2/ride/coaster/Steeplechase.cpp | 56 +- .../ride/coaster/SuspendedSwingingCoaster.cpp | 104 +- .../ride/coaster/TwisterRollerCoaster.cpp | 360 +++---- .../coaster/VerticalDropRollerCoaster.cpp | 358 +++---- src/openrct2/ride/coaster/VirginiaReel.cpp | 24 +- src/openrct2/ride/coaster/WildMouse.cpp | 60 +- .../ride/coaster/WoodenRollerCoaster.cpp | 280 +++--- src/openrct2/ride/coaster/WoodenWildMouse.cpp | 46 +- src/openrct2/ride/gentle/CarRide.cpp | 40 +- src/openrct2/ride/gentle/CircusShow.cpp | 4 +- src/openrct2/ride/gentle/CrookedHouse.cpp | 6 +- src/openrct2/ride/gentle/Dodgems.cpp | 2 +- src/openrct2/ride/gentle/FerrisWheel.cpp | 4 +- src/openrct2/ride/gentle/FlyingSaucers.cpp | 2 +- src/openrct2/ride/gentle/GhostTrain.cpp | 30 +- src/openrct2/ride/gentle/HauntedHouse.cpp | 4 +- src/openrct2/ride/gentle/Maze.cpp | 4 +- src/openrct2/ride/gentle/MerryGoRound.cpp | 4 +- src/openrct2/ride/gentle/MiniGolf.cpp | 34 +- src/openrct2/ride/gentle/MiniHelicopters.cpp | 24 +- src/openrct2/ride/gentle/MonorailCycles.cpp | 16 +- src/openrct2/ride/gentle/ObservationTower.cpp | 8 +- src/openrct2/ride/gentle/SpaceRings.cpp | 4 +- src/openrct2/ride/gentle/SpiralSlide.cpp | 8 +- src/openrct2/ride/ride.c | 390 +++---- src/openrct2/ride/ride.h | 16 +- src/openrct2/ride/ride_ratings.c | 82 +- src/openrct2/ride/shops/Facility.cpp | 2 +- src/openrct2/ride/shops/Shop.cpp | 2 +- src/openrct2/ride/thrill/3dCinema.cpp | 4 +- src/openrct2/ride/thrill/Enterprise.cpp | 8 +- src/openrct2/ride/thrill/GoKarts.cpp | 22 +- src/openrct2/ride/thrill/LaunchedFreefall.cpp | 8 +- src/openrct2/ride/thrill/MagicCarpet.cpp | 4 +- src/openrct2/ride/thrill/MotionSimulator.cpp | 6 +- src/openrct2/ride/thrill/PirateShip.cpp | 4 +- src/openrct2/ride/thrill/RotoDrop.cpp | 8 +- .../ride/thrill/SwingingInverterShip.cpp | 4 +- src/openrct2/ride/thrill/TopSpin.cpp | 6 +- src/openrct2/ride/thrill/Twist.cpp | 4 +- src/openrct2/ride/track_design_save.c | 186 ++-- src/openrct2/ride/track_paint.c | 44 +- src/openrct2/ride/track_paint.h | 24 +- src/openrct2/ride/transport/Chairlift.cpp | 44 +- src/openrct2/ride/transport/Lift.cpp | 4 +- .../ride/transport/MiniatureRailway.cpp | 50 +- src/openrct2/ride/transport/Monorail.cpp | 50 +- .../ride/transport/SuspendedMonorail.cpp | 52 +- src/openrct2/ride/water/BoatRide.cpp | 8 +- src/openrct2/ride/water/DingySlide.cpp | 78 +- src/openrct2/ride/water/LogFlume.cpp | 28 +- src/openrct2/ride/water/RiverRapids.cpp | 28 +- src/openrct2/ride/water/SplashBoats.cpp | 36 +- src/openrct2/ride/water/SubmarineRide.cpp | 12 +- src/openrct2/ride/water/WaterCoaster.cpp | 70 +- src/openrct2/scenario/scenario.c | 28 +- src/openrct2/scenario/scenario.h | 4 +- src/openrct2/title/TitleSequencePlayer.cpp | 2 +- .../windows/EditorObjectSelection.cpp | 24 +- src/openrct2/windows/Ride.cpp | 28 +- src/openrct2/windows/RideConstruction.cpp | 26 +- src/openrct2/windows/TileInspector.cpp | 76 +- src/openrct2/windows/TopToolbar.cpp | 90 +- src/openrct2/world/Banner.cpp | 46 +- src/openrct2/world/Duck.cpp | 6 +- src/openrct2/world/Entrance.cpp | 42 +- src/openrct2/world/Fountain.cpp | 8 +- src/openrct2/world/Fountain.h | 2 +- src/openrct2/world/SmallScenery.cpp | 54 +- src/openrct2/world/Wall.cpp | 104 +- src/openrct2/world/banner.h | 2 +- src/openrct2/world/entrance.h | 6 +- src/openrct2/world/footpath.c | 290 +++--- src/openrct2/world/footpath.h | 34 +- src/openrct2/world/map.c | 948 +++++++++--------- src/openrct2/world/map.h | 284 +++--- src/openrct2/world/map_animation.c | 86 +- src/openrct2/world/map_helpers.c | 12 +- src/openrct2/world/mapgen.c | 34 +- src/openrct2/world/money_effect.c | 2 +- src/openrct2/world/park.c | 28 +- src/openrct2/world/particle.c | 2 +- src/openrct2/world/scenery.c | 52 +- src/openrct2/world/scenery.h | 16 +- src/openrct2/world/sprite.c | 8 +- src/openrct2/world/tile_inspector.c | 148 +-- src/openrct2/world/tile_inspector.h | 2 +- test/testpaint/CMakeLists.txt | 2 +- test/testpaint/SegmentSupportHeightCall.cpp | 2 +- test/testpaint/TestPaint.hpp | 2 +- test/testpaint/TestTrack.cpp | 56 +- test/testpaint/compat.c | 74 +- test/testpaint/generate.cpp | 14 +- 179 files changed, 5939 insertions(+), 5939 deletions(-) rename src/openrct2/paint/{map_element => tile_element}/banner.c (85%) rename src/openrct2/paint/{map_element => tile_element}/entrance.c (89%) rename src/openrct2/paint/{map_element => tile_element}/fence.c (92%) rename src/openrct2/paint/{map_element => tile_element}/path.c (87%) rename src/openrct2/paint/{map_element => tile_element}/scenery.c (97%) rename src/openrct2/paint/{map_element => tile_element}/scenery_multiple.c (97%) rename src/openrct2/paint/{map_element => tile_element}/surface.c (98%) rename src/openrct2/paint/{map_element => tile_element}/surface.h (100%) rename src/openrct2/paint/{map_element/map_element.c => tile_element/tile_element.c} (83%) rename src/openrct2/paint/{map_element/map_element.h => tile_element/tile_element.h} (87%) diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj index 4f0761e56b..467fe31b68 100644 --- a/OpenRCT2.xcodeproj/project.pbxproj +++ b/OpenRCT2.xcodeproj/project.pbxproj @@ -373,7 +373,7 @@ F76C86881EC4E88400FA49E2 /* banner.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C843C1EC4E7CC00FA49E2 /* banner.c */; }; F76C86891EC4E88400FA49E2 /* entrance.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C843D1EC4E7CC00FA49E2 /* entrance.c */; }; F76C868A1EC4E88400FA49E2 /* fence.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C843E1EC4E7CC00FA49E2 /* fence.c */; }; - F76C868B1EC4E88400FA49E2 /* map_element.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C843F1EC4E7CC00FA49E2 /* map_element.c */; }; + F76C868B1EC4E88400FA49E2 /* tile_element.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C843F1EC4E7CC00FA49E2 /* tile_element.c */; }; F76C868D1EC4E88400FA49E2 /* path.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C84411EC4E7CC00FA49E2 /* path.c */; }; F76C868E1EC4E88400FA49E2 /* scenery.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C84421EC4E7CC00FA49E2 /* scenery.c */; }; F76C868F1EC4E88400FA49E2 /* scenery_multiple.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C84431EC4E7CC00FA49E2 /* scenery_multiple.c */; }; @@ -1255,8 +1255,8 @@ F76C843C1EC4E7CC00FA49E2 /* banner.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = banner.c; sourceTree = ""; }; F76C843D1EC4E7CC00FA49E2 /* entrance.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = entrance.c; sourceTree = ""; }; F76C843E1EC4E7CC00FA49E2 /* fence.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = fence.c; sourceTree = ""; }; - F76C843F1EC4E7CC00FA49E2 /* map_element.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = map_element.c; sourceTree = ""; }; - F76C84401EC4E7CC00FA49E2 /* map_element.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = map_element.h; sourceTree = ""; }; + F76C843F1EC4E7CC00FA49E2 /* tile_element.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = tile_element.c; sourceTree = ""; }; + F76C84401EC4E7CC00FA49E2 /* tile_element.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = tile_element.h; sourceTree = ""; }; F76C84411EC4E7CC00FA49E2 /* path.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = path.c; sourceTree = ""; }; F76C84421EC4E7CC00FA49E2 /* scenery.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = scenery.c; sourceTree = ""; }; F76C84431EC4E7CC00FA49E2 /* scenery_multiple.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = scenery_multiple.c; sourceTree = ""; }; @@ -2204,7 +2204,7 @@ F76C843A1EC4E7CC00FA49E2 /* paint */ = { isa = PBXGroup; children = ( - F76C843B1EC4E7CC00FA49E2 /* map_element */, + F76C843B1EC4E7CC00FA49E2 /* tile_element */, F76C84491EC4E7CC00FA49E2 /* sprite */, F76C84461EC4E7CC00FA49E2 /* Paint.cpp */, F76C84471EC4E7CC00FA49E2 /* paint.h */, @@ -2217,21 +2217,21 @@ path = paint; sourceTree = ""; }; - F76C843B1EC4E7CC00FA49E2 /* map_element */ = { + F76C843B1EC4E7CC00FA49E2 /* tile_element */ = { isa = PBXGroup; children = ( F76C843C1EC4E7CC00FA49E2 /* banner.c */, F76C843D1EC4E7CC00FA49E2 /* entrance.c */, F76C843E1EC4E7CC00FA49E2 /* fence.c */, - F76C843F1EC4E7CC00FA49E2 /* map_element.c */, - F76C84401EC4E7CC00FA49E2 /* map_element.h */, + F76C843F1EC4E7CC00FA49E2 /* tile_element.c */, + F76C84401EC4E7CC00FA49E2 /* tile_element.h */, F76C84411EC4E7CC00FA49E2 /* path.c */, F76C84421EC4E7CC00FA49E2 /* scenery.c */, F76C84431EC4E7CC00FA49E2 /* scenery_multiple.c */, F76C84441EC4E7CC00FA49E2 /* surface.c */, F76C84451EC4E7CC00FA49E2 /* surface.h */, ); - path = map_element; + path = tile_element; sourceTree = ""; }; F76C84491EC4E7CC00FA49E2 /* sprite */ = { @@ -3447,7 +3447,7 @@ F76C86881EC4E88400FA49E2 /* banner.c in Sources */, F76C86891EC4E88400FA49E2 /* entrance.c in Sources */, F76C868A1EC4E88400FA49E2 /* fence.c in Sources */, - F76C868B1EC4E88400FA49E2 /* map_element.c in Sources */, + F76C868B1EC4E88400FA49E2 /* tile_element.c in Sources */, F76C868D1EC4E88400FA49E2 /* path.c in Sources */, F76C868E1EC4E88400FA49E2 /* scenery.c in Sources */, F76C868F1EC4E88400FA49E2 /* scenery_multiple.c in Sources */, diff --git a/src/openrct2-ui/windows/Banner.cpp b/src/openrct2-ui/windows/Banner.cpp index 10d3485779..d4a088088e 100644 --- a/src/openrct2-ui/windows/Banner.cpp +++ b/src/openrct2-ui/windows/Banner.cpp @@ -143,19 +143,19 @@ rct_window * window_banner_open(rct_windownumber number) sint32 view_x = gBanners[w->number].x << 5; sint32 view_y = gBanners[w->number].y << 5; - rct_map_element* map_element = map_get_first_element_at(view_x / 32, view_y / 32); + rct_tile_element* tile_element = map_get_first_element_at(view_x / 32, view_y / 32); while(1) { if ( - (map_element_get_type(map_element) == MAP_ELEMENT_TYPE_BANNER) && - (map_element->properties.banner.index == w->number) + (tile_element_get_type(tile_element) == TILE_ELEMENT_TYPE_BANNER) && + (tile_element->properties.banner.index == w->number) ) { break; } - map_element++; + tile_element++; } - sint32 view_z = map_element->base_height<<3; + sint32 view_z = tile_element->base_height<<3; w->frame_no = view_z; view_x += 16; @@ -193,12 +193,12 @@ static void window_banner_mouseup(rct_window *w, rct_widgetindex widgetIndex) sint32 x = banner->x << 5; sint32 y = banner->y << 5; - rct_map_element* map_element = map_get_first_element_at(x / 32, y / 32); + rct_tile_element* tile_element = map_get_first_element_at(x / 32, y / 32); while (1){ - if ((map_element_get_type(map_element) == MAP_ELEMENT_TYPE_BANNER) && - (map_element->properties.banner.index == w->number)) break; - map_element++; + if ((tile_element_get_type(tile_element) == TILE_ELEMENT_TYPE_BANNER) && + (tile_element->properties.banner.index == w->number)) break; + tile_element++; } switch (widgetIndex) { @@ -206,7 +206,7 @@ static void window_banner_mouseup(rct_window *w, rct_widgetindex widgetIndex) window_close(w); break; case WIDX_BANNER_DEMOLISH: - game_do_command(x, 1, y, map_element->base_height | (map_element->properties.banner.position << 8), GAME_COMMAND_REMOVE_BANNER, 0, 0); + game_do_command(x, 1, y, tile_element->base_height | (tile_element->properties.banner.position << 8), GAME_COMMAND_REMOVE_BANNER, 0, 0); break; case WIDX_BANNER_TEXT: window_text_input_open(w, WIDX_BANNER_TEXT, STR_BANNER_TEXT, STR_ENTER_BANNER_TEXT, gBanners[w->number].string_idx, 0, 32); diff --git a/src/openrct2-ui/windows/DebugPaint.cpp b/src/openrct2-ui/windows/DebugPaint.cpp index ae3bee36ea..ec13d96979 100644 --- a/src/openrct2-ui/windows/DebugPaint.cpp +++ b/src/openrct2-ui/windows/DebugPaint.cpp @@ -19,7 +19,7 @@ #include #include - #include + #include #include #include diff --git a/src/openrct2-ui/windows/Footpath.cpp b/src/openrct2-ui/windows/Footpath.cpp index c64c07c5b2..285af18c38 100644 --- a/src/openrct2-ui/windows/Footpath.cpp +++ b/src/openrct2-ui/windows/Footpath.cpp @@ -795,7 +795,7 @@ static void window_footpath_set_provisional_path_at_point(sint32 x, sint32 y) gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_ARROW; sint32 interactionType; - rct_map_element * mapElement; + rct_tile_element * mapElement; LocationXY16 mapCoord = {0}; get_map_coordinates_from_pos(x, y, VIEWPORT_INTERACTION_MASK_FOOTPATH & VIEWPORT_INTERACTION_MASK_TERRAIN, &mapCoord.x, &mapCoord.y, &interactionType, &mapElement, nullptr); @@ -850,7 +850,7 @@ static void window_footpath_set_provisional_path_at_point(sint32 x, sint32 y) static void window_footpath_set_selection_start_bridge_at_point(sint32 screenX, sint32 screenY) { sint32 x, y, direction; - rct_map_element * mapElement; + rct_tile_element * mapElement; map_invalidate_selection_rect(); gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE; @@ -876,7 +876,7 @@ static void window_footpath_set_selection_start_bridge_at_point(sint32 screenX, sint32 z = mapElement->base_height; - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_SURFACE) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_SURFACE) { uint8 slope = mapElement->properties.surface.slope; if (slope & 0xf) @@ -899,7 +899,7 @@ static void window_footpath_set_selection_start_bridge_at_point(sint32 screenX, static void window_footpath_place_path_at_point(sint32 x, sint32 y) { sint32 interactionType, presentType, selectedType, z, cost; - rct_map_element * mapElement; + rct_tile_element * mapElement; if (_footpathErrorOccured) { @@ -952,7 +952,7 @@ static void window_footpath_place_path_at_point(sint32 x, sint32 y) static void window_footpath_start_bridge_at_point(sint32 screenX, sint32 screenY) { sint32 x, y, z, direction; - rct_map_element * mapElement; + rct_tile_element * mapElement; footpath_bridge_get_info_from_pos(screenX, screenY, &x, &y, &direction, &mapElement); if (x == LOCATION_NULL) @@ -960,7 +960,7 @@ static void window_footpath_start_bridge_at_point(sint32 screenX, sint32 screenY return; } - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_SURFACE) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_SURFACE) { // If we start the path on a slope, the arrow is slightly raised, so we // expect the path to be slightly raised as well. @@ -980,7 +980,7 @@ static void window_footpath_start_bridge_at_point(sint32 screenX, sint32 screenY else { z = mapElement->base_height; - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_PATH) { if (mapElement->properties.path.type & 4) { @@ -1064,7 +1064,7 @@ static void window_footpath_construct() * * rct2: 0x006A78EF */ -static void footpath_remove_map_element(rct_map_element * mapElement) +static void footpath_remove_tile_element(rct_tile_element * mapElement) { sint32 x, y, z; @@ -1123,9 +1123,9 @@ static void footpath_remove_map_element(rct_map_element * mapElement) * * rct2: 0x006A7873 */ -static rct_map_element * footpath_get_map_element_to_remove() +static rct_tile_element * footpath_get_tile_element_to_remove() { - rct_map_element * mapElement; + rct_tile_element * mapElement; sint32 x, y, z, zLow; x = gFootpathConstructFromPosition.x / 32; @@ -1141,7 +1141,7 @@ static rct_map_element * footpath_get_map_element_to_remove() mapElement = map_get_first_element_at(x, y); do { - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_PATH) { if (mapElement->base_height == z) { @@ -1169,7 +1169,7 @@ static rct_map_element * footpath_get_map_element_to_remove() } } } - while (!map_element_is_last_for_tile(mapElement++)); + while (!tile_element_is_last_for_tile(mapElement++)); return nullptr; } @@ -1180,15 +1180,15 @@ static rct_map_element * footpath_get_map_element_to_remove() */ static void window_footpath_remove() { - rct_map_element * mapElement; + rct_tile_element * mapElement; _window_footpath_cost = MONEY32_UNDEFINED; footpath_provisional_update(); - mapElement = footpath_get_map_element_to_remove(); + mapElement = footpath_get_tile_element_to_remove(); if (mapElement != nullptr) { - footpath_remove_map_element(mapElement); + footpath_remove_tile_element(mapElement); } window_footpath_set_enabled_and_pressed_widgets(); diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp index b9fcd67585..0a3112b91e 100644 --- a/src/openrct2-ui/windows/Guest.cpp +++ b/src/openrct2-ui/windows/Guest.cpp @@ -722,7 +722,7 @@ void window_guest_viewport_init(rct_window* w){ Ride *ride = get_ride(peep->current_ride); sint32 x = ride->overall_view.x * 32 + 16; sint32 y = ride->overall_view.y * 32 + 16; - sint32 height = map_element_height(x, y); + sint32 height = tile_element_height(x, y); height += 32; focus.coordinate.x = x; focus.coordinate.y = y; @@ -1194,7 +1194,7 @@ void window_guest_overview_tool_down(rct_window* w, rct_widgetindex widgetIndex, return; sint32 dest_x, dest_y; - rct_map_element* mapElement; + rct_tile_element* mapElement; footpath_get_coordinates_from_pos(x, y + 16, &dest_x, &dest_y, nullptr, &mapElement); if (dest_x == LOCATION_NULL) diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp index 093ee54322..45d48ab6ed 100644 --- a/src/openrct2-ui/windows/Map.cpp +++ b/src/openrct2-ui/windows/Map.cpp @@ -574,7 +574,7 @@ static void window_map_scrollmousedown(rct_window *w, sint32 scrollIndex, sint32 map_window_screen_to_map(x, y, &mapX, &mapY); mapX = Math::Clamp(0, mapX, 8191); mapY = Math::Clamp(0, mapY, 8191); - mapZ = map_element_height(x, y); + mapZ = tile_element_height(x, y); mainWindow = window_get_main(); if (mainWindow != nullptr) { @@ -1213,7 +1213,7 @@ static void window_map_set_land_rights_tool_update(sint32 x, sint32 y) */ static void place_park_entrance_get_map_position(sint32 x, sint32 y, sint16 *mapX, sint16 *mapY, sint16 *mapZ, sint32 *direction) { - rct_map_element *mapElement; + rct_tile_element *mapElement; sub_68A15E(x, y, mapX, mapY, direction, &mapElement); if (*mapX == LOCATION_NULL) @@ -1284,7 +1284,7 @@ static void window_map_place_park_entrance_tool_update(sint32 x, sint32 y) static void window_map_set_peep_spawn_tool_update(sint32 x, sint32 y) { sint32 mapX, mapY, mapZ, direction; - rct_map_element *mapElement; + rct_tile_element *mapElement; map_invalidate_selection_rect(); gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE; @@ -1294,7 +1294,7 @@ static void window_map_set_peep_spawn_tool_update(sint32 x, sint32 y) return; mapZ = mapElement->base_height * 8; - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_SURFACE) { + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_SURFACE) { if ((mapElement->properties.surface.slope & 0x0F) != 0) mapZ += 16; if (mapElement->properties.surface.slope & 0x10) @@ -1347,7 +1347,7 @@ static void window_map_place_park_entrance_tool_down(sint32 x, sint32 y) */ static void window_map_set_peep_spawn_tool_down(sint32 x, sint32 y) { - rct_map_element *mapElement, *surfaceMapElement; + rct_tile_element *mapElement, *surfaceMapElement; sint32 mapX, mapY, mapZ, direction; footpath_get_coordinates_from_pos(x, y, &mapX, &mapY, &direction, &mapElement); @@ -1445,27 +1445,27 @@ static const uint16 TerrainColour[] = { }; static const uint16 ElementTypeMaskColour[] = { - 0xFFFF, // MAP_ELEMENT_TYPE_SURFACE - 0x0000, // MAP_ELEMENT_TYPE_PATH - 0x00FF, // MAP_ELEMENT_TYPE_TRACK - 0xFF00, // MAP_ELEMENT_TYPE_SCENERY - 0x0000, // MAP_ELEMENT_TYPE_ENTRANCE - 0xFFFF, // MAP_ELEMENT_TYPE_WALL - 0x0000, // MAP_ELEMENT_TYPE_SCENERY_MULTIPLE - 0xFFFF, // MAP_ELEMENT_TYPE_BANNER - 0x0000, // MAP_ELEMENT_TYPE_CORRUPT + 0xFFFF, // TILE_ELEMENT_TYPE_SURFACE + 0x0000, // TILE_ELEMENT_TYPE_PATH + 0x00FF, // TILE_ELEMENT_TYPE_TRACK + 0xFF00, // TILE_ELEMENT_TYPE_SCENERY + 0x0000, // TILE_ELEMENT_TYPE_ENTRANCE + 0xFFFF, // TILE_ELEMENT_TYPE_WALL + 0x0000, // TILE_ELEMENT_TYPE_SCENERY_MULTIPLE + 0xFFFF, // TILE_ELEMENT_TYPE_BANNER + 0x0000, // TILE_ELEMENT_TYPE_CORRUPT }; static const uint16 ElementTypeAddColour[] = { - MAP_COLOUR(PALETTE_INDEX_0), // MAP_ELEMENT_TYPE_SURFACE - MAP_COLOUR(PALETTE_INDEX_17), // MAP_ELEMENT_TYPE_PATH - MAP_COLOUR_2(PALETTE_INDEX_183, PALETTE_INDEX_0), // MAP_ELEMENT_TYPE_TRACK - MAP_COLOUR_2(PALETTE_INDEX_0, PALETTE_INDEX_99), // MAP_ELEMENT_TYPE_SCENERY - MAP_COLOUR(PALETTE_INDEX_186), // MAP_ELEMENT_TYPE_ENTRANCE - MAP_COLOUR(PALETTE_INDEX_0), // MAP_ELEMENT_TYPE_WALL - MAP_COLOUR(PALETTE_INDEX_99), // MAP_ELEMENT_TYPE_SCENERY_MULTIPLE - MAP_COLOUR(PALETTE_INDEX_0), // MAP_ELEMENT_TYPE_BANNER - MAP_COLOUR(PALETTE_INDEX_68), // MAP_ELEMENT_TYPE_CORRUPT + MAP_COLOUR(PALETTE_INDEX_0), // TILE_ELEMENT_TYPE_SURFACE + MAP_COLOUR(PALETTE_INDEX_17), // TILE_ELEMENT_TYPE_PATH + MAP_COLOUR_2(PALETTE_INDEX_183, PALETTE_INDEX_0), // TILE_ELEMENT_TYPE_TRACK + MAP_COLOUR_2(PALETTE_INDEX_0, PALETTE_INDEX_99), // TILE_ELEMENT_TYPE_SCENERY + MAP_COLOUR(PALETTE_INDEX_186), // TILE_ELEMENT_TYPE_ENTRANCE + MAP_COLOUR(PALETTE_INDEX_0), // TILE_ELEMENT_TYPE_WALL + MAP_COLOUR(PALETTE_INDEX_99), // TILE_ELEMENT_TYPE_SCENERY_MULTIPLE + MAP_COLOUR(PALETTE_INDEX_0), // TILE_ELEMENT_TYPE_BANNER + MAP_COLOUR(PALETTE_INDEX_68), // TILE_ELEMENT_TYPE_CORRUPT }; enum { @@ -1578,11 +1578,11 @@ static const uint8 RideColourKey[] = { static uint16 map_window_get_pixel_colour_peep(sint32 x, sint32 y) { - rct_map_element *mapElement; + rct_tile_element *mapElement; uint16 colour; mapElement = map_get_surface_element_at(x >> 5, y >> 5); - colour = TerrainColour[map_element_get_terrain(mapElement)]; + colour = TerrainColour[tile_element_get_terrain(mapElement)]; if (map_get_water_height(mapElement) > 0) colour = WaterColour; @@ -1590,10 +1590,10 @@ static uint16 map_window_get_pixel_colour_peep(sint32 x, sint32 y) colour = PALETTE_INDEX_10 | (colour & 0xFF00); const sint32 maxSupportedMapElementType = (sint32)Util::CountOf(ElementTypeAddColour); - while (!map_element_is_last_for_tile(mapElement++)) { - sint32 mapElementType = map_element_get_type(mapElement) >> 2; + while (!tile_element_is_last_for_tile(mapElement++)) { + sint32 mapElementType = tile_element_get_type(mapElement) >> 2; if (mapElementType >= maxSupportedMapElementType) { - mapElementType = MAP_ELEMENT_TYPE_CORRUPT >> 2; + mapElementType = TILE_ELEMENT_TYPE_CORRUPT >> 2; } colour &= ElementTypeMaskColour[mapElementType]; colour |= ElementTypeAddColour[mapElementType]; @@ -1604,15 +1604,15 @@ static uint16 map_window_get_pixel_colour_peep(sint32 x, sint32 y) static uint16 map_window_get_pixel_colour_ride(sint32 x, sint32 y) { - rct_map_element *mapElement; + rct_tile_element *mapElement; Ride *ride; uint32 colour; colour = FALLBACK_COLOUR(PALETTE_INDEX_13); mapElement = map_get_surface_element_at(x >> 5, y >> 5); do { - switch (map_element_get_type(mapElement)) { - case MAP_ELEMENT_TYPE_SURFACE: + switch (tile_element_get_type(mapElement)) { + case TILE_ELEMENT_TYPE_SURFACE: if (map_get_water_height(mapElement) > 0) { colour &= 0xFFFF; colour |= FALLBACK_COLOUR(PALETTE_INDEX_194); @@ -1622,19 +1622,19 @@ static uint16 map_window_get_pixel_colour_ride(sint32 x, sint32 y) colour |= PALETTE_INDEX_10 << 16; } break; - case MAP_ELEMENT_TYPE_PATH: + case TILE_ELEMENT_TYPE_PATH: colour = MAP_COLOUR(PALETTE_INDEX_14); break; - case MAP_ELEMENT_TYPE_ENTRANCE: + case TILE_ELEMENT_TYPE_ENTRANCE: if (mapElement->properties.entrance.type == ENTRANCE_TYPE_PARK_ENTRANCE) break; // fall-through - case MAP_ELEMENT_TYPE_TRACK: + case TILE_ELEMENT_TYPE_TRACK: ride = get_ride(mapElement->properties.track.ride_index); colour = RideKeyColours[RideColourKey[ride->type]]; break; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); if ((colour & 0xFFFF) == 0) colour >>= 16; diff --git a/src/openrct2-ui/windows/Sign.cpp b/src/openrct2-ui/windows/Sign.cpp index 064d541d93..73f9db5df3 100644 --- a/src/openrct2-ui/windows/Sign.cpp +++ b/src/openrct2-ui/windows/Sign.cpp @@ -159,28 +159,28 @@ rct_window * window_sign_open(rct_windownumber number) sint32 view_x = gBanners[w->number].x << 5; sint32 view_y = gBanners[w->number].y << 5; - rct_map_element* map_element = map_get_first_element_at(view_x / 32, view_y / 32); + rct_tile_element* tile_element = map_get_first_element_at(view_x / 32, view_y / 32); while (1){ - if (map_element_get_type(map_element) == MAP_ELEMENT_TYPE_SCENERY_MULTIPLE) { - rct_scenery_entry* scenery_entry = get_large_scenery_entry(map_element->properties.scenerymultiple.type & MAP_ELEMENT_LARGE_TYPE_MASK); + if (tile_element_get_type(tile_element) == TILE_ELEMENT_TYPE_SCENERY_MULTIPLE) { + rct_scenery_entry* scenery_entry = get_large_scenery_entry(tile_element->properties.scenerymultiple.type & TILE_ELEMENT_LARGE_TYPE_MASK); if (scenery_entry->large_scenery.scrolling_mode != 0xFF){ - sint32 id = (map_element->type & 0xC0) | - ((map_element->properties.scenerymultiple.colour[0] & 0xE0) >> 2) | - ((map_element->properties.scenerymultiple.colour[1] & 0xE0) >> 5); + sint32 id = (tile_element->type & 0xC0) | + ((tile_element->properties.scenerymultiple.colour[0] & 0xE0) >> 2) | + ((tile_element->properties.scenerymultiple.colour[1] & 0xE0) >> 5); if (id == w->number) break; } } - map_element++; + tile_element++; } - sint32 view_z = map_element->base_height << 3; + sint32 view_z = tile_element->base_height << 3; w->frame_no = view_z; - w->list_information_type = map_element->properties.scenerymultiple.colour[0] & 0x1F; - w->var_492 = map_element->properties.scenerymultiple.colour[1] & 0x1F; - w->var_48C = map_element->properties.scenerymultiple.type & MAP_ELEMENT_LARGE_TYPE_MASK; + w->list_information_type = tile_element->properties.scenerymultiple.colour[0] & 0x1F; + w->var_492 = tile_element->properties.scenerymultiple.colour[1] & 0x1F; + w->var_48C = tile_element->properties.scenerymultiple.type & TILE_ELEMENT_LARGE_TYPE_MASK; view_x += 16; view_y += 16; @@ -219,7 +219,7 @@ static void window_sign_mouseup(rct_window *w, rct_widgetindex widgetIndex) rct_string_id string_id; - rct_map_element* map_element = map_get_first_element_at(x / 32, y / 32); + rct_tile_element* tile_element = map_get_first_element_at(x / 32, y / 32); switch (widgetIndex) { case WIDX_CLOSE: @@ -227,23 +227,23 @@ static void window_sign_mouseup(rct_window *w, rct_widgetindex widgetIndex) break; case WIDX_SIGN_DEMOLISH: while (1){ - if (map_element_get_type(map_element) == MAP_ELEMENT_TYPE_SCENERY_MULTIPLE) { - rct_scenery_entry* scenery_entry = get_large_scenery_entry(map_element->properties.scenerymultiple.type & MAP_ELEMENT_LARGE_TYPE_MASK); + if (tile_element_get_type(tile_element) == TILE_ELEMENT_TYPE_SCENERY_MULTIPLE) { + rct_scenery_entry* scenery_entry = get_large_scenery_entry(tile_element->properties.scenerymultiple.type & TILE_ELEMENT_LARGE_TYPE_MASK); if (scenery_entry->large_scenery.scrolling_mode != 0xFF){ - sint32 id = (map_element->type & 0xC0) | - ((map_element->properties.scenerymultiple.colour[0] & 0xE0) >> 2) | - ((map_element->properties.scenerymultiple.colour[1] & 0xE0) >> 5); + sint32 id = (tile_element->type & 0xC0) | + ((tile_element->properties.scenerymultiple.colour[0] & 0xE0) >> 2) | + ((tile_element->properties.scenerymultiple.colour[1] & 0xE0) >> 5); if (id == w->number) break; } } - map_element++; + tile_element++; } game_do_command( x, - 1 | ((map_element->type&0x3) << 8), + 1 | ((tile_element->type&0x3) << 8), y, - map_element->base_height | ((map_element->properties.scenerymultiple.type >> 10) << 8), + tile_element->base_height | ((tile_element->properties.scenerymultiple.type >> 10) << 8), GAME_COMMAND_REMOVE_LARGE_SCENERY, 0, 0); @@ -426,25 +426,25 @@ rct_window * window_sign_small_open(rct_windownumber number){ sint32 view_x = gBanners[w->number].x << 5; sint32 view_y = gBanners[w->number].y << 5; - rct_map_element* map_element = map_get_first_element_at(view_x / 32, view_y / 32); + rct_tile_element* tile_element = map_get_first_element_at(view_x / 32, view_y / 32); while (1){ - if (map_element_get_type(map_element) == MAP_ELEMENT_TYPE_WALL) { - rct_scenery_entry* scenery_entry = get_wall_entry(map_element->properties.wall.type); + if (tile_element_get_type(tile_element) == TILE_ELEMENT_TYPE_WALL) { + rct_scenery_entry* scenery_entry = get_wall_entry(tile_element->properties.wall.type); if (scenery_entry->wall.scrolling_mode != 0xFF){ - if (map_element->properties.wall.banner_index == w->number) + if (tile_element->properties.wall.banner_index == w->number) break; } } - map_element++; + tile_element++; } - sint32 view_z = map_element->base_height << 3; + sint32 view_z = tile_element->base_height << 3; w->frame_no = view_z; - w->list_information_type = map_element->properties.wall.colour_1 & 0x1F; - w->var_492 = wall_element_get_secondary_colour(map_element); - w->var_48C = map_element->properties.wall.type; + w->list_information_type = tile_element->properties.wall.colour_1 & 0x1F; + w->var_492 = wall_element_get_secondary_colour(tile_element); + w->var_48C = tile_element->properties.wall.type; view_x += 16; view_y += 16; @@ -484,7 +484,7 @@ static void window_sign_small_mouseup(rct_window *w, rct_widgetindex widgetIndex rct_string_id string_id; - rct_map_element* map_element = map_get_first_element_at(x / 32, y / 32); + rct_tile_element* tile_element = map_get_first_element_at(x / 32, y / 32); switch (widgetIndex) { case WIDX_CLOSE: @@ -492,21 +492,21 @@ static void window_sign_small_mouseup(rct_window *w, rct_widgetindex widgetIndex break; case WIDX_SIGN_DEMOLISH: while (1){ - if (map_element_get_type(map_element) == MAP_ELEMENT_TYPE_WALL) { - rct_scenery_entry* scenery_entry = get_wall_entry(map_element->properties.wall.type); + if (tile_element_get_type(tile_element) == TILE_ELEMENT_TYPE_WALL) { + rct_scenery_entry* scenery_entry = get_wall_entry(tile_element->properties.wall.type); if (scenery_entry->wall.scrolling_mode != 0xFF){ - if (map_element->properties.wall.banner_index == w->number) + if (tile_element->properties.wall.banner_index == w->number) break; } } - map_element++; + tile_element++; } gGameCommandErrorTitle = STR_CANT_REMOVE_THIS; game_do_command( x, - 1 | ((map_element->type & 0x3) << 8), + 1 | ((tile_element->type & 0x3) << 8), y, - (map_element->base_height << 8) | (map_element->type & 0x3), + (tile_element->base_height << 8) | (tile_element->type & 0x3), GAME_COMMAND_REMOVE_WALL, 0, 0); diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp index 42d55a2d91..1e2a500063 100644 --- a/src/openrct2-ui/windows/Staff.cpp +++ b/src/openrct2-ui/windows/Staff.cpp @@ -1132,7 +1132,7 @@ void window_staff_overview_tool_down(rct_window* w, rct_widgetindex widgetIndex, { if (widgetIndex == WIDX_PICKUP) { sint32 dest_x, dest_y; - rct_map_element* mapElement; + rct_tile_element* mapElement; footpath_get_coordinates_from_pos(x, y + 16, &dest_x, &dest_y, nullptr, &mapElement); if (dest_x == LOCATION_NULL) diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp index f2b7c90d3c..f3e0f6fa3f 100644 --- a/src/openrct2-ui/windows/StaffList.cpp +++ b/src/openrct2-ui/windows/StaffList.cpp @@ -336,7 +336,7 @@ static void window_staff_list_tooldown(rct_window *w, rct_widgetindex widgetInde sint32 selectedPeepType = _windowStaffListSelectedTab; sint32 direction; - rct_map_element *mapElement; + rct_tile_element *mapElement; footpath_get_coordinates_from_pos(x, y, &x, &y, &direction, &mapElement); if (x == 0x8000) return; diff --git a/src/openrct2-ui/windows/TitleCommandEditor.cpp b/src/openrct2-ui/windows/TitleCommandEditor.cpp index b3c13c7c7b..1f9b6447bd 100644 --- a/src/openrct2-ui/windows/TitleCommandEditor.cpp +++ b/src/openrct2-ui/windows/TitleCommandEditor.cpp @@ -169,7 +169,7 @@ static LocationXY16 get_location() rct_window *w = window_get_main(); if (w != nullptr) { sint32 interactionType; - rct_map_element *mapElement; + rct_tile_element *mapElement; get_map_coordinates_from_pos_window(w, w->viewport->view_width / 2, w->viewport->view_height / 2, VIEWPORT_INTERACTION_MASK_TERRAIN, &mapCoord.x, &mapCoord.y, &interactionType, &mapElement, nullptr); mapCoord.x -= 16; diff --git a/src/openrct2-ui/windows/TrackDesignPlace.cpp b/src/openrct2-ui/windows/TrackDesignPlace.cpp index 25f965a7e6..7f2f954bd0 100644 --- a/src/openrct2-ui/windows/TrackDesignPlace.cpp +++ b/src/openrct2-ui/windows/TrackDesignPlace.cpp @@ -406,7 +406,7 @@ static void window_track_place_clear_provisional() */ static sint32 window_track_place_get_base_z(sint32 x, sint32 y) { - rct_map_element *mapElement; + rct_tile_element *mapElement; sint32 z; mapElement = map_get_surface_element_at(x >> 5, y >> 5); diff --git a/src/openrct2-ui/windows/Viewport.cpp b/src/openrct2-ui/windows/Viewport.cpp index 8ac95c0a08..2c91657b33 100644 --- a/src/openrct2-ui/windows/Viewport.cpp +++ b/src/openrct2-ui/windows/Viewport.cpp @@ -160,7 +160,7 @@ static void window_viewport_mouseup(rct_window *w, rct_widgetindex widgetIndex) mainWindow = window_get_main(); if (mainWindow != nullptr) { get_map_coordinates_from_pos(w->x + (w->width / 2), w->y + (w->height / 2), VIEWPORT_INTERACTION_MASK_NONE, &x, &y, nullptr, nullptr, nullptr); - window_scroll_to_location(mainWindow, x, y, map_element_height(x, y)); + window_scroll_to_location(mainWindow, x, y, tile_element_height(x, y)); } break; } diff --git a/src/openrct2/actions/PlaceParkEntranceAction.hpp b/src/openrct2/actions/PlaceParkEntranceAction.hpp index cfcb3e82df..530e487b99 100644 --- a/src/openrct2/actions/PlaceParkEntranceAction.hpp +++ b/src/openrct2/actions/PlaceParkEntranceAction.hpp @@ -119,7 +119,7 @@ public: } // Check that entrance element does not already exist at this location - rct_map_element* entranceElement = map_get_park_entrance_element_at(entranceLoc.x, entranceLoc.y, zLow, false); + rct_tile_element* entranceElement = map_get_park_entrance_element_at(entranceLoc.x, entranceLoc.y, zLow, false); if (entranceElement != NULL) { return std::make_unique(GA_ERROR::ITEM_ALREADY_PLACED, STR_CANT_BUILD_PARK_ENTRANCE_HERE, STR_NONE); @@ -174,20 +174,20 @@ public: if (!(flags & GAME_COMMAND_FLAG_GHOST)) { - rct_map_element* surfaceElement = map_get_surface_element_at(entranceLoc.x / 32, entranceLoc.y / 32); + rct_tile_element* surfaceElement = map_get_surface_element_at(entranceLoc.x / 32, entranceLoc.y / 32); surfaceElement->properties.surface.ownership = 0; } - rct_map_element* newElement = map_element_insert(entranceLoc.x / 32, entranceLoc.y / 32, zLow, 0xF); + rct_tile_element* newElement = tile_element_insert(entranceLoc.x / 32, entranceLoc.y / 32, zLow, 0xF); Guard::Assert(newElement != NULL); newElement->clearance_height = zHigh; if (flags & GAME_COMMAND_FLAG_GHOST) { - newElement->flags |= MAP_ELEMENT_FLAG_GHOST; + newElement->flags |= TILE_ELEMENT_FLAG_GHOST; } - newElement->type = MAP_ELEMENT_TYPE_ENTRANCE; + newElement->type = TILE_ELEMENT_TYPE_ENTRANCE; newElement->type |= _direction; newElement->properties.entrance.index = index; newElement->properties.entrance.type = ENTRANCE_TYPE_PARK_ENTRANCE; diff --git a/src/openrct2/actions/RideDemolishAction.hpp b/src/openrct2/actions/RideDemolishAction.hpp index d3419d7d39..af58fb853d 100644 --- a/src/openrct2/actions/RideDemolishAction.hpp +++ b/src/openrct2/actions/RideDemolishAction.hpp @@ -191,7 +191,7 @@ public: { sint32 x = (ride->overall_view.x * 32) + 16; sint32 y = (ride->overall_view.y * 32) + 16; - sint32 z = map_element_height(x, y); + sint32 z = tile_element_height(x, y); res->Position = { x, y, z }; } diff --git a/src/openrct2/actions/RideSetName.hpp b/src/openrct2/actions/RideSetName.hpp index ba86a9aacc..cab658d5d8 100644 --- a/src/openrct2/actions/RideSetName.hpp +++ b/src/openrct2/actions/RideSetName.hpp @@ -100,7 +100,7 @@ public: auto res = std::make_unique(); res->Position.x = ride->overall_view.x * 32 + 16; res->Position.y = ride->overall_view.y * 32 + 16; - res->Position.z = map_element_height(res->Position.x, res->Position.y); + res->Position.z = tile_element_height(res->Position.x, res->Position.y); return res; } diff --git a/src/openrct2/actions/RideSetStatus.hpp b/src/openrct2/actions/RideSetStatus.hpp index 41ed824106..29933af5c3 100644 --- a/src/openrct2/actions/RideSetStatus.hpp +++ b/src/openrct2/actions/RideSetStatus.hpp @@ -119,7 +119,7 @@ public: { res->Position.x = ride->overall_view.x * 32 + 16; res->Position.y = ride->overall_view.y * 32 + 16; - res->Position.z = map_element_height(res->Position.x, res->Position.y); + res->Position.z = tile_element_height(res->Position.x, res->Position.y); } switch (_status) { diff --git a/src/openrct2/audio/Audio.cpp b/src/openrct2/audio/Audio.cpp index b4bc8e0a4d..3835a92620 100644 --- a/src/openrct2/audio/Audio.cpp +++ b/src/openrct2/audio/Audio.cpp @@ -215,7 +215,7 @@ AudioParams audio_get_params_from_location(sint32 soundId, const LocationXYZ16 * params.volume = 0; params.pan = 0; - rct_map_element * element = map_get_surface_element_at(location->x >> 5, location->y >> 5); + rct_tile_element * element = map_get_surface_element_at(location->x >> 5, location->y >> 5); if (element && (element->base_height * 8) - 5 > location->z) { volumeDown = 10; diff --git a/src/openrct2/cheats.c b/src/openrct2/cheats.c index e76487650e..7ec69ef6e3 100644 --- a/src/openrct2/cheats.c +++ b/src/openrct2/cheats.c @@ -60,7 +60,7 @@ sint32 park_rating_spinner_value; static void cheat_set_grass_length(sint32 length) { sint32 x, y; - rct_map_element *mapElement; + rct_tile_element *mapElement; for (y = 0; y < 256; y++) { for (x = 0; x < 256; x++) { @@ -68,7 +68,7 @@ static void cheat_set_grass_length(sint32 length) if (!(mapElement->properties.surface.ownership & OWNERSHIP_OWNED)) continue; - if (map_element_get_terrain(mapElement) != TERRAIN_GRASS) + if (tile_element_get_terrain(mapElement) != TERRAIN_GRASS) continue; if (map_get_water_height(mapElement) > 0) @@ -83,32 +83,32 @@ static void cheat_set_grass_length(sint32 length) static void cheat_water_plants() { - map_element_iterator it; + tile_element_iterator it; - map_element_iterator_begin(&it); + tile_element_iterator_begin(&it); do { - if (map_element_get_type(it.element) == MAP_ELEMENT_TYPE_SCENERY) { + if (tile_element_get_type(it.element) == TILE_ELEMENT_TYPE_SCENERY) { it.element->properties.scenery.age = 0; } - } while (map_element_iterator_next(&it)); + } while (tile_element_iterator_next(&it)); gfx_invalidate_screen(); } static void cheat_fix_vandalism() { - map_element_iterator it; + tile_element_iterator it; - map_element_iterator_begin(&it); + tile_element_iterator_begin(&it); do { - if (map_element_get_type(it.element) != MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(it.element) != TILE_ELEMENT_TYPE_PATH) continue; if (!footpath_element_has_path_scenery(it.element)) continue; - it.element->flags &= ~MAP_ELEMENT_FLAG_BROKEN; - } while (map_element_iterator_next(&it)); + it.element->flags &= ~TILE_ELEMENT_FLAG_BROKEN; + } while (tile_element_iterator_next(&it)); gfx_invalidate_screen(); } @@ -124,12 +124,12 @@ static void cheat_remove_litter() sprite_remove((rct_sprite*)litter); } - map_element_iterator it; + tile_element_iterator it; rct_scenery_entry *sceneryEntry; - map_element_iterator_begin(&it); + tile_element_iterator_begin(&it); do { - if (map_element_get_type(it.element) != MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(it.element) != TILE_ELEMENT_TYPE_PATH) continue; if (!footpath_element_has_path_scenery(it.element)) @@ -139,7 +139,7 @@ static void cheat_remove_litter() if (sceneryEntry->path_bit.flags & PATH_BIT_FLAG_IS_BIN) it.element->properties.path.addition_status = 0xFF; - } while (map_element_iterator_next(&it)); + } while (tile_element_iterator_next(&it)); gfx_invalidate_screen(); } @@ -443,7 +443,7 @@ static void cheat_own_all_land() sint32 max = gMapSizeUnits - 32; for (sint32 y = min; y <= max; y += 32) { for (sint32 x = min; x <= max; x += 32) { - rct_map_element * surfaceElement = map_get_surface_element_at(x >> 5, y >> 5); + rct_tile_element * surfaceElement = map_get_surface_element_at(x >> 5, y >> 5); // Ignore already owned tiles. if (surfaceElement->properties.surface.ownership & OWNERSHIP_OWNED) @@ -467,7 +467,7 @@ static void cheat_own_all_land() sint32 x = gPeepSpawns[i].x; sint32 y = gPeepSpawns[i].y; if (x != PEEP_SPAWN_UNDEFINED) { - rct_map_element * surfaceElement = map_get_surface_element_at(x >> 5, y >> 5); + rct_tile_element * surfaceElement = map_get_surface_element_at(x >> 5, y >> 5); surfaceElement->properties.surface.ownership = OWNERSHIP_UNOWNED; update_park_fences_around_tile(x, y); uint16 baseHeight = surfaceElement->base_height * 8; diff --git a/src/openrct2/drawing/lightfx.c b/src/openrct2/drawing/lightfx.c index 82142afb06..13ec3b2cf7 100644 --- a/src/openrct2/drawing/lightfx.c +++ b/src/openrct2/drawing/lightfx.c @@ -20,7 +20,7 @@ #include "../game.h" #include "../interface/viewport.h" #include "../interface/window.h" -#include "../paint/map_element/map_element.h" +#include "../paint/tile_element/tile_element.h" #include "../world/Climate.h" #include "../config/Config.h" #include "drawing.h" @@ -278,7 +278,7 @@ void lightfx_prepare_light_list() for (sint32 pat = startSamplePoint; pat < totalSamplePoints; pat++) { LocationXY16 mapCoord = { 0 }; - rct_map_element *mapElement = 0; + rct_tile_element *mapElement = 0; sint32 interactionType = 0; @@ -309,7 +309,7 @@ void lightfx_prepare_light_list() mapCoord.x = _interactionMapX + tileOffsetX; mapCoord.y = _interactionMapY + tileOffsetY; interactionType = _interactionSpriteType; - mapElement = RCT2_GLOBAL(0x9AC150, rct_map_element*); + mapElement = RCT2_GLOBAL(0x9AC150, rct_tile_element*); #endif //LIGHTFX_UNKNOWN_PART_1 //RCT2_GLOBAL(0x9AC154, uint16_t) = VIEWPORT_INTERACTION_MASK_NONE; diff --git a/src/openrct2/game.c b/src/openrct2/game.c index d49330cfea..58cfdc5317 100644 --- a/src/openrct2/game.c +++ b/src/openrct2/game.c @@ -1070,12 +1070,12 @@ void game_fix_save_vars() // and broken saves with incorrect invisible map border tiles for (sint32 y = 0; y < 256; y++) { for (sint32 x = 0; x < 256; x++) { - rct_map_element *mapElement = map_get_surface_element_at(x, y); + rct_tile_element *mapElement = map_get_surface_element_at(x, y); if (mapElement == NULL) { log_error("Null map element at x = %d and y = %d. Fixing...", x, y); - mapElement = map_element_insert(x, y, 14, 0); + mapElement = tile_element_insert(x, y, 14, 0); if (mapElement == NULL) { log_error("Unable to fix: Map element limit reached."); return; @@ -1130,7 +1130,7 @@ void game_fix_save_vars() // Fix invalid vehicle sprite sizes, thus preventing visual corruption of sprites fix_invalid_vehicle_sprite_sizes(); - // Fix gParkEntrance locations for which the map_element no longer exists + // Fix gParkEntrance locations for which the tile_element no longer exists fix_park_entrance_locations(); // Fix ride entrances and exits that were moved without updating ride->entrances[] / ride->exits[] diff --git a/src/openrct2/input.c b/src/openrct2/input.c index 77ebcb289d..a6803b1f00 100644 --- a/src/openrct2/input.c +++ b/src/openrct2/input.c @@ -85,7 +85,7 @@ void process_mouse_over(sint32 x, sint32 y); void process_mouse_tool(sint32 x, sint32 y); void invalidate_scroll(); static rct_mouse_data* get_mouse_input(); -void map_element_right_click(sint32 type, rct_map_element *mapElement, sint32 x, sint32 y); +void tile_element_right_click(sint32 type, rct_tile_element *mapElement, sint32 x, sint32 y); static void game_handle_input_mouse(sint32 x, sint32 y, sint32 state); static void input_widget_left(sint32 x, sint32 y, rct_window *w, rct_widgetindex widgetIndex); void input_state_widget_pressed(sint32 x, sint32 y, sint32 state, rct_widgetindex widgetIndex, rct_window* w, rct_widget* widget); diff --git a/src/openrct2/interface/Screenshot.cpp b/src/openrct2/interface/Screenshot.cpp index 464036c43e..a9386958fc 100644 --- a/src/openrct2/interface/Screenshot.cpp +++ b/src/openrct2/interface/Screenshot.cpp @@ -194,7 +194,7 @@ void screenshot_giant() sint32 centreY = (mapSize / 2) * 32 + 16; sint32 x = 0, y = 0; - sint32 z = map_element_height(centreX, centreY) & 0xFFFF; + sint32 z = tile_element_height(centreX, centreY) & 0xFFFF; switch (rotation) { case 0: x = centreY - centreX; @@ -303,7 +303,7 @@ sint32 cmdline_for_gfxbench(const char **argv, sint32 argc) customY = (mapSize / 2) * 32 + 16; sint32 x = 0, y = 0; - sint32 z = map_element_height(customX, customY) & 0xFFFF; + sint32 z = tile_element_height(customX, customY) & 0xFFFF; x = customY - customX; y = ((customX + customY) / 2) - z; @@ -427,7 +427,7 @@ sint32 cmdline_for_screenshot(const char **argv, sint32 argc) customY = (mapSize / 2) * 32 + 16; sint32 x = 0, y = 0; - sint32 z = map_element_height(customX, customY) & 0xFFFF; + sint32 z = tile_element_height(customX, customY) & 0xFFFF; switch (customRotation) { case 0: x = customY - customX; diff --git a/src/openrct2/interface/console.c b/src/openrct2/interface/console.c index a1515840b3..ddb285d241 100644 --- a/src/openrct2/interface/console.c +++ b/src/openrct2/interface/console.c @@ -818,7 +818,7 @@ static sint32 cc_get(const utf8 **argv, sint32 argc) rct_window *w = window_get_main(); if (w != NULL) { sint32 interactionType; - rct_map_element *mapElement; + rct_tile_element *mapElement; LocationXY16 mapCoord = { 0 }; get_map_coordinates_from_pos(w->viewport->view_width / 2, w->viewport->view_height / 2, VIEWPORT_INTERACTION_MASK_TERRAIN, &mapCoord.x, &mapCoord.y, &interactionType, &mapElement, NULL); mapCoord.x -= 16; @@ -1025,7 +1025,7 @@ static sint32 cc_set(const utf8 **argv, sint32 argc) if (w != NULL) { sint32 x = (sint16)(int_val[0] * 32 + 16); sint32 y = (sint16)(int_val[1] * 32 + 16); - sint32 z = map_element_height(x, y); + sint32 z = tile_element_height(x, y); window_set_location(w, x, y, z); viewport_update_position(w); console_execute_silent("get location"); @@ -1250,17 +1250,17 @@ static sint32 cc_remove_unused_objects(const utf8 **argv, sint32 argc) static sint32 cc_remove_park_fences(const utf8 **argv, sint32 argc) { - map_element_iterator it; - map_element_iterator_begin(&it); + tile_element_iterator it; + tile_element_iterator_begin(&it); do { - if (map_element_get_type(it.element) == MAP_ELEMENT_TYPE_SURFACE) + if (tile_element_get_type(it.element) == TILE_ELEMENT_TYPE_SURFACE) { // Remove all park fence flags it.element->properties.surface.ownership &= 0xF0; } } - while (map_element_iterator_next(&it)); + while (tile_element_iterator_next(&it)); console_printf("Park fences have been removed."); return 0; @@ -1306,7 +1306,7 @@ static sint32 cc_show_limits(const utf8 ** argv, sint32 argc) } console_printf("Sprites: %d/%d", spriteCount, MAX_SPRITES); - console_printf("Map Elements: %d/%d", mapElementCount, MAX_MAP_ELEMENTS); + console_printf("Map Elements: %d/%d", mapElementCount, MAX_TILE_ELEMENTS); console_printf("Banners: %d/%d", bannerCount, MAX_BANNERS); console_printf("Rides: %d/%d", rideCount, MAX_RIDES); console_printf("Staff: %d/%d", staffCount, STAFF_MAX_COUNT); diff --git a/src/openrct2/interface/viewport.c b/src/openrct2/interface/viewport.c index d33f1e73cc..066c10b9e8 100644 --- a/src/openrct2/interface/viewport.c +++ b/src/openrct2/interface/viewport.c @@ -44,7 +44,7 @@ uint8 gShowConstuctionRightsRefCount; rct_viewport g_viewport_list[MAX_VIEWPORT_COUNT]; rct_viewport *g_music_tracking_viewport; -static rct_map_element *_interaction_element = NULL; +static rct_tile_element *_interaction_element = NULL; sint16 gSavedViewX; sint16 gSavedViewY; @@ -229,7 +229,7 @@ void viewport_adjust_for_map_height(sint16* x, sint16* y, sint16 *z) LocationXY16 pos; for (sint32 i = 0; i < 6; i++) { pos = viewport_coord_to_map_coord(start_x, start_y, height); - height = map_element_height((0xFFFF) & pos.x, (0xFFFF) & pos.y); + height = tile_element_height((0xFFFF) & pos.x, (0xFFFF) & pos.y); // HACK: This is to prevent the x and y values being set to values outside // of the map. This can happen when the height is larger than the map size. @@ -555,7 +555,7 @@ void viewport_update_position(rct_window *window) if (at_map_edge_x || at_map_edge_y) { // The &0xFFFF is to prevent the sign extension messing the // function up. - sint32 zz = map_element_height(x & 0xFFFF, y & 0xFFFF); + sint32 zz = tile_element_height(x & 0xFFFF, y & 0xFFFF); sint32 _2d_x, _2d_y; centre_2d_coordinates(x, y, zz, &_2d_x, &_2d_y, viewport); @@ -605,7 +605,7 @@ void viewport_update_sprite_follow(rct_window *window) if (window->viewport_target_sprite != SPRITE_INDEX_NULL && window->viewport) { rct_sprite* sprite = get_sprite(window->viewport_target_sprite); - sint32 height = (map_element_height(0xFFFF & sprite->unknown.x, 0xFFFF & sprite->unknown.y) & 0xFFFF) - 16; + sint32 height = (tile_element_height(0xFFFF & sprite->unknown.x, 0xFFFF & sprite->unknown.y) & 0xFFFF) - 16; sint32 underground = sprite->unknown.z < height; viewport_set_underground_flag(underground, window, window->viewport); @@ -1347,14 +1347,14 @@ static void sub_68862C(rct_drawpixelinfo * dpi, paint_struct * ps) * mapElement: edx * viewport: edi */ -void get_map_coordinates_from_pos(sint32 screenX, sint32 screenY, sint32 flags, sint16 *x, sint16 *y, sint32 *interactionType, rct_map_element **mapElement, rct_viewport **viewport) +void get_map_coordinates_from_pos(sint32 screenX, sint32 screenY, sint32 flags, sint16 *x, sint16 *y, sint32 *interactionType, rct_tile_element **mapElement, 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, mapElement, viewport); } void get_map_coordinates_from_pos_window(rct_window * window, sint32 screenX, sint32 screenY, sint32 flags, sint16 * x, sint16 * y, - sint32 * interactionType, rct_map_element ** mapElement, rct_viewport ** viewport) + sint32 * interactionType, rct_tile_element ** mapElement, rct_viewport ** viewport) { _unk9AC154 = flags & 0xFFFF; _interactionSpriteType = 0; @@ -1471,7 +1471,7 @@ static rct_viewport *viewport_find_from_point(sint32 screenX, sint32 screenY) * Out: * x: ax * y: bx - * map_element: edx ? + * tile_element: edx ? * viewport: edi */ void screen_get_map_xy(sint32 screenX, sint32 screenY, sint16 *x, sint16 *y, rct_viewport **viewport) { @@ -1488,7 +1488,7 @@ void screen_get_map_xy(sint32 screenX, sint32 screenY, sint16 *x, sint16 *y, rct LocationXY16 map_pos = { my_x + 16, my_y + 16 }; for (sint32 i = 0; i < 5; i++) { - sint32 z = map_element_height(map_pos.x, map_pos.y); + sint32 z = tile_element_height(map_pos.x, map_pos.y); map_pos = viewport_coord_to_map_coord(start_vp_pos.x, start_vp_pos.y, z); map_pos.x = clamp(my_x, map_pos.x, my_x + 31); map_pos.y = clamp(my_y, map_pos.y, my_y + 31); diff --git a/src/openrct2/interface/viewport.h b/src/openrct2/interface/viewport.h index f5656479ff..d8c52236a5 100644 --- a/src/openrct2/interface/viewport.h +++ b/src/openrct2/interface/viewport.h @@ -80,7 +80,7 @@ typedef struct viewport_interaction_info { sint32 x; sint32 y; union { - rct_map_element *mapElement; + rct_tile_element *mapElement; rct_sprite *sprite; rct_peep *peep; rct_vehicle *vehicle; @@ -142,9 +142,9 @@ void show_construction_rights(); void hide_construction_rights(); void viewport_set_visibility(uint8 mode); -void get_map_coordinates_from_pos(sint32 screenX, sint32 screenY, sint32 flags, sint16 *x, sint16 *y, sint32 *interactionType, rct_map_element **mapElement, rct_viewport **viewport); +void get_map_coordinates_from_pos(sint32 screenX, sint32 screenY, sint32 flags, sint16 *x, sint16 *y, sint32 *interactionType, rct_tile_element **mapElement, rct_viewport **viewport); void get_map_coordinates_from_pos_window(rct_window * window, sint32 screenX, sint32 screenY, sint32 flags, sint16 * x, sint16 * y, - sint32 * interactionType, rct_map_element ** mapElement, rct_viewport ** viewport); + sint32 * interactionType, rct_tile_element ** mapElement, rct_viewport ** viewport); sint32 viewport_interaction_get_item_left(sint32 x, sint32 y, viewport_interaction_info *info); sint32 viewport_interaction_left_over(sint32 x, sint32 y); @@ -152,9 +152,9 @@ sint32 viewport_interaction_left_click(sint32 x, sint32 y); sint32 viewport_interaction_get_item_right(sint32 x, sint32 y, viewport_interaction_info *info); sint32 viewport_interaction_right_over(sint32 x, sint32 y); sint32 viewport_interaction_right_click(sint32 x, sint32 y); -void sub_68A15E(sint32 screenX, sint32 screenY, sint16 *x, sint16 *y, sint32 *direction, rct_map_element **mapElement); +void sub_68A15E(sint32 screenX, sint32 screenY, sint16 *x, sint16 *y, sint32 *direction, rct_tile_element **mapElement); -void viewport_interaction_remove_park_entrance(rct_map_element *mapElement, sint32 x, sint32 y); +void viewport_interaction_remove_park_entrance(rct_tile_element *mapElement, sint32 x, sint32 y); void sub_68B2B7(paint_session * session, sint32 x, sint32 y); diff --git a/src/openrct2/interface/viewport_interaction.c b/src/openrct2/interface/viewport_interaction.c index 17567494d9..974a14b7f7 100644 --- a/src/openrct2/interface/viewport_interaction.c +++ b/src/openrct2/interface/viewport_interaction.c @@ -33,11 +33,11 @@ #include "viewport.h" #include "../Context.h" -static void viewport_interaction_remove_scenery(rct_map_element *mapElement, sint32 x, sint32 y); -static void viewport_interaction_remove_footpath(rct_map_element *mapElement, sint32 x, sint32 y); -static void viewport_interaction_remove_footpath_item(rct_map_element *mapElement, sint32 x, sint32 y); -static void viewport_interaction_remove_park_wall(rct_map_element *mapElement, sint32 x, sint32 y); -static void viewport_interaction_remove_large_scenery(rct_map_element *mapElement, sint32 x, sint32 y); +static void viewport_interaction_remove_scenery(rct_tile_element *mapElement, sint32 x, sint32 y); +static void viewport_interaction_remove_footpath(rct_tile_element *mapElement, sint32 x, sint32 y); +static void viewport_interaction_remove_footpath_item(rct_tile_element *mapElement, sint32 x, sint32 y); +static void viewport_interaction_remove_park_wall(rct_tile_element *mapElement, sint32 x, sint32 y); +static void viewport_interaction_remove_large_scenery(rct_tile_element *mapElement, sint32 x, sint32 y); static rct_peep *viewport_interaction_get_closest_peep(sint32 x, sint32 y, sint32 maxDistance); /** @@ -46,7 +46,7 @@ static rct_peep *viewport_interaction_get_closest_peep(sint32 x, sint32 y, sint3 */ sint32 viewport_interaction_get_item_left(sint32 x, sint32 y, viewport_interaction_info *info) { - rct_map_element *mapElement; + rct_tile_element *mapElement; rct_sprite *sprite; rct_vehicle *vehicle; @@ -170,7 +170,7 @@ sint32 viewport_interaction_left_click(sint32 x, sint32 y) */ sint32 viewport_interaction_get_item_right(sint32 x, sint32 y, viewport_interaction_info *info) { - rct_map_element *mapElement; + rct_tile_element *mapElement; rct_scenery_entry *sceneryEntry; rct_banner *banner; Ride *ride; @@ -207,7 +207,7 @@ sint32 viewport_interaction_get_item_right(sint32 x, sint32 y, viewport_interact case VIEWPORT_INTERACTION_ITEM_RIDE: if (gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) return info->type = VIEWPORT_INTERACTION_ITEM_NONE; - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_PATH) return info->type = VIEWPORT_INTERACTION_ITEM_NONE; ride = get_ride(mapElement->properties.track.ride_index); @@ -216,7 +216,7 @@ sint32 viewport_interaction_get_item_right(sint32 x, sint32 y, viewport_interact set_map_tooltip_format_arg(0, rct_string_id, STR_MAP_TOOLTIP_STRINGID_CLICK_TO_MODIFY); - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_ENTRANCE) { + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_ENTRANCE) { rct_string_id stringId; if (mapElement->properties.track.type == ENTRANCE_TYPE_RIDE_ENTRANCE) { if (ride->num_stations > 1) { @@ -254,7 +254,7 @@ sint32 viewport_interaction_get_item_right(sint32 x, sint32 y, viewport_interact set_map_tooltip_format_arg(6, uint32, ride->name_arguments); set_map_tooltip_format_arg(10, rct_string_id, RideComponentNames[RideNameConvention[ride->type].station].capitalised); - stationIndex = map_element_get_station(mapElement); + stationIndex = tile_element_get_station(mapElement); for (i = stationIndex; i >= 0; i--) if (ride->station_starts[i].xy == RCT_XY8_UNDEFINED) stationIndex--; @@ -312,7 +312,7 @@ sint32 viewport_interaction_get_item_right(sint32 x, sint32 y, viewport_interact case VIEWPORT_INTERACTION_ITEM_FOOTPATH_ITEM: sceneryEntry = get_footpath_item_entry(footpath_element_get_path_scenery_index(mapElement)); set_map_tooltip_format_arg(0, rct_string_id, STR_MAP_TOOLTIP_STRINGID_CLICK_TO_REMOVE); - if (mapElement->flags & MAP_ELEMENT_FLAG_BROKEN) { + if (mapElement->flags & TILE_ELEMENT_FLAG_BROKEN) { set_map_tooltip_format_arg(2, rct_string_id, STR_BROKEN); set_map_tooltip_format_arg(4, rct_string_id, sceneryEntry->name); } else { @@ -324,7 +324,7 @@ sint32 viewport_interaction_get_item_right(sint32 x, sint32 y, viewport_interact if (!(gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) && !gCheatsSandboxMode) break; - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_ENTRANCE) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_ENTRANCE) break; set_map_tooltip_format_arg(0, rct_string_id, STR_MAP_TOOLTIP_STRINGID_CLICK_TO_REMOVE); @@ -407,7 +407,7 @@ sint32 viewport_interaction_right_click(sint32 x, sint32 y) * * rct2: 0x006E08D2 */ -static void viewport_interaction_remove_scenery(rct_map_element *mapElement, sint32 x, sint32 y) +static void viewport_interaction_remove_scenery(rct_tile_element *mapElement, sint32 x, sint32 y) { gGameCommandErrorTitle = STR_CANT_REMOVE_THIS; game_do_command( @@ -425,11 +425,11 @@ static void viewport_interaction_remove_scenery(rct_map_element *mapElement, sin * * rct2: 0x006A614A */ -static void viewport_interaction_remove_footpath(rct_map_element *mapElement, sint32 x, sint32 y) +static void viewport_interaction_remove_footpath(rct_tile_element *mapElement, sint32 x, sint32 y) { sint32 z; rct_window *w; - rct_map_element *mapElement2; + rct_tile_element *mapElement2; z = mapElement->base_height; @@ -439,19 +439,19 @@ static void viewport_interaction_remove_footpath(rct_map_element *mapElement, si mapElement2 = map_get_first_element_at(x / 32, y / 32); do { - if (map_element_get_type(mapElement2) == MAP_ELEMENT_TYPE_PATH && mapElement2->base_height == z) { + if (tile_element_get_type(mapElement2) == TILE_ELEMENT_TYPE_PATH && mapElement2->base_height == z) { gGameCommandErrorTitle = STR_CANT_REMOVE_FOOTPATH_FROM_HERE; footpath_remove(x, y, z, 1); break; } - } while (!map_element_is_last_for_tile(mapElement2++)); + } while (!tile_element_is_last_for_tile(mapElement2++)); } /** * * rct2: 0x006A61AB */ -static void viewport_interaction_remove_footpath_item(rct_map_element *mapElement, sint32 x, sint32 y) +static void viewport_interaction_remove_footpath_item(rct_tile_element *mapElement, sint32 x, sint32 y) { sint32 type; @@ -475,9 +475,9 @@ static void viewport_interaction_remove_footpath_item(rct_map_element *mapElemen * * rct2: 0x00666C0E */ -void viewport_interaction_remove_park_entrance(rct_map_element *mapElement, sint32 x, sint32 y) +void viewport_interaction_remove_park_entrance(rct_tile_element *mapElement, sint32 x, sint32 y) { - sint32 rotation = map_element_get_direction_with_offset(mapElement, 1); + sint32 rotation = tile_element_get_direction_with_offset(mapElement, 1); switch (mapElement->properties.entrance.index & 0x0F) { case 1: x += TileDirectionDelta[rotation].x; @@ -496,7 +496,7 @@ void viewport_interaction_remove_park_entrance(rct_map_element *mapElement, sint * * rct2: 0x006E57A9 */ -static void viewport_interaction_remove_park_wall(rct_map_element *mapElement, sint32 x, sint32 y) +static void viewport_interaction_remove_park_wall(rct_tile_element *mapElement, sint32 x, sint32 y) { rct_scenery_entry *sceneryEntry = get_wall_entry(mapElement->properties.wall.type); if (sceneryEntry->wall.scrolling_mode != 0xFF){ @@ -507,7 +507,7 @@ static void viewport_interaction_remove_park_wall(rct_map_element *mapElement, s x, GAME_COMMAND_FLAG_APPLY, y, - map_element_get_direction(mapElement) | (mapElement->base_height << 8), + tile_element_get_direction(mapElement) | (mapElement->base_height << 8), GAME_COMMAND_REMOVE_WALL, 0, 0 @@ -519,9 +519,9 @@ static void viewport_interaction_remove_park_wall(rct_map_element *mapElement, s * * rct2: 0x006B88DC */ -static void viewport_interaction_remove_large_scenery(rct_map_element *mapElement, sint32 x, sint32 y) +static void viewport_interaction_remove_large_scenery(rct_tile_element *mapElement, sint32 x, sint32 y) { - rct_scenery_entry *sceneryEntry = get_large_scenery_entry(mapElement->properties.scenerymultiple.type & MAP_ELEMENT_LARGE_TYPE_MASK); + rct_scenery_entry *sceneryEntry = get_large_scenery_entry(mapElement->properties.scenerymultiple.type & TILE_ELEMENT_LARGE_TYPE_MASK); if (sceneryEntry->large_scenery.scrolling_mode != 0xFF){ sint32 id = (mapElement->type & 0xC0) | @@ -532,7 +532,7 @@ static void viewport_interaction_remove_large_scenery(rct_map_element *mapElemen gGameCommandErrorTitle = STR_CANT_REMOVE_THIS; game_do_command( x, - 1 | (map_element_get_direction(mapElement) << 8), + 1 | (tile_element_get_direction(mapElement) << 8), y, mapElement->base_height | ((mapElement->properties.scenerymultiple.type >> 10) << 8), GAME_COMMAND_REMOVE_LARGE_SCENERY, @@ -586,11 +586,11 @@ static rct_peep *viewport_interaction_get_closest_peep(sint32 x, sint32 y, sint3 * * rct2: 0x0068A15E */ -void sub_68A15E(sint32 screenX, sint32 screenY, sint16 *x, sint16 *y, sint32 *direction, rct_map_element **mapElement) +void sub_68A15E(sint32 screenX, sint32 screenY, sint16 *x, sint16 *y, sint32 *direction, rct_tile_element **mapElement) { sint16 my_x, my_y; sint32 interactionType; - rct_map_element *myMapElement; + rct_tile_element *myMapElement; rct_viewport *viewport; get_map_coordinates_from_pos(screenX, screenY, VIEWPORT_INTERACTION_MASK_TERRAIN & VIEWPORT_INTERACTION_MASK_WATER, &my_x, &my_y, &interactionType, &myMapElement, &viewport); @@ -610,7 +610,7 @@ void sub_68A15E(sint32 screenX, sint32 screenY, sint16 *x, sint16 *y, sint32 *di for (sint32 i = 0; i < 5; i++) { sint16 z = originalZ; if (interactionType != VIEWPORT_INTERACTION_ITEM_WATER) { - z = map_element_height(map_pos.x, map_pos.y); + z = tile_element_height(map_pos.x, map_pos.y); } map_pos = viewport_coord_to_map_coord(start_vp_pos.x, start_vp_pos.y, z); map_pos.x = clamp(my_x, map_pos.x, my_x + 31); diff --git a/src/openrct2/interface/window.c b/src/openrct2/interface/window.c index c705f42433..e53e7620eb 100644 --- a/src/openrct2/interface/window.c +++ b/src/openrct2/interface/window.c @@ -1347,7 +1347,7 @@ void window_scroll_to_location(rct_window *w, sint32 x, sint32 y, sint32 z) assert(w != NULL); if (w->viewport) { - sint16 height = map_element_height(x, y); + sint16 height = tile_element_height(x, y); if (z < height - 16) { if (!(w->viewport->flags & 1 << 0)) { w->viewport->flags |= 1 << 0; @@ -1445,7 +1445,7 @@ void window_rotate_camera(rct_window *w, sint32 direction) viewport_adjust_for_map_height(&x, &y, &z); } else { - z = map_element_height(x, y); + z = tile_element_height(x, y); } gCurrentRotation = (get_current_rotation() + direction) & 3; @@ -1474,7 +1474,7 @@ void window_viewport_get_map_coords_by_cursor(rct_window *w, sint16 *map_x, sint get_map_coordinates_from_pos(mouse_x, mouse_y, VIEWPORT_INTERACTION_MASK_NONE, map_x, map_y, NULL, NULL, NULL); // Get viewport coordinates centring around the tile. - sint32 base_height = map_element_height(*map_x, *map_y); + sint32 base_height = tile_element_height(*map_x, *map_y); sint32 dest_x, dest_y; centre_2d_coordinates(*map_x, *map_y, base_height, &dest_x, &dest_y, w->viewport); @@ -1491,7 +1491,7 @@ void window_viewport_centre_tile_around_cursor(rct_window *w, sint16 map_x, sint { // Get viewport coordinates centring around the tile. sint32 dest_x, dest_y; - sint32 base_height = map_element_height(map_x, map_y); + sint32 base_height = tile_element_height(map_x, map_y); centre_2d_coordinates(map_x, map_y, base_height, &dest_x, &dest_y, w->viewport); // Get mouse position to offset against. diff --git a/src/openrct2/interface/window.h b/src/openrct2/interface/window.h index 2182b801b5..31bf65e4b8 100644 --- a/src/openrct2/interface/window.h +++ b/src/openrct2/interface/window.h @@ -719,7 +719,7 @@ void window_game_bottom_toolbar_invalidate_news_item(); void window_track_list_open(ride_list_item item); rct_window *window_ride_main_open(sint32 rideIndex); rct_window *window_ride_open_station(sint32 rideIndex, sint32 stationIndex); -rct_window *window_ride_open_track(rct_map_element *mapElement); +rct_window *window_ride_open_track(rct_tile_element *mapElement); rct_window *window_ride_open_vehicle(rct_vehicle *vehicle); void window_ride_construct(rct_window *w); rct_window *window_ride_construction_open(); diff --git a/src/openrct2/localisation/string_ids.h b/src/openrct2/localisation/string_ids.h index c4da344732..62885b5877 100644 --- a/src/openrct2/localisation/string_ids.h +++ b/src/openrct2/localisation/string_ids.h @@ -3611,7 +3611,7 @@ enum { STR_NO_CONSTRUCTION_RIGHTS_FOR_SALE_TIP = 5989, STR_NO_LAND_OR_CONSTRUCTION_RIGHTS_FOR_SALE_TIP = 5990, STR_CANT_PASTE = 5991, - STR_MAP_ELEMENT_LIMIT_REACHED = 5992, + STR_TILE_ELEMENT_LIMIT_REACHED = 5992, STR_TILE_INSPECTOR_COPY_TIP = 5993, STR_TILE_INSPECTOR_PASTE_TIP = 5994, STR_BOOSTER = 5995, diff --git a/src/openrct2/management/NewsItem.cpp b/src/openrct2/management/NewsItem.cpp index bc90d1ac39..0f0824afea 100644 --- a/src/openrct2/management/NewsItem.cpp +++ b/src/openrct2/management/NewsItem.cpp @@ -236,7 +236,7 @@ void news_item_get_subject_location(sint32 type, sint32 subject, sint32 * x, sin } *x = ride->overall_view.x * 32 + 16; *y = ride->overall_view.y * 32 + 16; - *z = map_element_height(*x, *y); + *z = tile_element_height(*x, *y); break; case NEWS_ITEM_PEEP_ON_RIDE: peep = GET_PEEP(subject); @@ -280,7 +280,7 @@ void news_item_get_subject_location(sint32 type, sint32 subject, sint32 * x, sin case NEWS_ITEM_BLANK: *x = subject; *y = subject >> 16; - *z = map_element_height(*x, *y); + *z = tile_element_height(*x, *y); break; default: *x = LOCATION_NULL; diff --git a/src/openrct2/paint/Paint.cpp b/src/openrct2/paint/Paint.cpp index 5089eca20e..ae2f9b0e27 100644 --- a/src/openrct2/paint/Paint.cpp +++ b/src/openrct2/paint/Paint.cpp @@ -20,7 +20,7 @@ #include "../config/Config.h" #include "../interface/viewport.h" #include "../core/Math.hpp" -#include "map_element/map_element.h" +#include "tile_element/tile_element.h" #include "sprite/sprite.h" #include @@ -188,7 +188,7 @@ static paint_struct * sub_9819_c(paint_session * session, uint32 image_id, Locat ps->var_29 = 0; ps->map_x = session->MapPosition.x; ps->map_y = session->MapPosition.y; - ps->mapElement = (rct_map_element*)session->CurrentlyDrawnItem; + ps->mapElement = (rct_tile_element*)session->CurrentlyDrawnItem; return ps; } @@ -219,12 +219,12 @@ void paint_session_generate(paint_session * session) mapTile.y &= 0xFFE0; for (; num_vertical_quadrants > 0; --num_vertical_quadrants) { - map_element_paint_setup(session, mapTile.x, mapTile.y); + tile_element_paint_setup(session, mapTile.x, mapTile.y); sprite_paint_setup(session, mapTile.x, mapTile.y); sprite_paint_setup(session, mapTile.x - 32, mapTile.y + 32); - map_element_paint_setup(session, mapTile.x, mapTile.y + 32); + tile_element_paint_setup(session, mapTile.x, mapTile.y + 32); sprite_paint_setup(session, mapTile.x, mapTile.y + 32); mapTile.x += 32; @@ -241,12 +241,12 @@ void paint_session_generate(paint_session * session) mapTile.y &= 0xFFE0; for (; num_vertical_quadrants > 0; --num_vertical_quadrants) { - map_element_paint_setup(session, mapTile.x, mapTile.y); + tile_element_paint_setup(session, mapTile.x, mapTile.y); sprite_paint_setup(session, mapTile.x, mapTile.y); sprite_paint_setup(session, mapTile.x - 32, mapTile.y - 32); - map_element_paint_setup(session, mapTile.x - 32, mapTile.y); + tile_element_paint_setup(session, mapTile.x - 32, mapTile.y); sprite_paint_setup(session, mapTile.x - 32, mapTile.y); mapTile.y += 32; @@ -263,12 +263,12 @@ void paint_session_generate(paint_session * session) mapTile.y &= 0xFFE0; for (; num_vertical_quadrants > 0; --num_vertical_quadrants) { - map_element_paint_setup(session, mapTile.x, mapTile.y); + tile_element_paint_setup(session, mapTile.x, mapTile.y); sprite_paint_setup(session, mapTile.x, mapTile.y); sprite_paint_setup(session, mapTile.x + 32, mapTile.y - 32); - map_element_paint_setup(session, mapTile.x, mapTile.y - 32); + tile_element_paint_setup(session, mapTile.x, mapTile.y - 32); sprite_paint_setup(session, mapTile.x, mapTile.y - 32); mapTile.x -= 32; @@ -287,12 +287,12 @@ void paint_session_generate(paint_session * session) for (; num_vertical_quadrants > 0; --num_vertical_quadrants) { - map_element_paint_setup(session, mapTile.x, mapTile.y); + tile_element_paint_setup(session, mapTile.x, mapTile.y); sprite_paint_setup(session, mapTile.x, mapTile.y); sprite_paint_setup(session, mapTile.x + 32, mapTile.y + 32); - map_element_paint_setup(session, mapTile.x + 32, mapTile.y); + tile_element_paint_setup(session, mapTile.x + 32, mapTile.y); sprite_paint_setup(session, mapTile.x + 32, mapTile.y); mapTile.y -= 32; @@ -783,30 +783,30 @@ extern "C" switch (rotation) { case 0: - rotate_map_coordinates(&coord_3d.x, &coord_3d.y, MAP_ELEMENT_DIRECTION_WEST); + rotate_map_coordinates(&coord_3d.x, &coord_3d.y, TILE_ELEMENT_DIRECTION_WEST); boundBox.x--; boundBox.y--; - rotate_map_coordinates(&boundBox.x, &boundBox.y, MAP_ELEMENT_DIRECTION_WEST); + rotate_map_coordinates(&boundBox.x, &boundBox.y, TILE_ELEMENT_DIRECTION_WEST); break; case 1: - rotate_map_coordinates(&coord_3d.x, &coord_3d.y, MAP_ELEMENT_DIRECTION_SOUTH); + rotate_map_coordinates(&coord_3d.x, &coord_3d.y, TILE_ELEMENT_DIRECTION_SOUTH); boundBox.x--; - rotate_map_coordinates(&boundBox.x, &boundBox.y, MAP_ELEMENT_DIRECTION_SOUTH); + rotate_map_coordinates(&boundBox.x, &boundBox.y, TILE_ELEMENT_DIRECTION_SOUTH); break; case 2: - rotate_map_coordinates(&coord_3d.x, &coord_3d.y, MAP_ELEMENT_DIRECTION_EAST); - rotate_map_coordinates(&boundBox.x, &boundBox.y, MAP_ELEMENT_DIRECTION_EAST); + rotate_map_coordinates(&coord_3d.x, &coord_3d.y, TILE_ELEMENT_DIRECTION_EAST); + rotate_map_coordinates(&boundBox.x, &boundBox.y, TILE_ELEMENT_DIRECTION_EAST); break; case 3: - rotate_map_coordinates(&coord_3d.x, &coord_3d.y, MAP_ELEMENT_DIRECTION_NORTH); + rotate_map_coordinates(&coord_3d.x, &coord_3d.y, TILE_ELEMENT_DIRECTION_NORTH); boundBox.y--; - rotate_map_coordinates(&boundBox.x, &boundBox.y, MAP_ELEMENT_DIRECTION_NORTH); + rotate_map_coordinates(&boundBox.x, &boundBox.y, TILE_ELEMENT_DIRECTION_NORTH); break; } @@ -847,7 +847,7 @@ extern "C" ps->var_29 = 0; ps->map_x = session->MapPosition.x; ps->map_y = session->MapPosition.y; - ps->mapElement = (rct_map_element*)session->CurrentlyDrawnItem; + ps->mapElement = (rct_tile_element*)session->CurrentlyDrawnItem; session->UnkF1AD28 = ps; diff --git a/src/openrct2/paint/paint.h b/src/openrct2/paint/paint.h index 364283d51b..879a136166 100644 --- a/src/openrct2/paint/paint.h +++ b/src/openrct2/paint/paint.h @@ -81,7 +81,7 @@ struct paint_struct { uint16 pad_2A; uint16 map_x; // 0x2C uint16 map_y; // 0x2E - rct_map_element *mapElement; // 0x30 (or sprite pointer) + rct_tile_element *mapElement; // 0x30 (or sprite pointer) }; #ifdef PLATFORM_32BIT // TODO: drop packing from this when all rendering is done. @@ -170,7 +170,7 @@ typedef struct paint_session tunnel_entry RightTunnels[TUNNEL_MAX_COUNT]; uint8 RightTunnelCount; uint8 VerticalTunnelHeight; - rct_map_element * SurfaceElement; + rct_tile_element * SurfaceElement; bool DidPassSurface; uint8 Unk141E9DB; uint16 Unk141E9DC; @@ -194,7 +194,7 @@ extern paint_session gPaintSession; #define gRightTunnels RCT2_ADDRESS(0x009E30B6, tunnel_entry) #define gRightTunnelCount RCT2_GLOBAL(0x0141F56B, uint8) #define gVerticalTunnelHeight RCT2_GLOBAL(0x009E323C, uint8) -#define gSurfaceElement RCT2_GLOBAL(0x009E3250, rct_map_element *) +#define gSurfaceElement RCT2_GLOBAL(0x009E3250, rct_tile_element *) #define gDidPassSurface RCT2_GLOBAL(0x009DE57C, bool) #define g141E9DB RCT2_GLOBAL(0x0141E9DB, uint8) #define gUnk141E9DC RCT2_GLOBAL(0x0141E9DC, uint16) diff --git a/src/openrct2/paint/supports.c b/src/openrct2/paint/supports.c index 30f80c3011..6dcd6c261f 100644 --- a/src/openrct2/paint/supports.c +++ b/src/openrct2/paint/supports.c @@ -17,7 +17,7 @@ #include "../interface/viewport.h" #include "../paint/paint.h" #include "supports.h" -#include "map_element/map_element.h" +#include "tile_element/tile_element.h" /** rct2: 0x0097AF20, 0x0097AF21 */ static const LocationXY8 loc_97AF20[] = { diff --git a/src/openrct2/paint/map_element/banner.c b/src/openrct2/paint/tile_element/banner.c similarity index 85% rename from src/openrct2/paint/map_element/banner.c rename to src/openrct2/paint/tile_element/banner.c index 00209fd821..1a8a5ade01 100644 --- a/src/openrct2/paint/map_element/banner.c +++ b/src/openrct2/paint/tile_element/banner.c @@ -19,7 +19,7 @@ #include "../../game.h" #include "../../interface/viewport.h" #include "../../localisation/localisation.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" #include "../../world/banner.h" #include "../../world/scenery.h" @@ -35,7 +35,7 @@ const LocationXY16 BannerBoundBoxes[][2] = { * * rct2: 0x006B9CC4 */ -void banner_paint(paint_session * session, uint8 direction, sint32 height, rct_map_element* map_element) +void banner_paint(paint_session * session, uint8 direction, sint32 height, rct_tile_element* tile_element) { uint16 boundBoxOffsetX, boundBoxOffsetY, boundBoxOffsetZ; rct_drawpixelinfo* dpi = session->Unk140E9A8; @@ -46,13 +46,13 @@ void banner_paint(paint_session * session, uint8 direction, sint32 height, rct_m height -= 16; - rct_scenery_entry* banner_scenery = get_banner_entry(gBanners[map_element->properties.banner.index].type); + rct_scenery_entry* banner_scenery = get_banner_entry(gBanners[tile_element->properties.banner.index].type); if (banner_scenery == NULL) { return; } - direction += map_element->properties.banner.position; + direction += tile_element->properties.banner.position; direction &= 3; boundBoxOffsetX = BannerBoundBoxes[direction][0].x; @@ -62,14 +62,14 @@ void banner_paint(paint_session * session, uint8 direction, sint32 height, rct_m uint32 base_id = (direction << 1) + banner_scenery->image; uint32 image_id = base_id; - if (map_element->flags & MAP_ELEMENT_FLAG_GHOST) // if being placed + if (tile_element->flags & TILE_ELEMENT_FLAG_GHOST) // if being placed { session->InteractionType = VIEWPORT_INTERACTION_ITEM_NONE; image_id |= construction_markers[gConfigGeneral.construction_marker_colour]; } else{ image_id |= - (gBanners[map_element->properties.banner.index].colour << 19) | + (gBanners[tile_element->properties.banner.index].colour << 19) | IMAGE_TYPE_REMAP; } @@ -84,7 +84,7 @@ void banner_paint(paint_session * session, uint8 direction, sint32 height, rct_m direction ^= 2; direction--; // If text not showing / ghost - if (direction >= 2 || (map_element->flags & MAP_ELEMENT_FLAG_GHOST)) return; + if (direction >= 2 || (tile_element->flags & TILE_ELEMENT_FLAG_GHOST)) return; uint16 scrollingMode = banner_scenery->banner.scrolling_mode; if (scrollingMode >= MAX_SCROLLING_TEXT_MODES) { @@ -97,9 +97,9 @@ void banner_paint(paint_session * session, uint8 direction, sint32 height, rct_m set_format_arg(4, uint32, 0); rct_string_id string_id = STR_NO_ENTRY; - if (!(gBanners[map_element->properties.banner.index].flags & BANNER_FLAG_NO_ENTRY)) + if (!(gBanners[tile_element->properties.banner.index].flags & BANNER_FLAG_NO_ENTRY)) { - set_format_arg(0, rct_string_id, gBanners[map_element->properties.banner.index].string_idx); + set_format_arg(0, rct_string_id, gBanners[tile_element->properties.banner.index].string_idx); string_id = STR_BANNER_TEXT_FORMAT; } if (gConfigGeneral.upper_case_banners) { diff --git a/src/openrct2/paint/map_element/entrance.c b/src/openrct2/paint/tile_element/entrance.c similarity index 89% rename from src/openrct2/paint/map_element/entrance.c rename to src/openrct2/paint/tile_element/entrance.c index 678f433be7..9998070eee 100644 --- a/src/openrct2/paint/map_element/entrance.c +++ b/src/openrct2/paint/tile_element/entrance.c @@ -23,7 +23,7 @@ #include "../../world/footpath.h" #include "../paint.h" #include "../supports.h" -#include "map_element.h" +#include "tile_element.h" #include "../../drawing/lightfx.h" static uint32 _unk9E32BC; @@ -32,13 +32,13 @@ static uint32 _unk9E32BC; * * rct2: 0x0066508C, 0x00665540 */ -static void ride_entrance_exit_paint(paint_session * session, uint8 direction, sint32 height, rct_map_element* map_element) +static void ride_entrance_exit_paint(paint_session * session, uint8 direction, sint32 height, rct_tile_element* tile_element) { - uint8 is_exit = map_element->properties.entrance.type == ENTRANCE_TYPE_RIDE_EXIT; + uint8 is_exit = tile_element->properties.entrance.type == ENTRANCE_TYPE_RIDE_EXIT; if (gTrackDesignSaveMode) { - if (map_element->properties.entrance.ride_index != gTrackDesignSaveRideIndex) + if (tile_element->properties.entrance.ride_index != gTrackDesignSaveRideIndex) return; } @@ -48,7 +48,7 @@ static void ride_entrance_exit_paint(paint_session * session, uint8 direction, s lightfx_add_3d_light_magic_from_drawing_tile(session->MapPosition, 0, 0, height + 45, LIGHTFX_LIGHT_TYPE_LANTERN_3); } - switch (map_element_get_direction(map_element)) { + switch (tile_element_get_direction(tile_element)) { case 0: lightfx_add_3d_light_magic_from_drawing_tile(session->MapPosition, 16, 0, height + 16, LIGHTFX_LIGHT_TYPE_LANTERN_2); break; @@ -65,7 +65,7 @@ static void ride_entrance_exit_paint(paint_session * session, uint8 direction, s } #endif - Ride* ride = get_ride(map_element->properties.entrance.ride_index); + Ride* ride = get_ride(tile_element->properties.entrance.ride_index); if (ride->entrance_style == RIDE_ENTRANCE_STYLE_NONE) return; const rct_ride_entrance_definition *style = &RideEntranceDefinitions[ride->entrance_style]; @@ -84,7 +84,7 @@ static void ride_entrance_exit_paint(paint_session * session, uint8 direction, s session->InteractionType = VIEWPORT_INTERACTION_ITEM_RIDE; _unk9E32BC = 0; - if (map_element->flags & MAP_ELEMENT_FLAG_GHOST){ + if (tile_element->flags & TILE_ELEMENT_FLAG_GHOST){ session->InteractionType = VIEWPORT_INTERACTION_ITEM_NONE; image_id = construction_markers[gConfigGeneral.construction_marker_colour]; _unk9E32BC = image_id; @@ -137,8 +137,8 @@ static void ride_entrance_exit_paint(paint_session * session, uint8 direction, s } if (!is_exit && - !(map_element->flags & MAP_ELEMENT_FLAG_GHOST) && - map_element->properties.entrance.ride_index != 0xFF){ + !(tile_element->flags & TILE_ELEMENT_FLAG_GHOST) && + tile_element->properties.entrance.ride_index != 0xFF){ set_format_arg(0, uint32, 0); set_format_arg(4, uint32, 0); @@ -185,7 +185,7 @@ static void ride_entrance_exit_paint(paint_session * session, uint8 direction, s * * rct2: 0x006658ED */ -static void park_entrance_paint(paint_session * session, uint8 direction, sint32 height, rct_map_element* map_element){ +static void park_entrance_paint(paint_session * session, uint8 direction, sint32 height, rct_tile_element* tile_element){ if (gTrackDesignSaveMode) return; @@ -198,17 +198,17 @@ static void park_entrance_paint(paint_session * session, uint8 direction, sint32 session->InteractionType = VIEWPORT_INTERACTION_ITEM_PARK; _unk9E32BC = 0; uint32 image_id, ghost_id = 0; - if (map_element->flags & MAP_ELEMENT_FLAG_GHOST){ + if (tile_element->flags & TILE_ELEMENT_FLAG_GHOST){ session->InteractionType = VIEWPORT_INTERACTION_ITEM_NONE; ghost_id = construction_markers[gConfigGeneral.construction_marker_colour]; _unk9E32BC = ghost_id; } - rct_footpath_entry* path_entry = get_footpath_entry(map_element->properties.entrance.path_type); + rct_footpath_entry* path_entry = get_footpath_entry(tile_element->properties.entrance.path_type); // Index to which part of the entrance // Middle, left, right - uint8 part_index = map_element->properties.entrance.index & 0xF; + uint8 part_index = tile_element->properties.entrance.index & 0xF; rct_entrance_type* entrance; uint8 di = ((direction / 2 + part_index / 2) & 1) ? 0x1A : 0x20; @@ -285,7 +285,7 @@ static void park_entrance_paint(paint_session * session, uint8 direction, sint32 * * rct2: 0x00664FD4 */ -void entrance_paint(paint_session * session, uint8 direction, sint32 height, rct_map_element* map_element){ +void entrance_paint(paint_session * session, uint8 direction, sint32 height, rct_tile_element* tile_element){ session->InteractionType = VIEWPORT_INTERACTION_ITEM_LABEL; rct_drawpixelinfo* dpi = session->Unk140E9A8; @@ -293,9 +293,9 @@ void entrance_paint(paint_session * session, uint8 direction, sint32 height, rct if (gCurrentViewportFlags & VIEWPORT_FLAG_PATH_HEIGHTS && dpi->zoom_level == 0){ - if (entrance_get_directions(map_element) & 0xF){ + if (entrance_get_directions(tile_element) & 0xF){ - sint32 z = map_element->base_height * 8 + 3; + sint32 z = tile_element->base_height * 8 + 3; uint32 image_id = 0x20101689 + get_height_marker_offset() + (z / 16); image_id -= gMapBaseZ; @@ -303,13 +303,13 @@ void entrance_paint(paint_session * session, uint8 direction, sint32 height, rct } } - switch (map_element->properties.entrance.type){ + switch (tile_element->properties.entrance.type){ case ENTRANCE_TYPE_RIDE_ENTRANCE: case ENTRANCE_TYPE_RIDE_EXIT: - ride_entrance_exit_paint(session, direction, height, map_element); + ride_entrance_exit_paint(session, direction, height, tile_element); break; case ENTRANCE_TYPE_PARK_ENTRANCE: - park_entrance_paint(session, direction, height, map_element); + park_entrance_paint(session, direction, height, tile_element); break; } } diff --git a/src/openrct2/paint/map_element/fence.c b/src/openrct2/paint/tile_element/fence.c similarity index 92% rename from src/openrct2/paint/map_element/fence.c rename to src/openrct2/paint/tile_element/fence.c index 5f895657f5..27fd80db4f 100644 --- a/src/openrct2/paint/map_element/fence.c +++ b/src/openrct2/paint/tile_element/fence.c @@ -24,7 +24,7 @@ #include "../../localisation/localisation.h" #include "../../interface/colour.h" #include "../../interface/viewport.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" #include "../paint.h" static const uint8 byte_9A406C[] = { @@ -129,13 +129,13 @@ static void fence_paint_wall(paint_session * session, uint32 frameNum, const rct * rct2: 0x006E44B0 * @param direction (cl) * @param height (dx) - * @param map_element (esi) + * @param tile_element (esi) */ -void fence_paint(paint_session * session, uint8 direction, sint32 height, rct_map_element * map_element) +void fence_paint(paint_session * session, uint8 direction, sint32 height, rct_tile_element * tile_element) { session->InteractionType = VIEWPORT_INTERACTION_ITEM_WALL; - rct_scenery_entry * sceneryEntry = get_wall_entry(map_element->properties.wall.type); + rct_scenery_entry * sceneryEntry = get_wall_entry(tile_element->properties.wall.type); if (sceneryEntry == NULL) { return; } @@ -146,18 +146,18 @@ void fence_paint(paint_session * session, uint8 direction, sint32 height, rct_ma } - sint32 primaryColour = map_element->properties.wall.colour_1 & 0x1F; + sint32 primaryColour = tile_element->properties.wall.colour_1 & 0x1F; uint32 imageColourFlags = primaryColour << 19 | IMAGE_TYPE_REMAP; uint32 dword_141F718 = imageColourFlags + 0x23800006; if (sceneryEntry->wall.flags & WALL_SCENERY_HAS_SECONDARY_COLOUR) { - uint8 secondaryColour = wall_element_get_secondary_colour(map_element); + uint8 secondaryColour = wall_element_get_secondary_colour(tile_element); imageColourFlags |= secondaryColour << 24 | IMAGE_TYPE_REMAP_2_PLUS; } uint32 tertiaryColour = 0; if (sceneryEntry->wall.flags & WALL_SCENERY_HAS_TERNARY_COLOUR) { - tertiaryColour = map_element->properties.wall.colour_3; + tertiaryColour = tile_element->properties.wall.colour_3; imageColourFlags &= 0x0DFFFFFFF; } @@ -165,17 +165,17 @@ void fence_paint(paint_session * session, uint8 direction, sint32 height, rct_ma uint32 dword_141F710 = 0; if (gTrackDesignSaveMode) { - if (!track_design_save_contains_map_element(map_element)) { + if (!track_design_save_contains_tile_element(tile_element)) { dword_141F710 = 0x21700000; } } - if (map_element->flags & MAP_ELEMENT_FLAG_GHOST) { + if (tile_element->flags & TILE_ELEMENT_FLAG_GHOST) { session->InteractionType = VIEWPORT_INTERACTION_ITEM_NONE; dword_141F710 = construction_markers[gConfigGeneral.construction_marker_colour]; } - // Save map_element + // Save tile_element uint8 ah = sceneryEntry->wall.height * 8 - 2; @@ -183,9 +183,9 @@ void fence_paint(paint_session * session, uint8 direction, sint32 height, rct_ma if (sceneryEntry->wall.flags & WALL_SCENERY_IS_DOOR) { LocationXYZ16 offset; LocationXYZ16 boundsR1, boundsR1_, boundsR2, boundsR2_, boundsL1, boundsL1_; - uint8 animationFrame = wall_element_get_animation_frame(map_element); + uint8 animationFrame = wall_element_get_animation_frame(tile_element); // Add the direction as well - animationFrame |= (map_element->properties.wall.animation & WALL_ANIMATION_FLAG_DIRECTION_BACKWARD) >> 3; + animationFrame |= (tile_element->properties.wall.animation & WALL_ANIMATION_FLAG_DIRECTION_BACKWARD) >> 3; uint32 imageId; switch (direction) { case 0: @@ -262,9 +262,9 @@ void fence_paint(paint_session * session, uint8 direction, sint32 height, rct_ma switch (direction) { case 0: - if (map_element->type & 0x80) { + if (tile_element->type & 0x80) { imageOffset = 3; - } else if (map_element->type & 0x40) { + } else if (tile_element->type & 0x40) { imageOffset = 5; } else { imageOffset = 1; @@ -276,9 +276,9 @@ void fence_paint(paint_session * session, uint8 direction, sint32 height, rct_ma break; case 1: - if (map_element->type & 0x80) { + if (tile_element->type & 0x80) { imageOffset = 2; - } else if (map_element->type & 0x40) { + } else if (tile_element->type & 0x40) { imageOffset = 4; } else { imageOffset = 0; @@ -300,9 +300,9 @@ void fence_paint(paint_session * session, uint8 direction, sint32 height, rct_ma break; case 2: - if (map_element->type & 0x80) { + if (tile_element->type & 0x80) { imageOffset = 5; - } else if (map_element->type & 0x40) { + } else if (tile_element->type & 0x40) { imageOffset = 3; } else { imageOffset = 1; @@ -318,9 +318,9 @@ void fence_paint(paint_session * session, uint8 direction, sint32 height, rct_ma break; case 3: - if (map_element->type & 0x80) { + if (tile_element->type & 0x80) { imageOffset = 4; - } else if (map_element->type & 0x40) { + } else if (tile_element->type & 0x40) { imageOffset = 2; } else { imageOffset = 0; @@ -346,7 +346,7 @@ void fence_paint(paint_session * session, uint8 direction, sint32 height, rct_ma set_format_arg(0, uint32, 0); set_format_arg(4, uint32, 0); - uint8 secondaryColour = wall_element_get_secondary_colour(map_element); + uint8 secondaryColour = wall_element_get_secondary_colour(tile_element); if (dword_141F710 != 0) { secondaryColour = COLOUR_GREY; @@ -360,7 +360,7 @@ void fence_paint(paint_session * session, uint8 direction, sint32 height, rct_ma uint16 scrollingMode = sceneryEntry->wall.scrolling_mode + ((direction + 1) & 0x3); - uint8 bannerIndex = map_element->properties.wall.banner_index; + uint8 bannerIndex = tile_element->properties.wall.banner_index; rct_banner * banner = &gBanners[bannerIndex]; set_format_arg(0, rct_string_id, banner->string_idx); diff --git a/src/openrct2/paint/map_element/path.c b/src/openrct2/paint/tile_element/path.c similarity index 87% rename from src/openrct2/paint/map_element/path.c rename to src/openrct2/paint/tile_element/path.c index 7fcccbb987..fd92419563 100644 --- a/src/openrct2/paint/map_element/path.c +++ b/src/openrct2/paint/tile_element/path.c @@ -26,7 +26,7 @@ #include "../../world/scenery.h" #include "../paint.h" #include "../supports.h" -#include "map_element.h" +#include "tile_element.h" #include "surface.h" #include "../../world/map.h" #include "../../drawing/lightfx.h" @@ -77,11 +77,11 @@ static const uint8 byte_98D8A4[] = { 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 1, 0 }; -void path_paint_pole_support(paint_session * session, rct_map_element * mapElement, sint32 height, rct_footpath_entry * footpathEntry, bool hasFences, uint32 imageFlags, uint32 sceneryImageFlags); -void path_paint_box_support(paint_session * session, rct_map_element* mapElement, sint16 height, rct_footpath_entry* footpathEntry, bool hasFences, uint32 imageFlags, uint32 sceneryImageFlags); +void path_paint_pole_support(paint_session * session, rct_tile_element * mapElement, sint32 height, rct_footpath_entry * footpathEntry, bool hasFences, uint32 imageFlags, uint32 sceneryImageFlags); +void path_paint_box_support(paint_session * session, rct_tile_element* mapElement, sint16 height, rct_footpath_entry* footpathEntry, bool hasFences, uint32 imageFlags, uint32 sceneryImageFlags); /* rct2: 0x006A5AE5 */ -static void path_bit_lights_paint(paint_session * session, rct_scenery_entry* pathBitEntry, rct_map_element* mapElement, sint32 height, uint8 edges, uint32 pathBitImageFlags) { +static void path_bit_lights_paint(paint_session * session, rct_scenery_entry* pathBitEntry, rct_tile_element* mapElement, sint32 height, uint8 edges, uint32 pathBitImageFlags) { if (footpath_element_is_sloped(mapElement)) height += 8; @@ -90,7 +90,7 @@ static void path_bit_lights_paint(paint_session * session, rct_scenery_entry* pa if (!(edges & (1 << 0))) { imageId = pathBitEntry->image + 1; - if (mapElement->flags & MAP_ELEMENT_FLAG_BROKEN) + if (mapElement->flags & TILE_ELEMENT_FLAG_BROKEN) imageId += 4; imageId |= pathBitImageFlags; @@ -100,7 +100,7 @@ static void path_bit_lights_paint(paint_session * session, rct_scenery_entry* pa if (!(edges & (1 << 1))) { imageId = pathBitEntry->image + 2; - if (mapElement->flags & MAP_ELEMENT_FLAG_BROKEN) + if (mapElement->flags & TILE_ELEMENT_FLAG_BROKEN) imageId += 4; imageId |= pathBitImageFlags; @@ -111,7 +111,7 @@ static void path_bit_lights_paint(paint_session * session, rct_scenery_entry* pa if (!(edges & (1 << 2))) { imageId = pathBitEntry->image + 3; - if (mapElement->flags & MAP_ELEMENT_FLAG_BROKEN) + if (mapElement->flags & TILE_ELEMENT_FLAG_BROKEN) imageId += 4; imageId |= pathBitImageFlags; @@ -122,7 +122,7 @@ static void path_bit_lights_paint(paint_session * session, rct_scenery_entry* pa if (!(edges & (1 << 3))) { imageId = pathBitEntry->image + 4; - if (mapElement->flags & MAP_ELEMENT_FLAG_BROKEN) + if (mapElement->flags & TILE_ELEMENT_FLAG_BROKEN) imageId += 4; imageId |= pathBitImageFlags; @@ -132,7 +132,7 @@ static void path_bit_lights_paint(paint_session * session, rct_scenery_entry* pa } /* rct2: 0x006A5C94 */ -static void path_bit_bins_paint(paint_session * session, rct_scenery_entry* pathBitEntry, rct_map_element* mapElement, sint32 height, uint8 edges, uint32 pathBitImageFlags) { +static void path_bit_bins_paint(paint_session * session, rct_scenery_entry* pathBitEntry, rct_tile_element* mapElement, sint32 height, uint8 edges, uint32 pathBitImageFlags) { if (footpath_element_is_sloped(mapElement)) height += 8; @@ -143,7 +143,7 @@ static void path_bit_bins_paint(paint_session * session, rct_scenery_entry* path imageId |= pathBitImageFlags; - if (!(mapElement->flags & MAP_ELEMENT_FLAG_BROKEN)) { + if (!(mapElement->flags & TILE_ELEMENT_FLAG_BROKEN)) { imageId -= 4; // Edges have been rotated around the rotation to check addition status @@ -160,7 +160,7 @@ static void path_bit_bins_paint(paint_session * session, rct_scenery_entry* path imageId |= pathBitImageFlags; - if (!(mapElement->flags & MAP_ELEMENT_FLAG_BROKEN)) { + if (!(mapElement->flags & TILE_ELEMENT_FLAG_BROKEN)) { imageId -= 4; // Edges have been rotated around the rotation to check addition status @@ -178,7 +178,7 @@ static void path_bit_bins_paint(paint_session * session, rct_scenery_entry* path imageId |= pathBitImageFlags; - if (!(mapElement->flags & MAP_ELEMENT_FLAG_BROKEN)) { + if (!(mapElement->flags & TILE_ELEMENT_FLAG_BROKEN)) { imageId -= 4; // Edges have been rotated around the rotation to check addition status @@ -196,7 +196,7 @@ static void path_bit_bins_paint(paint_session * session, rct_scenery_entry* path imageId |= pathBitImageFlags; - if (!(mapElement->flags & MAP_ELEMENT_FLAG_BROKEN)) { + if (!(mapElement->flags & TILE_ELEMENT_FLAG_BROKEN)) { imageId -= 4; // Edges have been rotated around the rotation to check addition status @@ -211,13 +211,13 @@ static void path_bit_bins_paint(paint_session * session, rct_scenery_entry* path } /* rct2: 0x006A5E81 */ -static void path_bit_benches_paint(paint_session * session, rct_scenery_entry* pathBitEntry, rct_map_element* mapElement, sint32 height, uint8 edges, uint32 pathBitImageFlags) { +static void path_bit_benches_paint(paint_session * session, rct_scenery_entry* pathBitEntry, rct_tile_element* mapElement, sint32 height, uint8 edges, uint32 pathBitImageFlags) { uint32 imageId; if (!(edges & (1 << 0))) { imageId = pathBitEntry->image + 1; - if (mapElement->flags & MAP_ELEMENT_FLAG_BROKEN) + if (mapElement->flags & TILE_ELEMENT_FLAG_BROKEN) imageId += 4; imageId |= pathBitImageFlags; @@ -227,7 +227,7 @@ static void path_bit_benches_paint(paint_session * session, rct_scenery_entry* p if (!(edges & (1 << 1))) { imageId = pathBitEntry->image + 2; - if (mapElement->flags & MAP_ELEMENT_FLAG_BROKEN) + if (mapElement->flags & TILE_ELEMENT_FLAG_BROKEN) imageId += 4; imageId |= pathBitImageFlags; @@ -238,7 +238,7 @@ static void path_bit_benches_paint(paint_session * session, rct_scenery_entry* p if (!(edges & (1 << 2))) { imageId = pathBitEntry->image + 3; - if (mapElement->flags & MAP_ELEMENT_FLAG_BROKEN) + if (mapElement->flags & TILE_ELEMENT_FLAG_BROKEN) imageId += 4; imageId |= pathBitImageFlags; @@ -249,7 +249,7 @@ static void path_bit_benches_paint(paint_session * session, rct_scenery_entry* p if (!(edges & (1 << 3))) { imageId = pathBitEntry->image + 4; - if (mapElement->flags & MAP_ELEMENT_FLAG_BROKEN) + if (mapElement->flags & TILE_ELEMENT_FLAG_BROKEN) imageId += 4; imageId |= pathBitImageFlags; @@ -259,7 +259,7 @@ static void path_bit_benches_paint(paint_session * session, rct_scenery_entry* p } /* rct2: 0x006A6008 */ -static void path_bit_jumping_fountains_paint(paint_session * session, rct_scenery_entry* pathBitEntry, rct_map_element* mapElement, sint32 height, uint8 edges, uint32 pathBitImageFlags, rct_drawpixelinfo* dpi) { +static void path_bit_jumping_fountains_paint(paint_session * session, rct_scenery_entry* pathBitEntry, rct_tile_element* mapElement, sint32 height, uint8 edges, uint32 pathBitImageFlags, rct_drawpixelinfo* dpi) { if (dpi->zoom_level != 0) return; @@ -274,17 +274,17 @@ static void path_bit_jumping_fountains_paint(paint_session * session, rct_scener /** * rct2: 0x006A4101 - * @param map_element (esi) + * @param tile_element (esi) * @param (ecx) * @param ebp (ebp) * @param base_image_id (0x00F3EF78) */ -static void sub_6A4101(paint_session * session, rct_map_element * map_element, uint16 height, uint32 ebp, bool word_F3F038, rct_footpath_entry * footpathEntry, uint32 base_image_id, uint32 imageFlags) +static void sub_6A4101(paint_session * session, rct_tile_element * tile_element, uint16 height, uint32 ebp, bool word_F3F038, rct_footpath_entry * footpathEntry, uint32 base_image_id, uint32 imageFlags) { - if (footpath_element_is_queue(map_element)) { + if (footpath_element_is_queue(tile_element)) { uint8 local_ebp = ebp & 0x0F; - if (footpath_element_is_sloped(map_element)) { - switch ((map_element->properties.path.type + get_current_rotation()) & 0x03) { + if (footpath_element_is_sloped(tile_element)) { + switch ((tile_element->properties.path.type + get_current_rotation()) & 0x03) { case 0: sub_98197C(session, 95 + base_image_id, 0, 4, 32, 1, 23, height, 0, 4, height + 2, get_current_rotation()); sub_98197C(session, 95 + base_image_id, 0, 28, 32, 1, 23, height, 0, 28, height + 2, get_current_rotation()); @@ -354,15 +354,15 @@ static void sub_6A4101(paint_session * session, rct_map_element * map_element, u } } - if (!(map_element->properties.path.type & 0x08)) { + if (!(tile_element->properties.path.type & 0x08)) { return; } - uint8 direction = ((map_element->type & 0xC0) >> 6); + uint8 direction = ((tile_element->type & 0xC0) >> 6); // Draw ride sign session->InteractionType = VIEWPORT_INTERACTION_ITEM_RIDE; - if (footpath_element_is_sloped(map_element)) { - if (footpath_element_get_slope_direction(map_element) == direction) + if (footpath_element_is_sloped(tile_element)) { + if (footpath_element_get_slope_direction(tile_element) == direction) height += 16; } direction += get_current_rotation(); @@ -385,14 +385,14 @@ static void sub_6A4101(paint_session * session, rct_map_element * map_element, u direction--; // If text shown - if (direction < 2 && map_element->properties.path.ride_index != 255 && imageFlags == 0) { + if (direction < 2 && tile_element->properties.path.ride_index != 255 && imageFlags == 0) { uint16 scrollingMode = footpathEntry->scrolling_mode; scrollingMode += direction; set_format_arg(0, uint32, 0); set_format_arg(4, uint32, 0); - Ride* ride = get_ride(map_element->properties.path.ride_index); + Ride* ride = get_ride(tile_element->properties.path.ride_index); rct_string_id string_id = STR_RIDE_ENTRANCE_CLOSED; if (ride->status == RIDE_STATUS_OPEN && !(ride->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN)){ set_format_arg(0, rct_string_id, ride->name); @@ -427,8 +427,8 @@ static void sub_6A4101(paint_session * session, rct_map_element * map_element, u dword_F3EF80 &= 0x0F; } - if (footpath_element_is_sloped(map_element)) { - switch ((map_element->properties.path.type + get_current_rotation()) & 0x03) { + if (footpath_element_is_sloped(tile_element)) { + switch ((tile_element->properties.path.type + get_current_rotation()) & 0x03) { case 0: sub_98197C(session, 81 + base_image_id, 0, 4, 32, 1, 23, height, 0, 4, height + 2, get_current_rotation()); sub_98197C(session, 81 + base_image_id, 0, 28, 32, 1, 23, height, 0, 28, height + 2, get_current_rotation()); @@ -570,14 +570,14 @@ static void sub_6A4101(paint_session * session, rct_map_element * map_element, u /** * rct2: 0x006A3F61 - * @param map_element (esp[0]) + * @param tile_element (esp[0]) * @param bp (bp) * @param height (dx) * @param footpathEntry (0x00F3EF6C) * @param imageFlags (0x00F3EF70) * @param sceneryImageFlags (0x00F3EF74) */ -static void sub_6A3F61(paint_session * session, rct_map_element * map_element, uint16 bp, uint16 height, rct_footpath_entry * footpathEntry, uint32 imageFlags, uint32 sceneryImageFlags, bool word_F3F038) +static void sub_6A3F61(paint_session * session, rct_tile_element * tile_element, uint16 bp, uint16 height, rct_footpath_entry * footpathEntry, uint32 imageFlags, uint32 sceneryImageFlags, bool word_F3F038) { // eax -- // ebx -- @@ -594,7 +594,7 @@ static void sub_6A3F61(paint_session * session, rct_map_element * map_element, u if (dpi->zoom_level <= 1) { if (!gTrackDesignSaveMode) { - uint8 additions = map_element->properties.path.additions & 0xF; + uint8 additions = tile_element->properties.path.additions & 0xF; if (additions != 0) { session->InteractionType = VIEWPORT_INTERACTION_ITEM_FOOTPATH_ITEM; if (sceneryImageFlags != 0) { @@ -602,19 +602,19 @@ static void sub_6A3F61(paint_session * session, rct_map_element * map_element, u } // Draw additional path bits (bins, benches, lamps, queue screens) - rct_scenery_entry* sceneryEntry = get_footpath_item_entry(footpath_element_get_path_scenery_index(map_element)); + rct_scenery_entry* sceneryEntry = get_footpath_item_entry(footpath_element_get_path_scenery_index(tile_element)); switch (sceneryEntry->path_bit.draw_type) { case PATH_BIT_DRAW_TYPE_LIGHTS: - path_bit_lights_paint(session, sceneryEntry, map_element, height, (uint8)bp, sceneryImageFlags); + path_bit_lights_paint(session, sceneryEntry, tile_element, height, (uint8)bp, sceneryImageFlags); break; case PATH_BIT_DRAW_TYPE_BINS: - path_bit_bins_paint(session, sceneryEntry, map_element, height, (uint8)bp, sceneryImageFlags); + path_bit_bins_paint(session, sceneryEntry, tile_element, height, (uint8)bp, sceneryImageFlags); break; case PATH_BIT_DRAW_TYPE_BENCHES: - path_bit_benches_paint(session, sceneryEntry, map_element, height, (uint8)bp, sceneryImageFlags); + path_bit_benches_paint(session, sceneryEntry, tile_element, height, (uint8)bp, sceneryImageFlags); break; case PATH_BIT_DRAW_TYPE_JUMPING_FOUNTAINS: - path_bit_jumping_fountains_paint(session, sceneryEntry, map_element, height, (uint8)bp, sceneryImageFlags, dpi); + path_bit_jumping_fountains_paint(session, sceneryEntry, tile_element, height, (uint8)bp, sceneryImageFlags, dpi); break; } @@ -628,12 +628,12 @@ static void sub_6A3F61(paint_session * session, rct_map_element * map_element, u // Redundant zoom-level check removed - sub_6A4101(session, map_element, height, bp, word_F3F038, footpathEntry, footpathEntry->image | imageFlags, imageFlags); + sub_6A4101(session, tile_element, height, bp, word_F3F038, footpathEntry, footpathEntry->image | imageFlags, imageFlags); } // This is about tunnel drawing - uint8 direction = (map_element->properties.path.type + get_current_rotation()) & 0x03; - uint8 diagonal = map_element->properties.path.type & 0x04; + uint8 direction = (tile_element->properties.path.type + get_current_rotation()) & 0x03; + uint8 diagonal = tile_element->properties.path.type & 0x04; uint8 bl = direction | diagonal; if (bp & 2) { @@ -664,7 +664,7 @@ static void sub_6A3F61(paint_session * session, rct_map_element * map_element, u /** * rct2: 0x0006A3590 */ -void path_paint(paint_session * session, uint8 direction, uint16 height, rct_map_element * map_element) +void path_paint(paint_session * session, uint8 direction, uint16 height, rct_tile_element * tile_element) { session->InteractionType = VIEWPORT_INTERACTION_ITEM_FOOTPATH; @@ -674,29 +674,29 @@ void path_paint(paint_session * session, uint8 direction, uint16 height, rct_map uint32 imageFlags = 0; if (gTrackDesignSaveMode) { - if (footpath_element_is_queue(map_element)) { - if (map_element->properties.path.ride_index != gTrackDesignSaveRideIndex) { + if (footpath_element_is_queue(tile_element)) { + if (tile_element->properties.path.ride_index != gTrackDesignSaveRideIndex) { return; } } - if (!track_design_save_contains_map_element(map_element)) { + if (!track_design_save_contains_tile_element(tile_element)) { imageFlags = 0x21700000; } } - if (footpath_element_path_scenery_is_ghost(map_element)) { + if (footpath_element_path_scenery_is_ghost(tile_element)) { sceneryImageFlags = construction_markers[gConfigGeneral.construction_marker_colour]; } - if (map_element->flags & MAP_ELEMENT_FLAG_GHOST) { + if (tile_element->flags & TILE_ELEMENT_FLAG_GHOST) { session->InteractionType = VIEWPORT_INTERACTION_ITEM_NONE; imageFlags = construction_markers[gConfigGeneral.construction_marker_colour]; } sint16 x = session->MapPosition.x, y = session->MapPosition.y; - rct_map_element * surface = map_get_surface_element_at(x / 32, y / 32); + rct_tile_element * surface = map_get_surface_element_at(x / 32, y / 32); uint16 bl = height / 8; if (surface == NULL) { @@ -704,10 +704,10 @@ void path_paint(paint_session * session, uint8 direction, uint16 height, rct_map } else if (surface->base_height != bl) { word_F3F038 = true; } else { - if (footpath_element_is_sloped(map_element)) { + if (footpath_element_is_sloped(tile_element)) { // Diagonal path - if ((surface->properties.surface.slope & 0x1F) != byte_98D800[map_element->properties.path.type & 0x03]) { + if ((surface->properties.surface.slope & 0x1F) != byte_98D800[tile_element->properties.path.type & 0x03]) { word_F3F038 = true; } } else { @@ -736,9 +736,9 @@ void path_paint(paint_session * session, uint8 direction, uint16 height, rct_map if (staff_is_patrol_area_set(200 + staffType, x, y)) { uint32 imageId = 2618; - sint32 height2 = map_element->base_height * 8; - if (footpath_element_is_sloped(map_element)) { - imageId = 2619 + ((map_element->properties.path.type + get_current_rotation()) & 3); + sint32 height2 = tile_element->base_height * 8; + if (footpath_element_is_sloped(tile_element)) { + imageId = 2619 + ((tile_element->properties.path.type + get_current_rotation()) & 3); height2 += 16; } @@ -748,8 +748,8 @@ void path_paint(paint_session * session, uint8 direction, uint16 height, rct_map if (gCurrentViewportFlags & VIEWPORT_FLAG_PATH_HEIGHTS) { - uint16 height2 = 3 + map_element->base_height * 8; - if (footpath_element_is_sloped(map_element)) { + uint16 height2 = 3 + tile_element->base_height * 8; + if (footpath_element_is_sloped(tile_element)) { height2 += 8; } uint32 imageId = (SPR_HEIGHT_MARKER_BASE + height2 / 16) | COLOUR_GREY << 19 | IMAGE_TYPE_REMAP; @@ -758,33 +758,33 @@ void path_paint(paint_session * session, uint8 direction, uint16 height, rct_map sub_98196C(session, imageId, 16, 16, 1, 1, 0, height2, get_current_rotation()); } - uint8 pathType = (map_element->properties.path.type & 0xF0) >> 4; + uint8 pathType = (tile_element->properties.path.type & 0xF0) >> 4; rct_footpath_entry * footpathEntry = get_footpath_entry(pathType); if (footpathEntry != NULL) { if (footpathEntry->support_type == FOOTPATH_ENTRY_SUPPORT_TYPE_POLE) { - path_paint_pole_support(session, map_element, height, footpathEntry, word_F3F038, imageFlags, sceneryImageFlags); + path_paint_pole_support(session, tile_element, height, footpathEntry, word_F3F038, imageFlags, sceneryImageFlags); } else { - path_paint_box_support(session, map_element, height, footpathEntry, word_F3F038, imageFlags, sceneryImageFlags); + path_paint_box_support(session, tile_element, height, footpathEntry, word_F3F038, imageFlags, sceneryImageFlags); } } #ifdef __ENABLE_LIGHTFX__ if (lightfx_is_available()) { - if (footpath_element_has_path_scenery(map_element) && !(map_element->flags & MAP_ELEMENT_FLAG_BROKEN)) { - rct_scenery_entry *sceneryEntry = get_footpath_item_entry(footpath_element_get_path_scenery_index(map_element)); + if (footpath_element_has_path_scenery(tile_element) && !(tile_element->flags & TILE_ELEMENT_FLAG_BROKEN)) { + rct_scenery_entry *sceneryEntry = get_footpath_item_entry(footpath_element_get_path_scenery_index(tile_element)); if (sceneryEntry->path_bit.flags & PATH_BIT_FLAG_LAMP) { - if (!(map_element->properties.path.edges & (1 << 0))) { + if (!(tile_element->properties.path.edges & (1 << 0))) { lightfx_add_3d_light_magic_from_drawing_tile(session->MapPosition, -16, 0, height + 23, LIGHTFX_LIGHT_TYPE_LANTERN_3); } - if (!(map_element->properties.path.edges & (1 << 1))) { + if (!(tile_element->properties.path.edges & (1 << 1))) { lightfx_add_3d_light_magic_from_drawing_tile(session->MapPosition, 0, 16, height + 23, LIGHTFX_LIGHT_TYPE_LANTERN_3); } - if (!(map_element->properties.path.edges & (1 << 2))) { + if (!(tile_element->properties.path.edges & (1 << 2))) { lightfx_add_3d_light_magic_from_drawing_tile(session->MapPosition, 16, 0, height + 23, LIGHTFX_LIGHT_TYPE_LANTERN_3); } - if (!(map_element->properties.path.edges & (1 << 3))) { + if (!(tile_element->properties.path.edges & (1 << 3))) { lightfx_add_3d_light_magic_from_drawing_tile(session->MapPosition, 0, -16, height + 23, LIGHTFX_LIGHT_TYPE_LANTERN_3); } } @@ -793,7 +793,7 @@ void path_paint(paint_session * session, uint8 direction, uint16 height, rct_map #endif } -void path_paint_pole_support(paint_session * session, rct_map_element * mapElement, sint32 height, rct_footpath_entry * footpathEntry, bool hasFences, uint32 imageFlags, uint32 sceneryImageFlags) +void path_paint_pole_support(paint_session * session, rct_tile_element * mapElement, sint32 height, rct_footpath_entry * footpathEntry, bool hasFences, uint32 imageFlags, uint32 sceneryImageFlags) { // Rol edges around rotation uint8 edges = ((mapElement->properties.path.edges << get_current_rotation()) & 0xF) | @@ -898,7 +898,7 @@ void path_paint_pole_support(paint_session * session, rct_map_element * mapEleme } } -void path_paint_box_support(paint_session * session, rct_map_element* mapElement, sint16 height, rct_footpath_entry* footpathEntry, bool hasFences, uint32 imageFlags, uint32 sceneryImageFlags) +void path_paint_box_support(paint_session * session, rct_tile_element* mapElement, sint16 height, rct_footpath_entry* footpathEntry, bool hasFences, uint32 imageFlags, uint32 sceneryImageFlags) { // Rol edges around rotation uint8 edges = ((mapElement->properties.path.edges << get_current_rotation()) & 0xF) | diff --git a/src/openrct2/paint/map_element/scenery.c b/src/openrct2/paint/tile_element/scenery.c similarity index 97% rename from src/openrct2/paint/map_element/scenery.c rename to src/openrct2/paint/tile_element/scenery.c index 248f2d0421..dae2a65a2f 100644 --- a/src/openrct2/paint/map_element/scenery.c +++ b/src/openrct2/paint/tile_element/scenery.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "map_element.h" +#include "tile_element.h" #include "../../config/Config.h" #include "../../game.h" #include "../../interface/viewport.h" @@ -42,7 +42,7 @@ static const LocationXY16 lengths[] = { * * rct2: 0x006DFF47 */ -void scenery_paint(paint_session * session, uint8 direction, sint32 height, rct_map_element* mapElement) { +void scenery_paint(paint_session * session, uint8 direction, sint32 height, rct_tile_element* mapElement) { //RCT2_CALLPROC_X(0x6DFF47, 0, 0, direction, height, (sint32)mapElement, 0, 0); return; session->InteractionType = VIEWPORT_INTERACTION_ITEM_SCENERY; LocationXYZ16 boxlength; @@ -53,11 +53,11 @@ void scenery_paint(paint_session * session, uint8 direction, sint32 height, rct_ sint32 baseImageid = 0; const sint32 rotation = get_current_rotation(); if (gTrackDesignSaveMode) { - if (!track_design_save_contains_map_element(mapElement)) { + if (!track_design_save_contains_tile_element(mapElement)) { baseImageid = 0x21700000; } } - if (mapElement->flags & MAP_ELEMENT_FLAG_GHOST) { + if (mapElement->flags & TILE_ELEMENT_FLAG_GHOST) { session->InteractionType = VIEWPORT_INTERACTION_ITEM_NONE; baseImageid = construction_markers[gConfigGeneral.construction_marker_colour]; } @@ -104,7 +104,7 @@ void scenery_paint(paint_session * session, uint8 direction, sint32 height, rct_ } } else { // 6DFFC2: - uint8 ecx = (map_element_get_scenery_quadrant(mapElement) + rotation) & 3; + uint8 ecx = (tile_element_get_scenery_quadrant(mapElement) + rotation) & 3; x_offset = ScenerySubTileOffsets[ecx].x; y_offset = ScenerySubTileOffsets[ecx].y; boxoffset.x = x_offset; @@ -310,7 +310,7 @@ void scenery_paint(paint_session * session, uint8 direction, sint32 height, rct_ } if (entry->small_scenery.flags & SMALL_SCENERY_FLAG_VOFFSET_CENTRE) { // 6E075C: - direction = (map_element_get_scenery_quadrant(mapElement) + rotation) % 4; + direction = (tile_element_get_scenery_quadrant(mapElement) + rotation) % 4; paint_util_set_segment_support_height(session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C8 | SEGMENT_CC, direction), height, 0x20); return; } @@ -324,7 +324,7 @@ void scenery_paint(paint_session * session, uint8 direction, sint32 height, rct_ return; } if (entry->small_scenery.flags & SMALL_SCENERY_FLAG_VOFFSET_CENTRE) { - direction = (map_element_get_scenery_quadrant(mapElement) + rotation) % 4; + direction = (tile_element_get_scenery_quadrant(mapElement) + rotation) % 4; paint_util_set_segment_support_height(session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF, 0); return; } diff --git a/src/openrct2/paint/map_element/scenery_multiple.c b/src/openrct2/paint/tile_element/scenery_multiple.c similarity index 97% rename from src/openrct2/paint/map_element/scenery_multiple.c rename to src/openrct2/paint/tile_element/scenery_multiple.c index c95951384b..f85ee7dbb8 100644 --- a/src/openrct2/paint/map_element/scenery_multiple.c +++ b/src/openrct2/paint/tile_element/scenery_multiple.c @@ -14,7 +14,7 @@ *****************************************************************************/ #pragma endregion -#include "map_element.h" +#include "tile_element.h" #include "../paint.h" #include "../supports.h" #include "../../config/Config.h" @@ -26,7 +26,7 @@ #include "../../world/scenery.h" // 6B8172: -static void scenery_multiple_paint_supports(paint_session * session, uint8 direction, uint16 height, rct_map_element *mapElement, uint32 dword_F4387C, rct_large_scenery_tile *tile) +static void scenery_multiple_paint_supports(paint_session * session, uint8 direction, uint16 height, rct_tile_element *mapElement, uint32 dword_F4387C, rct_large_scenery_tile *tile) { if (tile->var_7 & 0x20) { return; @@ -183,7 +183,7 @@ static const boundbox s98E3C4[] = { * * rct2: 0x006B7F0C */ -void scenery_multiple_paint(paint_session * session, uint8 direction, uint16 height, rct_map_element *mapElement) { +void scenery_multiple_paint(paint_session * session, uint8 direction, uint16 height, rct_tile_element *mapElement) { //RCT2_CALLPROC_X(0x6B7F0C, 0, 0, direction, height, (sint32)mapElement, 0, 0); return; session->InteractionType = VIEWPORT_INTERACTION_ITEM_LARGE_SCENERY; uint32 ebp = mapElement->properties.scenerymultiple.type >> 10; @@ -198,14 +198,14 @@ void scenery_multiple_paint(paint_session * session, uint8 direction, uint16 hei LocationXYZ16 boxlength; LocationXYZ16 boxoffset; if (gTrackDesignSaveMode) { - if (!track_design_save_contains_map_element(mapElement)) { + if (!track_design_save_contains_tile_element(mapElement)) { ebp = 0x21700000; image_id &= 0x7FFFF; dword_F4387C = ebp; image_id |= dword_F4387C; } } - if (mapElement->flags & MAP_ELEMENT_FLAG_GHOST) { + if (mapElement->flags & TILE_ELEMENT_FLAG_GHOST) { session->InteractionType = VIEWPORT_INTERACTION_ITEM_NONE; ebp = construction_markers[gConfigGeneral.construction_marker_colour]; image_id &= 0x7FFFF; diff --git a/src/openrct2/paint/map_element/surface.c b/src/openrct2/paint/tile_element/surface.c similarity index 98% rename from src/openrct2/paint/map_element/surface.c rename to src/openrct2/paint/tile_element/surface.c index 8d72f0ea54..3807d0324e 100644 --- a/src/openrct2/paint/map_element/surface.c +++ b/src/openrct2/paint/tile_element/surface.c @@ -20,7 +20,7 @@ #include "../../OpenRCT2.h" #include "../../peep/Staff.h" #include "../../sprites.h" -#include "map_element.h" +#include "tile_element.h" #include "surface.h" static const uint8 byte_97B444[] = { @@ -333,13 +333,13 @@ typedef struct tile_descriptor tile_descriptor; struct tile_descriptor { - rct_map_element * map_element; + rct_tile_element * tile_element; uint8 terrain; uint8 slope; corner_height corner_heights; }; -static uint8 viewport_surface_paint_setup_get_relative_slope(rct_map_element * mapElement, sint32 rotation) +static uint8 viewport_surface_paint_setup_get_relative_slope(rct_tile_element * mapElement, sint32 rotation) { uint8 slope = mapElement->properties.surface.slope; @@ -356,7 +356,7 @@ static uint8 viewport_surface_paint_setup_get_relative_slope(rct_map_element * m static void viewport_surface_smoothen_edge(paint_session * session, enum edge_t edge, struct tile_descriptor self, struct tile_descriptor neighbour) { - if (neighbour.map_element == NULL) { + if (neighbour.tile_element == NULL) { return; } @@ -492,7 +492,7 @@ static void viewport_surface_draw_land_side_top(paint_session * session, enum ed regs.dl = height; // save ecx - if (neighbour.map_element == NULL) { + if (neighbour.tile_element == NULL) { regs.ah = 1; regs.ch = 1; } @@ -599,7 +599,7 @@ static void viewport_surface_draw_land_side_bottom(paint_session * session, enum return; } - if (neighbour.map_element == 0) { + if (neighbour.tile_element == 0) { regs.ch = 1; regs.ah = 1; } @@ -751,11 +751,11 @@ static void viewport_surface_draw_water_side_top(paint_session * session, enum e regs.dl = height; // save ecx - if (neighbour.map_element == NULL) { + if (neighbour.tile_element == NULL) { regs.ah = 1; regs.ch = 1; } else { - regs.dh = map_get_water_height(neighbour.map_element); + regs.dh = map_get_water_height(neighbour.tile_element); if (regs.dl == regs.dh) { return; } @@ -863,11 +863,11 @@ static void viewport_surface_draw_water_side_bottom(paint_session * session, enu regs.dl = height; - if (neighbour.map_element == 0) { + if (neighbour.tile_element == 0) { regs.ch = 1; regs.ah = 1; } else { - regs.dh = map_get_water_height(neighbour.map_element); + regs.dh = map_get_water_height(neighbour.tile_element); if (regs.dl == regs.dh) { return; } @@ -986,9 +986,9 @@ static void viewport_surface_draw_water_side_bottom(paint_session * session, enu * * @param direction (cl) * @param height (dx) - * @param map_element (esi) + * @param tile_element (esi) */ -void surface_paint(paint_session * session, uint8 direction, uint16 height, rct_map_element * mapElement) +void surface_paint(paint_session * session, uint8 direction, uint16 height, rct_tile_element * mapElement) { rct_drawpixelinfo * dpi = session->Unk140E9A8; session->InteractionType = VIEWPORT_INTERACTION_ITEM_TERRAIN; @@ -998,7 +998,7 @@ void surface_paint(paint_session * session, uint8 direction, uint16 height, rct_ uint16 zoomLevel = dpi->zoom_level; const uint8 rotation = get_current_rotation(); - uint32 terrain_type = map_element_get_terrain(mapElement); + uint32 terrain_type = tile_element_get_terrain(mapElement); uint32 surfaceShape = viewport_surface_paint_setup_get_relative_slope(mapElement, rotation); LocationXY16 base = { @@ -1008,7 +1008,7 @@ void surface_paint(paint_session * session, uint8 direction, uint16 height, rct_ corner_height ch = corner_heights[surfaceShape]; tile_descriptor selfDescriptor = { - .map_element = mapElement, + .tile_element = mapElement, .slope = surfaceShape, .terrain = terrain_type, .corner_heights = { @@ -1026,18 +1026,18 @@ void surface_paint(paint_session * session, uint8 direction, uint16 height, rct_ LocationXY16 offset = viewport_surface_paint_data[i][rotation]; LocationXY16 position = {.x = base.x + offset.x, .y = base.y + offset.y}; - tileDescriptors[i + 1].map_element = NULL; + tileDescriptors[i + 1].tile_element = NULL; if (position.x > 0x2000 || position.y > 0x2000) { continue; } - rct_map_element * surfaceElement = map_get_surface_element_at(position.x / 32, position.y / 32); + rct_tile_element * surfaceElement = map_get_surface_element_at(position.x / 32, position.y / 32); if (surfaceElement == NULL) { continue; } - tileDescriptors[i + 1].map_element = surfaceElement; - tileDescriptors[i + 1].terrain = map_element_get_terrain(surfaceElement); + tileDescriptors[i + 1].tile_element = surfaceElement; + tileDescriptors[i + 1].terrain = tile_element_get_terrain(surfaceElement); uint32 ebx = viewport_surface_paint_setup_get_relative_slope(surfaceElement, rotation); tileDescriptors[i + 1].slope = ebx; @@ -1053,7 +1053,7 @@ void surface_paint(paint_session * session, uint8 direction, uint16 height, rct_ if ((gCurrentViewportFlags & VIEWPORT_FLAG_LAND_HEIGHTS) && (zoomLevel == 0)) { sint16 x = session->MapPosition.x, y = session->MapPosition.y; - sint32 dx = map_element_height(x + 16, y + 16) & 0xFFFF; + sint32 dx = tile_element_height(x + 16, y + 16) & 0xFFFF; dx += 3; sint32 image_id = (SPR_HEIGHT_MARKER_BASE + dx / 16) | 0x20780000; @@ -1076,7 +1076,7 @@ void surface_paint(paint_session * session, uint8 direction, uint16 height, rct_ sint32 branch = -1; if ((mapElement->properties.surface.terrain & 0xE0) == 0) { - if (map_element_get_direction(mapElement) == 0) { + if (tile_element_get_direction(mapElement) == 0) { if (zoomLevel == 0) { if ((gCurrentViewportFlags & (VIEWPORT_FLAG_HIDE_BASE | VIEWPORT_FLAG_UNDERGROUND_INSIDE)) == 0) { branch = mapElement->properties.surface.grass_length & 0x7; @@ -1195,7 +1195,7 @@ void surface_paint(paint_session * session, uint8 direction, uint16 height, rct_ } else if (mapElement->properties.surface.ownership & OWNERSHIP_AVAILABLE) { LocationXY16 pos = session->MapPosition; paint_struct * backup = session->UnkF1AD28; - sint32 height2 = (map_element_height(pos.x + 16, pos.y + 16) & 0xFFFF) + 3; + sint32 height2 = (tile_element_height(pos.x + 16, pos.y + 16) & 0xFFFF) + 3; sub_98196C(session, SPR_LAND_OWNERSHIP_AVAILABLE, 16, 16, 1, 1, 0, height2, rotation); session->UnkF1AD28 = backup; } @@ -1209,7 +1209,7 @@ void surface_paint(paint_session * session, uint8 direction, uint16 height, rct_ } else if (mapElement->properties.surface.ownership & OWNERSHIP_CONSTRUCTION_RIGHTS_AVAILABLE) { paint_struct * backup = session->UnkF1AD28; LocationXY16 pos = session->MapPosition; - sint32 height2 = map_element_height(pos.x + 16, pos.y + 16) & 0xFFFF; + sint32 height2 = tile_element_height(pos.x + 16, pos.y + 16) & 0xFFFF; sub_98196C(session, SPR_LAND_CONSTRUCTION_RIGHTS_AVAILABLE, 16, 16, 1, 1, 0, height2 + 3, rotation); session->UnkF1AD28 = backup; } diff --git a/src/openrct2/paint/map_element/surface.h b/src/openrct2/paint/tile_element/surface.h similarity index 100% rename from src/openrct2/paint/map_element/surface.h rename to src/openrct2/paint/tile_element/surface.h diff --git a/src/openrct2/paint/map_element/map_element.c b/src/openrct2/paint/tile_element/tile_element.c similarity index 83% rename from src/openrct2/paint/map_element/map_element.c rename to src/openrct2/paint/tile_element/tile_element.c index f46ed74e80..4f9d53f109 100644 --- a/src/openrct2/paint/map_element/map_element.c +++ b/src/openrct2/paint/tile_element/tile_element.c @@ -16,7 +16,7 @@ #include "../paint.h" #include "../../interface/viewport.h" -#include "map_element.h" +#include "tile_element.h" #include "../../drawing/drawing.h" #include "../../ride/ride_data.h" #include "../../ride/TrackData.h" @@ -45,7 +45,7 @@ const sint32 SEGMENTS_ALL = SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | * * rct2: 0x0068B35F */ -void map_element_paint_setup(paint_session * session, sint32 x, sint32 y) +void tile_element_paint_setup(paint_session * session, sint32 x, sint32 y) { if ( x < gMapSizeUnits && @@ -151,12 +151,12 @@ static void sub_68B3FB(paint_session * session, sint32 x, sint32 y) session->MapPosition.x = x; session->MapPosition.y = y; - rct_map_element* map_element = map_get_first_element_at(x >> 5, y >> 5); + rct_tile_element* tile_element = map_get_first_element_at(x >> 5, y >> 5); uint8 rotation = get_current_rotation(); - /* Check if the first (lowest) map_element is below the clip + /* Check if the first (lowest) tile_element is below the clip * height. */ - if ((gCurrentViewportFlags & VIEWPORT_FLAG_PAINT_CLIP_TO_HEIGHT) && (map_element->base_height > gClipHeight)) { + if ((gCurrentViewportFlags & VIEWPORT_FLAG_PAINT_CLIP_TO_HEIGHT) && (tile_element->base_height > gClipHeight)) { blank_tiles_paint(session, x, y); return; } @@ -207,16 +207,16 @@ static void sub_68B3FB(paint_session * session, sint32 x, sint32 y) if (bx <= dpi->y) return; - const rct_map_element* element = map_element;//push map_element + const rct_tile_element* element = tile_element;//push tile_element sint16 max_height = 0; do{ max_height = max(max_height, element->clearance_height); - } while (!map_element_is_last_for_tile(element++)); + } while (!tile_element_is_last_for_tile(element++)); element--; - if (map_element_get_type(element) == MAP_ELEMENT_TYPE_SURFACE && + if (tile_element_get_type(element) == TILE_ELEMENT_TYPE_SURFACE && (map_get_water_height(element) > 0)) { max_height = map_get_water_height(element) * 2; @@ -226,7 +226,7 @@ static void sub_68B3FB(paint_session * session, sint32 x, sint32 y) dx -= max_height + 32; - element = map_element;//pop map_element + element = tile_element;//pop tile_element dx -= dpi->height; if (dx >= dpi->y) return; @@ -235,59 +235,59 @@ static void sub_68B3FB(paint_session * session, sint32 x, sint32 y) session->SpritePosition.y = y; session->DidPassSurface = false; do { - // Only paint map_elements below the clip height. - if ((gCurrentViewportFlags & VIEWPORT_FLAG_PAINT_CLIP_TO_HEIGHT) && (map_element->base_height > gClipHeight)) break; + // Only paint tile_elements below the clip height. + if ((gCurrentViewportFlags & VIEWPORT_FLAG_PAINT_CLIP_TO_HEIGHT) && (tile_element->base_height > gClipHeight)) break; - sint32 direction = map_element_get_direction_with_offset(map_element, rotation); - sint32 height = map_element->base_height * 8; + sint32 direction = tile_element_get_direction_with_offset(tile_element, rotation); + sint32 height = tile_element->base_height * 8; LocationXY16 dword_9DE574 = session->MapPosition; - session->CurrentlyDrawnItem = map_element; + session->CurrentlyDrawnItem = tile_element; // Setup the painting of for example: the underground, signs, rides, scenery, etc. - switch (map_element_get_type(map_element)) + switch (tile_element_get_type(tile_element)) { - case MAP_ELEMENT_TYPE_SURFACE: - surface_paint(session, direction, height, map_element); + case TILE_ELEMENT_TYPE_SURFACE: + surface_paint(session, direction, height, tile_element); break; - case MAP_ELEMENT_TYPE_PATH: - path_paint(session, direction, height, map_element); + case TILE_ELEMENT_TYPE_PATH: + path_paint(session, direction, height, tile_element); break; - case MAP_ELEMENT_TYPE_TRACK: - track_paint(session, direction, height, map_element); + case TILE_ELEMENT_TYPE_TRACK: + track_paint(session, direction, height, tile_element); break; - case MAP_ELEMENT_TYPE_SCENERY: - scenery_paint(session, direction, height, map_element); + case TILE_ELEMENT_TYPE_SCENERY: + scenery_paint(session, direction, height, tile_element); break; - case MAP_ELEMENT_TYPE_ENTRANCE: - entrance_paint(session, direction, height, map_element); + case TILE_ELEMENT_TYPE_ENTRANCE: + entrance_paint(session, direction, height, tile_element); break; - case MAP_ELEMENT_TYPE_WALL: - fence_paint(session, direction, height, map_element); + case TILE_ELEMENT_TYPE_WALL: + fence_paint(session, direction, height, tile_element); break; - case MAP_ELEMENT_TYPE_SCENERY_MULTIPLE: - scenery_multiple_paint(session, direction, height, map_element); + case TILE_ELEMENT_TYPE_SCENERY_MULTIPLE: + scenery_multiple_paint(session, direction, height, tile_element); break; - case MAP_ELEMENT_TYPE_BANNER: - banner_paint(session, direction, height, map_element); + case TILE_ELEMENT_TYPE_BANNER: + banner_paint(session, direction, height, tile_element); break; // A corrupt element inserted by OpenRCT2 itself, which skips the drawing of the next element only. - case MAP_ELEMENT_TYPE_CORRUPT: - if (map_element_is_last_for_tile(map_element)) + case TILE_ELEMENT_TYPE_CORRUPT: + if (tile_element_is_last_for_tile(tile_element)) return; - map_element++; + tile_element++; break; default: // An undefined map element is most likely a corrupt element inserted by 8 cars' MOM feature to skip drawing of all elements after it. return; } session->MapPosition = dword_9DE574; - } while (!map_element_is_last_for_tile(map_element++)); + } while (!tile_element_is_last_for_tile(tile_element++)); if (!gShowSupportSegmentHeights) { return; } - if (map_element_get_type(map_element - 1) == MAP_ELEMENT_TYPE_SURFACE) { + if (tile_element_get_type(tile_element - 1) == TILE_ELEMENT_TYPE_SURFACE) { return; } diff --git a/src/openrct2/paint/map_element/map_element.h b/src/openrct2/paint/tile_element/tile_element.h similarity index 87% rename from src/openrct2/paint/map_element/map_element.h rename to src/openrct2/paint/tile_element/tile_element.h index e966cfd416..81661a43f4 100644 --- a/src/openrct2/paint/map_element/map_element.h +++ b/src/openrct2/paint/tile_element/tile_element.h @@ -14,8 +14,8 @@ *****************************************************************************/ #pragma endregion -#ifndef _PAINT_MAP_ELEMENT_H -#define _PAINT_MAP_ELEMENT_H +#ifndef _PAINT_TILE_ELEMENT_H +#define _PAINT_TILE_ELEMENT_H #include "../../rct2/addresses.h" #include "../../common.h" @@ -100,16 +100,16 @@ void paint_util_force_set_general_support_height(paint_session * session, sint16 void paint_util_set_segment_support_height(paint_session * session, sint32 segments, uint16 height, uint8 slope); uint16 paint_util_rotate_segments(uint16 segments, uint8 rotation); -void map_element_paint_setup(paint_session * session, sint32 x, sint32 y); +void tile_element_paint_setup(paint_session * session, sint32 x, sint32 y); -void entrance_paint(paint_session * session, uint8 direction, sint32 height, rct_map_element* map_element); -void banner_paint(paint_session * session, uint8 direction, sint32 height, rct_map_element* map_element); -void surface_paint(paint_session * session, uint8 direction, uint16 height, rct_map_element *mapElement); -void path_paint(paint_session * session, uint8 direction, uint16 height, rct_map_element *mapElement); -void scenery_paint(paint_session * session, uint8 direction, sint32 height, rct_map_element* mapElement); -void fence_paint(paint_session * session, uint8 direction, sint32 height, rct_map_element* mapElement); -void scenery_multiple_paint(paint_session * session, uint8 direction, uint16 height, rct_map_element *mapElement); -void track_paint(paint_session * session, uint8 direction, sint32 height, rct_map_element *mapElement); +void entrance_paint(paint_session * session, uint8 direction, sint32 height, rct_tile_element* tile_element); +void banner_paint(paint_session * session, uint8 direction, sint32 height, rct_tile_element* tile_element); +void surface_paint(paint_session * session, uint8 direction, uint16 height, rct_tile_element *mapElement); +void path_paint(paint_session * session, uint8 direction, uint16 height, rct_tile_element *mapElement); +void scenery_paint(paint_session * session, uint8 direction, sint32 height, rct_tile_element* mapElement); +void fence_paint(paint_session * session, uint8 direction, sint32 height, rct_tile_element* mapElement); +void scenery_multiple_paint(paint_session * session, uint8 direction, uint16 height, rct_tile_element *mapElement); +void track_paint(paint_session * session, uint8 direction, sint32 height, rct_tile_element *mapElement); #ifdef __cplusplus } diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp index e3b28301e8..8961f321bd 100644 --- a/src/openrct2/peep/Peep.cpp +++ b/src/openrct2/peep/Peep.cpp @@ -87,7 +87,7 @@ static struct static uint8 _unk_F1AEF0; static uint16 _unk_F1EE18; -static rct_map_element * _peepRideEntranceExitElement; +static rct_tile_element * _peepRideEntranceExitElement; static uint32 _peepRideConsideration[8]; static uint8 _peepPotentialRides[256]; @@ -171,7 +171,7 @@ static bool peep_update_fixing_sub_state_14(bool firstRun, rct_peep * peep, Ri static void peep_update_ride_inspected(sint32 rideIndex); static void peep_release_balloon(rct_peep * peep, sint16 spawn_height); -bool loc_690FD0(rct_peep * peep, uint8 * rideToView, uint8 * rideSeatToView, rct_map_element * esi); +bool loc_690FD0(rct_peep * peep, uint8 * rideToView, uint8 * rideSeatToView, rct_tile_element * esi); #ifdef DEBUG_DESYNC #define peep_rand() scenario_rand_data(peep) @@ -585,7 +585,7 @@ void peep_update_all() */ static uint8 peep_assess_surroundings(sint16 centre_x, sint16 centre_y, sint16 centre_z) { - if ((map_element_height(centre_x, centre_y) & 0xFFFF) > centre_z) + if ((tile_element_height(centre_x, centre_y) & 0xFFFF) > centre_z) return PEEP_THOUGHT_TYPE_NONE; uint16 num_scenery = 0; @@ -602,16 +602,16 @@ static uint8 peep_assess_surroundings(sint16 centre_x, sint16 centre_y, sint16 c { for (sint16 y = initial_y; y < final_y; y += 32) { - rct_map_element * mapElement = map_get_first_element_at(x / 32, y / 32); + rct_tile_element * mapElement = map_get_first_element_at(x / 32, y / 32); do { Ride * ride; rct_scenery_entry * scenery; - switch (map_element_get_type(mapElement)) + switch (tile_element_get_type(mapElement)) { - case MAP_ELEMENT_TYPE_PATH: + case TILE_ELEMENT_TYPE_PATH: if (!footpath_element_has_path_scenery(mapElement)) break; @@ -628,16 +628,16 @@ static uint8 peep_assess_surroundings(sint16 centre_x, sint16 centre_y, sint16 c num_fountains++; break; } - if (mapElement->flags & MAP_ELEMENT_FLAG_BROKEN) + if (mapElement->flags & TILE_ELEMENT_FLAG_BROKEN) { num_rubbish++; } break; - case MAP_ELEMENT_TYPE_SCENERY_MULTIPLE: - case MAP_ELEMENT_TYPE_SCENERY: + case TILE_ELEMENT_TYPE_SCENERY_MULTIPLE: + case TILE_ELEMENT_TYPE_SCENERY: num_scenery++; break; - case MAP_ELEMENT_TYPE_TRACK: + case TILE_ELEMENT_TYPE_TRACK: ride = get_ride(mapElement->properties.track.ride_index); if (ride->lifecycle_flags & RIDE_LIFECYCLE_MUSIC && ride->status != RIDE_STATUS_CLOSED && !(ride->lifecycle_flags & (RIDE_LIFECYCLE_BROKEN_DOWN | RIDE_LIFECYCLE_CRASHED))) @@ -663,7 +663,7 @@ static uint8 peep_assess_surroundings(sint16 centre_x, sint16 centre_y, sint16 c } break; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); } } @@ -1222,11 +1222,11 @@ static void sub_68F41A(rct_peep * peep, sint32 index) { /* Peep happiness is affected once the peep has been waiting * too long in a queue. */ - rct_map_element * mapElement = map_get_first_element_at(peep->next_x / 32, peep->next_y / 32); + rct_tile_element * mapElement = map_get_first_element_at(peep->next_x / 32, peep->next_y / 32); uint8 found = 0; do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_PATH) continue; if (mapElement->base_height != peep->next_z) continue; @@ -1242,7 +1242,7 @@ static void sub_68F41A(rct_peep * peep, sint32 index) } } break; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); if (found) { @@ -1466,27 +1466,27 @@ static sint32 checkForPath(rct_peep * peep) return 1; } - rct_map_element * map_element = map_get_first_element_at(peep->next_x / 32, peep->next_y / 32); + rct_tile_element * tile_element = map_get_first_element_at(peep->next_x / 32, peep->next_y / 32); - uint8 map_type = MAP_ELEMENT_TYPE_PATH; + uint8 map_type = TILE_ELEMENT_TYPE_PATH; if (peep->next_var_29 & ((1 << 4) | (1 << 3))) { - map_type = MAP_ELEMENT_TYPE_SURFACE; + map_type = TILE_ELEMENT_TYPE_SURFACE; } sint32 z = peep->next_z; do { - if (map_element_get_type(map_element) == map_type) + if (tile_element_get_type(tile_element) == map_type) { - if (z == map_element->base_height) + if (z == tile_element->base_height) { // Found a suitable path return 1; } } - } while (!map_element_is_last_for_tile(map_element++)); + } while (!tile_element_is_last_for_tile(tile_element++)); // Found no suitable path peep_decrement_num_riders(peep); @@ -1902,18 +1902,18 @@ void peep_update_sprite_type(rct_peep * peep) if (x < 0x1FFF && y < 0x1FFF) { - rct_map_element * map_element = map_get_first_element_at(x / 32, y / 32); + rct_tile_element * tile_element = map_get_first_element_at(x / 32, y / 32); while (1) { - if ((peep->z / 8) < map_element->base_height) + if ((peep->z / 8) < tile_element->base_height) break; - if (map_element_is_last_for_tile(map_element)) + if (tile_element_is_last_for_tile(tile_element)) { set_sprite_type(peep, PEEP_SPRITE_TYPE_UMBRELLA); return; } - map_element++; + tile_element++; } } } @@ -2050,7 +2050,7 @@ bool peep_pickup_place(rct_peep * peep, sint32 x, sint32 y, sint32 z, bool apply if (!peep) return false; - rct_map_element * mapElement = map_get_path_element_at(x / 32, y / 32, z); + rct_tile_element * mapElement = map_get_path_element_at(x / 32, y / 32, z); if (!mapElement) { @@ -2281,33 +2281,33 @@ static void peep_update_falling(rct_peep * peep) } // If not drowning then falling. Note: peeps 'fall' after leaving a ride/enter the park. - rct_map_element * map_element = map_get_first_element_at(peep->x / 32, peep->y / 32); - rct_map_element * saved_map = NULL; + rct_tile_element * tile_element = map_get_first_element_at(peep->x / 32, peep->y / 32); + rct_tile_element * saved_map = NULL; sint32 saved_height = 0; - if (map_element != NULL) + if (tile_element != NULL) { do { // If a path check if we are on it - if (map_element_get_type(map_element) == MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(tile_element) == TILE_ELEMENT_TYPE_PATH) { - sint32 height = map_height_from_slope(peep->x, peep->y, map_element->properties.surface.slope) + - map_element->base_height * 8; + sint32 height = map_height_from_slope(peep->x, peep->y, tile_element->properties.surface.slope) + + tile_element->base_height * 8; if (height < peep->z - 1 || height > peep->z + 4) continue; saved_height = height; - saved_map = map_element; + saved_map = tile_element; break; } // If a surface get the height and see if we are on it - else if (map_element_get_type(map_element) == MAP_ELEMENT_TYPE_SURFACE) + else if (tile_element_get_type(tile_element) == TILE_ELEMENT_TYPE_SURFACE) { // If the surface is water check to see if we could be drowning - if (map_get_water_height(map_element) > 0) + if (map_get_water_height(tile_element) > 0) { - sint32 height = map_get_water_height(map_element) * 16; + sint32 height = map_get_water_height(tile_element) * 16; if (height - 4 >= peep->z && height < peep->z + 20) { @@ -2329,15 +2329,15 @@ static void peep_update_falling(rct_peep * peep) return; } } - sint32 map_height = map_element_height(0xFFFF & peep->x, 0xFFFF & peep->y) & 0xFFFF; + sint32 map_height = tile_element_height(0xFFFF & peep->x, 0xFFFF & peep->y) & 0xFFFF; if (map_height < peep->z || map_height - 4 > peep->z) continue; saved_height = map_height; - saved_map = map_element; + saved_map = tile_element; } // If not a path or surface go see next element else continue; - } while (!map_element_is_last_for_tile(map_element++)); + } while (!tile_element_is_last_for_tile(tile_element++)); } // This will be null if peep is falling @@ -2364,7 +2364,7 @@ static void peep_update_falling(rct_peep * peep) peep->next_z = saved_map->base_height; sint32 edx = saved_map->properties.surface.slope & 0x7; - if (map_element_get_type(saved_map) != MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(saved_map) != TILE_ELEMENT_TYPE_PATH) { edx = 8; } @@ -2615,9 +2615,9 @@ static void peep_go_to_ride_entrance(rct_peep * peep, Ride * ride) sint32 y = ride->entrances[peep->current_ride_station].y; sint32 z = ride->station_heights[peep->current_ride_station]; - rct_map_element * map_element = ride_get_station_exit_element(ride, x, y, z); + rct_tile_element * tile_element = ride_get_station_exit_element(ride, x, y, z); - uint8 direction = (map_element == NULL ? 0 : map_element_get_direction(map_element)); + uint8 direction = (tile_element == NULL ? 0 : tile_element_get_direction(tile_element)); x *= 32; y *= 32; @@ -2905,9 +2905,9 @@ static void peep_update_ride_sub_state_1(rct_peep * peep) y = ride->entrances[peep->current_ride_station].y; z = ride->station_heights[peep->current_ride_station]; - rct_map_element * map_element = ride_get_station_exit_element(ride, x, y, z); + rct_tile_element * tile_element = ride_get_station_exit_element(ride, x, y, z); - uint8 direction_entrance = (map_element == NULL ? 0 : map_element_get_direction(map_element)); + uint8 direction_entrance = (tile_element == NULL ? 0 : tile_element_get_direction(tile_element)); if (ride->type == RIDE_TYPE_MAZE) { @@ -2946,9 +2946,9 @@ static void peep_update_ride_sub_state_1(rct_peep * peep) x = ride->station_starts[peep->current_ride_station].x; y = ride->station_starts[peep->current_ride_station].y; - map_element = ride_get_station_start_track_element(ride, peep->current_ride_station); + tile_element = ride_get_station_start_track_element(ride, peep->current_ride_station); - uint8 direction_track = (map_element == NULL ? 0 : map_element_get_direction(map_element)); + uint8 direction_track = (tile_element == NULL ? 0 : tile_element_get_direction(tile_element)); peep->var_37 = (direction_entrance << 2) | (direction_track << 4); @@ -2991,16 +2991,16 @@ static void peep_update_ride_sub_state_1(rct_peep * peep) y = ride->entrances[peep->current_ride_station].y; z = ride->station_heights[peep->current_ride_station]; - rct_map_element * map_element = ride_get_station_exit_element(ride, x, y, z); + rct_tile_element * tile_element = ride_get_station_exit_element(ride, x, y, z); - uint8 direction_entrance = (map_element == NULL ? 0 : map_element_get_direction(map_element)); + uint8 direction_entrance = (tile_element == NULL ? 0 : tile_element_get_direction(tile_element)); x = ride->station_starts[peep->current_ride_station].x; y = ride->station_starts[peep->current_ride_station].y; - map_element = ride_get_station_start_track_element(ride, peep->current_ride_station); + tile_element = ride_get_station_start_track_element(ride, peep->current_ride_station); - uint8 direction_track = (map_element == NULL ? 0 : map_element_get_direction(map_element)); + uint8 direction_track = (tile_element == NULL ? 0 : tile_element_get_direction(tile_element)); vehicle = GET_VEHICLE(ride->vehicles[peep->current_train]); ride_entry = get_ride_entry(vehicle->ride_subtype); @@ -3215,9 +3215,9 @@ static void peep_update_ride_sub_state_2_rejoin_queue(rct_peep * peep, Ride * ri y = ride->entrances[peep->current_ride_station].y; z = ride->station_heights[peep->current_ride_station]; - rct_map_element * map_element = ride_get_station_exit_element(ride, x, y, z); + rct_tile_element * tile_element = ride_get_station_exit_element(ride, x, y, z); - uint8 direction_entrance = (map_element == NULL ? 0 : map_element_get_direction(map_element)); + uint8 direction_entrance = (tile_element == NULL ? 0 : tile_element_get_direction(tile_element)); x *= 32; y *= 32; @@ -3455,9 +3455,9 @@ static void peep_update_ride_sub_state_7(rct_peep * peep) y = ride->exits[peep->current_ride_station].y; z = ride->station_heights[peep->current_ride_station]; - rct_map_element * map_element = ride_get_station_exit_element(ride, x, y, z); + rct_tile_element * tile_element = ride_get_station_exit_element(ride, x, y, z); - uint8 exit_direction = (map_element == NULL ? 0 : map_element_get_direction(map_element)); + uint8 exit_direction = (tile_element == NULL ? 0 : tile_element_get_direction(tile_element)); exit_direction ^= (1 << 1); if (!ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_16)) @@ -3469,16 +3469,16 @@ static void peep_update_ride_sub_state_7(rct_peep * peep) if (trackType == TRACK_ELEM_FLAT || trackType > TRACK_ELEM_MIDDLE_STATION) continue; - rct_map_element * inner_map = map_get_first_element_at(vehicle->track_x / 32, vehicle->track_y / 32); + rct_tile_element * inner_map = map_get_first_element_at(vehicle->track_x / 32, vehicle->track_y / 32); for (;; inner_map++) { - if (map_element_get_type(inner_map) != MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(inner_map) != TILE_ELEMENT_TYPE_TRACK) continue; if (inner_map->base_height == vehicle->track_z / 8) break; } - uint8 stationIndex = map_element_get_station(inner_map); + uint8 stationIndex = tile_element_get_station(inner_map); if (stationIndex == peep->current_ride_station) break; } @@ -3550,16 +3550,16 @@ static void peep_update_ride_sub_state_7(rct_peep * peep) y = ride->exits[peep->current_ride_station].y; z = ride->station_heights[peep->current_ride_station]; - rct_map_element * map_element = ride_get_station_exit_element(ride, x, y, z); + rct_tile_element * tile_element = ride_get_station_exit_element(ride, x, y, z); - uint8 exit_direction = (map_element == NULL ? 0 : map_element_get_direction(map_element)); + uint8 exit_direction = (tile_element == NULL ? 0 : tile_element_get_direction(tile_element)); x = ride->station_starts[peep->current_ride_station].x; y = ride->station_starts[peep->current_ride_station].y; - map_element = ride_get_station_start_track_element(ride, peep->current_ride_station); + tile_element = ride_get_station_start_track_element(ride, peep->current_ride_station); - uint8 station_direction = (map_element == NULL ? 0 : map_element_get_direction(map_element)); + uint8 station_direction = (tile_element == NULL ? 0 : tile_element_get_direction(tile_element)); vehicle = GET_VEHICLE(ride->vehicles[peep->current_train]); @@ -3627,9 +3627,9 @@ static void peep_update_ride_prepare_for_state_9(rct_peep * peep) sint16 y = ride->exits[peep->current_ride_station].y; sint16 z = ride->station_heights[peep->current_ride_station]; - rct_map_element * map_element = ride_get_station_exit_element(ride, x, y, z); + rct_tile_element * tile_element = ride_get_station_exit_element(ride, x, y, z); - uint8 exit_direction = (map_element == NULL ? 0 : map_element_get_direction(map_element)); + uint8 exit_direction = (tile_element == NULL ? 0 : tile_element_get_direction(tile_element)); x *= 32; y *= 32; @@ -3874,9 +3874,9 @@ static void peep_update_ride_sub_state_13(rct_peep * peep) y = ride->exits[peep->current_ride_station].y; sint16 z = ride->station_heights[peep->current_ride_station]; - rct_map_element * map_element = ride_get_station_exit_element(ride, x, y, z); + rct_tile_element * tile_element = ride_get_station_exit_element(ride, x, y, z); - uint8 exit_direction = (map_element == NULL ? 0 : map_element_get_direction(map_element)); + uint8 exit_direction = (tile_element == NULL ? 0 : tile_element_get_direction(tile_element)); exit_direction ^= (1 << 1); x *= 32; @@ -3951,9 +3951,9 @@ static void peep_update_ride_sub_state_14(rct_peep * peep) y = ride->exits[peep->current_ride_station].y; sint16 z = ride->station_heights[peep->current_ride_station]; - rct_map_element * map_element = ride_get_station_exit_element(ride, x, y, z); + rct_tile_element * tile_element = ride_get_station_exit_element(ride, x, y, z); - uint8 exit_direction = (map_element == NULL ? 0 : map_element_get_direction(map_element)); + uint8 exit_direction = (tile_element == NULL ? 0 : tile_element_get_direction(tile_element)); peep->var_37 = (exit_direction * 4) | (peep->var_37 & 0x30) | 1; x = ride->station_starts[peep->current_ride_station].x; @@ -4150,9 +4150,9 @@ static void peep_update_ride_sub_state_16(rct_peep * peep) y = ride->exits[peep->current_ride_station].y; sint16 z = ride->station_heights[peep->current_ride_station]; - rct_map_element * map_element = ride_get_station_exit_element(ride, x, y, z); + rct_tile_element * tile_element = ride_get_station_exit_element(ride, x, y, z); - uint8 exit_direction = (map_element == NULL ? 0 : map_element_get_direction(map_element)); + uint8 exit_direction = (tile_element == NULL ? 0 : tile_element_get_direction(tile_element)); exit_direction ^= (1 << 1); x *= 32; @@ -4232,13 +4232,13 @@ static void peep_update_ride_sub_state_17(rct_peep * peep) sint16 z = ride->station_heights[0]; // Find the station track element - rct_map_element * mapElement = map_get_first_element_at(x / 32, y / 32); + rct_tile_element * mapElement = map_get_first_element_at(x / 32, y / 32); do { - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_TRACK && z == mapElement->base_height) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_TRACK && z == mapElement->base_height) break; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); uint16 maze_entry = mapElement->properties.track.maze_entry; uint16 open_hedges = 0; @@ -4294,19 +4294,19 @@ static void peep_update_ride_sub_state_17(rct_peep * peep) if (z != mapElement->base_height) continue; - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_TRACK) { type = 1; break; } - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_ENTRANCE && + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_ENTRANCE && mapElement->properties.entrance.type == ENTRANCE_TYPE_RIDE_EXIT) { type = 2; break; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); switch (type) { @@ -4391,10 +4391,10 @@ static void peep_update_ride_sub_state_18(rct_peep * peep) y = peep->y & 0xFFE0; // Find the station track element - rct_map_element * mapElement = map_get_first_element_at(x / 32, y / 32); + rct_tile_element * mapElement = map_get_first_element_at(x / 32, y / 32); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_PATH) continue; sint16 z = map_height_from_slope(peep->x, peep->y, mapElement->properties.path.type); @@ -4407,7 +4407,7 @@ static void peep_update_ride_sub_state_18(rct_peep * peep) sprite_move(peep->x, peep->y, z, (rct_sprite *)peep); invalidate_sprite_2((rct_sprite *)peep); return; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); } /** @@ -4908,14 +4908,14 @@ static bool peep_update_fixing_sub_state_7(bool firstRun, rct_peep * peep, Ride uint16 stationX = stationPosition.x * 32; uint16 stationY = stationPosition.y * 32; - rct_map_element * mapElement = map_get_track_element_at(stationX, stationY, stationZ); + rct_tile_element * mapElement = map_get_track_element_at(stationX, stationY, stationZ); if (mapElement == NULL) { - log_error("Couldn't find map_element"); + log_error("Couldn't find tile_element"); return false; } - sint32 direction = map_element_get_direction(mapElement); + sint32 direction = tile_element_get_direction(mapElement); LocationXY16 offset = _992A3C[direction]; stationX += 16 + offset.x; @@ -5018,7 +5018,7 @@ static bool peep_update_fixing_sub_state_9(bool firstRun, rct_peep * peep, Ride input.y = trackBeginEnd.begin_y; input.element = trackBeginEnd.begin_element; - direction = map_element_get_direction(trackBeginEnd.begin_element); + direction = tile_element_get_direction(trackBeginEnd.begin_element); continue; } @@ -5451,7 +5451,7 @@ static void peep_update_mowing(rct_peep * peep) sint16 x = 0, y = 0, z, xy_distance; if (peep_update_action(&x, &y, &xy_distance, peep)) { - z = map_element_height(x, y) & 0xFFFF; + z = tile_element_height(x, y) & 0xFFFF; sprite_move(x, y, z, (rct_sprite *)peep); invalidate_sprite_2((rct_sprite *)peep); return; @@ -5476,16 +5476,16 @@ static void peep_update_mowing(rct_peep * peep) if (peep->var_37 != 7) continue; - rct_map_element * map_element = map_get_first_element_at(peep->next_x / 32, peep->next_y / 32); + rct_tile_element * tile_element = map_get_first_element_at(peep->next_x / 32, peep->next_y / 32); - for (; (map_element_get_type(map_element) != MAP_ELEMENT_TYPE_SURFACE); map_element++) + for (; (tile_element_get_type(tile_element) != TILE_ELEMENT_TYPE_SURFACE); tile_element++) ; - if ((map_element->properties.surface.terrain & MAP_ELEMENT_SURFACE_TERRAIN_MASK) == (TERRAIN_GRASS << 5)) + if ((tile_element->properties.surface.terrain & TILE_ELEMENT_SURFACE_TERRAIN_MASK) == (TERRAIN_GRASS << 5)) { - map_element->properties.surface.grass_length = GRASS_LENGTH_MOWED; - map_invalidate_tile_zoom0(peep->next_x, peep->next_y, map_element->base_height * 8, - map_element->base_height * 8 + 16); + tile_element->properties.surface.grass_length = GRASS_LENGTH_MOWED; + map_invalidate_tile_zoom0(peep->next_x, peep->next_y, tile_element->base_height * 8, + tile_element->base_height * 8 + 16); } peep->staff_lawns_mown++; peep->window_invalidate_flags |= PEEP_INVALIDATE_STAFF_STATS; @@ -5529,26 +5529,26 @@ static void peep_update_watering(rct_peep * peep) sint32 x = peep->next_x + TileDirectionDelta[peep->var_37].x; sint32 y = peep->next_y + TileDirectionDelta[peep->var_37].y; - rct_map_element * map_element = map_get_first_element_at(x / 32, y / 32); + rct_tile_element * tile_element = map_get_first_element_at(x / 32, y / 32); do { - if (map_element_get_type(map_element) != MAP_ELEMENT_TYPE_SCENERY) + if (tile_element_get_type(tile_element) != TILE_ELEMENT_TYPE_SCENERY) continue; - if (abs(((sint32)peep->next_z) - map_element->base_height) > 4) + if (abs(((sint32)peep->next_z) - tile_element->base_height) > 4) continue; - rct_scenery_entry * scenery_entry = get_small_scenery_entry(map_element->properties.scenery.type); + rct_scenery_entry * scenery_entry = get_small_scenery_entry(tile_element->properties.scenery.type); if (!(scenery_entry->small_scenery.flags & SMALL_SCENERY_FLAG_CAN_BE_WATERED)) continue; - map_element->properties.scenery.age = 0; - map_invalidate_tile_zoom0(x, y, map_element->base_height * 8, map_element->clearance_height * 8); + tile_element->properties.scenery.age = 0; + map_invalidate_tile_zoom0(x, y, tile_element->base_height * 8, tile_element->clearance_height * 8); peep->staff_gardens_watered++; peep->window_invalidate_flags |= PEEP_INVALIDATE_STAFF_STATS; - } while (!map_element_is_last_for_tile(map_element++)); + } while (!tile_element_is_last_for_tile(tile_element++)); peep_state_reset(peep); } @@ -5595,39 +5595,39 @@ static void peep_update_emptying_bin(rct_peep * peep) if (peep->action_frame != 11) return; - rct_map_element * map_element = map_get_first_element_at(peep->next_x / 32, peep->next_y / 32); + rct_tile_element * tile_element = map_get_first_element_at(peep->next_x / 32, peep->next_y / 32); - for (;; map_element++) + for (;; tile_element++) { - if (map_element_get_type(map_element) == MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(tile_element) == TILE_ELEMENT_TYPE_PATH) { - if (peep->next_z == map_element->base_height) + if (peep->next_z == tile_element->base_height) break; } - if (map_element_is_last_for_tile(map_element)) + if (tile_element_is_last_for_tile(tile_element)) { peep_state_reset(peep); return; } } - if (!footpath_element_has_path_scenery(map_element)) + if (!footpath_element_has_path_scenery(tile_element)) { peep_state_reset(peep); return; } - rct_scenery_entry * scenery_entry = get_footpath_item_entry(footpath_element_get_path_scenery_index(map_element)); - if (!(scenery_entry->path_bit.flags & PATH_BIT_FLAG_IS_BIN) || map_element->flags & (1 << 5) || - footpath_element_path_scenery_is_ghost(map_element)) + rct_scenery_entry * scenery_entry = get_footpath_item_entry(footpath_element_get_path_scenery_index(tile_element)); + if (!(scenery_entry->path_bit.flags & PATH_BIT_FLAG_IS_BIN) || tile_element->flags & (1 << 5) || + footpath_element_path_scenery_is_ghost(tile_element)) { peep_state_reset(peep); return; } - map_element->properties.path.addition_status |= ((3 << peep->var_37) << peep->var_37); + tile_element->properties.path.addition_status |= ((3 << peep->var_37) << peep->var_37); - map_invalidate_tile_zoom0(peep->next_x, peep->next_y, map_element->base_height * 8, map_element->clearance_height * 8); + map_invalidate_tile_zoom0(peep->next_x, peep->next_y, tile_element->base_height * 8, tile_element->clearance_height * 8); peep->staff_bins_emptied++; peep->window_invalidate_flags |= PEEP_INVALIDATE_STAFF_STATS; @@ -5901,35 +5901,35 @@ static sint32 peep_update_walking_find_bench(rct_peep * peep) if (!peep_should_find_bench(peep)) return 0; - rct_map_element * map_element = map_get_first_element_at(peep->next_x / 32, peep->next_y / 32); + rct_tile_element * tile_element = map_get_first_element_at(peep->next_x / 32, peep->next_y / 32); - for (;; map_element++) + for (;; tile_element++) { - if (map_element_get_type(map_element) == MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(tile_element) == TILE_ELEMENT_TYPE_PATH) { - if (peep->next_z == map_element->base_height) + if (peep->next_z == tile_element->base_height) break; } - if (map_element_is_last_for_tile(map_element)) + if (tile_element_is_last_for_tile(tile_element)) { return 0; } } - if (!footpath_element_has_path_scenery(map_element)) + if (!footpath_element_has_path_scenery(tile_element)) return 0; - rct_scenery_entry * sceneryEntry = get_footpath_item_entry(footpath_element_get_path_scenery_index(map_element)); + rct_scenery_entry * sceneryEntry = get_footpath_item_entry(footpath_element_get_path_scenery_index(tile_element)); if (sceneryEntry == nullptr || !(sceneryEntry->path_bit.flags & PATH_BIT_FLAG_IS_BENCH)) return 0; - if (map_element->flags & MAP_ELEMENT_FLAG_BROKEN) + if (tile_element->flags & TILE_ELEMENT_FLAG_BROKEN) return 0; - if (footpath_element_path_scenery_is_ghost(map_element)) + if (footpath_element_path_scenery_is_ghost(tile_element)) return 0; - sint32 edges = (map_element->properties.path.edges & 0xF) ^ 0xF; + sint32 edges = (tile_element->properties.path.edges & 0xF) ^ 0xF; if (edges == 0) return 0; @@ -6005,24 +6005,24 @@ static sint32 peep_update_walking_find_bin(rct_peep * peep) if (peep->next_var_29 & 0x18) return 0; - rct_map_element * map_element = map_get_first_element_at(peep->next_x / 32, peep->next_y / 32); + rct_tile_element * tile_element = map_get_first_element_at(peep->next_x / 32, peep->next_y / 32); - for (;; map_element++) + for (;; tile_element++) { - if (map_element_get_type(map_element) == MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(tile_element) == TILE_ELEMENT_TYPE_PATH) { - if (peep->next_z == map_element->base_height) + if (peep->next_z == tile_element->base_height) break; } - if (map_element_is_last_for_tile(map_element)) + if (tile_element_is_last_for_tile(tile_element)) { return 0; } } - if (!footpath_element_has_path_scenery(map_element)) + if (!footpath_element_has_path_scenery(tile_element)) return 0; - rct_scenery_entry * sceneryEntry = get_footpath_item_entry(footpath_element_get_path_scenery_index(map_element)); + rct_scenery_entry * sceneryEntry = get_footpath_item_entry(footpath_element_get_path_scenery_index(tile_element)); if (sceneryEntry == nullptr) { return 0; @@ -6031,20 +6031,20 @@ static sint32 peep_update_walking_find_bin(rct_peep * peep) if (!(sceneryEntry->path_bit.flags & PATH_BIT_FLAG_IS_BIN)) return 0; - if (map_element->flags & MAP_ELEMENT_FLAG_BROKEN) + if (tile_element->flags & TILE_ELEMENT_FLAG_BROKEN) return 0; - if (footpath_element_path_scenery_is_ghost(map_element)) + if (footpath_element_path_scenery_is_ghost(tile_element)) return 0; - sint32 edges = (map_element->properties.path.edges & 0xF) ^ 0xF; + sint32 edges = (tile_element->properties.path.edges & 0xF) ^ 0xF; if (edges == 0) return 0; uint8 chosen_edge = peep_rand() & 0x3; // Note: Bin quantity is inverted 0 = full, 3 = empty - uint8 bin_quantities = map_element->properties.path.addition_status; + uint8 bin_quantities = tile_element->properties.path.addition_status; // Rotate the bin to the correct edge. Makes it easier for next calc. bin_quantities = ror8(ror8(bin_quantities, chosen_edge), chosen_edge); @@ -6110,35 +6110,35 @@ static void peep_update_walking_break_scenery(rct_peep * peep) if (peep->next_var_29 & 0x18) return; - rct_map_element * map_element = map_get_first_element_at(peep->next_x / 32, peep->next_y / 32); + rct_tile_element * tile_element = map_get_first_element_at(peep->next_x / 32, peep->next_y / 32); - for (;; map_element++) + for (;; tile_element++) { - if (map_element_get_type(map_element) == MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(tile_element) == TILE_ELEMENT_TYPE_PATH) { - if (peep->next_z == map_element->base_height) + if (peep->next_z == tile_element->base_height) break; } - if (map_element_is_last_for_tile(map_element)) + if (tile_element_is_last_for_tile(tile_element)) { return; } } - if (!footpath_element_has_path_scenery(map_element)) + if (!footpath_element_has_path_scenery(tile_element)) return; - rct_scenery_entry * sceneryEntry = get_footpath_item_entry(footpath_element_get_path_scenery_index(map_element)); + rct_scenery_entry * sceneryEntry = get_footpath_item_entry(footpath_element_get_path_scenery_index(tile_element)); if (!(sceneryEntry->path_bit.flags & PATH_BIT_FLAG_BREAKABLE)) return; - if (map_element->flags & MAP_ELEMENT_FLAG_BROKEN) + if (tile_element->flags & TILE_ELEMENT_FLAG_BROKEN) return; - if (footpath_element_path_scenery_is_ghost(map_element)) + if (footpath_element_path_scenery_is_ghost(tile_element)) return; - sint32 edges = map_element->properties.path.edges & 0xF; + sint32 edges = tile_element->properties.path.edges & 0xF; if (edges == 0xF) return; @@ -6176,9 +6176,9 @@ static void peep_update_walking_break_scenery(rct_peep * peep) return; } - map_element->flags |= MAP_ELEMENT_FLAG_BROKEN; + tile_element->flags |= TILE_ELEMENT_FLAG_BROKEN; - map_invalidate_tile_zoom1(peep->next_x, peep->next_y, (map_element->base_height << 3) + 32, map_element->base_height << 3); + map_invalidate_tile_zoom1(peep->next_x, peep->next_y, (tile_element->base_height << 3) + 32, tile_element->base_height << 3); peep->angriness = 16; @@ -6384,45 +6384,45 @@ static void peep_update_using_bin(rct_peep * peep) return; } - rct_map_element * map_element = map_get_first_element_at(peep->next_x / 32, peep->next_y / 32); + rct_tile_element * tile_element = map_get_first_element_at(peep->next_x / 32, peep->next_y / 32); - for (;; map_element++) + for (;; tile_element++) { - if (map_element_get_type(map_element) != MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(tile_element) != TILE_ELEMENT_TYPE_PATH) { continue; } - if (map_element->base_height == peep->next_z) + if (tile_element->base_height == peep->next_z) break; - if (map_element_is_last_for_tile(map_element)) + if (tile_element_is_last_for_tile(tile_element)) { peep_state_reset(peep); return; } } - if (!footpath_element_has_path_scenery(map_element)) + if (!footpath_element_has_path_scenery(tile_element)) { peep_state_reset(peep); return; } - rct_scenery_entry * sceneryEntry = get_footpath_item_entry(footpath_element_get_path_scenery_index(map_element)); + rct_scenery_entry * sceneryEntry = get_footpath_item_entry(footpath_element_get_path_scenery_index(tile_element)); if (!(sceneryEntry->path_bit.flags & PATH_BIT_FLAG_IS_BIN)) { peep_state_reset(peep); return; } - if (map_element->flags & MAP_ELEMENT_FLAG_BROKEN) + if (tile_element->flags & TILE_ELEMENT_FLAG_BROKEN) { peep_state_reset(peep); return; } - if (footpath_element_path_scenery_is_ghost(map_element)) + if (footpath_element_path_scenery_is_ghost(tile_element)) { peep_state_reset(peep); return; @@ -6432,7 +6432,7 @@ static void peep_update_using_bin(rct_peep * peep) uint8 selected_bin = peep->var_37 * 2; // This counts down 2 = No rubbish, 0 = full - uint8 space_left_in_bin = 0x3 & (map_element->properties.path.addition_status >> selected_bin); + uint8 space_left_in_bin = 0x3 & (tile_element->properties.path.addition_status >> selected_bin); uint32 empty_containers = peep_empty_container_standard_flag(peep); for (uint8 cur_container = 0; cur_container < 32; cur_container++) @@ -6466,7 +6466,7 @@ static void peep_update_using_bin(rct_peep * peep) } // Original bug: This would clear any rubbish placed by the previous function - // space_left_in_bin = 0x3 & (map_element->properties.path.addition_status >> selected_bin); + // space_left_in_bin = 0x3 & (tile_element->properties.path.addition_status >> selected_bin); empty_containers = peep_empty_container_extra_flag(peep); for (uint8 cur_container = 0; cur_container < 32; cur_container++) @@ -6501,12 +6501,12 @@ static void peep_update_using_bin(rct_peep * peep) } // Place new amount in bin by first clearing the value - map_element->properties.path.addition_status &= ~(3 << selected_bin); + tile_element->properties.path.addition_status &= ~(3 << selected_bin); // Then placing the new value. - map_element->properties.path.addition_status |= space_left_in_bin << selected_bin; + tile_element->properties.path.addition_status |= space_left_in_bin << selected_bin; - map_invalidate_tile_zoom0(peep->next_x, peep->next_y, map_element->base_height << 3, - map_element->clearance_height << 3); + map_invalidate_tile_zoom0(peep->next_x, peep->next_y, tile_element->base_height << 3, + tile_element->clearance_height << 3); peep_state_reset(peep); } } @@ -6576,12 +6576,12 @@ static void peep_update_heading_to_inspect(rct_peep * peep) return; } - rct_map_element * map_element = _peepRideEntranceExitElement; + rct_tile_element * tile_element = _peepRideEntranceExitElement; - if (peep->current_ride != map_element->properties.entrance.ride_index) + if (peep->current_ride != tile_element->properties.entrance.ride_index) return; - uint8 exit_index = ((map_element->properties.entrance.index & 0x70) >> 4); + uint8 exit_index = ((tile_element->properties.entrance.index & 0x70) >> 4); if (peep->current_ride_station != exit_index) return; @@ -6594,7 +6594,7 @@ static void peep_update_heading_to_inspect(rct_peep * peep) } } - uint8 direction = map_element_get_direction(map_element); + uint8 direction = tile_element_get_direction(tile_element); peep->direction = direction; sint32 x = peep->next_x + 16 + word_981D6C[direction].x * 53; @@ -6605,7 +6605,7 @@ static void peep_update_heading_to_inspect(rct_peep * peep) peep->destination_tolerence = 2; peep->sprite_direction = direction << 3; - peep->z = map_element->base_height * 4; + peep->z = tile_element->base_height * 4; peep->sub_state = 4; // Falls through into sub_state 4 } @@ -6702,12 +6702,12 @@ static void peep_update_answering(rct_peep * peep) return; } - rct_map_element * map_element = _peepRideEntranceExitElement; + rct_tile_element * tile_element = _peepRideEntranceExitElement; - if (peep->current_ride != map_element->properties.entrance.ride_index) + if (peep->current_ride != tile_element->properties.entrance.ride_index) return; - uint8 exit_index = ((map_element->properties.entrance.index & 0x70) >> 4); + uint8 exit_index = ((tile_element->properties.entrance.index & 0x70) >> 4); if (peep->current_ride_station != exit_index) return; @@ -6720,7 +6720,7 @@ static void peep_update_answering(rct_peep * peep) } } - uint8 direction = map_element_get_direction(map_element); + uint8 direction = tile_element_get_direction(tile_element); peep->direction = direction; sint32 x = peep->next_x + 16 + word_981D6C[direction].x * 53; @@ -6731,7 +6731,7 @@ static void peep_update_answering(rct_peep * peep) peep->destination_tolerence = 2; peep->sprite_direction = direction << 3; - peep->z = map_element->base_height * 4; + peep->z = tile_element->base_height * 4; peep->sub_state = 4; // Falls through into sub_state 4 } @@ -6783,43 +6783,43 @@ static sint32 peep_update_patrolling_find_watering(rct_peep * peep) sint32 x = peep->next_x + TileDirectionDelta[chosen_position].x; sint32 y = peep->next_y + TileDirectionDelta[chosen_position].y; - rct_map_element * map_element = map_get_first_element_at(x / 32, y / 32); + rct_tile_element * tile_element = map_get_first_element_at(x / 32, y / 32); // This seems to happen in some SV4 files. - if (map_element == NULL) + if (tile_element == NULL) { continue; } do { - if (map_element_get_type(map_element) != MAP_ELEMENT_TYPE_SCENERY) + if (tile_element_get_type(tile_element) != TILE_ELEMENT_TYPE_SCENERY) { continue; } - uint8 z_diff = abs(peep->next_z - map_element->base_height); + uint8 z_diff = abs(peep->next_z - tile_element->base_height); if (z_diff >= 4) { continue; } - rct_scenery_entry * sceneryEntry = get_small_scenery_entry(map_element->properties.scenery.type); + rct_scenery_entry * sceneryEntry = get_small_scenery_entry(tile_element->properties.scenery.type); if (sceneryEntry == nullptr || !(sceneryEntry->small_scenery.flags & SMALL_SCENERY_FLAG_CAN_BE_WATERED)) { continue; } - if (map_element->properties.scenery.age < 55) + if (tile_element->properties.scenery.age < 55) { if (chosen_position >= 4) { continue; } - if (map_element->properties.scenery.age < 40) + if (tile_element->properties.scenery.age < 40) { continue; } @@ -6836,7 +6836,7 @@ static sint32 peep_update_patrolling_find_watering(rct_peep * peep) peep->destination_tolerence = 3; return 1; - } while (!map_element_is_last_for_tile(map_element++)); + } while (!tile_element_is_last_for_tile(tile_element++)); } return 0; } @@ -6853,35 +6853,35 @@ static sint32 peep_update_patrolling_find_bin(rct_peep * peep) if ((peep->next_var_29 & 0x18) != 0) return 0; - rct_map_element * map_element = map_get_first_element_at(peep->next_x / 32, peep->next_y / 32); - if (map_element == NULL) + rct_tile_element * tile_element = map_get_first_element_at(peep->next_x / 32, peep->next_y / 32); + if (tile_element == NULL) return 0; - for (;; map_element++) + for (;; tile_element++) { - if (map_element_get_type(map_element) == MAP_ELEMENT_TYPE_PATH && (map_element->base_height == peep->next_z)) + if (tile_element_get_type(tile_element) == TILE_ELEMENT_TYPE_PATH && (tile_element->base_height == peep->next_z)) break; - if (map_element_is_last_for_tile(map_element)) + if (tile_element_is_last_for_tile(tile_element)) return 0; } - if (!footpath_element_has_path_scenery(map_element)) + if (!footpath_element_has_path_scenery(tile_element)) return 0; - rct_scenery_entry * sceneryEntry = get_footpath_item_entry(footpath_element_get_path_scenery_index(map_element)); + rct_scenery_entry * sceneryEntry = get_footpath_item_entry(footpath_element_get_path_scenery_index(tile_element)); if (!(sceneryEntry->path_bit.flags & PATH_BIT_FLAG_IS_BIN)) return 0; - if (map_element->flags & MAP_ELEMENT_FLAG_BROKEN) + if (tile_element->flags & TILE_ELEMENT_FLAG_BROKEN) return 0; - if (footpath_element_path_scenery_is_ghost(map_element)) + if (footpath_element_path_scenery_is_ghost(tile_element)) return 0; - uint8 bin_positions = map_element->properties.path.edges & 0xF; - uint8 bin_quantity = map_element->properties.path.addition_status; + uint8 bin_positions = tile_element->properties.path.edges & 0xF; + uint8 bin_quantity = tile_element->properties.path.addition_status; uint8 chosen_position = 0; for (; chosen_position < 4; ++chosen_position) @@ -6922,12 +6922,12 @@ static sint32 peep_update_patrolling_find_grass(rct_peep * peep) if ((peep->next_var_29 & 0x18) != 8) return 0; - rct_map_element * map_element = map_get_surface_element_at(peep->next_x / 32, peep->next_y / 32); + rct_tile_element * tile_element = map_get_surface_element_at(peep->next_x / 32, peep->next_y / 32); - if ((map_element->properties.surface.terrain & MAP_ELEMENT_SURFACE_TERRAIN_MASK) != TERRAIN_GRASS) + if ((tile_element->properties.surface.terrain & TILE_ELEMENT_SURFACE_TERRAIN_MASK) != TERRAIN_GRASS) return 0; - if ((map_element->properties.surface.grass_length & 0x7) < GRASS_LENGTH_CLEAR_1) + if ((tile_element->properties.surface.grass_length & 0x7) < GRASS_LENGTH_CLEAR_1) return 0; peep_decrement_num_riders(peep); @@ -6994,11 +6994,11 @@ static void peep_update_patrolling(rct_peep * peep) if ((peep->next_var_29 & 0x18) == 8) { - rct_map_element * map_element = map_get_surface_element_at(peep->next_x / 32, peep->next_y / 32); + rct_tile_element * tile_element = map_get_surface_element_at(peep->next_x / 32, peep->next_y / 32); - if (map_element != NULL) + if (tile_element != NULL) { - sint32 water_height = map_get_water_height(map_element); + sint32 water_height = map_get_water_height(tile_element); if (water_height) { invalidate_sprite_2((rct_sprite *)peep); @@ -7196,9 +7196,9 @@ static void peep_update_walking(rct_peep * peep) if ((peep->next_var_29 & 0x18) == 8) { - rct_map_element * map_element = map_get_surface_element_at(peep->next_x / 32, peep->next_y / 32); + rct_tile_element * tile_element = map_get_surface_element_at(peep->next_x / 32, peep->next_y / 32); - sint32 water_height = map_get_water_height(map_element); + sint32 water_height = map_get_water_height(tile_element); if (water_height) { invalidate_sprite_2((rct_sprite *)peep); @@ -7248,16 +7248,16 @@ static void peep_update_walking(rct_peep * peep) if (peep->next_var_29 & 0x1C) return; - rct_map_element * map_element = map_get_first_element_at(peep->next_x / 32, peep->next_y / 32); + rct_tile_element * tile_element = map_get_first_element_at(peep->next_x / 32, peep->next_y / 32); - for (;; map_element++) + for (;; tile_element++) { - if (map_element_get_type(map_element) == MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(tile_element) == TILE_ELEMENT_TYPE_PATH) { - if (peep->next_z == map_element->base_height) + if (peep->next_z == tile_element->base_height) break; } - if (map_element_is_last_for_tile(map_element)) + if (tile_element_is_last_for_tile(tile_element)) { return; } @@ -7265,11 +7265,11 @@ static void peep_update_walking(rct_peep * peep) sint32 ebp = 15; - if (footpath_element_has_path_scenery(map_element)) + if (footpath_element_has_path_scenery(tile_element)) { - if (!footpath_element_path_scenery_is_ghost(map_element)) + if (!footpath_element_path_scenery_is_ghost(tile_element)) { - rct_scenery_entry * sceneryEntry = get_footpath_item_entry(footpath_element_get_path_scenery_index(map_element)); + rct_scenery_entry * sceneryEntry = get_footpath_item_entry(footpath_element_get_path_scenery_index(tile_element)); if (sceneryEntry == nullptr) { return; @@ -7280,7 +7280,7 @@ static void peep_update_walking(rct_peep * peep) } } - sint32 edges = (map_element->properties.path.edges & 0xF) ^ 0xF; + sint32 edges = (tile_element->properties.path.edges & 0xF) ^ 0xF; if (edges == 0) return; @@ -8783,10 +8783,10 @@ static sint32 peep_return_to_centre_of_tile(rct_peep * peep) * * rct2: 0x00693f2C */ -static sint32 peep_interact_with_entrance(rct_peep * peep, sint16 x, sint16 y, rct_map_element * map_element) +static sint32 peep_interact_with_entrance(rct_peep * peep, sint16 x, sint16 y, rct_tile_element * tile_element) { - uint8 entranceType = map_element->properties.entrance.type; - uint8 rideIndex = map_element->properties.entrance.ride_index; + uint8 entranceType = tile_element->properties.entrance.type; + uint8 rideIndex = tile_element->properties.entrance.ride_index; // Store some details to determine when to override the default // behaviour (defined below) for when staff attempt to enter a ride @@ -8794,12 +8794,12 @@ static sint32 peep_interact_with_entrance(rct_peep * peep, sint16 x, sint16 y, r if (entranceType == ENTRANCE_TYPE_RIDE_EXIT) { _unk_F1EE18 |= F1EE18_RIDE_EXIT; - _peepRideEntranceExitElement = map_element; + _peepRideEntranceExitElement = tile_element; } else if (entranceType == ENTRANCE_TYPE_RIDE_ENTRANCE) { _unk_F1EE18 |= F1EE18_RIDE_ENTRANCE; - _peepRideEntranceExitElement = map_element; + _peepRideEntranceExitElement = tile_element; } if (entranceType == ENTRANCE_TYPE_RIDE_EXIT) @@ -8837,7 +8837,7 @@ static sint32 peep_interact_with_entrance(rct_peep * peep, sint16 x, sint16 y, r return peep_return_to_centre_of_tile(peep); peep->var_F4 = 0; - uint8 stationNum = (map_element->properties.entrance.index >> 4) & 0x7; + uint8 stationNum = (tile_element->properties.entrance.index >> 4) & 0x7; // Guest walks up to the ride for the first time since entering // the path tile or since considering another ride attached to // the path tile. @@ -8888,10 +8888,10 @@ static sint32 peep_interact_with_entrance(rct_peep * peep, sint16 x, sint16 y, r return peep_return_to_centre_of_tile(peep); // If not the centre of the entrance arch - if (map_element->properties.entrance.index & 0xF) + if (tile_element->properties.entrance.index & 0xF) return peep_return_to_centre_of_tile(peep); - uint8 entranceDirection = map_element_get_direction(map_element); + uint8 entranceDirection = tile_element_get_direction(tile_element); if (entranceDirection != peep->direction) { if ((entranceDirection ^ (1 << 1)) != peep->direction) @@ -8959,10 +8959,10 @@ static sint32 peep_interact_with_entrance(rct_peep * peep, sint16 x, sint16 y, r sint16 next_y = (y & 0xFFE0) + TileDirectionDelta[entranceDirection].y; uint8 found = 0; - rct_map_element * nextMapElement = map_get_first_element_at(next_x / 32, next_y / 32); + rct_tile_element * nextMapElement = map_get_first_element_at(next_x / 32, next_y / 32); do { - if (map_element_get_type(nextMapElement) != MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(nextMapElement) != TILE_ELEMENT_TYPE_PATH) continue; if (nextMapElement->type & 1) @@ -8998,7 +8998,7 @@ static sint32 peep_interact_with_entrance(rct_peep * peep, sint16 x, sint16 y, r found = 1; break; } - } while (!map_element_is_last_for_tile(nextMapElement++)); + } while (!tile_element_is_last_for_tile(nextMapElement++)); if (!found) { @@ -9062,12 +9062,12 @@ static sint32 peep_interact_with_entrance(rct_peep * peep, sint16 x, sint16 y, r * * rct2: 0x006946D8 */ -static sint32 peep_footpath_move_forward(rct_peep * peep, sint16 x, sint16 y, rct_map_element * map_element, bool vandalism) +static sint32 peep_footpath_move_forward(rct_peep * peep, sint16 x, sint16 y, rct_tile_element * tile_element, bool vandalism) { peep->next_x = (x & 0xFFE0); peep->next_y = (y & 0xFFE0); - peep->next_z = map_element->base_height; - peep->next_var_29 = map_element->properties.path.type & 7; + peep->next_z = tile_element->base_height; + peep->next_var_29 = tile_element->properties.path.type & 7; sint16 z = peep_get_height_on_slope(peep, x, y); @@ -9208,18 +9208,18 @@ static sint32 peep_footpath_move_forward(rct_peep * peep, sint16 x, sint16 y, rc * * rct2: 0x0069455E */ -static sint32 peep_interact_with_path(rct_peep * peep, sint16 x, sint16 y, rct_map_element * map_element) +static sint32 peep_interact_with_path(rct_peep * peep, sint16 x, sint16 y, rct_tile_element * tile_element) { // 0x00F1AEE2 bool vandalism_present = false; - if (footpath_element_has_path_scenery(map_element) && (map_element->flags & MAP_ELEMENT_FLAG_BROKEN) && - (map_element->properties.path.edges & 0xF) != 0xF) + if (footpath_element_has_path_scenery(tile_element) && (tile_element->flags & TILE_ELEMENT_FLAG_BROKEN) && + (tile_element->properties.path.edges & 0xF) != 0xF) { vandalism_present = 1; } - sint16 z = map_element->base_height * 8; + sint16 z = tile_element->base_height * 8; if (!map_is_location_owned(x, y, z)) { if (peep->outside_of_park == 0) @@ -9231,10 +9231,10 @@ static sint32 peep_interact_with_path(rct_peep * peep, sint16 x, sint16 y, rct_m return peep_return_to_centre_of_tile(peep); } - if (peep->type == PEEP_TYPE_GUEST && footpath_element_is_queue(map_element)) + if (peep->type == PEEP_TYPE_GUEST && footpath_element_is_queue(tile_element)) { - uint8 rideIndex = map_element->properties.path.ride_index; + uint8 rideIndex = tile_element->properties.path.ride_index; if (peep->state == PEEP_STATE_QUEUING) { @@ -9243,7 +9243,7 @@ static sint32 peep_interact_with_path(rct_peep * peep, sint16 x, sint16 y, rct_m // the queue, rebuilt the ride, etc. if (peep->current_ride == rideIndex) { - return peep_footpath_move_forward(peep, x, y, map_element, vandalism_present); + return peep_footpath_move_forward(peep, x, y, tile_element, vandalism_present); } // Queue got disconnected from the original ride. peep->interaction_ride_index = 0xFF; @@ -9251,15 +9251,15 @@ static sint32 peep_interact_with_path(rct_peep * peep, sint16 x, sint16 y, rct_m peep_decrement_num_riders(peep); peep->state = PEEP_STATE_1; peep_window_state_update(peep); - return peep_footpath_move_forward(peep, x, y, map_element, vandalism_present); + return peep_footpath_move_forward(peep, x, y, tile_element, vandalism_present); } // Peep is not queuing. peep->var_F4 = 0; - uint8 stationNum = (map_element->properties.path.additions & 0x70) >> 4; + uint8 stationNum = (tile_element->properties.path.additions & 0x70) >> 4; - if ((map_element->properties.path.type & (1 << 3)) // Queue has the ride sign on it - && (((map_element->type & (3 << 6)) >> 6) == + if ((tile_element->properties.path.type & (1 << 3)) // Queue has the ride sign on it + && (((tile_element->type & (3 << 6)) >> 6) == ((peep->direction) ^ 2)) // Ride sign is facing the direction the peep is walking ) { @@ -9275,7 +9275,7 @@ static sint32 peep_interact_with_path(rct_peep * peep, sint16 x, sint16 y, rct_m { /* Peep is approaching a queue tile without a ride * sign facing the peep. */ - return peep_footpath_move_forward(peep, x, y, map_element, vandalism_present); + return peep_footpath_move_forward(peep, x, y, tile_element, vandalism_present); } // Peep has decided to go on the ride at the queue. @@ -9310,7 +9310,7 @@ static sint32 peep_interact_with_path(rct_peep * peep, sint16 x, sint16 y, rct_m } } - return peep_footpath_move_forward(peep, x, y, map_element, vandalism_present); + return peep_footpath_move_forward(peep, x, y, tile_element, vandalism_present); } else { @@ -9322,7 +9322,7 @@ static sint32 peep_interact_with_path(rct_peep * peep, sint16 x, sint16 y, rct_m peep->state = PEEP_STATE_1; peep_window_state_update(peep); } - return peep_footpath_move_forward(peep, x, y, map_element, vandalism_present); + return peep_footpath_move_forward(peep, x, y, tile_element, vandalism_present); } } @@ -9330,9 +9330,9 @@ static sint32 peep_interact_with_path(rct_peep * peep, sint16 x, sint16 y, rct_m * * rct2: 0x00693F70 */ -static sint32 peep_interact_with_shop(rct_peep * peep, sint16 x, sint16 y, rct_map_element * map_element) +static sint32 peep_interact_with_shop(rct_peep * peep, sint16 x, sint16 y, rct_tile_element * tile_element) { - uint8 rideIndex = map_element->properties.track.ride_index; + uint8 rideIndex = tile_element->properties.track.ride_index; Ride * ride = get_ride(rideIndex); if (!ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_IS_SHOP)) @@ -9516,24 +9516,24 @@ static sint32 guest_surface_path_finding(rct_peep * peep) return peep_move_one_tile(randDirection, peep); } -static rct_map_element * get_banner_on_path(rct_map_element * path_element) +static rct_tile_element * get_banner_on_path(rct_tile_element * path_element) { // This is an improved version of original. // That only checked for one fence in the way. - if (map_element_is_last_for_tile(path_element)) + if (tile_element_is_last_for_tile(path_element)) return NULL; - rct_map_element * bannerElement = path_element + 1; + rct_tile_element * bannerElement = path_element + 1; do { // Path on top, so no banners - if (map_element_get_type(bannerElement) == MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(bannerElement) == TILE_ELEMENT_TYPE_PATH) return NULL; // Found a banner - if (map_element_get_type(bannerElement) == MAP_ELEMENT_TYPE_BANNER) + if (tile_element_get_type(bannerElement) == TILE_ELEMENT_TYPE_BANNER) return bannerElement; // Last element so there cant be any other banners - if (map_element_is_last_for_tile(bannerElement)) + if (tile_element_is_last_for_tile(bannerElement)) return NULL; } while (bannerElement++); @@ -9541,11 +9541,11 @@ static rct_map_element * get_banner_on_path(rct_map_element * path_element) return NULL; } -static sint32 banner_clear_path_edges(rct_map_element * mapElement, sint32 edges) +static sint32 banner_clear_path_edges(rct_tile_element * mapElement, sint32 edges) { if (_peepPathFindIsStaff) return edges; - rct_map_element * bannerElement = get_banner_on_path(mapElement); + rct_tile_element * bannerElement = get_banner_on_path(mapElement); if (bannerElement != NULL) { do @@ -9559,12 +9559,12 @@ static sint32 banner_clear_path_edges(rct_map_element * mapElement, sint32 edges /** * Gets the connected edges of a path that are permitted (i.e. no 'no entry' signs) */ -static sint32 path_get_permitted_edges(rct_map_element * mapElement) +static sint32 path_get_permitted_edges(rct_tile_element * mapElement) { return banner_clear_path_edges(mapElement, mapElement->properties.path.edges) & 0x0F; } -bool is_valid_path_z_and_direction(rct_map_element * mapElement, sint32 currentZ, sint32 currentDirection) +bool is_valid_path_z_and_direction(rct_tile_element * mapElement, sint32 currentZ, sint32 currentDirection) { if (footpath_element_is_sloped(mapElement)) { @@ -9604,10 +9604,10 @@ bool is_valid_path_z_and_direction(rct_map_element * mapElement, sint32 currentZ * Returns the type of the next footpath tile a peep can get to from x,y,z / * inputMapElement in the given direction. */ -static uint8 footpath_element_next_in_direction(sint16 x, sint16 y, sint16 z, rct_map_element * mapElement, +static uint8 footpath_element_next_in_direction(sint16 x, sint16 y, sint16 z, rct_tile_element * mapElement, uint8 chosenDirection) { - rct_map_element * nextMapElement; + rct_tile_element * nextMapElement; if (footpath_element_is_sloped(mapElement)) { @@ -9622,9 +9622,9 @@ static uint8 footpath_element_next_in_direction(sint16 x, sint16 y, sint16 z, rc nextMapElement = map_get_first_element_at(x / 32, y / 32); do { - if (nextMapElement->flags & MAP_ELEMENT_FLAG_GHOST) + if (nextMapElement->flags & TILE_ELEMENT_FLAG_GHOST) continue; - if (map_element_get_type(nextMapElement) != MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(nextMapElement) != TILE_ELEMENT_TYPE_PATH) continue; if (!is_valid_path_z_and_direction(nextMapElement, z, chosenDirection)) continue; @@ -9635,7 +9635,7 @@ static uint8 footpath_element_next_in_direction(sint16 x, sint16 y, sint16 z, rc return PATH_SEARCH_RIDE_QUEUE; return PATH_SEARCH_OTHER; - } while (!map_element_is_last_for_tile(nextMapElement++)); + } while (!tile_element_is_last_for_tile(nextMapElement++)); return PATH_SEARCH_FAILED; } @@ -9658,10 +9658,10 @@ static uint8 footpath_element_next_in_direction(sint16 x, sint16 y, sint16 z, rc * * This is the recursive portion of footpath_element_destination_in_direction(). */ -static uint8 footpath_element_dest_in_dir(sint16 x, sint16 y, sint16 z, rct_map_element * inputMapElement, +static uint8 footpath_element_dest_in_dir(sint16 x, sint16 y, sint16 z, rct_tile_element * inputMapElement, uint8 chosenDirection, uint8 * outRideIndex, sint32 level) { - rct_map_element * mapElement; + rct_tile_element * mapElement; sint32 direction; if (level > 25) @@ -9676,12 +9676,12 @@ static uint8 footpath_element_dest_in_dir(sint16 x, sint16 y, sint16 z, rct_map_ } do { - if (mapElement->flags & MAP_ELEMENT_FLAG_GHOST) + if (mapElement->flags & TILE_ELEMENT_FLAG_GHOST) continue; - switch (map_element_get_type(mapElement)) + switch (tile_element_get_type(mapElement)) { - case MAP_ELEMENT_TYPE_TRACK: + case TILE_ELEMENT_TYPE_TRACK: { if (z != mapElement->base_height) continue; @@ -9694,13 +9694,13 @@ static uint8 footpath_element_dest_in_dir(sint16 x, sint16 y, sint16 z, rct_map_ } } break; - case MAP_ELEMENT_TYPE_ENTRANCE: + case TILE_ELEMENT_TYPE_ENTRANCE: if (z != mapElement->base_height) continue; switch (mapElement->properties.entrance.type) { case ENTRANCE_TYPE_RIDE_ENTRANCE: - direction = map_element_get_direction(mapElement); + direction = tile_element_get_direction(mapElement); if (direction == chosenDirection) { *outRideIndex = mapElement->properties.entrance.ride_index; @@ -9708,7 +9708,7 @@ static uint8 footpath_element_dest_in_dir(sint16 x, sint16 y, sint16 z, rct_map_ } break; case ENTRANCE_TYPE_RIDE_EXIT: - direction = map_element_get_direction(mapElement); + direction = tile_element_get_direction(mapElement); if (direction == chosenDirection) { *outRideIndex = mapElement->properties.entrance.ride_index; @@ -9719,7 +9719,7 @@ static uint8 footpath_element_dest_in_dir(sint16 x, sint16 y, sint16 z, rct_map_ return PATH_SEARCH_PARK_EXIT; } break; - case MAP_ELEMENT_TYPE_PATH: + case TILE_ELEMENT_TYPE_PATH: if (!is_valid_path_z_and_direction(mapElement, z, chosenDirection)) continue; if (footpath_element_is_wide(mapElement)) @@ -9749,7 +9749,7 @@ static uint8 footpath_element_dest_in_dir(sint16 x, sint16 y, sint16 z, rct_map_ } return PATH_SEARCH_DEAD_END; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return PATH_SEARCH_FAILED; } @@ -9777,7 +9777,7 @@ static uint8 footpath_element_dest_in_dir(sint16 x, sint16 y, sint16 z, rct_map_ * This is useful for finding out what is at the end of a short single * width path, for example that leads from a ride exit back to the main path. */ -static uint8 footpath_element_destination_in_direction(sint16 x, sint16 y, sint16 z, rct_map_element * inputMapElement, +static uint8 footpath_element_destination_in_direction(sint16 x, sint16 y, sint16 z, rct_tile_element * inputMapElement, uint8 chosenDirection, uint8 * outRideIndex) { if (footpath_element_is_sloped(inputMapElement)) @@ -9857,7 +9857,7 @@ static uint8 peep_pathfind_get_max_number_junctions(rct_peep * peep) * and ride queues coming off a path should not result in the path being * considered a junction. */ -static bool path_is_thin_junction(rct_map_element * path, sint16 x, sint16 y, uint8 z) +static bool path_is_thin_junction(rct_tile_element * path, sint16 x, sint16 y, uint8 z) { uint8 edges = path_get_permitted_edges(path); @@ -9965,7 +9965,7 @@ static bool path_is_thin_junction(rct_map_element * path, sint16 x, sint16 y, ui * * rct2: 0x0069A997 */ -static void peep_pathfind_heuristic_search(sint16 x, sint16 y, uint8 z, rct_peep * peep, rct_map_element * currentMapElement, +static void peep_pathfind_heuristic_search(sint16 x, sint16 y, uint8 z, rct_peep * peep, rct_tile_element * currentMapElement, bool inPatrolArea, uint8 counter, uint16 * endScore, sint32 test_edge, uint8 * endJunctions, LocationXYZ8 junctionList[16], uint8 directionList[16], LocationXYZ8 * endXYZ, uint8 * endSteps) @@ -10017,7 +10017,7 @@ static void peep_pathfind_heuristic_search(sint16 x, sint16 y, uint8 z, rct_peep /* Get the next map element of interest in the direction of test_edge. */ bool found = false; - rct_map_element * mapElement = map_get_first_element_at(x / 32, y / 32); + rct_tile_element * mapElement = map_get_first_element_at(x / 32, y / 32); if (mapElement == nullptr) { return; @@ -10027,13 +10027,13 @@ static void peep_pathfind_heuristic_search(sint16 x, sint16 y, uint8 z, rct_peep /* Look for all map elements that the peep could walk onto while * navigating to the goal, including the goal tile. */ - if (mapElement->flags & MAP_ELEMENT_FLAG_GHOST) + if (mapElement->flags & TILE_ELEMENT_FLAG_GHOST) continue; uint8 rideIndex = 0xFF; - switch (map_element_get_type(mapElement)) + switch (tile_element_get_type(mapElement)) { - case MAP_ELEMENT_TYPE_TRACK: + case TILE_ELEMENT_TYPE_TRACK: { if (z != mapElement->base_height) continue; @@ -10052,7 +10052,7 @@ static void peep_pathfind_heuristic_search(sint16 x, sint16 y, uint8 z, rct_peep continue; } } - case MAP_ELEMENT_TYPE_ENTRANCE: + case TILE_ELEMENT_TYPE_ENTRANCE: if (z != mapElement->base_height) continue; sint32 direction; @@ -10065,7 +10065,7 @@ static void peep_pathfind_heuristic_search(sint16 x, sint16 y, uint8 z, rct_peep * For mechanics heading for the ride entrance * (in the case when the station has no exit), * the goal is the ride entrance tile. */ - direction = map_element_get_direction(mapElement); + direction = tile_element_get_direction(mapElement); if (direction == test_edge) { /* The rideIndex will be useful for @@ -10085,7 +10085,7 @@ static void peep_pathfind_heuristic_search(sint16 x, sint16 y, uint8 z, rct_peep case ENTRANCE_TYPE_RIDE_EXIT: /* For mechanics heading for the ride exit, the * goal is the ride exit tile. */ - direction = map_element_get_direction(mapElement); + direction = tile_element_get_direction(mapElement); if (direction == test_edge) { searchResult = PATH_SEARCH_RIDE_EXIT; @@ -10097,7 +10097,7 @@ static void peep_pathfind_heuristic_search(sint16 x, sint16 y, uint8 z, rct_peep continue; } break; - case MAP_ELEMENT_TYPE_PATH: + case TILE_ELEMENT_TYPE_PATH: { /* For peeps heading for a ride with a queue, the goal is the last * queue path. @@ -10518,7 +10518,7 @@ static void peep_pathfind_heuristic_search(sint16 x, sint16 y, uint8 z, rct_peep #endif // defined(DEBUG_LEVEL_2) && DEBUG_LEVEL_2 } while ((next_test_edge = bitscanforward(edges)) != -1); - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); if (!found) { @@ -10575,7 +10575,7 @@ sint32 peep_pathfind_choose_direction(sint16 x, sint16 y, uint8 z, rct_peep * pe #endif // defined(DEBUG_LEVEL_1) && DEBUG_LEVEL_1 // Get the path element at this location - rct_map_element * dest_map_element = map_get_first_element_at(x / 32, y / 32); + rct_tile_element * dest_tile_element = map_get_first_element_at(x / 32, y / 32); /* 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 @@ -10591,21 +10591,21 @@ sint32 peep_pathfind_choose_direction(sint16 x, sint16 y, uint8 z, rct_peep * pe * 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_map_element * first_map_element = NULL; + rct_tile_element * first_tile_element = NULL; bool found = false; uint8 permitted_edges = 0; bool isThin = false; do { - if (dest_map_element->base_height != z) + if (dest_tile_element->base_height != z) continue; - if (map_element_get_type(dest_map_element) != MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(dest_tile_element) != TILE_ELEMENT_TYPE_PATH) continue; found = true; - if (first_map_element == NULL) + if (first_tile_element == NULL) { - first_map_element = dest_map_element; + first_tile_element = dest_tile_element; } /* Check if this path element is a thin junction. @@ -10614,11 +10614,11 @@ sint32 peep_pathfind_choose_direction(sint16 x, sint16 y, uint8 z, rct_peep * pe * check if the combination is 'thin'! * The junction is considered 'thin' simply if any of the * overlaid path elements there is a 'thin junction'. */ - isThin = isThin || path_is_thin_junction(dest_map_element, x, y, z); + isThin = isThin || path_is_thin_junction(dest_tile_element, x, y, z); // Collect the permitted edges of ALL matching path elements at this location. - permitted_edges |= path_get_permitted_edges(dest_map_element); - } while (!map_element_is_last_for_tile(dest_map_element++)); + permitted_edges |= path_get_permitted_edges(dest_tile_element); + } while (!tile_element_is_last_for_tile(dest_tile_element++)); // Peep is not on a path. if (!found) return -1; @@ -10746,8 +10746,8 @@ sint32 peep_pathfind_choose_direction(sint16 x, sint16 y, uint8 z, rct_peep * pe edges &= ~(1 << test_edge); uint8 height = z; - if (footpath_element_is_sloped(first_map_element) && - footpath_element_get_slope_direction(first_map_element) == test_edge) + if (footpath_element_is_sloped(first_tile_element) && + footpath_element_get_slope_direction(first_tile_element) == test_edge) { height += 0x2; } @@ -10807,7 +10807,7 @@ sint32 peep_pathfind_choose_direction(sint16 x, sint16 y, uint8 z, rct_peep * pe } #endif // defined(DEBUG_LEVEL_2) && DEBUG_LEVEL_2 - peep_pathfind_heuristic_search(x, y, height, peep, first_map_element, inPatrolArea, 0, &score, test_edge, + peep_pathfind_heuristic_search(x, y, height, peep, first_tile_element, inPatrolArea, 0, &score, test_edge, &endJunctions, endJunctionList, endDirectionList, &endXYZ, &endSteps); #if defined(DEBUG_LEVEL_1) && DEBUG_LEVEL_1 @@ -10951,7 +10951,7 @@ static uint8 get_nearest_park_entrance_index(uint16 x, uint16 y) * * rct2: 0x006952C0 */ -static sint32 guest_path_find_entering_park(rct_peep * peep, rct_map_element * map_element, uint8 edges) +static sint32 guest_path_find_entering_park(rct_peep * peep, rct_tile_element * tile_element, uint8 edges) { // Send peeps to the nearest park entrance. uint8 chosenEntrance = get_nearest_park_entrance_index(peep->next_x, peep->next_y); @@ -11006,7 +11006,7 @@ static uint8 get_nearest_peep_spawn_index(uint16 x, uint16 y) * * rct2: 0x0069536C */ -static sint32 guest_path_find_leaving_park(rct_peep * peep, rct_map_element * map_element, uint8 edges) +static sint32 guest_path_find_leaving_park(rct_peep * peep, rct_tile_element * tile_element, uint8 edges) { // Send peeps to the nearest spawn point. uint8 chosenSpawn = get_nearest_peep_spawn_index(peep->next_x, peep->next_y); @@ -11041,7 +11041,7 @@ static sint32 guest_path_find_leaving_park(rct_peep * peep, rct_map_element * ma * * rct2: 0x00695161 */ -static sint32 guest_path_find_park_entrance(rct_peep * peep, rct_map_element * map_element, uint8 edges) +static sint32 guest_path_find_park_entrance(rct_peep * peep, rct_tile_element * tile_element, uint8 edges) { uint8 entranceNum; @@ -11113,7 +11113,7 @@ static sint32 guest_path_find_park_entrance(rct_peep * peep, rct_map_element * m static void get_ride_queue_end(sint16 * x, sint16 * y, sint16 * z) { LocationXY16 result = { 0, 0 }; - rct_map_element * mapElement = map_get_first_element_at(*x / 32, *y / 32); + rct_tile_element * mapElement = map_get_first_element_at(*x / 32, *y / 32); if (mapElement == NULL) { @@ -11123,7 +11123,7 @@ static void get_ride_queue_end(sint16 * x, sint16 * y, sint16 * z) bool found = false; do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_ENTRANCE) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_ENTRANCE) continue; if (*z != mapElement->base_height) @@ -11131,21 +11131,21 @@ static void get_ride_queue_end(sint16 * x, sint16 * y, sint16 * z) found = true; break; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); if (!found) return; - uint8 direction = map_element_get_direction_with_offset(mapElement, 2); - rct_map_element * lastPathElement = NULL; - rct_map_element * firstPathElement = NULL; + uint8 direction = tile_element_get_direction_with_offset(mapElement, 2); + rct_tile_element * lastPathElement = NULL; + rct_tile_element * firstPathElement = NULL; sint16 baseZ = mapElement->base_height; sint16 nextX = *x; sint16 nextY = *y; while (1) { - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_PATH) { lastPathElement = mapElement; result.x = nextX; @@ -11169,7 +11169,7 @@ static void get_ride_queue_end(sint16 * x, sint16 * y, sint16 * z) if (mapElement == firstPathElement) continue; - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_PATH) continue; if (baseZ == mapElement->base_height) @@ -11197,7 +11197,7 @@ static void get_ride_queue_end(sint16 * x, sint16 * y, sint16 * z) found = true; break; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); if (found == false) break; @@ -11269,7 +11269,7 @@ static sint32 guest_path_finding(rct_peep * peep) y = peep->next_y; z = peep->next_z; - rct_map_element * mapElement = map_get_path_element_at(x / 32, y / 32, z); + rct_tile_element * mapElement = map_get_path_element_at(x / 32, y / 32, z); if (mapElement == NULL) { return 1; @@ -11616,7 +11616,7 @@ static sint32 peep_perform_next_action(rct_peep * peep) return peep_return_to_centre_of_tile(peep); } - rct_map_element * mapElement = map_get_first_element_at(x / 32, y / 32); + rct_tile_element * mapElement = map_get_first_element_at(x / 32, y / 32); sint16 base_z = Math::Max(0, (peep->z / 8) - 2); sint16 top_z = (peep->z / 8) + 1; @@ -11626,29 +11626,29 @@ static sint32 peep_perform_next_action(rct_peep * peep) continue; if (top_z < mapElement->base_height) continue; - if (mapElement->flags & MAP_ELEMENT_FLAG_GHOST) + if (mapElement->flags & TILE_ELEMENT_FLAG_GHOST) continue; - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_PATH) { if (peep_interact_with_path(peep, x, y, mapElement)) return 1; } - else if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_TRACK) + else if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_TRACK) { if (peep_interact_with_shop(peep, x, y, mapElement)) return 1; } - else if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_ENTRANCE) + else if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_ENTRANCE) { if (peep_interact_with_entrance(peep, x, y, mapElement)) return 1; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); if (peep->type == PEEP_TYPE_STAFF || (peep->next_var_29 & 0x18)) { - sint16 z = abs(map_element_height(x, y) - peep->z); + sint16 z = abs(tile_element_height(x, y) - peep->z); if (z <= 3 || (peep->type == PEEP_TYPE_STAFF && z <= 32)) { @@ -12581,7 +12581,7 @@ static void peep_easter_egg_peep_interactions(rct_peep * peep) * * @return (CF) */ -static bool peep_should_watch_ride(rct_map_element * mapElement) +static bool peep_should_watch_ride(rct_tile_element * mapElement) { Ride * ride = get_ride(mapElement->properties.track.ride_index); @@ -12589,7 +12589,7 @@ static bool peep_should_watch_ride(rct_map_element * mapElement) // as that may lead to a desync. if (network_get_mode() != NETWORK_MODE_NONE) { - if (map_element_is_ghost(mapElement)) + if (tile_element_is_ghost(mapElement)) return false; } @@ -12648,7 +12648,7 @@ static bool peep_should_watch_ride(rct_map_element * mapElement) */ static bool peep_find_ride_to_look_at(rct_peep * peep, uint8 edge, uint8 * rideToView, uint8 * rideSeatToView) { - rct_map_element *mapElement, *surfaceElement; + rct_tile_element *mapElement, *surfaceElement; surfaceElement = map_get_surface_element_at(peep->next_x / 32, peep->next_y / 32); @@ -12659,12 +12659,12 @@ static bool peep_find_ride_to_look_at(rct_peep * peep, uint8 edge, uint8 * rideT // as that may lead to a desync. if (network_get_mode() != NETWORK_MODE_NONE) { - if (map_element_is_ghost(mapElement)) + if (tile_element_is_ghost(mapElement)) continue; } - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_WALL) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_WALL) continue; - if (map_element_get_direction(mapElement) != edge) + if (tile_element_get_direction(mapElement) != edge) continue; auto wallEntry = get_wall_entry(mapElement->properties.wall.type); if (wallEntry == nullptr || wallEntry->wall.flags2 & WALL_SCENERY_2_FLAG4) @@ -12675,7 +12675,7 @@ static bool peep_find_ride_to_look_at(rct_peep * peep, uint8 edge, uint8 * rideT continue; return false; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); uint16 x = peep->next_x + TileDirectionDelta[edge].x; uint16 y = peep->next_y + TileDirectionDelta[edge].y; @@ -12693,12 +12693,12 @@ static bool peep_find_ride_to_look_at(rct_peep * peep, uint8 edge, uint8 * rideT // as that may lead to a desync. if (network_get_mode() != NETWORK_MODE_NONE) { - if (map_element_is_ghost(mapElement)) + if (tile_element_is_ghost(mapElement)) continue; } - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_WALL) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_WALL) continue; - if (map_element_get_direction_with_offset(mapElement, 2) != edge) + if (tile_element_get_direction_with_offset(mapElement, 2) != edge) continue; auto wallEntry = get_wall_entry(mapElement->properties.wall.type); if (wallEntry == nullptr || wallEntry->wall.flags2 & WALL_SCENERY_2_FLAG4) @@ -12710,7 +12710,7 @@ static bool peep_find_ride_to_look_at(rct_peep * peep, uint8 edge, uint8 * rideT continue; return false; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); // TODO: Extract loop B mapElement = surfaceElement; @@ -12720,7 +12720,7 @@ static bool peep_find_ride_to_look_at(rct_peep * peep, uint8 edge, uint8 * rideT // as that may lead to a desync. if (network_get_mode() != NETWORK_MODE_NONE) { - if (map_element_is_ghost(mapElement)) + if (tile_element_is_ghost(mapElement)) continue; } @@ -12729,7 +12729,7 @@ static bool peep_find_ride_to_look_at(rct_peep * peep, uint8 edge, uint8 * rideT if (peep->next_z + 6 < mapElement->base_height) continue; - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_TRACK) { if (peep_should_watch_ride(mapElement)) { @@ -12737,7 +12737,7 @@ static bool peep_find_ride_to_look_at(rct_peep * peep, uint8 edge, uint8 * rideT } } - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_SCENERY_MULTIPLE) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_SCENERY_MULTIPLE) { if (!(get_large_scenery_entry(mapElement->properties.scenerymultiple.type & 0x3FF)->large_scenery.flags & LARGE_SCENERY_FLAG_PHOTOGENIC)) @@ -12755,7 +12755,7 @@ static bool peep_find_ride_to_look_at(rct_peep * peep, uint8 edge, uint8 * rideT return true; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); // TODO: Extract loop C mapElement = surfaceElement; @@ -12765,19 +12765,19 @@ static bool peep_find_ride_to_look_at(rct_peep * peep, uint8 edge, uint8 * rideT // as that may lead to a desync. if (network_get_mode() != NETWORK_MODE_NONE) { - if (map_element_is_ghost(mapElement)) + if (tile_element_is_ghost(mapElement)) continue; } if (mapElement->clearance_height + 1 < peep->next_z) continue; if (peep->next_z + 6 < mapElement->base_height) continue; - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_SURFACE) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_SURFACE) continue; - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_PATH) continue; - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_WALL) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_WALL) { auto wallEntry = get_wall_entry(mapElement->properties.wall.type); if (wallEntry == nullptr || wallEntry->wall.flags2 & WALL_SCENERY_2_FLAG4) @@ -12787,7 +12787,7 @@ static bool peep_find_ride_to_look_at(rct_peep * peep, uint8 edge, uint8 * rideT } return false; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); x += TileDirectionDelta[edge].x; y += TileDirectionDelta[edge].y; @@ -12806,12 +12806,12 @@ static bool peep_find_ride_to_look_at(rct_peep * peep, uint8 edge, uint8 * rideT // as that may lead to a desync. if (network_get_mode() != NETWORK_MODE_NONE) { - if (map_element_is_ghost(mapElement)) + if (tile_element_is_ghost(mapElement)) continue; } - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_WALL) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_WALL) continue; - if (map_element_get_direction_with_offset(mapElement, 2) != edge) + if (tile_element_get_direction_with_offset(mapElement, 2) != edge) continue; auto wallEntry = get_wall_entry(mapElement->properties.wall.type); if (wallEntry == nullptr || wallEntry->wall.flags2 & WALL_SCENERY_2_FLAG4) @@ -12822,7 +12822,7 @@ static bool peep_find_ride_to_look_at(rct_peep * peep, uint8 edge, uint8 * rideT continue; return false; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); // TODO: Extract loop B mapElement = surfaceElement; @@ -12832,7 +12832,7 @@ static bool peep_find_ride_to_look_at(rct_peep * peep, uint8 edge, uint8 * rideT // as that may lead to a desync. if (network_get_mode() != NETWORK_MODE_NONE) { - if (map_element_is_ghost(mapElement)) + if (tile_element_is_ghost(mapElement)) continue; } if (mapElement->clearance_height + 1 < peep->next_z) @@ -12840,7 +12840,7 @@ static bool peep_find_ride_to_look_at(rct_peep * peep, uint8 edge, uint8 * rideT if (peep->next_z + 8 < mapElement->base_height) continue; - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_TRACK) { if (peep_should_watch_ride(mapElement)) { @@ -12848,7 +12848,7 @@ static bool peep_find_ride_to_look_at(rct_peep * peep, uint8 edge, uint8 * rideT } } - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_SCENERY_MULTIPLE) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_SCENERY_MULTIPLE) { auto sceneryEntry = get_large_scenery_entry(mapElement->properties.scenerymultiple.type & 0x3FF); if (!(sceneryEntry == nullptr || sceneryEntry->large_scenery.flags & @@ -12867,7 +12867,7 @@ static bool peep_find_ride_to_look_at(rct_peep * peep, uint8 edge, uint8 * rideT return true; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); // TODO: Extract loop C mapElement = surfaceElement; @@ -12877,19 +12877,19 @@ static bool peep_find_ride_to_look_at(rct_peep * peep, uint8 edge, uint8 * rideT // as that may lead to a desync. if (network_get_mode() != NETWORK_MODE_NONE) { - if (map_element_is_ghost(mapElement)) + if (tile_element_is_ghost(mapElement)) continue; } if (mapElement->clearance_height + 1 < peep->next_z) continue; if (peep->next_z + 8 < mapElement->base_height) continue; - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_SURFACE) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_SURFACE) continue; - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_PATH) continue; - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_WALL) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_WALL) { auto wallEntry = get_wall_entry(mapElement->properties.wall.type); if (wallEntry == nullptr || wallEntry->wall.flags2 & WALL_SCENERY_2_FLAG4) @@ -12899,7 +12899,7 @@ static bool peep_find_ride_to_look_at(rct_peep * peep, uint8 edge, uint8 * rideT } return false; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); x += TileDirectionDelta[edge].x; y += TileDirectionDelta[edge].y; @@ -12918,12 +12918,12 @@ static bool peep_find_ride_to_look_at(rct_peep * peep, uint8 edge, uint8 * rideT // as that may lead to a desync. if (network_get_mode() != NETWORK_MODE_NONE) { - if (map_element_is_ghost(mapElement)) + if (tile_element_is_ghost(mapElement)) continue; } - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_WALL) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_WALL) continue; - if (map_element_get_direction_with_offset(mapElement, 2) != edge) + if (tile_element_get_direction_with_offset(mapElement, 2) != edge) continue; auto wallEntry = get_wall_entry(mapElement->properties.wall.type); if (wallEntry == nullptr || wallEntry->wall.flags2 & WALL_SCENERY_2_FLAG4) @@ -12934,7 +12934,7 @@ static bool peep_find_ride_to_look_at(rct_peep * peep, uint8 edge, uint8 * rideT continue; return false; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); // TODO: Extract loop B mapElement = surfaceElement; @@ -12944,7 +12944,7 @@ static bool peep_find_ride_to_look_at(rct_peep * peep, uint8 edge, uint8 * rideT // as that may lead to a desync. if (network_get_mode() != NETWORK_MODE_NONE) { - if (map_element_is_ghost(mapElement)) + if (tile_element_is_ghost(mapElement)) continue; } if (mapElement->clearance_height + 1 < peep->next_z) @@ -12952,7 +12952,7 @@ static bool peep_find_ride_to_look_at(rct_peep * peep, uint8 edge, uint8 * rideT if (peep->next_z + 10 < mapElement->base_height) continue; - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_TRACK) { if (peep_should_watch_ride(mapElement)) { @@ -12960,7 +12960,7 @@ static bool peep_find_ride_to_look_at(rct_peep * peep, uint8 edge, uint8 * rideT } } - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_SCENERY_MULTIPLE) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_SCENERY_MULTIPLE) { if (!(get_large_scenery_entry(mapElement->properties.scenerymultiple.type & 0x3FF)->large_scenery.flags & LARGE_SCENERY_FLAG_PHOTOGENIC)) @@ -12978,12 +12978,12 @@ static bool peep_find_ride_to_look_at(rct_peep * peep, uint8 edge, uint8 * rideT return true; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return false; } -bool loc_690FD0(rct_peep * peep, uint8 * rideToView, uint8 * rideSeatToView, rct_map_element * esi) +bool loc_690FD0(rct_peep * peep, uint8 * rideToView, uint8 * rideSeatToView, rct_tile_element * esi) { Ride * ride = get_ride(esi->properties.track.ride_index); @@ -13030,7 +13030,7 @@ static sint32 peep_get_height_on_slope(rct_peep * peep, sint32 x, sint32 y) if (peep->next_var_29 & 0x18) { - return map_element_height(x, y) & 0xFFFF; + return tile_element_height(x, y) & 0xFFFF; } sint32 z = peep->next_z * 8; @@ -13531,15 +13531,15 @@ static void peep_pick_ride_to_go_on(rct_peep * peep) { if (x >= 0 && y >= 0 && x < (256 * 32) && y < (256 * 32)) { - rct_map_element * mapElement = map_get_first_element_at(x >> 5, y >> 5); + rct_tile_element * mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; sint32 rideIndex = mapElement->properties.track.ride_index; _peepRideConsideration[rideIndex >> 5] |= (1u << (rideIndex & 0x1F)); - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); } } } @@ -13670,10 +13670,10 @@ static void peep_head_for_nearest_ride_type(rct_peep * peep, sint32 rideType) { if (x >= 0 && y >= 0 && x < (256 * 32) && y < (256 * 32)) { - rct_map_element * mapElement = map_get_first_element_at(x >> 5, y >> 5); + rct_tile_element * mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; sint32 rideIndex = mapElement->properties.track.ride_index; @@ -13682,7 +13682,7 @@ static void peep_head_for_nearest_ride_type(rct_peep * peep, sint32 rideType) { _peepRideConsideration[rideIndex >> 5] |= (1u << (rideIndex & 0x1F)); } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); } } } @@ -13802,10 +13802,10 @@ static void peep_head_for_nearest_ride_with_flags(rct_peep * peep, sint32 rideTy { if (x >= 0 && y >= 0 && x < (256 * 32) && y < (256 * 32)) { - rct_map_element * mapElement = map_get_first_element_at(x >> 5, y >> 5); + rct_tile_element * mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; sint32 rideIndex = mapElement->properties.track.ride_index; @@ -13814,7 +13814,7 @@ static void peep_head_for_nearest_ride_with_flags(rct_peep * peep, sint32 rideTy { _peepRideConsideration[rideIndex >> 5] |= (1u << (rideIndex & 0x1F)); } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); } } } diff --git a/src/openrct2/peep/Peep.h b/src/openrct2/peep/Peep.h index a324ed0f1b..7766e40320 100644 --- a/src/openrct2/peep/Peep.h +++ b/src/openrct2/peep/Peep.h @@ -801,7 +801,7 @@ void game_command_set_guest_name(sint32 * eax, sint32 * ebx, sint32 * ecx, sint3 sint32 peep_pathfind_choose_direction(sint16 x, sint16 y, uint8 z, rct_peep * peep); void peep_reset_pathfind_goal(rct_peep * peep); -bool is_valid_path_z_and_direction(rct_map_element * mapElement, sint32 currentZ, sint32 currentDirection); +bool is_valid_path_z_and_direction(rct_tile_element * mapElement, sint32 currentZ, sint32 currentDirection); #if defined(DEBUG_LEVEL_1) && DEBUG_LEVEL_1 #define PATHFIND_DEBUG 0 // Set to 0 to disable pathfinding debugging; diff --git a/src/openrct2/peep/Staff.cpp b/src/openrct2/peep/Staff.cpp index dc927113f6..9455610cc8 100644 --- a/src/openrct2/peep/Staff.cpp +++ b/src/openrct2/peep/Staff.cpp @@ -27,7 +27,7 @@ #include "../management/Finance.h" #include "../network/network.h" #include "../object_list.h" -#include "../paint/map_element/map_element.h" +#include "../paint/tile_element/tile_element.h" #include "../scenario/scenario.h" #include "../util/util.h" #include "../world/entrance.h" @@ -674,7 +674,7 @@ sint32 staff_is_location_on_patrol_edge(rct_peep * mechanic, sint32 x, sint32 y) return onZoneEdge; } -sint32 staff_can_ignore_wide_flag(rct_peep * staff, sint32 x, sint32 y, uint8 z, rct_map_element * path) +sint32 staff_can_ignore_wide_flag(rct_peep * staff, sint32 x, sint32 y, uint8 z, rct_tile_element * path) { /* Wide flags can potentially wall off parts of a staff patrol zone * for the heuristic search. @@ -743,12 +743,12 @@ sint32 staff_can_ignore_wide_flag(rct_peep * staff, sint32 x, sint32 y, uint8 z, } /* Search through all adjacent map elements */ - rct_map_element * test_element = map_get_first_element_at(adjac_x / 32, adjac_y / 32); + rct_tile_element * test_element = map_get_first_element_at(adjac_x / 32, adjac_y / 32); bool pathfound = false; bool widefound = false; do { - if (map_element_get_type(test_element) != MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(test_element) != TILE_ELEMENT_TYPE_PATH) { continue; } @@ -772,7 +772,7 @@ sint32 staff_can_ignore_wide_flag(rct_peep * staff, sint32 x, sint32 y, uint8 z, widecount++; } } - } while (!map_element_is_last_for_tile(test_element++)); + } while (!tile_element_is_last_for_tile(test_element++)); } switch (total) @@ -954,18 +954,18 @@ static uint8 staff_handyman_direction_to_nearest_litter(rct_peep * peep) sint16 nextZ = ((peep->z + 8) & 0xFFF0) / 8; - rct_map_element * mapElement = map_get_first_element_at(nextTile.x / 32, nextTile.y / 32); + rct_tile_element * mapElement = map_get_first_element_at(nextTile.x / 32, nextTile.y / 32); do { if (mapElement->base_height != nextZ) continue; - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_ENTRANCE || - map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_ENTRANCE || + tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_TRACK) { return 0xFF; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); nextTile.x = (peep->x & 0xFFE0) + TileDirectionDelta[nextDirection].x; nextTile.y = (peep->y & 0xFFE0) + TileDirectionDelta[nextDirection].y; @@ -976,12 +976,12 @@ static uint8 staff_handyman_direction_to_nearest_litter(rct_peep * peep) { if (mapElement->base_height != nextZ) continue; - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_ENTRANCE || - map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_ENTRANCE || + tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_TRACK) { return 0xFF; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return nextDirection; } @@ -996,17 +996,17 @@ static uint8 staff_handyman_direction_to_uncut_grass(rct_peep * peep, uint8 vali if (!(peep->next_var_29 & 0x18)) { - rct_map_element * mapElement = map_get_surface_element_at(peep->next_x / 32, peep->next_y / 32); + rct_tile_element * mapElement = map_get_surface_element_at(peep->next_x / 32, peep->next_y / 32); if (peep->next_z != mapElement->base_height) return 0xFF; if (peep->next_var_29 & 0x4) { - if ((mapElement->properties.surface.slope & MAP_ELEMENT_SLOPE_MASK) != byte_98D800[peep->next_var_29 & 0x3]) + if ((mapElement->properties.surface.slope & TILE_ELEMENT_SLOPE_MASK) != byte_98D800[peep->next_var_29 & 0x3]) return 0xFF; } - else if ((mapElement->properties.surface.slope & MAP_ELEMENT_SLOPE_MASK) != 0) + else if ((mapElement->properties.surface.slope & TILE_ELEMENT_SLOPE_MASK) != 0) return 0xFF; } @@ -1026,9 +1026,9 @@ static uint8 staff_handyman_direction_to_uncut_grass(rct_peep * peep, uint8 vali if (chosenTile.x > 0x1FFF || chosenTile.y > 0x1FFF) continue; - rct_map_element * mapElement = map_get_surface_element_at(chosenTile.x / 32, chosenTile.y / 32); + rct_tile_element * mapElement = map_get_surface_element_at(chosenTile.x / 32, chosenTile.y / 32); - if (map_element_get_terrain(mapElement) != 0) + if (tile_element_get_terrain(mapElement) != 0) continue; if (abs(mapElement->base_height - peep->next_z) > 2) @@ -1100,7 +1100,7 @@ static sint32 staff_path_finding_handyman(rct_peep * peep) } else { - rct_map_element * mapElement = map_get_path_element_at(peep->next_x / 32, peep->next_y / 32, peep->next_z); + rct_tile_element * mapElement = map_get_path_element_at(peep->next_x / 32, peep->next_y / 32, peep->next_z); if (mapElement == NULL) return 1; @@ -1269,7 +1269,7 @@ static uint8 staff_mechanic_direction_path_rand(rct_peep * peep, uint8 pathDirec * * rct2: 0x006C0121 */ -static uint8 staff_mechanic_direction_path(rct_peep * peep, uint8 validDirections, rct_map_element * pathElement) +static uint8 staff_mechanic_direction_path(rct_peep * peep, uint8 validDirections, rct_tile_element * pathElement) { uint8 direction = 0xFF; @@ -1326,12 +1326,12 @@ static uint8 staff_mechanic_direction_path(rct_peep * peep, uint8 validDirection gPeepPathFindGoalPosition.x = chosenTile.x; gPeepPathFindGoalPosition.y = chosenTile.y; - // Find the exit/entrance map_element + // Find the exit/entrance tile_element bool entranceFound = false; - rct_map_element * mapElement = map_get_first_element_at(chosenTile.x / 32, chosenTile.y / 32); + rct_tile_element * mapElement = map_get_first_element_at(chosenTile.x / 32, chosenTile.y / 32); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_ENTRANCE) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_ENTRANCE) continue; if (mapElement->base_height != z) @@ -1343,7 +1343,7 @@ static uint8 staff_mechanic_direction_path(rct_peep * peep, uint8 validDirection entranceFound = true; break; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); if (entranceFound == false) { @@ -1394,7 +1394,7 @@ static sint32 staff_path_finding_mechanic(rct_peep * peep) } else { - rct_map_element * pathElement = map_get_path_element_at(peep->next_x / 32, peep->next_y / 32, peep->next_z); + rct_tile_element * pathElement = map_get_path_element_at(peep->next_x / 32, peep->next_y / 32, peep->next_z); if (pathElement == NULL) return 1; @@ -1426,7 +1426,7 @@ static sint32 staff_path_finding_mechanic(rct_peep * peep) * * rct2: 0x006C050B */ -static uint8 staff_direction_path(rct_peep * peep, uint8 validDirections, rct_map_element * pathElement) +static uint8 staff_direction_path(rct_peep * peep, uint8 validDirections, rct_tile_element * pathElement) { uint8 direction = 0xFF; uint8 pathDirections = pathElement->properties.path.edges & 0xF; @@ -1482,7 +1482,7 @@ static sint32 staff_path_finding_misc(rct_peep * peep) } else { - rct_map_element * pathElement = map_get_path_element_at(peep->next_x / 32, peep->next_y / 32, peep->next_z); + rct_tile_element * pathElement = map_get_path_element_at(peep->next_x / 32, peep->next_y / 32, peep->next_z); if (pathElement == NULL) return 1; diff --git a/src/openrct2/peep/Staff.h b/src/openrct2/peep/Staff.h index 9738748b4f..bf3b28eb8d 100644 --- a/src/openrct2/peep/Staff.h +++ b/src/openrct2/peep/Staff.h @@ -106,7 +106,7 @@ uint16 hire_new_staff_member(uint8 staffType); void staff_update_greyed_patrol_areas(); sint32 staff_is_location_in_patrol(rct_peep * mechanic, sint32 x, sint32 y); sint32 staff_is_location_on_patrol_edge(rct_peep * mechanic, sint32 x, sint32 y); -sint32 staff_can_ignore_wide_flag(rct_peep * mechanic, sint32 x, sint32 y, uint8 z, rct_map_element * path); +sint32 staff_can_ignore_wide_flag(rct_peep * mechanic, sint32 x, sint32 y, uint8 z, rct_tile_element * path); sint32 staff_path_finding(rct_peep * peep); void staff_reset_stats(); bool staff_is_patrol_area_set(sint32 staffIndex, sint32 x, sint32 y); diff --git a/src/openrct2/rct1.h b/src/openrct2/rct1.h index 4d966548e0..7fd60f0e60 100644 --- a/src/openrct2/rct1.h +++ b/src/openrct2/rct1.h @@ -27,7 +27,7 @@ #include "world/sprite.h" #include "world/map_animation.h" -#define RCT1_MAX_MAP_ELEMENTS 0xC000 +#define RCT1_MAX_TILE_ELEMENTS 0xC000 #define RCT1_MAX_SPRITES 5000 #define RCT1_MAX_TRAINS_PER_RIDE 12 #define RCT1_MAX_MAP_SIZE 128 @@ -587,7 +587,7 @@ typedef struct rct1_s4 { uint32 ticks; uint32 random_a; uint32 random_b; - rct_map_element map_elements[RCT1_MAX_MAP_ELEMENTS]; + rct_tile_element tile_elements[RCT1_MAX_TILE_ELEMENTS]; uint32 unk_counter; rct1_sprite sprites[RCT1_MAX_SPRITES]; uint16 next_sprite_index; diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index b9f1d4fcb4..4dc6bf5ab7 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -452,14 +452,14 @@ private: { size_t maxTiles = 128 * 128; size_t tileIndex = 0; - rct_map_element * mapElement = _s4.map_elements; + rct_tile_element * mapElement = _s4.tile_elements; while (tileIndex < maxTiles) { - switch (map_element_get_type(mapElement)) { - case MAP_ELEMENT_TYPE_PATH: + switch (tile_element_get_type(mapElement)) { + case TILE_ELEMENT_TYPE_PATH: { - uint8 pathColour = map_element_get_direction(mapElement); + uint8 pathColour = tile_element_get_direction(mapElement); uint8 pathType = (mapElement->properties.path.type & 0xF0) >> 4; pathType = (pathType << 2) | pathColour; @@ -469,13 +469,13 @@ private: AddEntryForPathAddition(pathAdditionsType); break; } - case MAP_ELEMENT_TYPE_SCENERY: + case TILE_ELEMENT_TYPE_SCENERY: AddEntryForSmallScenery(mapElement->properties.scenery.type); break; - case MAP_ELEMENT_TYPE_SCENERY_MULTIPLE: - AddEntryForLargeScenery(mapElement->properties.scenerymultiple.type & MAP_ELEMENT_LARGE_TYPE_MASK); + case TILE_ELEMENT_TYPE_SCENERY_MULTIPLE: + AddEntryForLargeScenery(mapElement->properties.scenerymultiple.type & TILE_ELEMENT_LARGE_TYPE_MASK); break; - case MAP_ELEMENT_TYPE_WALL: + case TILE_ELEMENT_TYPE_WALL: { uint8 var_05 = mapElement->properties.wall.colour_3; uint16 var_06 = mapElement->properties.wall.colour_1 | @@ -495,7 +495,7 @@ private: } } - if (map_element_is_last_for_tile(mapElement++)) + if (tile_element_is_last_for_tile(mapElement++)) { tileIndex++; } @@ -1871,7 +1871,7 @@ private: void ImportMapElements() { - Memory::Copy(gMapElements, _s4.map_elements, RCT1_MAX_MAP_ELEMENTS * sizeof(rct_map_element)); + Memory::Copy(gMapElements, _s4.tile_elements, RCT1_MAX_TILE_ELEMENTS * sizeof(rct_tile_element)); ClearExtraTileEntries(); FixSceneryColours(); FixMapElementZ(); @@ -2217,17 +2217,17 @@ private: void ClearExtraTileEntries() { // Reset the map tile pointers - Memory::Set(gMapElementTilePointers, 0, sizeof(rct_map_element*) * MAX_TILE_MAP_ELEMENT_POINTERS); + Memory::Set(gMapElementTilePointers, 0, sizeof(rct_tile_element*) * MAX_TILE_TILE_ELEMENT_POINTERS); // Get the first free map element - rct_map_element * nextFreeMapElement = gMapElements; + rct_tile_element * nextFreeMapElement = gMapElements; for (size_t i = 0; i < RCT1_MAX_MAP_SIZE * RCT1_MAX_MAP_SIZE; i++) { - while (!map_element_is_last_for_tile(nextFreeMapElement++)); + while (!tile_element_is_last_for_tile(nextFreeMapElement++)); } - rct_map_element * mapElement = gMapElements; - rct_map_element * * tilePointer = gMapElementTilePointers; + rct_tile_element * mapElement = gMapElements; + rct_tile_element * * tilePointer = gMapElementTilePointers; // 128 rows of map data from RCT1 map for (sint32 x = 0; x < RCT1_MAX_MAP_SIZE; x++) @@ -2236,14 +2236,14 @@ private: for (sint32 y = 0; y < RCT1_MAX_MAP_SIZE; y++) { *tilePointer++ = mapElement; - while (!map_element_is_last_for_tile(mapElement++)); + while (!tile_element_is_last_for_tile(mapElement++)); } // Fill the rest of the row with blank tiles for (sint32 y = 0; y < RCT1_MAX_MAP_SIZE; y++) { - nextFreeMapElement->type = MAP_ELEMENT_TYPE_SURFACE; - nextFreeMapElement->flags = MAP_ELEMENT_FLAG_LAST_TILE; + nextFreeMapElement->type = TILE_ELEMENT_TYPE_SURFACE; + nextFreeMapElement->flags = TILE_ELEMENT_FLAG_LAST_TILE; nextFreeMapElement->base_height = 2; nextFreeMapElement->clearance_height = 0; nextFreeMapElement->properties.surface.slope = 0; @@ -2257,8 +2257,8 @@ private: // 128 extra rows left to fill with blank tiles for (sint32 y = 0; y < 128 * 256; y++) { - nextFreeMapElement->type = MAP_ELEMENT_TYPE_SURFACE; - nextFreeMapElement->flags = MAP_ELEMENT_FLAG_LAST_TILE; + nextFreeMapElement->type = TILE_ELEMENT_TYPE_SURFACE; + nextFreeMapElement->flags = TILE_ELEMENT_FLAG_LAST_TILE; nextFreeMapElement->base_height = 2; nextFreeMapElement->clearance_height = 0; nextFreeMapElement->properties.surface.slope = 0; @@ -2274,13 +2274,13 @@ private: void FixSceneryColours() { colour_t colour; - rct_map_element * mapElement = gMapElements; + rct_tile_element * mapElement = gMapElements; while (mapElement < gNextFreeMapElement) { if (mapElement->base_height != 255) { - switch (map_element_get_type(mapElement)) { - case MAP_ELEMENT_TYPE_SCENERY: + switch (tile_element_get_type(mapElement)) { + case TILE_ELEMENT_TYPE_SCENERY: colour = RCT1::GetColour(scenery_small_get_primary_colour(mapElement)); scenery_small_set_primary_colour(mapElement, colour); @@ -2295,7 +2295,7 @@ private: break; } break; - case MAP_ELEMENT_TYPE_WALL: + case TILE_ELEMENT_TYPE_WALL: colour = ((mapElement->type & 0xC0) >> 3) | ((mapElement->properties.wall.type & 0xE0) >> 5); colour = RCT1::GetColour(colour); @@ -2305,7 +2305,7 @@ private: mapElement->type |= (colour & 0x18) << 3; mapElement->properties.wall.type |= (colour & 7) << 5; break; - case MAP_ELEMENT_TYPE_SCENERY_MULTIPLE: + case TILE_ELEMENT_TYPE_SCENERY_MULTIPLE: colour = RCT1::GetColour(mapElement->properties.scenerymultiple.colour[0] & 0x1F); mapElement->properties.scenerymultiple.colour[0] &= 0xE0; mapElement->properties.scenerymultiple.colour[0] |= colour; @@ -2322,7 +2322,7 @@ private: void FixMapElementZ() { - rct_map_element * mapElement = gMapElements; + rct_tile_element * mapElement = gMapElements; while (mapElement < gNextFreeMapElement) { if (mapElement->base_height != 255) @@ -2337,11 +2337,11 @@ private: void FixPaths() { - rct_map_element * mapElement = gMapElements; + rct_tile_element * mapElement = gMapElements; while (mapElement < gNextFreeMapElement) { - switch (map_element_get_type(mapElement)) { - case MAP_ELEMENT_TYPE_PATH: + switch (tile_element_get_type(mapElement)) { + case TILE_ELEMENT_TYPE_PATH: { // Type uint8 pathColour = mapElement->type & 3; @@ -2352,7 +2352,7 @@ private: mapElement->type &= 0xFC; mapElement->flags &= ~0x60; - mapElement->flags &= ~MAP_ELEMENT_FLAG_BROKEN; + mapElement->flags &= ~TILE_ELEMENT_FLAG_BROKEN; mapElement->properties.path.type &= 0x0F; footpath_scenery_set_is_ghost(mapElement, false); if (RCT1::PathIsQueue(pathType)) @@ -2369,13 +2369,13 @@ private: entryIndex = _pathAdditionTypeToEntryMap[normalisedType]; if (additionType != normalisedType) { - mapElement->flags |= MAP_ELEMENT_FLAG_BROKEN; + mapElement->flags |= TILE_ELEMENT_FLAG_BROKEN; } footpath_element_set_path_scenery(mapElement, entryIndex + 1); } break; } - case MAP_ELEMENT_TYPE_ENTRANCE: + case TILE_ELEMENT_TYPE_ENTRANCE: if (mapElement->properties.entrance.type == ENTRANCE_TYPE_PARK_ENTRANCE) { uint8 pathType = mapElement->properties.entrance.path_type; @@ -2403,13 +2403,13 @@ private: { for (sint32 y = 0; y < RCT1_MAX_MAP_SIZE; y++) { - rct_map_element * mapElement = map_get_first_element_at(x, y); + rct_tile_element * mapElement = map_get_first_element_at(x, y); do { - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_WALL) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_WALL) { - rct_map_element originalMapElement = *mapElement; - map_element_remove(mapElement); + rct_tile_element originalMapElement = *mapElement; + tile_element_remove(mapElement); uint8 var_05 = originalMapElement.properties.wall.colour_3; uint16 var_06 = originalMapElement.properties.wall.colour_1 | @@ -2435,7 +2435,7 @@ private: break; } } - while (!map_element_is_last_for_tile(mapElement++)); + while (!tile_element_is_last_for_tile(mapElement++)); } } @@ -2484,10 +2484,10 @@ private: { for (sint32 y = 0; y < RCT1_MAX_MAP_SIZE; y++) { - rct_map_element * mapElement = map_get_first_element_at(x, y); + rct_tile_element * mapElement = map_get_first_element_at(x, y); do { - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_BANNER) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_BANNER) { uint8 index = mapElement->properties.banner.index; rct_banner * src = &_s4.banners[index]; @@ -2495,7 +2495,7 @@ private: ImportBanner(dst, src); } } - while (!map_element_is_last_for_tile(mapElement++)); + while (!tile_element_is_last_for_tile(mapElement++)); } } } @@ -2522,15 +2522,15 @@ private: void FixTerrain() { - map_element_iterator it; - map_element_iterator_begin(&it); - while (map_element_iterator_next(&it)) + tile_element_iterator it; + tile_element_iterator_begin(&it); + while (tile_element_iterator_next(&it)) { - rct_map_element * element = it.element; - if (map_element_get_type(element) == MAP_ELEMENT_TYPE_SURFACE) + rct_tile_element * element = it.element; + if (tile_element_get_type(element) == TILE_ELEMENT_TYPE_SURFACE) { - map_element_set_terrain(element, RCT1::GetTerrain(map_element_get_terrain(element))); - map_element_set_terrain_edge(element, RCT1::GetTerrainEdge(map_element_get_terrain_edge(element))); + tile_element_set_terrain(element, RCT1::GetTerrain(tile_element_get_terrain(element))); + tile_element_set_terrain_edge(element, RCT1::GetTerrainEdge(tile_element_get_terrain_edge(element))); } } } @@ -2544,39 +2544,39 @@ private: uint8 entranceIndex = 0; - map_element_iterator it; - map_element_iterator_begin(&it); - while (map_element_iterator_next(&it) && entranceIndex < RCT12_MAX_PARK_ENTRANCES) + tile_element_iterator it; + tile_element_iterator_begin(&it); + while (tile_element_iterator_next(&it) && entranceIndex < RCT12_MAX_PARK_ENTRANCES) { - rct_map_element * element = it.element; + rct_tile_element * element = it.element; - if (map_element_get_type(element) != MAP_ELEMENT_TYPE_ENTRANCE) continue; + if (tile_element_get_type(element) != TILE_ELEMENT_TYPE_ENTRANCE) continue; if (element->properties.entrance.type != ENTRANCE_TYPE_PARK_ENTRANCE) continue; if ((element->properties.entrance.index & 0x0F) != 0) continue; gParkEntrances[entranceIndex].x = it.x * 32; gParkEntrances[entranceIndex].y = it.y * 32; gParkEntrances[entranceIndex].z = element->base_height * 8; - gParkEntrances[entranceIndex].direction = map_element_get_direction(element); + gParkEntrances[entranceIndex].direction = tile_element_get_direction(element); entranceIndex++; } } void FixMapElementEntryTypes() { - map_element_iterator it; - map_element_iterator_begin(&it); - while (map_element_iterator_next(&it)) + tile_element_iterator it; + tile_element_iterator_begin(&it); + while (tile_element_iterator_next(&it)) { - rct_map_element * mapElement = it.element; - switch (map_element_get_type(mapElement)) { - case MAP_ELEMENT_TYPE_SCENERY: + rct_tile_element * mapElement = it.element; + switch (tile_element_get_type(mapElement)) { + case TILE_ELEMENT_TYPE_SCENERY: mapElement->properties.scenery.type = _smallSceneryTypeToEntryMap[mapElement->properties.scenery.type]; break; - case MAP_ELEMENT_TYPE_SCENERY_MULTIPLE: + case TILE_ELEMENT_TYPE_SCENERY_MULTIPLE: { - uint8 type = mapElement->properties.scenerymultiple.type & MAP_ELEMENT_LARGE_TYPE_MASK; - mapElement->properties.scenerymultiple.type &= ~MAP_ELEMENT_LARGE_TYPE_MASK; + uint8 type = mapElement->properties.scenerymultiple.type & TILE_ELEMENT_LARGE_TYPE_MASK; + mapElement->properties.scenerymultiple.type &= ~TILE_ELEMENT_LARGE_TYPE_MASK; mapElement->properties.scenerymultiple.type |= _largeSceneryTypeToEntryMap[type]; break; } @@ -2655,7 +2655,7 @@ private: void FixLandOwnershipTiles(std::initializer_list tiles) { - rct_map_element * currentElement; + rct_tile_element * currentElement; for (const LocationXY8 * tile = tiles.begin(); tile != tiles.end(); ++tile) { currentElement = map_get_surface_element_at((*tile).x, (*tile).y); @@ -2673,10 +2673,10 @@ private: { for (sint32 y = 0; y < RCT1_MAX_MAP_SIZE; y++) { - rct_map_element * mapElement = map_get_first_element_at(x, y); + rct_tile_element * mapElement = map_get_first_element_at(x, y); do { - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_TRACK) { // Lift hill tops are the only pieces present in RCT1 that can count as a block brake. if (!track_element_is_lift_hill(mapElement)) @@ -2698,7 +2698,7 @@ private: ride->num_block_brakes++; } } - while (!map_element_is_last_for_tile(mapElement++)); + while (!tile_element_is_last_for_tile(mapElement++)); } } } diff --git a/src/openrct2/rct2.h b/src/openrct2/rct2.h index e92e58ecf7..cd66bef725 100644 --- a/src/openrct2/rct2.h +++ b/src/openrct2/rct2.h @@ -33,7 +33,7 @@ #define RCT2_DOWNTIME_HISTORY_SIZE 8 #define RCT2_CUSTOMER_HISTORY_SIZE 10 #define RCT2_MAX_SPRITES 10000 -#define RCT2_MAX_MAP_ELEMENTS 0x30000 +#define RCT2_MAX_TILE_ELEMENTS 0x30000 #define RCT2_MAX_ANIMATED_OBJECTS 2000 diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index bea99e832b..70f3d1d764 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -113,12 +113,12 @@ void S6Exporter::Save(IStream * stream, bool isScenario) chunkWriter.WriteChunk(&_s6.elapsed_months, 16, SAWYER_ENCODING::RLECOMPRESSED); // 5: Map elements + sprites and other fields chunk - chunkWriter.WriteChunk(&_s6.map_elements, 0x180000, SAWYER_ENCODING::RLECOMPRESSED); + chunkWriter.WriteChunk(&_s6.tile_elements, 0x180000, SAWYER_ENCODING::RLECOMPRESSED); if (_s6.header.type == S6_TYPE_SCENARIO) { // 6 to 13: - chunkWriter.WriteChunk(&_s6.next_free_map_element_pointer_index, 0x27104C, SAWYER_ENCODING::RLECOMPRESSED); + chunkWriter.WriteChunk(&_s6.next_free_tile_element_pointer_index, 0x27104C, SAWYER_ENCODING::RLECOMPRESSED); chunkWriter.WriteChunk(&_s6.guests_in_park, 4, SAWYER_ENCODING::RLECOMPRESSED); chunkWriter.WriteChunk(&_s6.last_guests_in_park, 8, SAWYER_ENCODING::RLECOMPRESSED); chunkWriter.WriteChunk(&_s6.park_rating, 2, SAWYER_ENCODING::RLECOMPRESSED); @@ -130,7 +130,7 @@ void S6Exporter::Save(IStream * stream, bool isScenario) else { // 6: Everything else... - chunkWriter.WriteChunk(&_s6.next_free_map_element_pointer_index, 0x2E8570, SAWYER_ENCODING::RLECOMPRESSED); + chunkWriter.WriteChunk(&_s6.next_free_tile_element_pointer_index, 0x2E8570, SAWYER_ENCODING::RLECOMPRESSED); } // Determine number of bytes written @@ -183,9 +183,9 @@ void S6Exporter::Export() _s6.scenario_srand_0 = gScenarioSrand0; _s6.scenario_srand_1 = gScenarioSrand1; - memcpy(_s6.map_elements, gMapElements, sizeof(_s6.map_elements)); + memcpy(_s6.tile_elements, gMapElements, sizeof(_s6.tile_elements)); - _s6.next_free_map_element_pointer_index = gNextFreeMapElementPointerIndex; + _s6.next_free_tile_element_pointer_index = gNextFreeMapElementPointerIndex; // Sprites needs to be reset before they get used. // Might as well reset them in here to zero out the space and improve // compression ratios. Especially useful for multiplayer servers that diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 7554c3bc07..87dbeedab1 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -152,8 +152,8 @@ public: { chunkReader.ReadChunk(&_s6.objects, sizeof(_s6.objects)); chunkReader.ReadChunk(&_s6.elapsed_months, 16); - chunkReader.ReadChunk(&_s6.map_elements, sizeof(_s6.map_elements)); - chunkReader.ReadChunk(&_s6.next_free_map_element_pointer_index, 2560076); + chunkReader.ReadChunk(&_s6.tile_elements, sizeof(_s6.tile_elements)); + chunkReader.ReadChunk(&_s6.next_free_tile_element_pointer_index, 2560076); chunkReader.ReadChunk(&_s6.guests_in_park, 4); chunkReader.ReadChunk(&_s6.last_guests_in_park, 8); chunkReader.ReadChunk(&_s6.park_rating, 2); @@ -166,8 +166,8 @@ public: { chunkReader.ReadChunk(&_s6.objects, sizeof(_s6.objects)); chunkReader.ReadChunk(&_s6.elapsed_months, 16); - chunkReader.ReadChunk(&_s6.map_elements, sizeof(_s6.map_elements)); - chunkReader.ReadChunk(&_s6.next_free_map_element_pointer_index, 3048816); + chunkReader.ReadChunk(&_s6.tile_elements, sizeof(_s6.tile_elements)); + chunkReader.ReadChunk(&_s6.next_free_tile_element_pointer_index, 3048816); } auto missingObjects = _objectManager->GetInvalidObjects(_s6.objects); @@ -198,9 +198,9 @@ public: gScenarioSrand0 = _s6.scenario_srand_0; gScenarioSrand1 = _s6.scenario_srand_1; - memcpy(gMapElements, _s6.map_elements, sizeof(_s6.map_elements)); + memcpy(gMapElements, _s6.tile_elements, sizeof(_s6.tile_elements)); - gNextFreeMapElementPointerIndex = _s6.next_free_map_element_pointer_index; + gNextFreeMapElementPointerIndex = _s6.next_free_tile_element_pointer_index; for (sint32 i = 0; i < RCT2_MAX_SPRITES; i++) { memcpy(get_sprite(i), &_s6.sprites[i], sizeof(rct_sprite)); diff --git a/src/openrct2/rct2/addresses.h b/src/openrct2/rct2/addresses.h index 02298bbd60..a7641ba7a7 100644 --- a/src/openrct2/rct2/addresses.h +++ b/src/openrct2/rct2/addresses.h @@ -73,8 +73,8 @@ #define RCT2_ADDRESS_SCENARIO_TICKS 0x00F663AC -#define RCT2_ADDRESS_MAP_ELEMENTS 0x00F663B8 -#define RCT2_ADDRESS_MAP_ELEMENTS_END 0x010E53B8 +#define RCT2_ADDRESS_TILE_ELEMENTS 0x00F663B8 +#define RCT2_ADDRESS_TILE_ELEMENTS_END 0x010E53B8 #define RCT2_ADDRESS_CURRENT_TICKS 0x013628F4 #define RCT2_ADDRESS_RIDE_LIST 0x013628F8 @@ -89,7 +89,7 @@ #define RCT2_ADDRESS_SAVED_VIEW_ZOOM 0x0138869E #define RCT2_ADDRESS_SAVED_VIEW_ROTATION 0x0138869F -#define RCT2_ADDRESS_TILE_MAP_ELEMENT_POINTERS 0x013CE9A4 +#define RCT2_ADDRESS_TILE_TILE_ELEMENT_POINTERS 0x013CE9A4 #define RCT2_ADDRESS_CURRENT_ROTATION 0x0141E9E0 @@ -383,12 +383,12 @@ #define RCT2_ADDRESS_CURRENT_MONTH_TICKS 0x00F663AA #define RCT2_ADDRESS_SCENERY_COST 0x00F64EB4 -#define RCT2_ADDRESS_SCENERY_MAP_ELEMENT 0x00F64EBC +#define RCT2_ADDRESS_SCENERY_TILE_ELEMENT 0x00F64EBC #define RCT2_ADDRESS_SCENERY_ROTATION 0x00F64EC0 #define RCT2_ADDRESS_GHOST_SCENERY_X 0x00F64EC4 #define RCT2_ADDRESS_GHOST_SCENERY_Y 0x00F64EC6 #define RCT2_ADDRESS_GHOST_SCENERY_Z 0x00F64F09 -#define RCT2_ADDRESS_SCENERY_MAP_ELEMENT_TYPE 0x00F64F0C +#define RCT2_ADDRESS_SCENERY_TILE_ELEMENT_TYPE 0x00F64F0C #define RCT2_ADDRESS_GHOST_SCENERY_TYPE 0x00F64F0D #define RCT2_ADDRESS_SCENERY_TARGET_PATH_INCLINE 0x00F64F0F #define RCT2_ADDRESS_GHOST_SCENERY_PATH_OBJECT_TYPE 0x00F64EAC @@ -519,7 +519,7 @@ #define RCT2_ADDRESS_COMMON_FORMAT_ARGS 0x013CE952 -#define RCT2_ADDRESS_NEXT_FREE_MAP_ELEMENT 0x0140E9A4 +#define RCT2_ADDRESS_NEXT_FREE_TILE_ELEMENT 0x0140E9A4 #define RCT2_ADDRESS_GAME_COMMAND_ERROR_TEXT 0x0141E9AC #define RCT2_ADDRESS_GAME_COMMAND_ERROR_TITLE 0x0141E9AE diff --git a/src/openrct2/ride/CableLift.cpp b/src/openrct2/ride/CableLift.cpp index e70bdeef19..37f0e989bd 100644 --- a/src/openrct2/ride/CableLift.cpp +++ b/src/openrct2/ride/CableLift.cpp @@ -252,7 +252,7 @@ static bool sub_6DF01A_loop(rct_vehicle * vehicle) { _vehicleVAngleEndF64E36 = TrackDefinitions[trackType].vangle_end; _vehicleBankEndF64E37 = TrackDefinitions[trackType].bank_end; - rct_map_element * trackElement = map_get_track_element_at_of_type_seq( + rct_tile_element * trackElement = map_get_track_element_at_of_type_seq( vehicle->track_x, vehicle->track_y, vehicle->track_z / 8, @@ -336,7 +336,7 @@ static bool sub_6DF21B_loop(rct_vehicle * vehicle) _vehicleVAngleEndF64E36 = TrackDefinitions[trackType].vangle_start; _vehicleBankEndF64E37 = TrackDefinitions[trackType].bank_start; - rct_map_element * trackElement = map_get_track_element_at_of_type_seq( + rct_tile_element * trackElement = map_get_track_element_at_of_type_seq( vehicle->track_x, vehicle->track_y, vehicle->track_z / 8, diff --git a/src/openrct2/ride/Station.cpp b/src/openrct2/ride/Station.cpp index 4050445861..9f7508526c 100644 --- a/src/openrct2/ride/Station.cpp +++ b/src/openrct2/ride/Station.cpp @@ -57,13 +57,13 @@ void ride_update_station(Ride * ride, sint32 stationIndex) */ static void ride_update_station_blocksection(Ride * ride, sint32 stationIndex) { - rct_map_element * mapElement = ride_get_station_start_track_element(ride, stationIndex); + rct_tile_element * mapElement = ride_get_station_start_track_element(ride, stationIndex); if ((ride->status == RIDE_STATUS_CLOSED && ride->num_riders == 0) || (mapElement != nullptr && mapElement->flags & 0x20)) { ride->station_depart[stationIndex] &= ~STATION_DEPART_FLAG; - if ((ride->station_depart[stationIndex] & STATION_DEPART_FLAG) || (mapElement != nullptr && map_element_get_green_light(mapElement))) + if ((ride->station_depart[stationIndex] & STATION_DEPART_FLAG) || (mapElement != nullptr && tile_element_get_green_light(mapElement))) ride_invalidate_station_start(ride, stationIndex, false); } else @@ -73,7 +73,7 @@ static void ride_update_station_blocksection(Ride * ride, sint32 stationIndex) ride->station_depart[stationIndex] |= STATION_DEPART_FLAG; ride_invalidate_station_start(ride, stationIndex, true); } - else if (mapElement != nullptr && map_element_get_green_light(mapElement)) + else if (mapElement != nullptr && tile_element_get_green_light(mapElement)) { ride_invalidate_station_start(ride, stationIndex, true); } @@ -296,47 +296,47 @@ static void ride_invalidate_station_start(Ride * ride, sint32 stationIndex, bool { sint32 x = ride->station_starts[stationIndex].x * 32; sint32 y = ride->station_starts[stationIndex].y * 32; - rct_map_element * mapElement = ride_get_station_start_track_element(ride, stationIndex); + rct_tile_element * mapElement = ride_get_station_start_track_element(ride, stationIndex); // If no station track found return if (mapElement == nullptr) return; - map_element_set_green_light(mapElement, greenLight); + tile_element_set_green_light(mapElement, greenLight); // Invalidate map tile map_invalidate_tile_zoom1(x, y, mapElement->base_height * 8, mapElement->clearance_height * 8); } -rct_map_element * ride_get_station_start_track_element(Ride * ride, sint32 stationIndex) +rct_tile_element * ride_get_station_start_track_element(Ride * ride, sint32 stationIndex) { sint32 x = ride->station_starts[stationIndex].x; sint32 y = ride->station_starts[stationIndex].y; sint32 z = ride->station_heights[stationIndex]; // Find the station track element - rct_map_element * mapElement = map_get_first_element_at(x, y); + rct_tile_element * mapElement = map_get_first_element_at(x, y); do { - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_TRACK && z == mapElement->base_height) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_TRACK && z == mapElement->base_height) return mapElement; } - while (!map_element_is_last_for_tile(mapElement++)); + while (!tile_element_is_last_for_tile(mapElement++)); return nullptr; } -rct_map_element * ride_get_station_exit_element(Ride * ride, sint32 x, sint32 y, sint32 z) +rct_tile_element * ride_get_station_exit_element(Ride * ride, sint32 x, sint32 y, sint32 z) { // Find the station track element - rct_map_element * mapElement = map_get_first_element_at(x, y); + rct_tile_element * mapElement = map_get_first_element_at(x, y); do { - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_ENTRANCE && z == mapElement->base_height) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_ENTRANCE && z == mapElement->base_height) return mapElement; } - while (!map_element_is_last_for_tile(mapElement++)); + while (!tile_element_is_last_for_tile(mapElement++)); return nullptr; } diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp index 42898a1590..acbfb3b06f 100644 --- a/src/openrct2/ride/Track.cpp +++ b/src/openrct2/ride/Track.cpp @@ -567,7 +567,7 @@ const rct_trackdefinition FlatRideTrackDefinitions[256] = /** * Helper method to determine if a connects to b by its bank and angle, not location. */ -sint32 track_is_connected_by_shape(rct_map_element * a, rct_map_element * b) +sint32 track_is_connected_by_shape(rct_tile_element * a, rct_tile_element * b) { sint32 trackType, aBank, aAngle, bBank, bAngle; @@ -603,16 +603,16 @@ const rct_preview_track * get_track_def_from_ride_index(sint32 rideIndex, sint32 return get_track_def_from_ride(get_ride(rideIndex), trackType); } -static rct_map_element * find_station_element(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 rideIndex) +static rct_tile_element * find_station_element(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 rideIndex) { - rct_map_element * mapElement = map_get_first_element_at(x >> 5, y >> 5); + rct_tile_element * mapElement = map_get_first_element_at(x >> 5, y >> 5); do { if (z != mapElement->base_height) continue; - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; - if (map_element_get_direction(mapElement) != direction) + if (tile_element_get_direction(mapElement) != direction) continue; if (mapElement->properties.track.ride_index != rideIndex) continue; @@ -621,7 +621,7 @@ static rct_map_element * find_station_element(sint32 x, sint32 y, sint32 z, sint return mapElement; } - while (!map_element_is_last_for_tile(mapElement++)); + while (!tile_element_is_last_for_tile(mapElement++)); return nullptr; } @@ -675,7 +675,7 @@ static bool track_add_station_element(sint32 x, sint32 y, sint32 z, sint32 direc return true; } - rct_map_element * stationElement; + rct_tile_element * stationElement; // Search backwards for more station x = stationX0; @@ -812,7 +812,7 @@ static bool track_remove_station_element(sint32 x, sint32 y, sint32 z, sint32 di Ride * ride = get_ride(rideIndex); if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_3)) { - rct_map_element * mapElement = map_get_track_element_at_with_direction_from_ride(x, y, z, direction, rideIndex); + rct_tile_element * mapElement = map_get_track_element_at_with_direction_from_ride(x, y, z, direction, rideIndex); if (mapElement != nullptr) { if (flags & GAME_COMMAND_FLAG_APPLY) @@ -823,7 +823,7 @@ static bool track_remove_station_element(sint32 x, sint32 y, sint32 z, sint32 di return true; } - rct_map_element * stationElement; + rct_tile_element * stationElement; // Search backwards for more station x = stationX0; @@ -991,7 +991,7 @@ static money32 track_place(sint32 rideIndex, log_warning("Invalid ride type for track placement, rideIndex = %d", rideIndex); return MONEY32_UNDEFINED; } - rct_map_element * mapElement; + rct_tile_element * mapElement; gCommandExpenditureType = RCT_EXPENDITURE_TYPE_RIDE_CONSTRUCTION; gCommandPosition.x = originX + 16; @@ -1478,25 +1478,25 @@ static money32 track_place(sint32 rideIndex, ride->overall_view.y = y / 32; } - mapElement = map_element_insert(x / 32, y / 32, baseZ, bl & 0xF); + mapElement = tile_element_insert(x / 32, y / 32, baseZ, bl & 0xF); assert(mapElement != nullptr); mapElement->clearance_height = clearanceZ; uint8 map_type = direction; - map_type |= MAP_ELEMENT_TYPE_TRACK; + map_type |= TILE_ELEMENT_TYPE_TRACK; if (liftHillAndAlternativeState & CONSTRUCTION_LIFT_HILL_SELECTED) { map_type |= (1 << 7); } mapElement->type = map_type; - map_element_set_track_sequence(mapElement, trackBlock->index); + tile_element_set_track_sequence(mapElement, trackBlock->index); mapElement->properties.track.ride_index = rideIndex; mapElement->properties.track.type = type; mapElement->properties.track.colour = 0; if (flags & GAME_COMMAND_FLAG_GHOST) { - mapElement->flags |= MAP_ELEMENT_FLAG_GHOST; + mapElement->flags |= TILE_ELEMENT_FLAG_GHOST; } switch (type) @@ -1516,7 +1516,7 @@ static money32 track_place(sint32 rideIndex, } if (track_element_has_speed_setting(type)) { - map_element_set_brake_booster_speed(mapElement, brakeSpeed); + tile_element_set_brake_booster_speed(mapElement, brakeSpeed); } else { @@ -1550,7 +1550,7 @@ static money32 track_place(sint32 rideIndex, if (rideTypeFlags & RIDE_TYPE_FLAG_TRACK_MUST_BE_ON_WATER) { - rct_map_element * surfaceElement = map_get_surface_element_at(x / 32, y / 32); + rct_tile_element * surfaceElement = map_get_surface_element_at(x / 32, y / 32); surfaceElement->type |= (1 << 6); mapElement = surfaceElement; } @@ -1645,7 +1645,7 @@ static money32 track_remove(uint8 type, } uint8 found = 0; - rct_map_element * mapElement = map_get_first_element_at(originX / 32, originY / 32); + rct_tile_element * mapElement = map_get_first_element_at(originX / 32, originY / 32); if (mapElement == nullptr) { log_warning("Invalid coordinates for track removal. x = %d, y = %d", originX, originY); @@ -1656,13 +1656,13 @@ static money32 track_remove(uint8 type, if (mapElement->base_height * 8 != originZ) continue; - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; - if ((map_element_get_direction(mapElement)) != rotation) + if ((tile_element_get_direction(mapElement)) != rotation) continue; - if (map_element_get_track_sequence(mapElement) != sequence) + if (tile_element_get_track_sequence(mapElement) != sequence) continue; // Probably should add a check for ghost here as well! @@ -1682,14 +1682,14 @@ static money32 track_remove(uint8 type, found = 1; break; } - while (!map_element_is_last_for_tile(mapElement++)); + while (!tile_element_is_last_for_tile(mapElement++)); if (!found) { return MONEY32_UNDEFINED; } - if (mapElement->flags & MAP_ELEMENT_FLAG_INDESTRUCTIBLE_TRACK_PIECE) + if (mapElement->flags & TILE_ELEMENT_FLAG_INDESTRUCTIBLE_TRACK_PIECE) { gGameCommandErrorText = STR_YOU_ARE_NOT_ALLOWED_TO_REMOVE_THIS_SECTION; return MONEY32_UNDEFINED; @@ -1701,9 +1701,9 @@ static money32 track_remove(uint8 type, Ride * ride = get_ride(rideIndex); const rct_preview_track * trackBlock = get_track_def_from_ride(ride, type); - trackBlock += map_element_get_track_sequence(mapElement); + trackBlock += tile_element_get_track_sequence(mapElement); - uint8 originDirection = map_element_get_direction(mapElement); + uint8 originDirection = tile_element_get_direction(mapElement); switch (originDirection) { case 0: @@ -1769,13 +1769,13 @@ static money32 track_remove(uint8 type, if (mapElement->base_height != z / 8) continue; - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; - if ((map_element_get_direction(mapElement)) != rotation) + if ((tile_element_get_direction(mapElement)) != rotation) continue; - if (map_element_get_track_sequence(mapElement) != trackBlock->index) + if (tile_element_get_track_sequence(mapElement) != trackBlock->index) continue; if (mapElement->properties.track.type != type) @@ -1784,7 +1784,7 @@ static money32 track_remove(uint8 type, found = 1; break; } - while (!map_element_is_last_for_tile(mapElement++)); + while (!tile_element_is_last_for_tile(mapElement++)); if (!found) { @@ -1802,7 +1802,7 @@ static money32 track_remove(uint8 type, entranceDirections = TrackSequenceProperties[type][0]; } - if (entranceDirections & TRACK_SEQUENCE_FLAG_ORIGIN && (map_element_get_track_sequence(mapElement) == 0)) + if (entranceDirections & TRACK_SEQUENCE_FLAG_ORIGIN && (tile_element_get_track_sequence(mapElement) == 0)) { if (!track_remove_station_element(x, y, z / 8, rotation, rideIndex, 0)) { @@ -1810,7 +1810,7 @@ static money32 track_remove(uint8 type, } } - rct_map_element * surfaceElement = map_get_surface_element_at(x / 32, y / 32); + rct_tile_element * surfaceElement = map_get_surface_element_at(x / 32, y / 32); if (surfaceElement == nullptr) { return MONEY32_UNDEFINED; @@ -1827,7 +1827,7 @@ static money32 track_remove(uint8 type, if (!(flags & GAME_COMMAND_FLAG_APPLY)) continue; - if (entranceDirections & (1 << 4) && (map_element_get_track_sequence(mapElement) == 0)) + if (entranceDirections & (1 << 4) && (tile_element_get_track_sequence(mapElement) == 0)) { if (!track_remove_station_element(x, y, z / 8, rotation, rideIndex, GAME_COMMAND_FLAG_APPLY)) { @@ -1842,11 +1842,11 @@ static money32 track_remove(uint8 type, invalidate_test_results(rideIndex); footpath_queue_chain_reset(); - if (!gCheatsDisableClearanceChecks || !(mapElement->flags & MAP_ELEMENT_FLAG_GHOST)) + if (!gCheatsDisableClearanceChecks || !(mapElement->flags & TILE_ELEMENT_FLAG_GHOST)) { footpath_remove_edges_at(x, y, mapElement); } - map_element_remove(mapElement); + tile_element_remove(mapElement); if (!(flags & GAME_COMMAND_FLAG_GHOST)) { sub_6CB945(rideIndex); @@ -2030,7 +2030,7 @@ static money32 set_maze_track(uint16 x, uint8 flags, uint8 direction, uint16 y, return MONEY32_UNDEFINED; } - rct_map_element * mapElement = map_get_surface_element_at(x / 32, y / 32); + rct_tile_element * mapElement = map_get_surface_element_at(x / 32, y / 32); if (mapElement == nullptr) { return MONEY32_UNDEFINED; @@ -2095,17 +2095,17 @@ static money32 set_maze_track(uint16 x, uint8 flags, uint8 direction, uint16 y, uint16 flooredX = floor2(x, 32); uint16 flooredY = floor2(y, 32); - mapElement = map_element_insert(x / 32, y / 32, baseHeight, 0xF); + mapElement = tile_element_insert(x / 32, y / 32, baseHeight, 0xF); assert(mapElement != nullptr); mapElement->clearance_height = clearanceHeight; - mapElement->type = MAP_ELEMENT_TYPE_TRACK; + mapElement->type = TILE_ELEMENT_TYPE_TRACK; mapElement->properties.track.type = TRACK_ELEM_MAZE; mapElement->properties.track.ride_index = rideIndex; mapElement->properties.track.maze_entry = 0xFFFF; if (flags & GAME_COMMAND_FLAG_GHOST) { - mapElement->flags |= MAP_ELEMENT_FLAG_GHOST; + mapElement->flags |= TILE_ELEMENT_FLAG_GHOST; } map_invalidate_tile_full(flooredX, flooredY); @@ -2154,7 +2154,7 @@ static money32 set_maze_track(uint16 x, uint8 flags, uint8 direction, uint16 y, uint16 previousElementX = floor2(x, 32) - TileDirectionDelta[direction].x; uint16 previousElementY = floor2(y, 32) - TileDirectionDelta[direction].y; - rct_map_element * previousMapElement = map_get_track_element_at_of_type_from_ride( + rct_tile_element * previousMapElement = map_get_track_element_at_of_type_from_ride( previousElementX, previousElementY, baseHeight, @@ -2213,7 +2213,7 @@ static money32 set_maze_track(uint16 x, uint8 flags, uint8 direction, uint16 y, uint16 nextElementX = floor2(previousSegmentX, 32) + TileDirectionDelta[direction1].x; uint16 nextElementY = floor2(previousSegmentY, 32) + TileDirectionDelta[direction1].y; - rct_map_element * tmp_mapElement = map_get_track_element_at_of_type_from_ride( + rct_tile_element * tmp_mapElement = map_get_track_element_at_of_type_from_ride( nextElementX, nextElementY, baseHeight, @@ -2236,7 +2236,7 @@ static money32 set_maze_track(uint16 x, uint8 flags, uint8 direction, uint16 y, if ((mapElement->properties.track.maze_entry & 0x8888) == 0x8888) { - map_element_remove(mapElement); + tile_element_remove(mapElement); sub_6CB945(rideIndex); get_ride(rideIndex)->maze_tiles--; } @@ -2301,7 +2301,7 @@ void game_command_set_brakes_speed(sint32 * eax, return; } - rct_map_element * mapElement = map_get_first_element_at(x >> 5, y >> 5); + rct_tile_element * mapElement = map_get_first_element_at(x >> 5, y >> 5); if (mapElement == nullptr) { log_warning("Invalid game command for setting brakes speed. x = %d, y = %d", x, y); @@ -2312,16 +2312,16 @@ void game_command_set_brakes_speed(sint32 * eax, { if (mapElement->base_height * 8 != z) continue; - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; if (mapElement->properties.track.type != trackType) continue; - map_element_set_brake_booster_speed(mapElement, brakesSpeed); + tile_element_set_brake_booster_speed(mapElement, brakesSpeed); break; } - while (!map_element_is_last_for_tile(mapElement++)); + while (!tile_element_is_last_for_tile(mapElement++)); *ebx = 0; } @@ -2443,7 +2443,7 @@ void track_get_front(rct_xy_element * input, rct_xy_element * output) *output = lastTrack; } -bool track_element_is_lift_hill(rct_map_element * trackElement) +bool track_element_is_lift_hill(rct_tile_element * trackElement) { return trackElement->type & TRACK_ELEMENT_FLAG_CHAIN_LIFT; } @@ -2453,7 +2453,7 @@ bool track_element_is_lift_hill(rct_map_element * trackElement) * 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_map_element * trackElement) +bool track_element_is_block_start(rct_tile_element * trackElement) { switch (trackElement->properties.track.type) { @@ -2474,27 +2474,27 @@ bool track_element_is_block_start(rct_map_element * trackElement) return false; } -bool track_element_is_cable_lift(rct_map_element * trackElement) +bool track_element_is_cable_lift(rct_tile_element * trackElement) { return trackElement->properties.track.colour & TRACK_ELEMENT_COLOUR_FLAG_CABLE_LIFT; } -void track_element_set_cable_lift(rct_map_element * trackElement) +void track_element_set_cable_lift(rct_tile_element * trackElement) { trackElement->properties.track.colour |= TRACK_ELEMENT_COLOUR_FLAG_CABLE_LIFT; } -void track_element_clear_cable_lift(rct_map_element * trackElement) +void track_element_clear_cable_lift(rct_tile_element * trackElement) { trackElement->properties.track.colour &= ~TRACK_ELEMENT_COLOUR_FLAG_CABLE_LIFT; } -bool track_element_is_inverted(rct_map_element * mapElement) +bool track_element_is_inverted(rct_tile_element * mapElement) { return mapElement->properties.track.colour & TRACK_ELEMENT_COLOUR_FLAG_INVERTED; } -void track_element_set_inverted(rct_map_element * mapElement, bool inverted) +void track_element_set_inverted(rct_tile_element * mapElement, bool inverted) { if (inverted) { @@ -2506,7 +2506,7 @@ void track_element_set_inverted(rct_map_element * mapElement, bool inverted) } } -sint32 track_get_actual_bank(rct_map_element * mapElement, sint32 bank) +sint32 track_get_actual_bank(rct_tile_element * mapElement, sint32 bank) { Ride * ride = get_ride(mapElement->properties.track.ride_index); sint32 trackColour = mapElement->properties.track.colour; @@ -2532,7 +2532,7 @@ sint32 track_get_actual_bank_2(sint32 rideType, sint32 trackColour, sint32 bank) return bank; } -sint32 track_get_actual_bank_3(rct_vehicle * vehicle, rct_map_element * mapElement) +sint32 track_get_actual_bank_3(rct_vehicle * vehicle, rct_tile_element * mapElement) { uint8 colourThingToXor = (vehicle->update_flags >> 9) & 0xFF; sint32 trackType = mapElement->properties.track.type; @@ -2542,7 +2542,7 @@ sint32 track_get_actual_bank_3(rct_vehicle * vehicle, rct_map_element * mapEleme return track_get_actual_bank_2(rideType, trackColour, bankStart); } -bool track_element_is_station(rct_map_element * trackElement) +bool track_element_is_station(rct_tile_element * trackElement) { switch (trackElement->properties.track.type) { @@ -2605,23 +2605,23 @@ bool track_element_has_speed_setting(uint8 trackType) return false; } -uint8 track_element_get_seat_rotation(const rct_map_element * mapElement) +uint8 track_element_get_seat_rotation(const rct_tile_element * mapElement) { return mapElement->properties.track.colour >> 4; } -void track_element_set_seat_rotation(rct_map_element * mapElement, uint8 seatRotation) +void track_element_set_seat_rotation(rct_tile_element * mapElement, uint8 seatRotation) { mapElement->properties.track.colour &= 0x0F; mapElement->properties.track.colour |= (seatRotation << 4); } -uint8 track_element_get_colour_scheme(const rct_map_element * mapElement) +uint8 track_element_get_colour_scheme(const rct_tile_element * mapElement) { return mapElement->properties.track.colour & 0x3; } -void track_element_set_colour_scheme(rct_map_element * mapElement, uint8 colourScheme) +void track_element_set_colour_scheme(rct_tile_element * mapElement, uint8 colourScheme) { mapElement->properties.track.colour &= ~0x3; mapElement->properties.track.colour |= (colourScheme & 0x3); diff --git a/src/openrct2/ride/Track.h b/src/openrct2/ride/Track.h index 38150f4f2a..ec73361f6c 100644 --- a/src/openrct2/ride/Track.h +++ b/src/openrct2/ride/Track.h @@ -514,7 +514,7 @@ typedef struct track_circuit_iterator rct_xy_element current; sint32 currentZ; sint32 currentDirection; - rct_map_element * first; + rct_tile_element * first; bool firstIteration; bool looped; } track_circuit_iterator; @@ -528,7 +528,7 @@ extern const rct_trackdefinition TrackDefinitions[256]; extern uint8 gTrackGroundFlags; -sint32 track_is_connected_by_shape(rct_map_element * a, rct_map_element * b); +sint32 track_is_connected_by_shape(rct_tile_element * a, rct_tile_element * b); const rct_preview_track * get_track_def_from_ride(Ride * ride, sint32 trackType); const rct_preview_track * get_track_def_from_ride_index(sint32 rideIndex, sint32 trackType); @@ -541,19 +541,19 @@ bool track_circuit_iterator_next(track_circuit_iterator * it); void track_get_back(rct_xy_element * input, rct_xy_element * output); void track_get_front(rct_xy_element * input, rct_xy_element * output); -bool track_element_is_block_start(rct_map_element * trackElement); +bool track_element_is_block_start(rct_tile_element * trackElement); bool track_element_is_covered(sint32 trackElementType); -bool track_element_is_station(rct_map_element * trackElement); -bool track_element_is_lift_hill(rct_map_element * trackElement); -bool track_element_is_cable_lift(rct_map_element * trackElement); -void track_element_set_cable_lift(rct_map_element * trackElement); -void track_element_clear_cable_lift(rct_map_element * trackElement); -bool track_element_is_inverted(rct_map_element * mapElement); -void track_element_set_inverted(rct_map_element * mapElement, bool inverted); +bool track_element_is_station(rct_tile_element * trackElement); +bool track_element_is_lift_hill(rct_tile_element * trackElement); +bool track_element_is_cable_lift(rct_tile_element * trackElement); +void track_element_set_cable_lift(rct_tile_element * trackElement); +void track_element_clear_cable_lift(rct_tile_element * trackElement); +bool track_element_is_inverted(rct_tile_element * mapElement); +void track_element_set_inverted(rct_tile_element * mapElement, bool inverted); -sint32 track_get_actual_bank(rct_map_element * mapElement, sint32 bank); +sint32 track_get_actual_bank(rct_tile_element * mapElement, sint32 bank); sint32 track_get_actual_bank_2(sint32 rideType, sint32 trackColour, sint32 bank); -sint32 track_get_actual_bank_3(rct_vehicle * vehicle, rct_map_element * mapElement); +sint32 track_get_actual_bank_3(rct_vehicle * vehicle, rct_tile_element * mapElement); void game_command_place_track(sint32 * eax, sint32 * ebx, sint32 * ecx, sint32 * edx, sint32 * esi, sint32 * edi, sint32 * ebp); void game_command_remove_track(sint32 * eax, sint32 * ebx, sint32 * ecx, sint32 * edx, sint32 * esi, sint32 * edi, sint32 * ebp); @@ -561,10 +561,10 @@ void game_command_set_maze_track(sint32 * eax, sint32 * ebx, sint32 * ecx, sint3 void game_command_set_brakes_speed(sint32 * eax, sint32 * ebx, sint32 * ecx, sint32 * edx, sint32 * esi, sint32 * edi, sint32 * ebp); bool track_element_is_booster(uint8 rideType, uint8 trackType); bool track_element_has_speed_setting(uint8 trackType); -uint8 track_element_get_seat_rotation(const rct_map_element * mapElement); -void track_element_set_seat_rotation(rct_map_element * mapElement, uint8 seatRotation); -uint8 track_element_get_colour_scheme(const rct_map_element * mapElement); -void track_element_set_colour_scheme(rct_map_element * mapElement, uint8 colourScheme); +uint8 track_element_get_seat_rotation(const rct_tile_element * mapElement); +void track_element_set_seat_rotation(rct_tile_element * mapElement, uint8 seatRotation); +uint8 track_element_get_colour_scheme(const rct_tile_element * mapElement); +void track_element_set_colour_scheme(rct_tile_element * mapElement, uint8 colourScheme); #ifdef __cplusplus } diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp index cf0d6160ff..3cae2c2011 100644 --- a/src/openrct2/ride/TrackDesign.cpp +++ b/src/openrct2/ride/TrackDesign.cpp @@ -42,9 +42,9 @@ typedef struct map_backup { - rct_map_element map_elements[MAX_MAP_ELEMENTS]; - rct_map_element * tile_pointers[MAX_TILE_MAP_ELEMENT_POINTERS]; - rct_map_element * next_free_map_element; + 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; uint16 map_size_units; uint16 map_size_units_minus_2; uint16 map_size; @@ -698,19 +698,19 @@ track_design_place_scenery(rct_td6_scenery_element * scenery_start, uint8 rideIn LocationXY8 tile = {(uint8) (originX / 32), (uint8) (originY / 32)}; switch (rotation & 3) { - case MAP_ELEMENT_DIRECTION_WEST: + case TILE_ELEMENT_DIRECTION_WEST: tile.x += scenery->x; tile.y += scenery->y; break; - case MAP_ELEMENT_DIRECTION_NORTH: + case TILE_ELEMENT_DIRECTION_NORTH: tile.x += scenery->y; tile.y -= scenery->x; break; - case MAP_ELEMENT_DIRECTION_EAST: + case TILE_ELEMENT_DIRECTION_EAST: tile.x -= scenery->x; tile.y -= scenery->y; break; - case MAP_ELEMENT_DIRECTION_SOUTH: + case TILE_ELEMENT_DIRECTION_SOUTH: tile.x -= scenery->y; tile.y += scenery->x; break; @@ -799,7 +799,7 @@ track_design_place_scenery(rct_td6_scenery_element * scenery_start, uint8 rideIn uint8 quadrant = (scenery->flags >> 2) + _currentTrackPieceDirection; quadrant &= 3; - uint8 bh = rotation | (quadrant << 6) | MAP_ELEMENT_TYPE_SCENERY; + uint8 bh = rotation | (quadrant << 6) | TILE_ELEMENT_TYPE_SCENERY; rct_scenery_entry * small_scenery = get_small_scenery_entry(entry_index); if (!(!(small_scenery->small_scenery.flags & SMALL_SCENERY_FLAG_FULL_TILE) && @@ -1102,15 +1102,15 @@ track_design_place_scenery(rct_td6_scenery_element * scenery_start, uint8 rideIn continue; } - rct_map_element * map_element = map_get_path_element_at(mapCoord.x / 32, mapCoord.y / 32, z); + rct_tile_element * tile_element = map_get_path_element_at(mapCoord.x / 32, mapCoord.y / 32, z); - if (map_element == NULL) + if (tile_element == NULL) { continue; } footpath_queue_chain_reset(); - footpath_remove_edges_at(mapCoord.x, mapCoord.y, map_element); + footpath_remove_edges_at(mapCoord.x, mapCoord.y, tile_element); bl = 1; if (_trackDesignPlaceOperation == PTD_OPERATION_GET_COST) @@ -1122,7 +1122,7 @@ track_design_place_scenery(rct_td6_scenery_element * scenery_start, uint8 rideIn bl = 105; } - footpath_connect_edges(mapCoord.x, mapCoord.y, map_element, bl); + footpath_connect_edges(mapCoord.x, mapCoord.y, tile_element, bl); footpath_update_queue_chains(); continue; } @@ -1162,7 +1162,7 @@ static sint32 track_design_place_maze(rct_track_td6 * td6, sint16 x, sint16 y, s gMapSelectionTiles->x = -1; gMapSelectArrowPosition.x = x; gMapSelectArrowPosition.y = y; - gMapSelectArrowPosition.z = map_element_height(x, y) & 0xFFFF; + gMapSelectArrowPosition.z = tile_element_height(x, y) & 0xFFFF; gMapSelectArrowDirection = _currentTrackPieceDirection; } @@ -1316,20 +1316,20 @@ static sint32 track_design_place_maze(rct_track_td6 * td6, sint16 x, sint16 y, s continue; } - rct_map_element * map_element = map_get_surface_element_at(mapCoord.x / 32, mapCoord.y / 32); - sint16 map_height = map_element->base_height * 8; - if (map_element->properties.surface.slope & 0xF) + rct_tile_element * tile_element = map_get_surface_element_at(mapCoord.x / 32, mapCoord.y / 32); + sint16 map_height = tile_element->base_height * 8; + if (tile_element->properties.surface.slope & 0xF) { map_height += 16; - if (map_element->properties.surface.slope & 0x10) + if (tile_element->properties.surface.slope & 0x10) { map_height += 16; } } - if (map_get_water_height(map_element) > 0) + if (map_get_water_height(tile_element) > 0) { - sint16 water_height = map_get_water_height(map_element); + sint16 water_height = map_get_water_height(tile_element); water_height *= 16; if (water_height > map_height) { @@ -1366,7 +1366,7 @@ static bool track_design_place_ride(rct_track_td6 * td6, sint16 x, sint16 y, sin gMapSelectionTiles->x = -1; gMapSelectArrowPosition.x = x; gMapSelectArrowPosition.y = y; - gMapSelectArrowPosition.z = map_element_height(x, y) & 0xFFFF; + gMapSelectArrowPosition.z = tile_element_height(x, y) & 0xFFFF; gMapSelectArrowDirection = _currentTrackPieceDirection; } @@ -1478,7 +1478,7 @@ static bool track_design_place_ride(rct_track_td6 * td6, sint16 x, sint16 y, sin continue; } - rct_map_element * mapElement = map_get_surface_element_at(tile.x >> 5, tile.y >> 5); + rct_tile_element * mapElement = map_get_surface_element_at(tile.x >> 5, tile.y >> 5); if (mapElement == NULL) { return false; @@ -1562,22 +1562,22 @@ static bool track_design_place_ride(rct_track_td6 * td6, sint16 x, sint16 y, sin (sint16) (x + TileDirectionDelta[rotation].x), (sint16) (y + TileDirectionDelta[rotation].y) }; - rct_map_element * map_element = map_get_first_element_at(tile.x >> 5, tile.y >> 5); + rct_tile_element * tile_element = map_get_first_element_at(tile.x >> 5, tile.y >> 5); z = gTrackPreviewOrigin.z / 8; z += (entrance->z == (sint8) (uint8) 0x80) ? -1 : entrance->z; do { - if (map_element_get_type(map_element) != MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(tile_element) != TILE_ELEMENT_TYPE_TRACK) { continue; } - if (map_element->base_height != z) + if (tile_element->base_height != z) { continue; } - sint32 stationIndex = map_element_get_station(map_element); + sint32 stationIndex = tile_element_get_station(tile_element); uint8 bl = 1; if (_trackDesignPlaceOperation == PTD_OPERATION_GET_COST) { @@ -1607,7 +1607,7 @@ static bool track_design_place_ride(rct_track_td6 * td6, sint16 x, sint16 y, sin _trackDesignPlaceStateEntranceExitPlaced = true; break; } - while (!map_element_is_last_for_tile(map_element++)); + while (!tile_element_is_last_for_tile(tile_element++)); } else { @@ -2041,7 +2041,7 @@ static money32 place_maze_design(uint8 flags, uint8 rideIndex, uint16 mazeEntry, // Check support height if (!gCheatsDisableSupportLimits) { - rct_map_element * mapElement = map_get_surface_element_at(x >> 5, y >> 5); + rct_tile_element * mapElement = map_get_surface_element_at(x >> 5, y >> 5); uint8 supportZ = (z + 32) >> 3; if (supportZ > mapElement->base_height) { @@ -2109,15 +2109,15 @@ static money32 place_maze_design(uint8 flags, uint8 rideIndex, uint16 mazeEntry, sint32 fx = floor2(x, 32); sint32 fy = floor2(y, 32); sint32 fz = z >> 3; - rct_map_element * mapElement = map_element_insert(fx >> 5, fy >> 5, fz, 15); + rct_tile_element * mapElement = tile_element_insert(fx >> 5, fy >> 5, fz, 15); mapElement->clearance_height = fz + 4; - mapElement->type = MAP_ELEMENT_TYPE_TRACK; + mapElement->type = TILE_ELEMENT_TYPE_TRACK; mapElement->properties.track.type = TRACK_ELEM_MAZE; mapElement->properties.track.ride_index = rideIndex; mapElement->properties.track.maze_entry = mazeEntry; if (flags & GAME_COMMAND_FLAG_GHOST) { - mapElement->flags |= MAP_ELEMENT_FLAG_GHOST; + mapElement->flags |= TILE_ELEMENT_FLAG_GHOST; } map_invalidate_element(fx, fy, mapElement); @@ -2285,16 +2285,16 @@ static map_backup * track_design_preview_backup_map() if (backup != NULL) { memcpy( - backup->map_elements, + backup->tile_elements, gMapElements, - sizeof(backup->map_elements) + sizeof(backup->tile_elements) ); memcpy( backup->tile_pointers, gMapElementTilePointers, sizeof(backup->tile_pointers) ); - backup->next_free_map_element = gNextFreeMapElement; + backup->next_free_tile_element = gNextFreeMapElement; backup->map_size_units = gMapSizeUnits; backup->map_size_units_minus_2 = gMapSizeMinus2; backup->map_size = gMapSize; @@ -2311,15 +2311,15 @@ static void track_design_preview_restore_map(map_backup * backup) { memcpy( gMapElements, - backup->map_elements, - sizeof(backup->map_elements) + backup->tile_elements, + sizeof(backup->tile_elements) ); memcpy( gMapElementTilePointers, backup->tile_pointers, sizeof(backup->tile_pointers) ); - gNextFreeMapElement = backup->next_free_map_element; + gNextFreeMapElement = backup->next_free_tile_element; gMapSizeUnits = backup->map_size_units; gMapSizeMinus2 = backup->map_size_units_minus_2; gMapSize = backup->map_size; @@ -2340,17 +2340,17 @@ static void track_design_preview_clear_map() gMapSizeMinus2 = (264 * 32) - 2; gMapSize = 256; - for (sint32 i = 0; i < MAX_TILE_MAP_ELEMENT_POINTERS; i++) + for (sint32 i = 0; i < MAX_TILE_TILE_ELEMENT_POINTERS; i++) { - rct_map_element * map_element = &gMapElements[i]; - map_element->type = MAP_ELEMENT_TYPE_SURFACE; - map_element->flags = MAP_ELEMENT_FLAG_LAST_TILE; - map_element->base_height = 2; - map_element->clearance_height = 0; - map_element->properties.surface.slope = 0; - map_element->properties.surface.terrain = 0; - map_element->properties.surface.grass_length = GRASS_LENGTH_CLEAR_0; - map_element->properties.surface.ownership = OWNERSHIP_OWNED; + rct_tile_element * tile_element = &gMapElements[i]; + tile_element->type = TILE_ELEMENT_TYPE_SURFACE; + tile_element->flags = TILE_ELEMENT_FLAG_LAST_TILE; + tile_element->base_height = 2; + tile_element->clearance_height = 0; + tile_element->properties.surface.slope = 0; + tile_element->properties.surface.terrain = 0; + tile_element->properties.surface.grass_length = GRASS_LENGTH_CLEAR_0; + tile_element->properties.surface.ownership = OWNERSHIP_OWNED; } map_update_tile_pointers(); } diff --git a/src/openrct2/ride/TrackDesign.h b/src/openrct2/ride/TrackDesign.h index af0615f20e..f34b1625f2 100644 --- a/src/openrct2/ride/TrackDesign.h +++ b/src/openrct2/ride/TrackDesign.h @@ -232,9 +232,9 @@ void track_design_draw_preview(rct_track_td6 *td6, uint8 *pixels); /////////////////////////////////////////////////////////////////////////////// void track_design_save_init(); void track_design_save_reset_scenery(); -bool track_design_save_contains_map_element(rct_map_element *mapElement); +bool track_design_save_contains_tile_element(rct_tile_element *mapElement); void track_design_save_select_nearby_scenery(sint32 rideIndex); -void track_design_save_select_map_element(sint32 interactionType, sint32 x, sint32 y, rct_map_element *mapElement, bool collect); +void track_design_save_select_tile_element(sint32 interactionType, sint32 x, sint32 y, rct_tile_element *mapElement, bool collect); bool track_design_save(uint8 rideIndex); bool track_design_save_to_file(const utf8 *path); diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index 02012a9eb7..cee217f908 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -936,8 +936,8 @@ static void vehicle_update_sound_params(rct_vehicle * vehicle) i->volume = 0; if (vehicle->x != LOCATION_NULL) { - rct_map_element * map_element = map_get_surface_element_at(vehicle->x >> 5, vehicle->y >> 5); - if (map_element != NULL && map_element->base_height * 8 > vehicle->z) + rct_tile_element * tile_element = map_get_surface_element_at(vehicle->x >> 5, vehicle->y >> 5); + if (tile_element != NULL && tile_element->base_height * 8 > vehicle->z) { // vehicle underground i->volume = 0x30; } @@ -1813,35 +1813,35 @@ static void vehicle_update_measurements(rct_vehicle * vehicle) return; } - rct_map_element * map_element = map_get_surface_element_at(x / 32, y / 32); - if (map_element->base_height * 8 <= vehicle->z) + rct_tile_element * tile_element = map_get_surface_element_at(x / 32, y / 32); + if (tile_element->base_height * 8 <= vehicle->z) { bool cover_found = false; do { - if (map_element_get_type(map_element) == MAP_ELEMENT_TYPE_SCENERY_MULTIPLE) + if (tile_element_get_type(tile_element) == TILE_ELEMENT_TYPE_SCENERY_MULTIPLE) { cover_found = true; break; } - if (map_element_get_type(map_element) == MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(tile_element) == TILE_ELEMENT_TYPE_PATH) { cover_found = true; break; } - if (map_element_get_type(map_element) != MAP_ELEMENT_TYPE_SCENERY) + if (tile_element_get_type(tile_element) != TILE_ELEMENT_TYPE_SCENERY) continue; - rct_scenery_entry * scenery = get_small_scenery_entry(map_element->properties.scenery.type); + rct_scenery_entry * scenery = get_small_scenery_entry(tile_element->properties.scenery.type); if (scenery->small_scenery.flags & SMALL_SCENERY_FLAG_FULL_TILE) { cover_found = true; break; } - } while (!map_element_is_last_for_tile(map_element++)); + } while (!tile_element_is_last_for_tile(tile_element++)); if (cover_found == false) { @@ -2729,7 +2729,7 @@ static bool try_add_synchronised_station(sint32 x, sint32 y, sint32 z) return false; } - rct_map_element * mapElement = get_station_platform(x, y, z, 2); + rct_tile_element * mapElement = get_station_platform(x, y, z, 2); if (mapElement == NULL) { /* No station platform element found, @@ -2749,7 +2749,7 @@ static bool try_add_synchronised_station(sint32 x, sint32 y, sint32 z) * to sync with adjacent stations, so it will return true. * Still to determine if a vehicle to sync can be identified. */ - sint32 stationIndex = map_element_get_station(mapElement); + sint32 stationIndex = tile_element_get_station(mapElement); rct_synchronised_vehicle * sv = _lastSynchronisedVehicle; sv->ride_id = rideIndex; @@ -2829,7 +2829,7 @@ static bool vehicle_can_depart_synchronised(rct_vehicle * vehicle) sint32 y = location.y * 32; sint32 z = ride->station_heights[station]; - rct_map_element * mapElement = map_get_track_element_at(x, y, z); + rct_tile_element * mapElement = map_get_track_element_at(x, y, z); if (mapElement == NULL) { return false; @@ -3113,10 +3113,10 @@ void vehicle_test_reset(rct_vehicle * vehicle) static bool vehicle_next_tower_element_is_top(rct_vehicle * vehicle) { - rct_map_element * mapElement = + rct_tile_element * mapElement = map_get_track_element_at_of_type(vehicle->track_x, vehicle->track_y, vehicle->track_z / 8, vehicle->track_type >> 2); - if (mapElement->flags & MAP_ELEMENT_FLAG_LAST_TILE) + if (mapElement->flags & TILE_ELEMENT_FLAG_LAST_TILE) { return true; } @@ -3129,7 +3129,7 @@ static bool vehicle_next_tower_element_is_top(rct_vehicle * vehicle) } } - if ((mapElement + 1)->flags & MAP_ELEMENT_FLAG_LAST_TILE) + if ((mapElement + 1)->flags & TILE_ELEMENT_FLAG_LAST_TILE) { return true; } @@ -3991,14 +3991,14 @@ loc_6D8E36: return; } - rct_map_element * mapElement = map_get_track_element_at(vehicle->track_x, vehicle->track_y, vehicle->track_z / 8); + rct_tile_element * mapElement = map_get_track_element_at(vehicle->track_x, vehicle->track_y, vehicle->track_z / 8); if (mapElement == NULL) { return; } - vehicle->current_station = map_element_get_station(mapElement); + vehicle->current_station = tile_element_get_station(mapElement); vehicle->num_laps++; if (vehicle->sub_state != 0) @@ -4278,7 +4278,7 @@ static void loc_6DA9F9(rct_vehicle * vehicle, sint32 x, sint32 y, sint32 bx, sin vehicle->track_x = bx; vehicle->track_y = dx; - rct_map_element * mapElement = map_get_track_element_at(vehicle->track_x, vehicle->track_y, vehicle->track_z >> 3); + rct_tile_element * mapElement = map_get_track_element_at(vehicle->track_x, vehicle->track_y, vehicle->track_z >> 3); Ride * ride = get_ride(vehicle->ride); vehicle->track_type = (mapElement->properties.track.type << 2) | (ride->boat_hire_return_direction & 3); @@ -4657,10 +4657,10 @@ static void vehicle_update_boat_location(rct_vehicle * vehicle) static bool vehicle_is_boat_on_water(rct_vehicle * vehicle, sint32 x, sint32 y) { sint32 z = vehicle->track_z >> 3; - rct_map_element * mapElement = map_get_first_element_at(x >> 5, y >> 5); + rct_tile_element * mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_SURFACE) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_SURFACE) { sint32 waterZ = map_get_water_height(mapElement) * 2; if (z != waterZ) @@ -4675,7 +4675,7 @@ static bool vehicle_is_boat_on_water(rct_vehicle * vehicle, sint32 x, sint32 y) return true; } } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return false; } @@ -5155,9 +5155,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_map_element * vehicle_check_collision(sint16 x, sint16 y, sint16 z) +static rct_tile_element * vehicle_check_collision(sint16 x, sint16 y, sint16 z) { - rct_map_element * mapElement = map_get_first_element_at(x / 32, y / 32); + rct_tile_element * mapElement = map_get_first_element_at(x / 32, y / 32); if (mapElement == NULL) { return NULL; @@ -5187,7 +5187,7 @@ static rct_map_element * vehicle_check_collision(sint16 x, sint16 y, sint16 z) if (mapElement->flags & bl) return mapElement; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return NULL; } @@ -5405,7 +5405,7 @@ static void vehicle_update_crash(rct_vehicle * vehicle) continue; } - rct_map_element * collideElement = vehicle_check_collision(curVehicle->x, curVehicle->y, curVehicle->z); + rct_tile_element * collideElement = vehicle_check_collision(curVehicle->x, curVehicle->y, curVehicle->z); if (collideElement == NULL) { curVehicle->sub_state = 1; @@ -5416,7 +5416,7 @@ static void vehicle_update_crash(rct_vehicle * vehicle) continue; } - sint32 z = map_element_height(curVehicle->x, curVehicle->y); + sint32 z = tile_element_height(curVehicle->x, curVehicle->y); sint16 waterHeight = (z >> 16) & 0xFFFF; z = (sint16)(z & 0xFFFF); sint16 zDiff; @@ -6648,7 +6648,7 @@ static void check_and_apply_block_section_stop_site(rct_vehicle * vehicle) sint32 trackType = vehicle->track_type >> 2; - rct_map_element * trackElement = + rct_tile_element * trackElement = map_get_track_element_at_of_type(vehicle->track_x, vehicle->track_y, vehicle->track_z >> 3, trackType); if (trackElement == NULL) @@ -6660,13 +6660,13 @@ static void check_and_apply_block_section_stop_site(rct_vehicle * vehicle) { case TRACK_ELEM_BLOCK_BRAKES: if (ride_is_block_sectioned(ride)) - apply_block_brakes(vehicle, trackElement->flags & MAP_ELEMENT_FLAG_BLOCK_BRAKE_CLOSED); + apply_block_brakes(vehicle, trackElement->flags & TILE_ELEMENT_FLAG_BLOCK_BRAKE_CLOSED); else apply_non_stop_block_brake(vehicle, true); break; case TRACK_ELEM_END_STATION: - if (trackElement->flags & MAP_ELEMENT_FLAG_BLOCK_BRAKE_CLOSED) + if (trackElement->flags & TILE_ELEMENT_FLAG_BLOCK_BRAKE_CLOSED) _vehicleMotionTrackFlags |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_10; break; @@ -6679,7 +6679,7 @@ static void check_and_apply_block_section_stop_site(rct_vehicle * vehicle) { if (trackType == TRACK_ELEM_CABLE_LIFT_HILL || track_element_is_lift_hill(trackElement)) { - if (trackElement->flags & MAP_ELEMENT_FLAG_BLOCK_BRAKE_CLOSED) + if (trackElement->flags & TILE_ELEMENT_FLAG_BLOCK_BRAKE_CLOSED) { apply_block_brakes(vehicle, true); } @@ -6719,13 +6719,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_map_element * mapElement) +static void vehicle_update_block_brakes_open_previous_section(rct_vehicle * vehicle, rct_tile_element * mapElement) { sint32 x = vehicle->track_x; sint32 y = vehicle->track_y; sint32 z = vehicle->track_z; track_begin_end trackBeginEnd, slowTrackBeginEnd; - rct_map_element slowMapElement = *mapElement; + rct_tile_element slowMapElement = *mapElement; bool counter = true; sint32 slowX = x; sint32 slowY = y; @@ -6771,7 +6771,7 @@ static void vehicle_update_block_brakes_open_previous_section(rct_vehicle * vehi { return; } - mapElement->flags &= ~MAP_ELEMENT_FLAG_BLOCK_BRAKE_CLOSED; + mapElement->flags &= ~TILE_ELEMENT_FLAG_BLOCK_BRAKE_CLOSED; map_invalidate_element(x, y, mapElement); sint32 trackType = mapElement->properties.track.type; @@ -7198,7 +7198,7 @@ static void vehicle_update_spinning_car(rct_vehicle * vehicle) */ static void steam_particle_create(sint16 x, sint16 y, sint16 z) { - rct_map_element * mapElement = map_get_surface_element_at(x >> 5, y >> 5); + rct_tile_element * mapElement = map_get_surface_element_at(x >> 5, y >> 5); if (mapElement != NULL && z > mapElement->base_height * 8) { rct_steam_particle * steam = (rct_steam_particle *)create_sprite(2); @@ -7364,7 +7364,7 @@ static void sub_6D63D4(rct_vehicle * vehicle) * * rct2: 0x006DEDB1 */ -static void vehicle_play_scenery_door_open_sound(rct_vehicle * vehicle, rct_map_element * mapElement) +static void vehicle_play_scenery_door_open_sound(rct_vehicle * vehicle, rct_tile_element * mapElement) { rct_scenery_entry * wallEntry = get_wall_entry(mapElement->properties.wall.type); sint32 doorSoundType = (wallEntry->wall.flags2 >> 1) & 3; @@ -7382,7 +7382,7 @@ static void vehicle_play_scenery_door_open_sound(rct_vehicle * vehicle, rct_map_ * * rct2: 0x006DED7A */ -static void vehicle_play_scenery_door_close_sound(rct_vehicle * vehicle, rct_map_element * mapElement) +static void vehicle_play_scenery_door_close_sound(rct_vehicle * vehicle, rct_tile_element * mapElement) { rct_scenery_entry * wallEntry = get_wall_entry(mapElement->properties.wall.type); sint32 doorSoundType = (wallEntry->wall.flags2 >> 1) & 3; @@ -7414,7 +7414,7 @@ static void vehicle_update_scenery_door(rct_vehicle * vehicle) sint32 z = (vehicle->track_z - trackBlock->z + trackCoordinates->z_end) >> 3; sint32 direction = (vehicle->track_direction + trackCoordinates->rotation_end) & 3; - rct_map_element * mapElement = map_get_wall_element_at(x, y, z, direction); + rct_tile_element * mapElement = map_get_wall_element_at(x, y, z, direction); if (mapElement == NULL) { return; @@ -7439,7 +7439,7 @@ static void vehicle_update_scenery_door(rct_vehicle * vehicle) * * rct2: 0x006DB38B */ -static bool loc_6DB38B(rct_vehicle * vehicle, rct_map_element * mapElement) +static bool loc_6DB38B(rct_vehicle * vehicle, rct_tile_element * mapElement) { // Get bank sint32 bankStart = track_get_actual_bank_3(vehicle, mapElement); @@ -7477,9 +7477,9 @@ static void loc_6DB481(rct_vehicle * vehicle) * * rct2: 0x006DB545 */ -static void vehicle_trigger_on_ride_photo(rct_vehicle * vehicle, rct_map_element * mapElement) +static void vehicle_trigger_on_ride_photo(rct_vehicle * vehicle, rct_tile_element * mapElement) { - map_element_set_onride_photo_timeout(mapElement); + tile_element_set_onride_photo_timeout(mapElement); map_animation_create(MAP_ANIMATION_TYPE_TRACK_ONRIDEPHOTO, vehicle->track_x, vehicle->track_y, mapElement->base_height); } @@ -7499,7 +7499,7 @@ static void vehicle_update_handle_scenery_door(rct_vehicle * vehicle) sint32 direction = (vehicle->track_direction + trackCoordinates->rotation_begin) & 3; direction ^= 2; - rct_map_element * mapElement = map_get_wall_element_at(x, y, z, direction); + rct_tile_element * mapElement = map_get_wall_element_at(x, y, z, direction); if (mapElement == NULL) { return; @@ -7837,7 +7837,7 @@ static void sub_6DBF3E(rct_vehicle * vehicle) _vehicleMotionTrackFlags |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_3; - rct_map_element * mapElement = NULL; + rct_tile_element * mapElement = NULL; if (map_is_location_valid(vehicle->track_x, vehicle->track_y)) { mapElement = @@ -7851,7 +7851,7 @@ static void sub_6DBF3E(rct_vehicle * vehicle) if (_vehicleStationIndex == 0xFF) { - _vehicleStationIndex = map_element_get_station(mapElement); + _vehicleStationIndex = tile_element_get_station(mapElement); } if (trackType == TRACK_ELEM_TOWER_BASE && vehicle == gCurrentVehicle) @@ -7919,7 +7919,7 @@ static bool vehicle_update_track_motion_forwards_get_new_track(rct_vehicle * veh _vehicleVAngleEndF64E36 = TrackDefinitions[trackType].vangle_end; _vehicleBankEndF64E37 = TrackDefinitions[trackType].bank_end; - rct_map_element * mapElement = + rct_tile_element * mapElement = map_get_track_element_at_of_type_seq(vehicle->track_x, vehicle->track_y, vehicle->track_z >> 3, trackType, 0); if (mapElement == NULL) @@ -7936,7 +7936,7 @@ static bool vehicle_update_track_motion_forwards_get_new_track(rct_vehicle * veh { if (vehicle->next_vehicle_on_train == SPRITE_INDEX_NULL) { - mapElement->flags |= MAP_ELEMENT_FLAG_BLOCK_BRAKE_CLOSED; + mapElement->flags |= TILE_ELEMENT_FLAG_BLOCK_BRAKE_CLOSED; if (trackType == TRACK_ELEM_BLOCK_BRAKES || trackType == TRACK_ELEM_END_STATION) { if (!(rideEntry->vehicles[0].flags & VEHICLE_ENTRY_FLAG_POWERED)) @@ -8084,7 +8084,7 @@ loc_6DB41D: } vehicle->track_direction = regs.bl & 3; vehicle->track_type |= trackType << 2; - vehicle->brake_speed = map_element_get_brake_booster_speed(mapElement); + vehicle->brake_speed = tile_element_get_brake_booster_speed(mapElement); if (trackType == TRACK_ELEM_ON_RIDE_PHOTO) { vehicle_trigger_on_ride_photo(vehicle, mapElement); @@ -8352,7 +8352,7 @@ static bool vehicle_update_track_motion_backwards_get_new_track(rct_vehicle * ve { _vehicleVAngleEndF64E36 = TrackDefinitions[trackType].vangle_start; _vehicleBankEndF64E37 = TrackDefinitions[trackType].bank_start; - rct_map_element * mapElement = + rct_tile_element * mapElement = map_get_track_element_at_of_type_seq(vehicle->track_x, vehicle->track_y, vehicle->track_z >> 3, trackType, 0); if (mapElement == NULL) @@ -8500,7 +8500,7 @@ static bool vehicle_update_track_motion_backwards_get_new_track(rct_vehicle * ve direction &= 3; vehicle->track_type = trackType << 2; vehicle->track_direction |= direction; - vehicle->brake_speed = map_element_get_brake_booster_speed(mapElement); + vehicle->brake_speed = tile_element_get_brake_booster_speed(mapElement); // There are two bytes before the move info list uint16 trackTotalProgress = vehicle_get_move_info_size(vehicle->var_CD, vehicle->track_type); @@ -8678,7 +8678,7 @@ static sint32 vehicle_update_track_motion_mini_golf(rct_vehicle * vehicle, sint3 rct_ride_entry * rideEntry = get_ride_entry(vehicle->ride_subtype); rct_ride_entry_vehicle * vehicleEntry = vehicle_get_vehicle_entry(vehicle); - rct_map_element * mapElement = NULL; + rct_tile_element * mapElement = NULL; gCurrentVehicle = vehicle; _vehicleMotionTrackFlags = 0; @@ -8867,7 +8867,7 @@ loc_6DC476: vehicle->update_flags &= ~VEHICLE_UPDATE_FLAG_0; vehicle->track_type = (mapElement->properties.track.type << 2) | (direction & 3); - vehicle->var_CF = map_element_get_brake_booster_speed(mapElement); + vehicle->var_CF = tile_element_get_brake_booster_speed(mapElement); regs.ax = 0; loc_6DC743: diff --git a/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp b/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp index d7cda84217..1b656d0f41 100644 --- a/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp +++ b/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" #include "../../paint/paint.h" #include "../../paint/supports.h" #include "../../sprites.h" @@ -182,7 +182,7 @@ static uint32 air_powered_vertical_rc_get_support_colour(paint_session * session /** rct2: 0x008AFAD4 */ static void air_powered_vertical_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4] = { SPR_AIR_POWERED_VERTICAL_RC_FLAT_SW_NE, @@ -203,7 +203,7 @@ static void air_powered_vertical_rc_track_flat(paint_session * session, uint8 ri } static void air_powered_vertical_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_AIR_POWERED_VERTICAL_RC_STATION_SW_NE, SPR_STATION_BASE_B_SW_NE }, @@ -229,7 +229,7 @@ static void air_powered_vertical_rc_track_station(paint_session * session, uint8 } static void air_powered_vertical_rc_track_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const sprite_bb imageIds[4][5] = { { @@ -308,7 +308,7 @@ static void air_powered_vertical_rc_track_right_quarter_turn_5(paint_session * s } static void air_powered_vertical_rc_track_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; air_powered_vertical_rc_track_right_quarter_turn_5(session, rideIndex, trackSequence, (direction + 1) % 4, height, @@ -317,7 +317,7 @@ static void air_powered_vertical_rc_track_left_quarter_turn_5(paint_session * se /** rct2: 0x008AFB74 */ static void air_powered_vertical_rc_track_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_LEFT_BANK_SW_NE, SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_LEFT_BANK_FRONT_SW_NE }, @@ -345,7 +345,7 @@ static void air_powered_vertical_rc_track_flat_to_left_bank(paint_session * sess /** rct2: 0x008AFB84 */ static void air_powered_vertical_rc_track_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_RIGHT_BANK_SW_NE, SPR_AIR_POWERED_VERTICAL_RC_FLAT_TO_LEFT_BANK_FRONT_SW_NE }, @@ -372,7 +372,7 @@ static void air_powered_vertical_rc_track_flat_to_right_bank(paint_session * ses } static void air_powered_vertical_rc_track_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { air_powered_vertical_rc_track_flat_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -380,14 +380,14 @@ static void air_powered_vertical_rc_track_left_bank_to_flat(paint_session * sess /** rct2: 0x008AFBA4 */ static void air_powered_vertical_rc_track_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { air_powered_vertical_rc_track_flat_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } static void air_powered_vertical_rc_track_banked_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { static const sprite_bb imageIds[4][5] = { { @@ -481,7 +481,7 @@ static void air_powered_vertical_rc_track_banked_right_quarter_turn_5(paint_sess static void air_powered_vertical_rc_track_banked_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; air_powered_vertical_rc_track_banked_right_quarter_turn_5(session, rideIndex, trackSequence, (direction + 1) % 4, height, @@ -490,7 +490,7 @@ static void air_powered_vertical_rc_track_banked_left_quarter_turn_5(paint_sessi /** rct2: 0x008AFBD4 */ static void air_powered_vertical_rc_track_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4] = { SPR_AIR_POWERED_VERTICAL_RC_LEFT_BANK_SW_NE, @@ -518,13 +518,13 @@ static void air_powered_vertical_rc_track_left_bank(paint_session * session, uin } static void air_powered_vertical_rc_track_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { air_powered_vertical_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } static void air_powered_vertical_rc_track_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4] = { SPR_AIR_POWERED_VERTICAL_RC_BRAKES_NW_SE, @@ -545,7 +545,7 @@ static void air_powered_vertical_rc_track_brakes(paint_session * session, uint8 } static void air_powered_vertical_rc_track_vertical_slope_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 trackImageIds[7][4] = { { @@ -747,7 +747,7 @@ static void air_powered_vertical_rc_track_vertical_slope_up(paint_session * sess } static void air_powered_vertical_rc_track_vertical_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_UP_SW_NE_SEQ_0, SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_UP_SW_NE_SEQ_1 }, @@ -783,7 +783,7 @@ static void air_powered_vertical_rc_track_vertical_up(paint_session * session, u } static void air_powered_vertical_rc_track_vertical_top(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (direction == 2 || direction == 3) { @@ -865,13 +865,13 @@ static void air_powered_vertical_rc_track_vertical_top(paint_session * session, } static void air_powered_vertical_rc_track_vertical_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { air_powered_vertical_rc_track_vertical_up(session, rideIndex, trackSequence ^ 1, (direction + 2) & 3, height, mapElement); } static void air_powered_vertical_rc_track_vertical_slope_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { air_powered_vertical_rc_track_vertical_slope_up(session, rideIndex, 6 - trackSequence, (direction + 2) & 3, height, mapElement); diff --git a/src/openrct2/ride/coaster/BobsleighCoaster.cpp b/src/openrct2/ride/coaster/BobsleighCoaster.cpp index e4fb71228a..56dd545177 100644 --- a/src/openrct2/ride/coaster/BobsleighCoaster.cpp +++ b/src/openrct2/ride/coaster/BobsleighCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" #include "../../paint/paint.h" #include "../../paint/supports.h" #include "../../sprites.h" @@ -28,7 +28,7 @@ /** rct2: 0x006FE5B4 */ static void bobsleigh_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -85,7 +85,7 @@ static void bobsleigh_rc_track_flat(paint_session * session, uint8 rideIndex, ui } static void bobsleigh_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { 14580, SPR_STATION_BASE_B_SW_NE }, @@ -107,7 +107,7 @@ static void bobsleigh_rc_track_station(paint_session * session, uint8 rideIndex, /** rct2: 0x006FE5C4 */ static void bobsleigh_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -192,7 +192,7 @@ static void bobsleigh_rc_track_25_deg_up(paint_session * session, uint8 rideInde /** rct2: 0x006FE5D4 */ static void bobsleigh_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -277,7 +277,7 @@ static void bobsleigh_rc_track_flat_to_25_deg_up(paint_session * session, uint8 /** rct2: 0x006FE5E4 */ static void bobsleigh_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -362,28 +362,28 @@ static void bobsleigh_rc_track_25_deg_up_to_flat(paint_session * session, uint8 /** rct2: 0x006FE5F4 */ static void bobsleigh_rc_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bobsleigh_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x006FE604 */ static void bobsleigh_rc_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bobsleigh_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x006FE614 */ static void bobsleigh_rc_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bobsleigh_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x006FE624 */ static void bobsleigh_rc_track_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -577,7 +577,7 @@ static void bobsleigh_rc_track_left_quarter_turn_5(paint_session * session, uint /** rct2: 0x006FE634 */ static void bobsleigh_rc_track_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; bobsleigh_rc_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -585,7 +585,7 @@ static void bobsleigh_rc_track_right_quarter_turn_5(paint_session * session, uin /** rct2: 0x006FE644 */ static void bobsleigh_rc_track_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -626,7 +626,7 @@ static void bobsleigh_rc_track_flat_to_left_bank(paint_session * session, uint8 /** rct2: 0x006FE654 */ static void bobsleigh_rc_track_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -667,7 +667,7 @@ static void bobsleigh_rc_track_flat_to_right_bank(paint_session * session, uint8 /** rct2: 0x006FE664 */ static void bobsleigh_rc_track_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -708,7 +708,7 @@ static void bobsleigh_rc_track_left_bank_to_flat(paint_session * session, uint8 /** rct2: 0x006FE674 */ static void bobsleigh_rc_track_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -749,7 +749,7 @@ static void bobsleigh_rc_track_right_bank_to_flat(paint_session * session, uint8 /** rct2: 0x006FE684 */ static void bobsleigh_rc_track_banked_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -943,7 +943,7 @@ static void bobsleigh_rc_track_banked_left_quarter_turn_5(paint_session * sessio /** rct2: 0x006FE694 */ static void bobsleigh_rc_track_banked_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; bobsleigh_rc_track_banked_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -951,7 +951,7 @@ static void bobsleigh_rc_track_banked_right_quarter_turn_5(paint_session * sessi /** rct2: 0x006FE6A4 */ static void bobsleigh_rc_track_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -999,7 +999,7 @@ static void bobsleigh_rc_track_left_bank_to_25_deg_up(paint_session * session, u /** rct2: 0x006FE6B4 */ static void bobsleigh_rc_track_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1047,7 +1047,7 @@ static void bobsleigh_rc_track_right_bank_to_25_deg_up(paint_session * session, /** rct2: 0x006FE6C4 */ static void bobsleigh_rc_track_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1095,7 +1095,7 @@ static void bobsleigh_rc_track_25_deg_up_to_left_bank(paint_session * session, u /** rct2: 0x006FE6D4 */ static void bobsleigh_rc_track_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1143,35 +1143,35 @@ static void bobsleigh_rc_track_25_deg_up_to_right_bank(paint_session * session, /** rct2: 0x006FE6E4 */ static void bobsleigh_rc_track_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bobsleigh_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x006FE6F4 */ static void bobsleigh_rc_track_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bobsleigh_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x006FE704 */ static void bobsleigh_rc_track_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bobsleigh_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x006FE714 */ static void bobsleigh_rc_track_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bobsleigh_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x006FE724 */ static void bobsleigh_rc_track_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1212,14 +1212,14 @@ static void bobsleigh_rc_track_left_bank(paint_session * session, uint8 rideInde /** rct2: 0x006FE734 */ static void bobsleigh_rc_track_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bobsleigh_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x006FE744 */ static void bobsleigh_rc_track_s_bend_left(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1379,7 +1379,7 @@ static void bobsleigh_rc_track_s_bend_left(paint_session * session, uint8 rideIn /** rct2: 0x006FE754 */ static void bobsleigh_rc_track_s_bend_right(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1539,7 +1539,7 @@ static void bobsleigh_rc_track_s_bend_right(paint_session * session, uint8 rideI /** rct2: 0x006FE794 */ static void bobsleigh_rc_track_left_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1662,7 +1662,7 @@ static void bobsleigh_rc_track_left_quarter_turn_3(paint_session * session, uint /** rct2: 0x006FE7A4 */ static void bobsleigh_rc_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; bobsleigh_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -1670,7 +1670,7 @@ static void bobsleigh_rc_track_right_quarter_turn_3(paint_session * session, uin /** rct2: 0x006FE7B4 */ static void bobsleigh_rc_track_left_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1793,7 +1793,7 @@ static void bobsleigh_rc_track_left_quarter_turn_3_bank(paint_session * session, /** rct2: 0x006FE7C4 */ static void bobsleigh_rc_track_right_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; bobsleigh_rc_track_left_quarter_turn_3_bank(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -1801,7 +1801,7 @@ static void bobsleigh_rc_track_right_quarter_turn_3_bank(paint_session * session /** rct2: 0x006FE7D4 */ static void bobsleigh_rc_track_left_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2042,7 +2042,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_small(paint_session * s /** rct2: 0x006FE7E4 */ static void bobsleigh_rc_track_right_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2283,7 +2283,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_small(paint_session * /** rct2: 0x006FE7F4 */ static void bobsleigh_rc_track_left_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 4) { @@ -2297,7 +2297,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_down_small(paint_session * /** rct2: 0x006FE804 */ static void bobsleigh_rc_track_right_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 4) { @@ -2311,7 +2311,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_down_small(paint_session /** rct2: 0x006FE814 */ static void bobsleigh_rc_track_left_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2694,7 +2694,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(paint_session * s /** rct2: 0x006FE824 */ static void bobsleigh_rc_track_right_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3077,7 +3077,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(paint_session * /** rct2: 0x006FE834 */ static void bobsleigh_rc_track_left_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 7) { @@ -3091,7 +3091,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_down_large(paint_session * /** rct2: 0x006FE844 */ static void bobsleigh_rc_track_right_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 7) { @@ -3105,7 +3105,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_down_large(paint_session /** rct2: 0x006FE854 */ static void bobsleigh_rc_track_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -3136,7 +3136,7 @@ static void bobsleigh_rc_track_brakes(paint_session * session, uint8 rideIndex, /** rct2: 0x006FE864 */ static void bobsleigh_rc_track_block_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -3166,7 +3166,7 @@ static void bobsleigh_rc_track_block_brakes(paint_session * session, uint8 rideI } static void bobsleigh_rc_track_on_ride_photo(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { diff --git a/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp b/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp index 51ecd3219f..ef40069ec6 100644 --- a/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp +++ b/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp @@ -16,7 +16,7 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" #include "../../paint/paint.h" #include "../../paint/supports.h" #include "../../sprites.h" @@ -28,7 +28,7 @@ #include "BolligerMabillardTrack.h" void bolliger_mabillard_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { if (track_element_is_lift_hill(mapElement)) { @@ -83,7 +83,7 @@ void bolliger_mabillard_track_flat(paint_session * session, uint8 rideIndex, uin } void bolliger_mabillard_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { static const uint32 imageIds[4][3] = { { 17154, 17150, SPR_STATION_BASE_A_SW_NE }, @@ -116,7 +116,7 @@ void bolliger_mabillard_track_station(paint_session * session, uint8 rideIndex, } void bolliger_mabillard_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { if (track_element_is_lift_hill(mapElement)) { @@ -184,7 +184,7 @@ void bolliger_mabillard_track_25_deg_up(paint_session * session, uint8 rideIndex } void bolliger_mabillard_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { if (track_element_is_lift_hill(mapElement)) { @@ -252,7 +252,7 @@ void bolliger_mabillard_track_60_deg_up(paint_session * session, uint8 rideIndex } void bolliger_mabillard_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { if (track_element_is_lift_hill(mapElement)) { @@ -320,7 +320,7 @@ void bolliger_mabillard_track_flat_to_25_deg_up(paint_session * session, uint8 r } void bolliger_mabillard_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { if (track_element_is_lift_hill(mapElement)) @@ -397,7 +397,7 @@ void bolliger_mabillard_track_25_deg_up_to_60_deg_up(paint_session * session, ui } void bolliger_mabillard_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { if (track_element_is_lift_hill(mapElement)) @@ -474,7 +474,7 @@ void bolliger_mabillard_track_60_deg_up_to_25_deg_up(paint_session * session, ui } void bolliger_mabillard_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { if (track_element_is_lift_hill(mapElement)) { @@ -542,19 +542,19 @@ void bolliger_mabillard_track_25_deg_up_to_flat(paint_session * session, uint8 r } void bolliger_mabillard_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } void bolliger_mabillard_track_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } void bolliger_mabillard_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, @@ -562,7 +562,7 @@ void bolliger_mabillard_track_flat_to_25_deg_down(paint_session * session, uint8 } void bolliger_mabillard_track_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, @@ -570,7 +570,7 @@ void bolliger_mabillard_track_25_deg_down_to_60_deg_down(paint_session * session } void bolliger_mabillard_track_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, @@ -578,7 +578,7 @@ void bolliger_mabillard_track_60_deg_down_to_25_deg_down(paint_session * session } void bolliger_mabillard_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, @@ -586,7 +586,7 @@ void bolliger_mabillard_track_25_deg_down_to_flat(paint_session * session, uint8 } void bolliger_mabillard_track_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -740,7 +740,7 @@ void bolliger_mabillard_track_left_quarter_turn_5(paint_session * session, uint8 } void bolliger_mabillard_track_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; @@ -749,7 +749,7 @@ void bolliger_mabillard_track_right_quarter_turn_5(paint_session * session, uint } void bolliger_mabillard_track_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (direction) { @@ -785,7 +785,7 @@ void bolliger_mabillard_track_flat_to_left_bank(paint_session * session, uint8 r } void bolliger_mabillard_track_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (direction) { @@ -821,7 +821,7 @@ void bolliger_mabillard_track_flat_to_right_bank(paint_session * session, uint8 } void bolliger_mabillard_track_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (direction) { @@ -857,7 +857,7 @@ void bolliger_mabillard_track_left_bank_to_flat(paint_session * session, uint8 r } void bolliger_mabillard_track_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (direction) { @@ -893,7 +893,7 @@ void bolliger_mabillard_track_right_bank_to_flat(paint_session * session, uint8 } void bolliger_mabillard_track_banked_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -1054,7 +1054,7 @@ void bolliger_mabillard_track_banked_left_quarter_turn_5(paint_session * session } void bolliger_mabillard_track_banked_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; @@ -1063,7 +1063,7 @@ void bolliger_mabillard_track_banked_right_quarter_turn_5(paint_session * sessio } void bolliger_mabillard_track_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (direction) @@ -1107,7 +1107,7 @@ void bolliger_mabillard_track_left_bank_to_25_deg_up(paint_session * session, ui } void bolliger_mabillard_track_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (direction) @@ -1151,7 +1151,7 @@ void bolliger_mabillard_track_right_bank_to_25_deg_up(paint_session * session, u } void bolliger_mabillard_track_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (direction) @@ -1195,7 +1195,7 @@ void bolliger_mabillard_track_25_deg_up_to_left_bank(paint_session * session, ui } void bolliger_mabillard_track_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (direction) @@ -1239,7 +1239,7 @@ void bolliger_mabillard_track_25_deg_up_to_right_bank(paint_session * session, u } void bolliger_mabillard_track_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, @@ -1247,7 +1247,7 @@ void bolliger_mabillard_track_left_bank_to_25_deg_down(paint_session * session, } void bolliger_mabillard_track_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, @@ -1255,7 +1255,7 @@ void bolliger_mabillard_track_right_bank_to_25_deg_down(paint_session * session, } void bolliger_mabillard_track_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, @@ -1263,7 +1263,7 @@ void bolliger_mabillard_track_25_deg_down_to_left_bank(paint_session * session, } void bolliger_mabillard_track_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, @@ -1271,7 +1271,7 @@ void bolliger_mabillard_track_25_deg_down_to_right_bank(paint_session * session, } void bolliger_mabillard_track_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (direction) { @@ -1303,13 +1303,13 @@ void bolliger_mabillard_track_left_bank(paint_session * session, uint8 rideIndex } void bolliger_mabillard_track_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } void bolliger_mabillard_track_left_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -1458,7 +1458,7 @@ void bolliger_mabillard_track_left_quarter_turn_5_25_deg_up(paint_session * sess } void bolliger_mabillard_track_right_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -1607,7 +1607,7 @@ void bolliger_mabillard_track_right_quarter_turn_5_25_deg_up(paint_session * ses } void bolliger_mabillard_track_left_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; @@ -1616,7 +1616,7 @@ void bolliger_mabillard_track_left_quarter_turn_5_25_deg_down(paint_session * se } void bolliger_mabillard_track_right_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; @@ -1625,7 +1625,7 @@ void bolliger_mabillard_track_right_quarter_turn_5_25_deg_down(paint_session * s } void bolliger_mabillard_track_s_bend_left(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) { @@ -1748,7 +1748,7 @@ void bolliger_mabillard_track_s_bend_left(paint_session * session, uint8 rideInd } void bolliger_mabillard_track_s_bend_right(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) { @@ -1871,7 +1871,7 @@ void bolliger_mabillard_track_s_bend_right(paint_session * session, uint8 rideIn } void bolliger_mabillard_track_left_vertical_loop(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) { @@ -2094,7 +2094,7 @@ void bolliger_mabillard_track_left_vertical_loop(paint_session * session, uint8 } void bolliger_mabillard_track_right_vertical_loop(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -2286,7 +2286,7 @@ void bolliger_mabillard_track_right_vertical_loop(paint_session * session, uint8 } void bolliger_mabillard_track_left_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -2385,7 +2385,7 @@ void bolliger_mabillard_track_left_quarter_turn_3(paint_session * session, uint8 } void bolliger_mabillard_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; @@ -2394,7 +2394,7 @@ void bolliger_mabillard_track_right_quarter_turn_3(paint_session * session, uint } void bolliger_mabillard_track_left_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -2497,7 +2497,7 @@ void bolliger_mabillard_track_left_quarter_turn_3_bank(paint_session * session, } void bolliger_mabillard_track_right_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; @@ -2506,7 +2506,7 @@ void bolliger_mabillard_track_right_quarter_turn_3_bank(paint_session * session, } void bolliger_mabillard_track_left_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -2576,7 +2576,7 @@ void bolliger_mabillard_track_left_quarter_turn_3_25_deg_up(paint_session * sess } void bolliger_mabillard_track_right_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -2649,7 +2649,7 @@ void bolliger_mabillard_track_right_quarter_turn_3_25_deg_up(paint_session * ses } void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; @@ -2658,7 +2658,7 @@ void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down(paint_session * se } void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; @@ -2667,7 +2667,7 @@ void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down(paint_session * s } void bolliger_mabillard_track_left_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -2868,7 +2868,7 @@ void bolliger_mabillard_track_left_half_banked_helix_up_small(paint_session * se } void bolliger_mabillard_track_right_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -3069,7 +3069,7 @@ void bolliger_mabillard_track_right_half_banked_helix_up_small(paint_session * s } void bolliger_mabillard_track_left_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { if (trackSequence >= 4) @@ -3083,7 +3083,7 @@ void bolliger_mabillard_track_left_half_banked_helix_down_small(paint_session * } void bolliger_mabillard_track_right_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { if (trackSequence >= 4) @@ -3097,7 +3097,7 @@ void bolliger_mabillard_track_right_half_banked_helix_down_small(paint_session * } void bolliger_mabillard_track_left_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -3408,7 +3408,7 @@ void bolliger_mabillard_track_left_half_banked_helix_up_large(paint_session * se } void bolliger_mabillard_track_right_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -3725,7 +3725,7 @@ void bolliger_mabillard_track_right_half_banked_helix_up_large(paint_session * s } void bolliger_mabillard_track_left_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { if (trackSequence >= 7) @@ -3739,7 +3739,7 @@ void bolliger_mabillard_track_left_half_banked_helix_down_large(paint_session * } void bolliger_mabillard_track_right_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { if (trackSequence >= 7) @@ -3753,7 +3753,7 @@ void bolliger_mabillard_track_right_half_banked_helix_down_large(paint_session * } void bolliger_mabillard_track_left_quarter_turn_1_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (direction) @@ -3789,7 +3789,7 @@ void bolliger_mabillard_track_left_quarter_turn_1_60_deg_up(paint_session * sess } void bolliger_mabillard_track_right_quarter_turn_1_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (direction) @@ -3825,7 +3825,7 @@ void bolliger_mabillard_track_right_quarter_turn_1_60_deg_up(paint_session * ses } void bolliger_mabillard_track_left_quarter_turn_1_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_right_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, @@ -3833,7 +3833,7 @@ void bolliger_mabillard_track_left_quarter_turn_1_60_deg_down(paint_session * se } void bolliger_mabillard_track_right_quarter_turn_1_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_left_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, @@ -3841,7 +3841,7 @@ void bolliger_mabillard_track_right_quarter_turn_1_60_deg_down(paint_session * s } void bolliger_mabillard_track_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (direction) { @@ -3867,7 +3867,7 @@ void bolliger_mabillard_track_brakes(paint_session * session, uint8 rideIndex, u } void bolliger_mabillard_track_25_deg_up_left_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (direction) @@ -3907,7 +3907,7 @@ void bolliger_mabillard_track_25_deg_up_left_banked(paint_session * session, uin } void bolliger_mabillard_track_25_deg_up_right_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (direction) @@ -3947,7 +3947,7 @@ void bolliger_mabillard_track_25_deg_up_right_banked(paint_session * session, ui } void bolliger_mabillard_track_on_ride_photo(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (direction) { @@ -3987,7 +3987,7 @@ void bolliger_mabillard_track_on_ride_photo(paint_session * session, uint8 rideI } void bolliger_mabillard_track_25_deg_down_left_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_25_deg_up_right_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, @@ -3995,7 +3995,7 @@ void bolliger_mabillard_track_25_deg_down_left_banked(paint_session * session, u } void bolliger_mabillard_track_25_deg_down_right_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_25_deg_up_left_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, @@ -4003,7 +4003,7 @@ void bolliger_mabillard_track_25_deg_down_right_banked(paint_session * session, } void bolliger_mabillard_track_90_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) { @@ -4038,13 +4038,13 @@ void bolliger_mabillard_track_90_deg_up(paint_session * session, uint8 rideIndex } void bolliger_mabillard_track_90_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_90_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } void bolliger_mabillard_track_60_deg_up_to_90_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -4084,7 +4084,7 @@ void bolliger_mabillard_track_60_deg_up_to_90_deg_up(paint_session * session, ui } void bolliger_mabillard_track_90_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_60_deg_up_to_90_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, @@ -4092,7 +4092,7 @@ void bolliger_mabillard_track_90_deg_down_to_60_deg_down(paint_session * session } void bolliger_mabillard_track_90_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (direction) @@ -4129,7 +4129,7 @@ void bolliger_mabillard_track_90_deg_up_to_60_deg_up(paint_session * session, ui } void bolliger_mabillard_track_60_deg_down_to_90_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -4168,7 +4168,7 @@ void bolliger_mabillard_track_60_deg_down_to_90_deg_down(paint_session * session } void bolliger_mabillard_track_left_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -4292,7 +4292,7 @@ void bolliger_mabillard_track_left_eighth_to_diag(paint_session * session, uint8 } void bolliger_mabillard_track_right_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -4416,7 +4416,7 @@ void bolliger_mabillard_track_right_eighth_to_diag(paint_session * session, uint } void bolliger_mabillard_track_left_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; @@ -4425,7 +4425,7 @@ void bolliger_mabillard_track_left_eighth_to_orthogonal(paint_session * session, } void bolliger_mabillard_track_right_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; @@ -4434,7 +4434,7 @@ void bolliger_mabillard_track_right_eighth_to_orthogonal(paint_session * session } void bolliger_mabillard_track_left_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -4558,7 +4558,7 @@ void bolliger_mabillard_track_left_eighth_bank_to_diag(paint_session * session, } void bolliger_mabillard_track_right_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -4682,7 +4682,7 @@ void bolliger_mabillard_track_right_eighth_bank_to_diag(paint_session * session, } void bolliger_mabillard_track_left_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; @@ -4691,7 +4691,7 @@ void bolliger_mabillard_track_left_eighth_bank_to_orthogonal(paint_session * ses } void bolliger_mabillard_track_right_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; @@ -4700,7 +4700,7 @@ void bolliger_mabillard_track_right_eighth_bank_to_orthogonal(paint_session * se } void bolliger_mabillard_track_diag_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) { @@ -4828,7 +4828,7 @@ void bolliger_mabillard_track_diag_flat(paint_session * session, uint8 rideIndex } void bolliger_mabillard_track_diag_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) { @@ -4956,7 +4956,7 @@ void bolliger_mabillard_track_diag_25_deg_up(paint_session * session, uint8 ride } void bolliger_mabillard_track_diag_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) { @@ -5084,7 +5084,7 @@ void bolliger_mabillard_track_diag_60_deg_up(paint_session * session, uint8 ride } void bolliger_mabillard_track_diag_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -5213,7 +5213,7 @@ void bolliger_mabillard_track_diag_flat_to_25_deg_up(paint_session * session, ui } void bolliger_mabillard_track_diag_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -5342,7 +5342,7 @@ void bolliger_mabillard_track_diag_25_deg_up_to_60_deg_up(paint_session * sessio } void bolliger_mabillard_track_diag_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -5471,7 +5471,7 @@ void bolliger_mabillard_track_diag_60_deg_up_to_25_deg_up(paint_session * sessio } void bolliger_mabillard_track_diag_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -5600,7 +5600,7 @@ void bolliger_mabillard_track_diag_25_deg_up_to_flat(paint_session * session, ui } void bolliger_mabillard_track_diag_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) { @@ -5728,7 +5728,7 @@ void bolliger_mabillard_track_diag_25_deg_down(paint_session * session, uint8 ri } void bolliger_mabillard_track_diag_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) { @@ -5856,7 +5856,7 @@ void bolliger_mabillard_track_diag_60_deg_down(paint_session * session, uint8 ri } void bolliger_mabillard_track_diag_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -5983,7 +5983,7 @@ void bolliger_mabillard_track_diag_flat_to_25_deg_down(paint_session * session, } void bolliger_mabillard_track_diag_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -6112,7 +6112,7 @@ void bolliger_mabillard_track_diag_25_deg_down_to_60_deg_down(paint_session * se } void bolliger_mabillard_track_diag_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -6241,7 +6241,7 @@ void bolliger_mabillard_track_diag_60_deg_down_to_25_deg_down(paint_session * se } void bolliger_mabillard_track_diag_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -6370,7 +6370,7 @@ void bolliger_mabillard_track_diag_25_deg_down_to_flat(paint_session * session, } void bolliger_mabillard_track_diag_flat_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -6499,7 +6499,7 @@ void bolliger_mabillard_track_diag_flat_to_60_deg_up(paint_session * session, ui } void bolliger_mabillard_track_diag_60_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -6628,7 +6628,7 @@ void bolliger_mabillard_track_diag_60_deg_up_to_flat(paint_session * session, ui } void bolliger_mabillard_track_diag_flat_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -6757,7 +6757,7 @@ void bolliger_mabillard_track_diag_flat_to_60_deg_down(paint_session * session, } void bolliger_mabillard_track_diag_60_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -6886,7 +6886,7 @@ void bolliger_mabillard_track_diag_60_deg_down_to_flat(paint_session * session, } void bolliger_mabillard_track_diag_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -6955,7 +6955,7 @@ void bolliger_mabillard_track_diag_flat_to_left_bank(paint_session * session, ui } void bolliger_mabillard_track_diag_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -7024,7 +7024,7 @@ void bolliger_mabillard_track_diag_flat_to_right_bank(paint_session * session, u } void bolliger_mabillard_track_diag_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -7093,7 +7093,7 @@ void bolliger_mabillard_track_diag_left_bank_to_flat(paint_session * session, ui } void bolliger_mabillard_track_diag_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -7162,7 +7162,7 @@ void bolliger_mabillard_track_diag_right_bank_to_flat(paint_session * session, u } void bolliger_mabillard_track_diag_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -7231,7 +7231,7 @@ void bolliger_mabillard_track_diag_left_bank_to_25_deg_up(paint_session * sessio } void bolliger_mabillard_track_diag_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -7300,7 +7300,7 @@ void bolliger_mabillard_track_diag_right_bank_to_25_deg_up(paint_session * sessi } void bolliger_mabillard_track_diag_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -7369,7 +7369,7 @@ void bolliger_mabillard_track_diag_25_deg_up_to_left_bank(paint_session * sessio } void bolliger_mabillard_track_diag_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -7438,7 +7438,7 @@ void bolliger_mabillard_track_diag_25_deg_up_to_right_bank(paint_session * sessi } void bolliger_mabillard_track_diag_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -7505,7 +7505,7 @@ void bolliger_mabillard_track_diag_left_bank_to_25_deg_down(paint_session * sess } void bolliger_mabillard_track_diag_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -7572,7 +7572,7 @@ void bolliger_mabillard_track_diag_right_bank_to_25_deg_down(paint_session * ses } void bolliger_mabillard_track_diag_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -7641,7 +7641,7 @@ void bolliger_mabillard_track_diag_25_deg_down_to_left_bank(paint_session * sess } void bolliger_mabillard_track_diag_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -7710,7 +7710,7 @@ void bolliger_mabillard_track_diag_25_deg_down_to_right_bank(paint_session * ses } void bolliger_mabillard_track_diag_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) { @@ -7776,7 +7776,7 @@ void bolliger_mabillard_track_diag_left_bank(paint_session * session, uint8 ride } void bolliger_mabillard_track_diag_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) { @@ -7843,7 +7843,7 @@ void bolliger_mabillard_track_diag_right_bank(paint_session * session, uint8 rid void bolliger_mabillard_track_left_bank_to_left_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement, sint32 supportType) + rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) { @@ -7915,7 +7915,7 @@ void bolliger_mabillard_track_left_bank_to_left_quarter_turn_3_25_deg_up(paint_s void bolliger_mabillard_track_right_bank_to_right_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement, sint32 supportType) + rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) { @@ -7990,7 +7990,7 @@ void bolliger_mabillard_track_right_bank_to_right_quarter_turn_3_25_deg_up(paint void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement, sint32 supportType) + rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) { @@ -8065,7 +8065,7 @@ void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down_to_left_bank(paint void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, + sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -8137,7 +8137,7 @@ void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down_to_right_bank(pai } void bolliger_mabillard_track_block_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (direction) { @@ -8164,7 +8164,7 @@ void bolliger_mabillard_track_block_brakes(paint_session * session, uint8 rideIn void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement, sint32 supportType) + rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) { @@ -8237,7 +8237,7 @@ void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up(paint_session void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement, sint32 supportType) + rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) { @@ -8313,7 +8313,7 @@ void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up(paint_sessio void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement, sint32 supportType) + rct_tile_element * mapElement, sint32 supportType) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, @@ -8322,7 +8322,7 @@ void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_down(paint_sessi void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement, sint32 supportType) + rct_tile_element * mapElement, sint32 supportType) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, @@ -8331,7 +8331,7 @@ void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_down(paint_sess void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement, sint32 supportType) + rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) { @@ -8483,7 +8483,7 @@ void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up(paint_session void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement, sint32 supportType) + rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) { @@ -8635,7 +8635,7 @@ void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up(paint_sessio void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement, sint32 supportType) + rct_tile_element * mapElement, sint32 supportType) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, @@ -8644,7 +8644,7 @@ void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_down(paint_sessi void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement, sint32 supportType) + rct_tile_element * mapElement, sint32 supportType) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, @@ -8652,7 +8652,7 @@ void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_down(paint_sess } void bolliger_mabillard_track_25_deg_up_to_left_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (direction) @@ -8694,7 +8694,7 @@ void bolliger_mabillard_track_25_deg_up_to_left_banked_25_deg_up(paint_session * } void bolliger_mabillard_track_25_deg_up_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (direction) @@ -8736,7 +8736,7 @@ void bolliger_mabillard_track_25_deg_up_to_right_banked_25_deg_up(paint_session } void bolliger_mabillard_track_left_banked_25_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (direction) @@ -8778,7 +8778,7 @@ void bolliger_mabillard_track_left_banked_25_deg_up_to_25_deg_up(paint_session * } void bolliger_mabillard_track_right_banked_25_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (direction) @@ -8821,7 +8821,7 @@ void bolliger_mabillard_track_right_banked_25_deg_up_to_25_deg_up(paint_session void bolliger_mabillard_track_25_deg_down_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement, sint32 supportType) + rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_right_banked_25_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); @@ -8829,7 +8829,7 @@ void bolliger_mabillard_track_25_deg_down_to_left_banked_25_deg_down(paint_sessi void bolliger_mabillard_track_25_deg_down_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement, sint32 supportType) + rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_left_banked_25_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); @@ -8837,7 +8837,7 @@ void bolliger_mabillard_track_25_deg_down_to_right_banked_25_deg_down(paint_sess void bolliger_mabillard_track_left_banked_25_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement, sint32 supportType) + rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_25_deg_up_to_right_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); @@ -8845,7 +8845,7 @@ void bolliger_mabillard_track_left_banked_25_deg_down_to_25_deg_down(paint_sessi void bolliger_mabillard_track_right_banked_25_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement, sint32 supportType) + rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_25_deg_up_to_left_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); @@ -8853,7 +8853,7 @@ void bolliger_mabillard_track_right_banked_25_deg_down_to_25_deg_down(paint_sess void bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement, sint32 supportType) + rct_tile_element * mapElement, sint32 supportType) { switch (direction) { @@ -8893,7 +8893,7 @@ void bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_up(paint_se void bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement, sint32 supportType) + rct_tile_element * mapElement, sint32 supportType) { switch (direction) { @@ -8933,7 +8933,7 @@ void bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_up(paint_ void bolliger_mabillard_track_left_banked_25_deg_up_to_left_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement, sint32 supportType) + rct_tile_element * mapElement, sint32 supportType) { switch (direction) { @@ -8973,7 +8973,7 @@ void bolliger_mabillard_track_left_banked_25_deg_up_to_left_banked_flat(paint_se void bolliger_mabillard_track_right_banked_25_deg_up_to_right_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement, sint32 supportType) + rct_tile_element * mapElement, sint32 supportType) { switch (direction) { @@ -9013,7 +9013,7 @@ void bolliger_mabillard_track_right_banked_25_deg_up_to_right_banked_flat(paint_ void bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement, sint32 supportType) + rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_right_banked_25_deg_up_to_right_banked_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); @@ -9021,7 +9021,7 @@ void bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_down(paint_ void bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement, sint32 supportType) + rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_left_banked_25_deg_up_to_left_banked_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); @@ -9029,7 +9029,7 @@ void bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_down(pain void bolliger_mabillard_track_left_banked_25_deg_down_to_left_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement, sint32 supportType) + rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); @@ -9037,14 +9037,14 @@ void bolliger_mabillard_track_left_banked_25_deg_down_to_left_banked_flat(paint_ void bolliger_mabillard_track_right_banked_25_deg_down_to_right_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement, sint32 supportType) + rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, supportType); } void bolliger_mabillard_track_flat_to_left_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (direction) @@ -9086,7 +9086,7 @@ void bolliger_mabillard_track_flat_to_left_banked_25_deg_up(paint_session * sess } void bolliger_mabillard_track_flat_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (direction) @@ -9128,7 +9128,7 @@ void bolliger_mabillard_track_flat_to_right_banked_25_deg_up(paint_session * ses } void bolliger_mabillard_track_left_banked_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (direction) @@ -9170,7 +9170,7 @@ void bolliger_mabillard_track_left_banked_25_deg_up_to_flat(paint_session * sess } void bolliger_mabillard_track_right_banked_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (direction) @@ -9212,7 +9212,7 @@ void bolliger_mabillard_track_right_banked_25_deg_up_to_flat(paint_session * ses } void bolliger_mabillard_track_flat_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_right_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, @@ -9220,7 +9220,7 @@ void bolliger_mabillard_track_flat_to_left_banked_25_deg_down(paint_session * se } void bolliger_mabillard_track_flat_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_left_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, @@ -9228,7 +9228,7 @@ void bolliger_mabillard_track_flat_to_right_banked_25_deg_down(paint_session * s } void bolliger_mabillard_track_left_banked_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_flat_to_right_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, @@ -9236,7 +9236,7 @@ void bolliger_mabillard_track_left_banked_25_deg_down_to_flat(paint_session * se } void bolliger_mabillard_track_right_banked_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_flat_to_left_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, @@ -9244,7 +9244,7 @@ void bolliger_mabillard_track_right_banked_25_deg_down_to_flat(paint_session * s } void bolliger_mabillard_track_left_quarter_turn_1_90_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -9284,7 +9284,7 @@ void bolliger_mabillard_track_left_quarter_turn_1_90_deg_up(paint_session * sess } void bolliger_mabillard_track_right_quarter_turn_1_90_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -9324,7 +9324,7 @@ void bolliger_mabillard_track_right_quarter_turn_1_90_deg_up(paint_session * ses } void bolliger_mabillard_track_left_quarter_turn_1_90_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_right_quarter_turn_1_90_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, @@ -9332,7 +9332,7 @@ void bolliger_mabillard_track_left_quarter_turn_1_90_deg_down(paint_session * se } void bolliger_mabillard_track_right_quarter_turn_1_90_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_left_quarter_turn_1_90_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, @@ -9341,7 +9341,7 @@ void bolliger_mabillard_track_right_quarter_turn_1_90_deg_down(paint_session * s /* 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 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { if (track_element_is_lift_hill(mapElement)) { @@ -9411,7 +9411,7 @@ void bolliger_mabillard_track_flat_to_60_deg_up(paint_session * session, uint8 r } void bolliger_mabillard_track_60_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { if (track_element_is_lift_hill(mapElement)) { @@ -9481,7 +9481,7 @@ void bolliger_mabillard_track_60_deg_up_to_flat(paint_session * session, uint8 r } void bolliger_mabillard_track_flat_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_60_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, @@ -9489,7 +9489,7 @@ void bolliger_mabillard_track_flat_to_60_deg_down(paint_session * session, uint8 } void bolliger_mabillard_track_60_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_flat_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement, @@ -9497,7 +9497,7 @@ void bolliger_mabillard_track_60_deg_down_to_flat(paint_session * session, uint8 } void bolliger_mabillard_track_brake_for_drop(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (direction) { @@ -9538,7 +9538,7 @@ void bolliger_mabillard_track_brake_for_drop(paint_session * session, uint8 ride /* The following track elements used to be specific to the Steel Twister */ void bolliger_mabillard_track_half_loop_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) { @@ -9645,13 +9645,13 @@ void bolliger_mabillard_track_half_loop_up(paint_session * session, uint8 rideIn } void bolliger_mabillard_track_half_loop_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_half_loop_up(session, rideIndex, 3 - trackSequence, direction, height, mapElement, supportType); } void bolliger_mabillard_track_left_corkscrew_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) { @@ -9748,7 +9748,7 @@ void bolliger_mabillard_track_left_corkscrew_up(paint_session * session, uint8 r } void bolliger_mabillard_track_right_corkscrew_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) { @@ -9846,7 +9846,7 @@ void bolliger_mabillard_track_right_corkscrew_up(paint_session * session, uint8 } void bolliger_mabillard_track_left_corkscrew_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_right_corkscrew_up(session, rideIndex, 2 - trackSequence, (direction + 1) & 3, height, mapElement, @@ -9854,7 +9854,7 @@ void bolliger_mabillard_track_left_corkscrew_down(paint_session * session, uint8 } void bolliger_mabillard_track_right_corkscrew_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_left_corkscrew_up(session, rideIndex, 2 - trackSequence, (direction - 1) & 3, height, mapElement, @@ -9862,7 +9862,7 @@ void bolliger_mabillard_track_right_corkscrew_down(paint_session * session, uint } void bolliger_mabillard_track_flat_to_60_deg_up_long_base(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -9997,7 +9997,7 @@ void bolliger_mabillard_track_flat_to_60_deg_up_long_base(paint_session * sessio /** rct2: 0x008AC104 */ void bolliger_mabillard_track_60_deg_up_to_flat_long_base(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -10131,7 +10131,7 @@ void bolliger_mabillard_track_60_deg_up_to_flat_long_base(paint_session * sessio } void bolliger_mabillard_track_flat_to_60_deg_down_long_base(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_flat_to_60_deg_up_long_base(session, rideIndex, 3 - trackSequence, (direction + 2) & 3, height, @@ -10139,7 +10139,7 @@ void bolliger_mabillard_track_flat_to_60_deg_down_long_base(paint_session * sess } void bolliger_mabillard_track_60_deg_up_to_flat_long_base122(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_60_deg_up_to_flat_long_base(session, rideIndex, 3 - trackSequence, (direction + 2) & 3, height, @@ -10147,7 +10147,7 @@ void bolliger_mabillard_track_60_deg_up_to_flat_long_base122(paint_session * ses } void bolliger_mabillard_track_left_barrel_roll_up_to_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -10273,7 +10273,7 @@ void bolliger_mabillard_track_left_barrel_roll_up_to_down(paint_session * sessio } void bolliger_mabillard_track_right_barrel_roll_up_to_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -10399,7 +10399,7 @@ void bolliger_mabillard_track_right_barrel_roll_up_to_down(paint_session * sessi } void bolliger_mabillard_track_left_barrel_roll_down_to_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_left_barrel_roll_up_to_down(session, rideIndex, 2 - trackSequence, (direction + 2) & 3, height, @@ -10407,7 +10407,7 @@ void bolliger_mabillard_track_left_barrel_roll_down_to_up(paint_session * sessio } void bolliger_mabillard_track_right_barrel_roll_down_to_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_right_barrel_roll_up_to_down(session, rideIndex, 2 - trackSequence, (direction + 2) & 3, height, @@ -10415,7 +10415,7 @@ void bolliger_mabillard_track_right_barrel_roll_down_to_up(paint_session * sessi } void bolliger_mabillard_track_powered_lift(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (direction) { @@ -10451,7 +10451,7 @@ void bolliger_mabillard_track_powered_lift(paint_session * session, uint8 rideIn } void bolliger_mabillard_track_left_large_half_loop_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -10650,7 +10650,7 @@ void bolliger_mabillard_track_left_large_half_loop_up(paint_session * session, u } void bolliger_mabillard_track_right_large_half_loop_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) @@ -10849,7 +10849,7 @@ void bolliger_mabillard_track_right_large_half_loop_up(paint_session * session, } void bolliger_mabillard_track_right_large_half_loop_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_right_large_half_loop_up(session, rideIndex, 6 - trackSequence, direction, height, mapElement, @@ -10857,7 +10857,7 @@ void bolliger_mabillard_track_right_large_half_loop_down(paint_session * session } void bolliger_mabillard_track_left_large_half_loop_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement, + uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_left_large_half_loop_up(session, rideIndex, 6 - trackSequence, direction, height, mapElement, @@ -10866,7 +10866,7 @@ void bolliger_mabillard_track_left_large_half_loop_down(paint_session * session, void bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement, sint32 supportType) + rct_tile_element * mapElement, sint32 supportType) { switch (trackSequence) { @@ -10951,14 +10951,14 @@ void bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up(paint_sess void bolliger_mabillard_track_inverted_flat_to_90_deg_quarter_loop_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement, sint32 supportType) + rct_tile_element * mapElement, sint32 supportType) { bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up(session, rideIndex, 2 - trackSequence, direction, height, mapElement, supportType); } void bolliger_mabillard_track_booster(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement, sint32 supportType) + sint32 height, rct_tile_element * mapElement, sint32 supportType) { // These offsets could be moved to the g2.dat file when that supports offsets. sint8 ne_sw_offsetX = 8; diff --git a/src/openrct2/ride/coaster/BolligerMabillardTrack.h b/src/openrct2/ride/coaster/BolligerMabillardTrack.h index 1738cc283f..3d2cbb5f22 100644 --- a/src/openrct2/ride/coaster/BolligerMabillardTrack.h +++ b/src/openrct2/ride/coaster/BolligerMabillardTrack.h @@ -14,187 +14,187 @@ *****************************************************************************/ #pragma endregion -void bolliger_mabillard_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_banked_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_banked_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_s_bend_left(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_s_bend_right(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_vertical_loop(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_vertical_loop(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_quarter_turn_1_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_quarter_turn_1_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_quarter_turn_1_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_quarter_turn_1_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_25_deg_up_left_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_25_deg_up_right_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_on_ride_photo(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_25_deg_down_left_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_25_deg_down_right_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_90_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_90_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_60_deg_up_to_90_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_90_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_90_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_60_deg_down_to_90_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_diag_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_diag_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_diag_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_diag_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_diag_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_diag_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_diag_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_diag_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_diag_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_diag_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_diag_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_diag_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_diag_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_diag_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_diag_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_diag_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_diag_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_diag_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_diag_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_diag_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_diag_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_diag_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_diag_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_diag_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_diag_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_diag_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_diag_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_bank_to_left_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_bank_to_right_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_block_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_25_deg_up_to_left_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_25_deg_up_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_banked_25_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_banked_25_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_25_deg_down_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_25_deg_down_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_banked_25_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_banked_25_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_banked_25_deg_up_to_left_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_banked_25_deg_up_to_right_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_banked_25_deg_down_to_left_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_banked_25_deg_down_to_right_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_flat_to_left_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_flat_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_banked_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_banked_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_flat_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_flat_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_banked_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_banked_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_quarter_turn_1_90_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_quarter_turn_1_90_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_quarter_turn_1_90_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_quarter_turn_1_90_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_banked_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_banked_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_s_bend_left(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_s_bend_right(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_vertical_loop(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_vertical_loop(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_quarter_turn_1_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_quarter_turn_1_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_quarter_turn_1_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_quarter_turn_1_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_up_left_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_up_right_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_on_ride_photo(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_down_left_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_down_right_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_90_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_90_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_60_deg_up_to_90_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_90_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_90_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_60_deg_down_to_90_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_bank_to_left_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_bank_to_right_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_block_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_up_to_left_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_up_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_banked_25_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_banked_25_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_down_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_25_deg_down_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_banked_25_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_banked_25_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_banked_25_deg_up_to_left_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_banked_25_deg_up_to_right_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_banked_25_deg_down_to_left_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_banked_25_deg_down_to_right_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_flat_to_left_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_flat_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_banked_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_banked_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_flat_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_flat_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_banked_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_banked_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_quarter_turn_1_90_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_quarter_turn_1_90_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_quarter_turn_1_90_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_quarter_turn_1_90_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); /* Previously specific to the Vertical RC */ -void bolliger_mabillard_track_flat_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_60_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_flat_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_60_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_brake_for_drop(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_diag_flat_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_diag_60_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_diag_flat_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_diag_60_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_flat_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_60_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_flat_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_60_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_brake_for_drop(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_flat_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_60_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_flat_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_diag_60_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); /* Previously specific to the Steel Twister */ -void bolliger_mabillard_track_half_loop_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_half_loop_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_corkscrew_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_corkscrew_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_corkscrew_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_corkscrew_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_flat_to_60_deg_up_long_base(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_60_deg_up_to_flat_long_base(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_flat_to_60_deg_down_long_base(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_60_deg_up_to_flat_long_base122(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_barrel_roll_up_to_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_barrel_roll_up_to_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_barrel_roll_down_to_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_barrel_roll_down_to_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_powered_lift(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_large_half_loop_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_large_half_loop_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_right_large_half_loop_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_left_large_half_loop_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_inverted_flat_to_90_deg_quarter_loop_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_half_loop_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_half_loop_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_corkscrew_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_corkscrew_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_corkscrew_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_corkscrew_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_flat_to_60_deg_up_long_base(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_60_deg_up_to_flat_long_base(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_flat_to_60_deg_down_long_base(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_60_deg_up_to_flat_long_base122(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_barrel_roll_up_to_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_barrel_roll_up_to_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_barrel_roll_down_to_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_barrel_roll_down_to_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_powered_lift(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_large_half_loop_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_large_half_loop_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_right_large_half_loop_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_left_large_half_loop_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_inverted_flat_to_90_deg_quarter_loop_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); -void bolliger_mabillard_track_booster(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, sint32 supportType); +void bolliger_mabillard_track_booster(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, sint32 supportType); diff --git a/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp b/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp index aafc25b5c7..266298b744 100644 --- a/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp +++ b/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" #include "../../paint/paint.h" #include "../../paint/supports.h" #include "../../sprites.h" @@ -28,7 +28,7 @@ /** rct2: 0x008AE6E0 */ static void compact_inverted_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -77,7 +77,7 @@ static void compact_inverted_rc_track_flat(paint_session * session, uint8 rideIn /** rct2: 0x008AE950, 0x008AE960, 0x008AE970 */ static void compact_inverted_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][3] = { { SPR_STATION_BASE_C_SW_NE, 26557, SPR_STATION_INVERTED_BAR_A_SW_NE }, @@ -102,7 +102,7 @@ static void compact_inverted_rc_track_station(paint_session * session, uint8 rid /** rct2: 0x008AE6F0 */ static void compact_inverted_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -187,7 +187,7 @@ static void compact_inverted_rc_track_25_deg_up(paint_session * session, uint8 r /** rct2: 0x008AE700 */ static void compact_inverted_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -248,7 +248,7 @@ static void compact_inverted_rc_track_60_deg_up(paint_session * session, uint8 r /** rct2: 0x008AE710 */ static void compact_inverted_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -333,7 +333,7 @@ static void compact_inverted_rc_track_flat_to_25_deg_up(paint_session * session, /** rct2: 0x008AE720 */ static void compact_inverted_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -402,7 +402,7 @@ static void compact_inverted_rc_track_25_deg_up_to_60_deg_up(paint_session * ses /** rct2: 0x008AE730 */ static void compact_inverted_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -495,7 +495,7 @@ static void compact_inverted_rc_track_60_deg_up_to_25_deg_up(paint_session * ses /** rct2: 0x008AE740 */ static void compact_inverted_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -580,28 +580,28 @@ static void compact_inverted_rc_track_25_deg_up_to_flat(paint_session * session, /** rct2: 0x008AE750 */ static void compact_inverted_rc_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { compact_inverted_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AE760 */ static void compact_inverted_rc_track_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { compact_inverted_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AE770 */ static void compact_inverted_rc_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { compact_inverted_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AE780 */ static void compact_inverted_rc_track_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { compact_inverted_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -609,7 +609,7 @@ static void compact_inverted_rc_track_25_deg_down_to_60_deg_down(paint_session * /** rct2: 0x008AE790 */ static void compact_inverted_rc_track_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { compact_inverted_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -617,14 +617,14 @@ static void compact_inverted_rc_track_60_deg_down_to_25_deg_down(paint_session * /** rct2: 0x008AE7A0 */ static void compact_inverted_rc_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { compact_inverted_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AE7B0 */ static void compact_inverted_rc_track_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -781,7 +781,7 @@ static void compact_inverted_rc_track_left_quarter_turn_5(paint_session * sessio /** rct2: 0x008AE7C0 */ static void compact_inverted_rc_track_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; compact_inverted_rc_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -789,7 +789,7 @@ static void compact_inverted_rc_track_right_quarter_turn_5(paint_session * sessi /** rct2: 0x008AE7D0 */ static void compact_inverted_rc_track_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -827,7 +827,7 @@ static void compact_inverted_rc_track_flat_to_left_bank(paint_session * session, /** rct2: 0x008AE7E0 */ static void compact_inverted_rc_track_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -865,7 +865,7 @@ static void compact_inverted_rc_track_flat_to_right_bank(paint_session * session /** rct2: 0x008AE7F0 */ static void compact_inverted_rc_track_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -903,7 +903,7 @@ static void compact_inverted_rc_track_left_bank_to_flat(paint_session * session, /** rct2: 0x008AE800 */ static void compact_inverted_rc_track_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -941,7 +941,7 @@ static void compact_inverted_rc_track_right_bank_to_flat(paint_session * session /** rct2: 0x008AE810 */ static void compact_inverted_rc_track_banked_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1098,7 +1098,7 @@ static void compact_inverted_rc_track_banked_left_quarter_turn_5(paint_session * /** rct2: 0x008AE820 */ static void compact_inverted_rc_track_banked_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; compact_inverted_rc_track_banked_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, @@ -1107,7 +1107,7 @@ static void compact_inverted_rc_track_banked_right_quarter_turn_5(paint_session /** rct2: 0x008AE830 */ static void compact_inverted_rc_track_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1169,7 +1169,7 @@ static void compact_inverted_rc_track_left_bank_to_25_deg_up(paint_session * ses /** rct2: 0x008AE840 */ static void compact_inverted_rc_track_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1231,7 +1231,7 @@ static void compact_inverted_rc_track_right_bank_to_25_deg_up(paint_session * se /** rct2: 0x008AE850 */ static void compact_inverted_rc_track_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1293,7 +1293,7 @@ static void compact_inverted_rc_track_25_deg_up_to_left_bank(paint_session * ses /** rct2: 0x008AE860 */ static void compact_inverted_rc_track_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1355,7 +1355,7 @@ static void compact_inverted_rc_track_25_deg_up_to_right_bank(paint_session * se /** rct2: 0x008AE870 */ static void compact_inverted_rc_track_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { compact_inverted_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -1363,7 +1363,7 @@ static void compact_inverted_rc_track_left_bank_to_25_deg_down(paint_session * s /** rct2: 0x008AE880 */ static void compact_inverted_rc_track_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { compact_inverted_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -1371,7 +1371,7 @@ static void compact_inverted_rc_track_right_bank_to_25_deg_down(paint_session * /** rct2: 0x008AE890 */ static void compact_inverted_rc_track_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { compact_inverted_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -1379,7 +1379,7 @@ static void compact_inverted_rc_track_25_deg_down_to_left_bank(paint_session * s /** rct2: 0x008AE8A0 */ static void compact_inverted_rc_track_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { compact_inverted_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -1387,7 +1387,7 @@ static void compact_inverted_rc_track_25_deg_down_to_right_bank(paint_session * /** rct2: 0x008AE8B0 */ static void compact_inverted_rc_track_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1425,7 +1425,7 @@ static void compact_inverted_rc_track_left_bank(paint_session * session, uint8 r /** rct2: 0x008AE8C0 */ static void compact_inverted_rc_track_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { compact_inverted_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } @@ -1433,7 +1433,7 @@ static void compact_inverted_rc_track_right_bank(paint_session * session, uint8 /** rct2: 0x008AE8D0 */ static void compact_inverted_rc_track_left_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -1576,7 +1576,7 @@ static void compact_inverted_rc_track_left_quarter_turn_5_25_deg_up(paint_sessio /** rct2: 0x008AE8E0 */ static void compact_inverted_rc_track_right_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -1719,7 +1719,7 @@ static void compact_inverted_rc_track_right_quarter_turn_5_25_deg_up(paint_sessi /** rct2: 0x008AE8F0 */ static void compact_inverted_rc_track_left_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; compact_inverted_rc_track_right_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, @@ -1729,7 +1729,7 @@ static void compact_inverted_rc_track_left_quarter_turn_5_25_deg_down(paint_sess /** rct2: 0x008AE900 */ static void compact_inverted_rc_track_right_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; compact_inverted_rc_track_left_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, @@ -1738,7 +1738,7 @@ static void compact_inverted_rc_track_right_quarter_turn_5_25_deg_down(paint_ses /** rct2: 0x008AE910 */ static void compact_inverted_rc_track_s_bend_left(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1890,7 +1890,7 @@ static void compact_inverted_rc_track_s_bend_left(paint_session * session, uint8 /** rct2: 0x008AE920 */ static void compact_inverted_rc_track_s_bend_right(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2042,7 +2042,7 @@ static void compact_inverted_rc_track_s_bend_right(paint_session * session, uint /** rct2: 0x008AE930 */ static void compact_inverted_rc_track_left_vertical_loop(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2312,7 +2312,7 @@ static void compact_inverted_rc_track_left_vertical_loop(paint_session * session /** rct2: 0x008AE940 */ static void compact_inverted_rc_track_right_vertical_loop(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2582,7 +2582,7 @@ static void compact_inverted_rc_track_right_vertical_loop(paint_session * sessio /** rct2: 0x008AE980 */ static void compact_inverted_rc_track_left_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2688,7 +2688,7 @@ static void compact_inverted_rc_track_left_quarter_turn_3(paint_session * sessio /** rct2: 0x008AE990 */ static void compact_inverted_rc_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; compact_inverted_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -2696,7 +2696,7 @@ static void compact_inverted_rc_track_right_quarter_turn_3(paint_session * sessi /** rct2: 0x008AE9A0 */ static void compact_inverted_rc_track_left_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2803,7 +2803,7 @@ static void compact_inverted_rc_track_left_quarter_turn_3_bank(paint_session * s /** rct2: 0x008AE9B0 */ static void compact_inverted_rc_track_right_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; compact_inverted_rc_track_left_quarter_turn_3_bank(session, rideIndex, trackSequence, (direction - 1) & 3, height, @@ -2813,7 +2813,7 @@ static void compact_inverted_rc_track_right_quarter_turn_3_bank(paint_session * /** rct2: 0x008AE9C0 */ static void compact_inverted_rc_track_left_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -2892,7 +2892,7 @@ static void compact_inverted_rc_track_left_quarter_turn_3_25_deg_up(paint_sessio /** rct2: 0x008AE9D0 */ static void compact_inverted_rc_track_right_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -2971,7 +2971,7 @@ static void compact_inverted_rc_track_right_quarter_turn_3_25_deg_up(paint_sessi /** rct2: 0x008AE9E0 */ static void compact_inverted_rc_track_left_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; compact_inverted_rc_track_right_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, @@ -2981,7 +2981,7 @@ static void compact_inverted_rc_track_left_quarter_turn_3_25_deg_down(paint_sess /** rct2: 0x008AE9F0 */ static void compact_inverted_rc_track_right_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; compact_inverted_rc_track_left_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, @@ -2990,7 +2990,7 @@ static void compact_inverted_rc_track_right_quarter_turn_3_25_deg_down(paint_ses /** rct2: 0x008AEA00 */ static void compact_inverted_rc_track_left_twist_down_to_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3084,7 +3084,7 @@ static void compact_inverted_rc_track_left_twist_down_to_up(paint_session * sess /** rct2: 0x008AEA10 */ static void compact_inverted_rc_track_right_twist_down_to_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3178,7 +3178,7 @@ static void compact_inverted_rc_track_right_twist_down_to_up(paint_session * ses /** rct2: 0x008AEA20 */ static void compact_inverted_rc_track_left_twist_up_to_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3272,7 +3272,7 @@ static void compact_inverted_rc_track_left_twist_up_to_down(paint_session * sess /** rct2: 0x008AEA30 */ static void compact_inverted_rc_track_right_twist_up_to_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3366,7 +3366,7 @@ static void compact_inverted_rc_track_right_twist_up_to_down(paint_session * ses /** rct2: 0x008AEA40 */ static void compact_inverted_rc_track_half_loop_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3501,14 +3501,14 @@ static void compact_inverted_rc_track_half_loop_up(paint_session * session, uint /** rct2: 0x008AEA50 */ static void compact_inverted_rc_track_half_loop_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { compact_inverted_rc_track_half_loop_up(session, rideIndex, 3 - trackSequence, direction, height, mapElement); } /** rct2: 0x008AEA60 */ static void compact_inverted_rc_track_left_corkscrew_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3613,7 +3613,7 @@ static void compact_inverted_rc_track_left_corkscrew_up(paint_session * session, /** rct2: 0x008AEA70 */ static void compact_inverted_rc_track_right_corkscrew_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3718,7 +3718,7 @@ static void compact_inverted_rc_track_right_corkscrew_up(paint_session * session /** rct2: 0x008AEA80 */ static void compact_inverted_rc_track_left_corkscrew_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { compact_inverted_rc_track_right_corkscrew_up(session, rideIndex, 2 - trackSequence, (direction + 1) & 3, height, mapElement); @@ -3726,7 +3726,7 @@ static void compact_inverted_rc_track_left_corkscrew_down(paint_session * sessio /** rct2: 0x008AEA90 */ static void compact_inverted_rc_track_right_corkscrew_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { compact_inverted_rc_track_left_corkscrew_up(session, rideIndex, 2 - trackSequence, (direction - 1) & 3, height, mapElement); } @@ -3734,7 +3734,7 @@ static void compact_inverted_rc_track_right_corkscrew_down(paint_session * sessi /** rct2: 0x008AEAD0 */ static void compact_inverted_rc_track_left_quarter_turn_1_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (direction) { @@ -3771,7 +3771,7 @@ static void compact_inverted_rc_track_left_quarter_turn_1_60_deg_up(paint_sessio /** rct2: 0x008AEAB0 */ static void compact_inverted_rc_track_right_quarter_turn_1_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (direction) { @@ -3808,7 +3808,7 @@ static void compact_inverted_rc_track_right_quarter_turn_1_60_deg_up(paint_sessi /** rct2: 0x008AEAC0 */ static void compact_inverted_rc_track_left_quarter_turn_1_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { compact_inverted_rc_track_right_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); @@ -3817,7 +3817,7 @@ static void compact_inverted_rc_track_left_quarter_turn_1_60_deg_down(paint_sess /** rct2: 0x008AEAE0 */ static void compact_inverted_rc_track_right_quarter_turn_1_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { compact_inverted_rc_track_left_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -3825,7 +3825,7 @@ static void compact_inverted_rc_track_right_quarter_turn_1_60_deg_down(paint_ses /** rct2: 0x008AEAA0 */ static void compact_inverted_rc_track_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -3856,7 +3856,7 @@ static void compact_inverted_rc_track_brakes(paint_session * session, uint8 ride /** rct2: 0x008AEAF0 */ static void compact_inverted_rc_track_left_quarter_banked_helix_large_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -4019,7 +4019,7 @@ static void compact_inverted_rc_track_left_quarter_banked_helix_large_up(paint_s /** rct2: 0x008AEB00 */ static void compact_inverted_rc_track_right_quarter_banked_helix_large_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -4182,7 +4182,7 @@ static void compact_inverted_rc_track_right_quarter_banked_helix_large_up(paint_ /** rct2: 0x008AEB10 */ static void compact_inverted_rc_track_left_quarter_banked_helix_large_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -4345,7 +4345,7 @@ static void compact_inverted_rc_track_left_quarter_banked_helix_large_down(paint /** rct2: 0x008AEB20 */ static void compact_inverted_rc_track_right_quarter_banked_helix_large_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -4507,7 +4507,7 @@ static void compact_inverted_rc_track_right_quarter_banked_helix_large_down(pain /** rct2: 0x008AEB30 */ static void compact_inverted_rc_track_on_ride_photo(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -4556,7 +4556,7 @@ static void compact_inverted_rc_track_on_ride_photo(paint_session * session, uin /** rct2: 0x008AEDB0 */ static void compact_inverted_rc_track_90_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4617,14 +4617,14 @@ static void compact_inverted_rc_track_90_deg_up(paint_session * session, uint8 r /** rct2: 0x008AEDC0 */ static void compact_inverted_rc_track_90_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { compact_inverted_rc_track_90_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AED70 */ static void compact_inverted_rc_track_60_deg_up_to_90_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4689,7 +4689,7 @@ static void compact_inverted_rc_track_60_deg_up_to_90_deg_up(paint_session * ses /** rct2: 0x008AED80 */ static void compact_inverted_rc_track_90_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { compact_inverted_rc_track_60_deg_up_to_90_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -4697,7 +4697,7 @@ static void compact_inverted_rc_track_90_deg_down_to_60_deg_down(paint_session * /** rct2: 0x008AED90 */ static void compact_inverted_rc_track_90_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -4759,7 +4759,7 @@ static void compact_inverted_rc_track_90_deg_up_to_60_deg_up(paint_session * ses /** rct2: 0x008AEDA0 */ static void compact_inverted_rc_track_60_deg_down_to_90_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4823,7 +4823,7 @@ static void compact_inverted_rc_track_60_deg_down_to_90_deg_down(paint_session * /** rct2: 0x008AEB40 */ static void compact_inverted_rc_track_left_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4967,7 +4967,7 @@ static void compact_inverted_rc_track_left_eighth_to_diag(paint_session * sessio /** rct2: 0x008AEB50 */ static void compact_inverted_rc_track_right_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5111,7 +5111,7 @@ static void compact_inverted_rc_track_right_eighth_to_diag(paint_session * sessi /** rct2: 0x008AEB60 */ static void compact_inverted_rc_track_left_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; compact_inverted_rc_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -5119,7 +5119,7 @@ static void compact_inverted_rc_track_left_eighth_to_orthogonal(paint_session * /** rct2: 0x008AEB70 */ static void compact_inverted_rc_track_right_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; compact_inverted_rc_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); @@ -5127,7 +5127,7 @@ static void compact_inverted_rc_track_right_eighth_to_orthogonal(paint_session * /** rct2: 0x008AED30 */ static void compact_inverted_rc_track_left_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5272,7 +5272,7 @@ static void compact_inverted_rc_track_left_eighth_bank_to_diag(paint_session * s /** rct2: 0x008AED40 */ static void compact_inverted_rc_track_right_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5418,7 +5418,7 @@ static void compact_inverted_rc_track_right_eighth_bank_to_diag(paint_session * /** rct2: 0x008AED50 */ static void compact_inverted_rc_track_left_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; compact_inverted_rc_track_right_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, @@ -5428,7 +5428,7 @@ static void compact_inverted_rc_track_left_eighth_bank_to_orthogonal(paint_sessi /** rct2: 0x008AED60 */ static void compact_inverted_rc_track_right_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; compact_inverted_rc_track_left_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, @@ -5437,7 +5437,7 @@ static void compact_inverted_rc_track_right_eighth_bank_to_orthogonal(paint_sess /** rct2: 0x008AEB80 */ static void compact_inverted_rc_track_diag_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5567,7 +5567,7 @@ static void compact_inverted_rc_track_diag_flat(paint_session * session, uint8 r /** rct2: 0x008AEBB0 */ static void compact_inverted_rc_track_diag_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5697,7 +5697,7 @@ static void compact_inverted_rc_track_diag_25_deg_up(paint_session * session, ui /** rct2: 0x008AEC10 */ static void compact_inverted_rc_track_diag_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5775,7 +5775,7 @@ static void compact_inverted_rc_track_diag_60_deg_up(paint_session * session, ui /** rct2: 0x008AEB90 */ static void compact_inverted_rc_track_diag_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5905,7 +5905,7 @@ static void compact_inverted_rc_track_diag_flat_to_25_deg_up(paint_session * ses /** rct2: 0x008AEBF0 */ static void compact_inverted_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5983,7 +5983,7 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_60_deg_up(paint_session /** rct2: 0x008AEC00 */ static void compact_inverted_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6061,7 +6061,7 @@ static void compact_inverted_rc_track_diag_60_deg_up_to_25_deg_up(paint_session /** rct2: 0x008AEBA0 */ static void compact_inverted_rc_track_diag_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6191,7 +6191,7 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_flat(paint_session * ses /** rct2: 0x008AEBE0 */ static void compact_inverted_rc_track_diag_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6321,7 +6321,7 @@ static void compact_inverted_rc_track_diag_25_deg_down(paint_session * session, /** rct2: 0x008AEC40 */ static void compact_inverted_rc_track_diag_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6399,7 +6399,7 @@ static void compact_inverted_rc_track_diag_60_deg_down(paint_session * session, /** rct2: 0x008AEBC0 */ static void compact_inverted_rc_track_diag_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6527,7 +6527,7 @@ static void compact_inverted_rc_track_diag_flat_to_25_deg_down(paint_session * s /** rct2: 0x008AEC20 */ static void compact_inverted_rc_track_diag_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -6606,7 +6606,7 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_60_deg_down(paint_sess /** rct2: 0x008AEC30 */ static void compact_inverted_rc_track_diag_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -6684,7 +6684,7 @@ static void compact_inverted_rc_track_diag_60_deg_down_to_25_deg_down(paint_sess /** rct2: 0x008AEBD0 */ static void compact_inverted_rc_track_diag_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6814,7 +6814,7 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_flat(paint_session * s /** rct2: 0x008AEC70 */ static void compact_inverted_rc_track_diag_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6893,7 +6893,7 @@ static void compact_inverted_rc_track_diag_flat_to_left_bank(paint_session * ses /** rct2: 0x008AEC80 */ static void compact_inverted_rc_track_diag_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6972,7 +6972,7 @@ static void compact_inverted_rc_track_diag_flat_to_right_bank(paint_session * se /** rct2: 0x008AEC90 */ static void compact_inverted_rc_track_diag_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7051,7 +7051,7 @@ static void compact_inverted_rc_track_diag_left_bank_to_flat(paint_session * ses /** rct2: 0x008AECA0 */ static void compact_inverted_rc_track_diag_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7130,7 +7130,7 @@ static void compact_inverted_rc_track_diag_right_bank_to_flat(paint_session * se /** rct2: 0x008AECD0 */ static void compact_inverted_rc_track_diag_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7209,7 +7209,7 @@ static void compact_inverted_rc_track_diag_left_bank_to_25_deg_up(paint_session /** rct2: 0x008AECE0 */ static void compact_inverted_rc_track_diag_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -7287,7 +7287,7 @@ static void compact_inverted_rc_track_diag_right_bank_to_25_deg_up(paint_session /** rct2: 0x008AECB0 */ static void compact_inverted_rc_track_diag_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7366,7 +7366,7 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_left_bank(paint_session /** rct2: 0x008AECC0 */ static void compact_inverted_rc_track_diag_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -7445,7 +7445,7 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_right_bank(paint_session /** rct2: 0x008AECF0 */ static void compact_inverted_rc_track_diag_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -7521,7 +7521,7 @@ static void compact_inverted_rc_track_diag_left_bank_to_25_deg_down(paint_sessio /** rct2: 0x008AED00 */ static void compact_inverted_rc_track_diag_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -7597,7 +7597,7 @@ static void compact_inverted_rc_track_diag_right_bank_to_25_deg_down(paint_sessi /** rct2: 0x008AED10 */ static void compact_inverted_rc_track_diag_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -7676,7 +7676,7 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_left_bank(paint_sessio /** rct2: 0x008AED20 */ static void compact_inverted_rc_track_diag_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -7754,7 +7754,7 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_right_bank(paint_sessi /** rct2: 0x008AEC50 */ static void compact_inverted_rc_track_diag_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7833,7 +7833,7 @@ static void compact_inverted_rc_track_diag_left_bank(paint_session * session, ui /** rct2: 0x008AEC60 */ static void compact_inverted_rc_track_diag_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7912,7 +7912,7 @@ static void compact_inverted_rc_track_diag_right_bank(paint_session * session, u /** rct2: 0x008AEAA0 */ static void compact_inverted_rc_track_block_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { diff --git a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp index 60f1180640..1b47a68036 100644 --- a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" #include "../../paint/paint.h" #include "../../paint/supports.h" #include "../../sprites.h" @@ -28,7 +28,7 @@ /** rct2: 0x008A7AF8 */ static void corkscrew_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -84,7 +84,7 @@ static void corkscrew_rc_track_flat(paint_session * session, uint8 rideIndex, ui /** rct2: 0x008A7D68, 0x008A7D78, 0x008A7D88 */ static void corkscrew_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][3] = { { 16236, 16232, SPR_STATION_BASE_A_SW_NE }, @@ -114,7 +114,7 @@ static void corkscrew_rc_track_station(paint_session * session, uint8 rideIndex, /** rct2: 0x008A7B08 */ static void corkscrew_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -183,7 +183,7 @@ static void corkscrew_rc_track_25_deg_up(paint_session * session, uint8 rideInde /** rct2: 0x008A7B18 */ static void corkscrew_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -252,7 +252,7 @@ static void corkscrew_rc_track_60_deg_up(paint_session * session, uint8 rideInde /** rct2: 0x008A7B28 */ static void corkscrew_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -321,7 +321,7 @@ static void corkscrew_rc_track_flat_to_25_deg_up(paint_session * session, uint8 /** rct2: 0x008A7B38 */ static void corkscrew_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -398,7 +398,7 @@ static void corkscrew_rc_track_25_deg_up_to_60_deg_up(paint_session * session, u /** rct2: 0x008A7B48 */ static void corkscrew_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -475,7 +475,7 @@ static void corkscrew_rc_track_60_deg_up_to_25_deg_up(paint_session * session, u /** rct2: 0x008A7B58 */ static void corkscrew_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -544,49 +544,49 @@ static void corkscrew_rc_track_25_deg_up_to_flat(paint_session * session, uint8 /** rct2: 0x008A7B68 */ static void corkscrew_rc_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { corkscrew_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A7B78 */ static void corkscrew_rc_track_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { corkscrew_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A7B88 */ static void corkscrew_rc_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { corkscrew_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A7B98 */ static void corkscrew_rc_track_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { corkscrew_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A7BA8 */ static void corkscrew_rc_track_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { corkscrew_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A7BB8 */ static void corkscrew_rc_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { corkscrew_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A7BC8 */ static void corkscrew_rc_track_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -740,7 +740,7 @@ static void corkscrew_rc_track_left_quarter_turn_5(paint_session * session, uint /** rct2: 0x008A7BD8 */ static void corkscrew_rc_track_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; corkscrew_rc_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -748,7 +748,7 @@ static void corkscrew_rc_track_right_quarter_turn_5(paint_session * session, uin /** rct2: 0x008A7BE8 */ static void corkscrew_rc_track_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -785,7 +785,7 @@ static void corkscrew_rc_track_flat_to_left_bank(paint_session * session, uint8 /** rct2: 0x008A7BF8 */ static void corkscrew_rc_track_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -822,7 +822,7 @@ static void corkscrew_rc_track_flat_to_right_bank(paint_session * session, uint8 /** rct2: 0x008A7C08 */ static void corkscrew_rc_track_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -859,7 +859,7 @@ static void corkscrew_rc_track_left_bank_to_flat(paint_session * session, uint8 /** rct2: 0x008A7C18 */ static void corkscrew_rc_track_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -896,7 +896,7 @@ static void corkscrew_rc_track_right_bank_to_flat(paint_session * session, uint8 /** rct2: 0x008A7C28 */ static void corkscrew_rc_track_banked_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1054,7 +1054,7 @@ static void corkscrew_rc_track_banked_left_quarter_turn_5(paint_session * sessio /** rct2: 0x008A7C38 */ static void corkscrew_rc_track_banked_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; corkscrew_rc_track_banked_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -1062,7 +1062,7 @@ static void corkscrew_rc_track_banked_right_quarter_turn_5(paint_session * sessi /** rct2: 0x008A7C48 */ static void corkscrew_rc_track_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1106,7 +1106,7 @@ static void corkscrew_rc_track_left_bank_to_25_deg_up(paint_session * session, u /** rct2: 0x008A7C58 */ static void corkscrew_rc_track_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1150,7 +1150,7 @@ static void corkscrew_rc_track_right_bank_to_25_deg_up(paint_session * session, /** rct2: 0x008A7C68 */ static void corkscrew_rc_track_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1194,7 +1194,7 @@ static void corkscrew_rc_track_25_deg_up_to_left_bank(paint_session * session, u /** rct2: 0x008A7C78 */ static void corkscrew_rc_track_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1238,35 +1238,35 @@ static void corkscrew_rc_track_25_deg_up_to_right_bank(paint_session * session, /** rct2: 0x008A7C88 */ static void corkscrew_rc_track_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { corkscrew_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A7C98 */ static void corkscrew_rc_track_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { corkscrew_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A7CA8 */ static void corkscrew_rc_track_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { corkscrew_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A7CB8 */ static void corkscrew_rc_track_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { corkscrew_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A7CC8 */ static void corkscrew_rc_track_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1299,14 +1299,14 @@ static void corkscrew_rc_track_left_bank(paint_session * session, uint8 rideInde /** rct2: 0x008A7CD8 */ static void corkscrew_rc_track_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { corkscrew_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A7CE8 */ static void corkscrew_rc_track_left_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1455,7 +1455,7 @@ static void corkscrew_rc_track_left_quarter_turn_5_25_deg_up(paint_session * ses /** rct2: 0x008A7CF8 */ static void corkscrew_rc_track_right_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1604,7 +1604,7 @@ static void corkscrew_rc_track_right_quarter_turn_5_25_deg_up(paint_session * se /** rct2: 0x008A7D08 */ static void corkscrew_rc_track_left_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; corkscrew_rc_track_right_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, @@ -1613,7 +1613,7 @@ static void corkscrew_rc_track_left_quarter_turn_5_25_deg_down(paint_session * s /** rct2: 0x008A7D18 */ static void corkscrew_rc_track_right_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; corkscrew_rc_track_left_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, @@ -1622,7 +1622,7 @@ static void corkscrew_rc_track_right_quarter_turn_5_25_deg_down(paint_session * /** rct2: 0x008A7D28 */ static void corkscrew_rc_track_s_bend_left(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1746,7 +1746,7 @@ static void corkscrew_rc_track_s_bend_left(paint_session * session, uint8 rideIn /** rct2: 0x008A7D38 */ static void corkscrew_rc_track_s_bend_right(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1870,7 +1870,7 @@ static void corkscrew_rc_track_s_bend_right(paint_session * session, uint8 rideI /** rct2: 0x008A7D48 */ static void corkscrew_rc_track_left_vertical_loop(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2094,7 +2094,7 @@ static void corkscrew_rc_track_left_vertical_loop(paint_session * session, uint8 /** rct2: 0x008A7D58 */ static void corkscrew_rc_track_right_vertical_loop(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2286,7 +2286,7 @@ static void corkscrew_rc_track_right_vertical_loop(paint_session * session, uint /** rct2: 0x008A7D98 */ static void corkscrew_rc_track_left_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2385,7 +2385,7 @@ static void corkscrew_rc_track_left_quarter_turn_3(paint_session * session, uint /** rct2: 0x008A7DA8 */ static void corkscrew_rc_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; corkscrew_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -2393,7 +2393,7 @@ static void corkscrew_rc_track_right_quarter_turn_3(paint_session * session, uin /** rct2: 0x008A7DB8 */ static void corkscrew_rc_track_left_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2496,7 +2496,7 @@ static void corkscrew_rc_track_left_quarter_turn_3_bank(paint_session * session, /** rct2: 0x008A7DC8 */ static void corkscrew_rc_track_right_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; corkscrew_rc_track_left_quarter_turn_3_bank(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -2504,7 +2504,7 @@ static void corkscrew_rc_track_right_quarter_turn_3_bank(paint_session * session /** rct2: 0x008A7DD8 */ static void corkscrew_rc_track_left_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2574,7 +2574,7 @@ static void corkscrew_rc_track_left_quarter_turn_3_25_deg_up(paint_session * ses /** rct2: 0x008A7DE8 */ static void corkscrew_rc_track_right_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2647,7 +2647,7 @@ static void corkscrew_rc_track_right_quarter_turn_3_25_deg_up(paint_session * se /** rct2: 0x008A7DF8 */ static void corkscrew_rc_track_left_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; corkscrew_rc_track_right_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, @@ -2656,7 +2656,7 @@ static void corkscrew_rc_track_left_quarter_turn_3_25_deg_down(paint_session * s /** rct2: 0x008A7E08 */ static void corkscrew_rc_track_right_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; corkscrew_rc_track_left_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, @@ -2665,7 +2665,7 @@ static void corkscrew_rc_track_right_quarter_turn_3_25_deg_down(paint_session * /** rct2: 0x008A7E18 */ static void corkscrew_rc_track_half_loop_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2773,14 +2773,14 @@ static void corkscrew_rc_track_half_loop_up(paint_session * session, uint8 rideI /** rct2: 0x008A7E28 */ static void corkscrew_rc_track_half_loop_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { corkscrew_rc_track_half_loop_up(session, rideIndex, 3 - trackSequence, direction, height, mapElement); } /** rct2: 0x008A7E38 */ static void corkscrew_rc_track_left_corkscrew_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2878,7 +2878,7 @@ static void corkscrew_rc_track_left_corkscrew_up(paint_session * session, uint8 /** rct2: 0x008A7E48 */ static void corkscrew_rc_track_right_corkscrew_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2977,21 +2977,21 @@ static void corkscrew_rc_track_right_corkscrew_up(paint_session * session, uint8 /** rct2: 0x008A7E58 */ static void corkscrew_rc_track_left_corkscrew_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { corkscrew_rc_track_right_corkscrew_up(session, rideIndex, 2 - trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A7E68 */ static void corkscrew_rc_track_right_corkscrew_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { corkscrew_rc_track_left_corkscrew_up(session, rideIndex, 2 - trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A7E78 */ static void corkscrew_rc_track_left_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3192,7 +3192,7 @@ static void corkscrew_rc_track_left_half_banked_helix_up_small(paint_session * s /** rct2: 0x008A7E88 */ static void corkscrew_rc_track_right_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3393,7 +3393,7 @@ static void corkscrew_rc_track_right_half_banked_helix_up_small(paint_session * /** rct2: 0x008A7E98 */ static void corkscrew_rc_track_left_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 4) { @@ -3407,7 +3407,7 @@ static void corkscrew_rc_track_left_half_banked_helix_down_small(paint_session * /** rct2: 0x008A7EA8 */ static void corkscrew_rc_track_right_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 4) { @@ -3421,7 +3421,7 @@ static void corkscrew_rc_track_right_half_banked_helix_down_small(paint_session /** rct2: 0x008A7EB8 */ static void corkscrew_rc_track_left_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3732,7 +3732,7 @@ static void corkscrew_rc_track_left_half_banked_helix_up_large(paint_session * s /** rct2: 0x008A7EC8 */ static void corkscrew_rc_track_right_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4043,7 +4043,7 @@ static void corkscrew_rc_track_right_half_banked_helix_up_large(paint_session * /** rct2: 0x008A7ED8 */ static void corkscrew_rc_track_left_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 7) { @@ -4057,7 +4057,7 @@ static void corkscrew_rc_track_left_half_banked_helix_down_large(paint_session * /** rct2: 0x008A7EE8 */ static void corkscrew_rc_track_right_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 7) { @@ -4071,7 +4071,7 @@ static void corkscrew_rc_track_right_half_banked_helix_down_large(paint_session /** rct2: 0x008A7F18 */ static void corkscrew_rc_track_left_quarter_turn_1_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -4107,7 +4107,7 @@ static void corkscrew_rc_track_left_quarter_turn_1_60_deg_up(paint_session * ses /** rct2: 0x008A7EF8 */ static void corkscrew_rc_track_right_quarter_turn_1_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -4143,7 +4143,7 @@ static void corkscrew_rc_track_right_quarter_turn_1_60_deg_up(paint_session * se /** rct2: 0x008A7F08 */ static void corkscrew_rc_track_left_quarter_turn_1_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { corkscrew_rc_track_right_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); @@ -4151,7 +4151,7 @@ static void corkscrew_rc_track_left_quarter_turn_1_60_deg_down(paint_session * s /** rct2: 0x008A7F28 */ static void corkscrew_rc_track_right_quarter_turn_1_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { corkscrew_rc_track_left_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -4159,7 +4159,7 @@ static void corkscrew_rc_track_right_quarter_turn_1_60_deg_down(paint_session * /** rct2: 0x008A7F38 */ static void corkscrew_rc_track_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -4186,7 +4186,7 @@ static void corkscrew_rc_track_brakes(paint_session * session, uint8 rideIndex, /** rct2: 0x008A7F48 */ static void corkscrew_rc_track_on_ride_photo(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -4227,7 +4227,7 @@ static void corkscrew_rc_track_on_ride_photo(paint_session * session, uint8 ride /** rct2: 0x008A8198 */ static void corkscrew_rc_track_flat_to_60_deg_up_long_base(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4361,7 +4361,7 @@ static void corkscrew_rc_track_flat_to_60_deg_up_long_base(paint_session * sessi /** rct2: 0x008A81A8 */ static void corkscrew_rc_track_60_deg_up_to_flat_long_base(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4495,7 +4495,7 @@ static void corkscrew_rc_track_60_deg_up_to_flat_long_base(paint_session * sessi /** rct2: 0x008A81B8 */ static void corkscrew_rc_track_flat_to_60_deg_down_long_base(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { corkscrew_rc_track_flat_to_60_deg_up_long_base(session, rideIndex, 3 - trackSequence, (direction + 2) & 3, height, mapElement); @@ -4503,7 +4503,7 @@ static void corkscrew_rc_track_flat_to_60_deg_down_long_base(paint_session * ses /** rct2: 0x008A81C8 */ static void corkscrew_rc_track_60_deg_up_to_flat_long_base122(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { corkscrew_rc_track_60_deg_up_to_flat_long_base(session, rideIndex, 3 - trackSequence, (direction + 2) & 3, height, mapElement); @@ -4511,7 +4511,7 @@ static void corkscrew_rc_track_60_deg_up_to_flat_long_base122(paint_session * se /** rct2: 0x008A7F68 */ static void corkscrew_rc_track_left_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4635,7 +4635,7 @@ static void corkscrew_rc_track_left_eighth_to_diag(paint_session * session, uint /** rct2: 0x008A7F78 */ static void corkscrew_rc_track_right_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4759,7 +4759,7 @@ static void corkscrew_rc_track_right_eighth_to_diag(paint_session * session, uin /** rct2: 0x008A7F88 */ static void corkscrew_rc_track_left_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; corkscrew_rc_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -4767,7 +4767,7 @@ static void corkscrew_rc_track_left_eighth_to_orthogonal(paint_session * session /** rct2: 0x008A7F98 */ static void corkscrew_rc_track_right_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; corkscrew_rc_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); @@ -4775,7 +4775,7 @@ static void corkscrew_rc_track_right_eighth_to_orthogonal(paint_session * sessio /** rct2: 0x008A7FA8 */ static void corkscrew_rc_track_left_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4899,7 +4899,7 @@ static void corkscrew_rc_track_left_eighth_bank_to_diag(paint_session * session, /** rct2: 0x008A7FB8 */ static void corkscrew_rc_track_right_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5023,7 +5023,7 @@ static void corkscrew_rc_track_right_eighth_bank_to_diag(paint_session * session /** rct2: 0x008A7FC8 */ static void corkscrew_rc_track_left_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; corkscrew_rc_track_right_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -5031,7 +5031,7 @@ static void corkscrew_rc_track_left_eighth_bank_to_orthogonal(paint_session * se /** rct2: 0x008A7FD8 */ static void corkscrew_rc_track_right_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; corkscrew_rc_track_left_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); @@ -5039,7 +5039,7 @@ static void corkscrew_rc_track_right_eighth_bank_to_orthogonal(paint_session * s /** rct2: 0x008A7F58 */ static void corkscrew_rc_track_diag_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5176,7 +5176,7 @@ static void corkscrew_rc_track_diag_flat(paint_session * session, uint8 rideInde /** rct2: 0x008A8008 */ static void corkscrew_rc_track_diag_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5313,7 +5313,7 @@ static void corkscrew_rc_track_diag_25_deg_up(paint_session * session, uint8 rid /** rct2: 0x008A8068 */ static void corkscrew_rc_track_diag_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5450,7 +5450,7 @@ static void corkscrew_rc_track_diag_60_deg_up(paint_session * session, uint8 rid /** rct2: 0x008A7FE8 */ static void corkscrew_rc_track_diag_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5587,7 +5587,7 @@ static void corkscrew_rc_track_diag_flat_to_25_deg_up(paint_session * session, u /** rct2: 0x008A8048 */ static void corkscrew_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5724,7 +5724,7 @@ static void corkscrew_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * sessi /** rct2: 0x008A8058 */ static void corkscrew_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5861,7 +5861,7 @@ static void corkscrew_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * sessi /** rct2: 0x008A7FF8 */ static void corkscrew_rc_track_diag_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5998,7 +5998,7 @@ static void corkscrew_rc_track_diag_25_deg_up_to_flat(paint_session * session, u /** rct2: 0x008A8038 */ static void corkscrew_rc_track_diag_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6135,7 +6135,7 @@ static void corkscrew_rc_track_diag_25_deg_down(paint_session * session, uint8 r /** rct2: 0x008A8098 */ static void corkscrew_rc_track_diag_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6272,7 +6272,7 @@ static void corkscrew_rc_track_diag_60_deg_down(paint_session * session, uint8 r /** rct2: 0x008A8018 */ static void corkscrew_rc_track_diag_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6407,7 +6407,7 @@ static void corkscrew_rc_track_diag_flat_to_25_deg_down(paint_session * session, /** rct2: 0x008A8078 */ static void corkscrew_rc_track_diag_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6544,7 +6544,7 @@ static void corkscrew_rc_track_diag_25_deg_down_to_60_deg_down(paint_session * s /** rct2: 0x008A8088 */ static void corkscrew_rc_track_diag_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6681,7 +6681,7 @@ static void corkscrew_rc_track_diag_60_deg_down_to_25_deg_down(paint_session * s /** rct2: 0x008A8028 */ static void corkscrew_rc_track_diag_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6818,7 +6818,7 @@ static void corkscrew_rc_track_diag_25_deg_down_to_flat(paint_session * session, /** rct2: 0x008A80C8 */ static void corkscrew_rc_track_diag_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6887,7 +6887,7 @@ static void corkscrew_rc_track_diag_flat_to_left_bank(paint_session * session, u /** rct2: 0x008A80D8 */ static void corkscrew_rc_track_diag_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6956,7 +6956,7 @@ static void corkscrew_rc_track_diag_flat_to_right_bank(paint_session * session, /** rct2: 0x008A80E8 */ static void corkscrew_rc_track_diag_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7025,7 +7025,7 @@ static void corkscrew_rc_track_diag_left_bank_to_flat(paint_session * session, u /** rct2: 0x008A80F8 */ static void corkscrew_rc_track_diag_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7094,7 +7094,7 @@ static void corkscrew_rc_track_diag_right_bank_to_flat(paint_session * session, /** rct2: 0x008A8128 */ static void corkscrew_rc_track_diag_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7163,7 +7163,7 @@ static void corkscrew_rc_track_diag_left_bank_to_25_deg_up(paint_session * sessi /** rct2: 0x008A8138 */ static void corkscrew_rc_track_diag_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7232,7 +7232,7 @@ static void corkscrew_rc_track_diag_right_bank_to_25_deg_up(paint_session * sess /** rct2: 0x008A8108 */ static void corkscrew_rc_track_diag_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7301,7 +7301,7 @@ static void corkscrew_rc_track_diag_25_deg_up_to_left_bank(paint_session * sessi /** rct2: 0x008A8118 */ static void corkscrew_rc_track_diag_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7370,7 +7370,7 @@ static void corkscrew_rc_track_diag_25_deg_up_to_right_bank(paint_session * sess /** rct2: 0x008A8148 */ static void corkscrew_rc_track_diag_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7437,7 +7437,7 @@ static void corkscrew_rc_track_diag_left_bank_to_25_deg_down(paint_session * ses /** rct2: 0x008A8158 */ static void corkscrew_rc_track_diag_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7504,7 +7504,7 @@ static void corkscrew_rc_track_diag_right_bank_to_25_deg_down(paint_session * se /** rct2: 0x008A8168 */ static void corkscrew_rc_track_diag_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7573,7 +7573,7 @@ static void corkscrew_rc_track_diag_25_deg_down_to_left_bank(paint_session * ses /** rct2: 0x008A8178 */ static void corkscrew_rc_track_diag_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7642,7 +7642,7 @@ static void corkscrew_rc_track_diag_25_deg_down_to_right_bank(paint_session * se /** rct2: 0x008A80A8 */ static void corkscrew_rc_track_diag_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7709,7 +7709,7 @@ static void corkscrew_rc_track_diag_left_bank(paint_session * session, uint8 rid /** rct2: 0x008A80B8 */ static void corkscrew_rc_track_diag_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7776,7 +7776,7 @@ static void corkscrew_rc_track_diag_right_bank(paint_session * session, uint8 ri /** rct2: 0x008A8188 */ static void corkscrew_rc_track_block_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -7799,7 +7799,7 @@ static void corkscrew_rc_track_block_brakes(paint_session * session, uint8 rideI } static void corkscrew_rc_track_booster(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!is_csg_loaded()) { diff --git a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp index eec2b03f54..3a8fae461f 100644 --- a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" #include "../../paint/paint.h" #include "../../paint/supports.h" #include "../../sprites.h" @@ -28,7 +28,7 @@ /** rct2: 0x007C6FF4 */ static void flying_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -135,7 +135,7 @@ static void flying_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 /** rct2: 0x007C7244, 0x007C7254, 0x007C7264 */ static void flying_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_inverted(mapElement)) { @@ -187,7 +187,7 @@ static void flying_rc_track_station(paint_session * session, uint8 rideIndex, ui /** rct2: 0x007C7004 */ static void flying_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -313,7 +313,7 @@ static void flying_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, /** rct2: 0x007C7014 */ static void flying_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -390,7 +390,7 @@ static void flying_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, /** rct2: 0x007C7024 */ static void flying_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -516,7 +516,7 @@ static void flying_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rid /** rct2: 0x007C7034 */ static void flying_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -601,7 +601,7 @@ static void flying_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uint /** rct2: 0x007C7044 */ static void flying_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -710,7 +710,7 @@ static void flying_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uint /** rct2: 0x007C7054 */ static void flying_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -836,49 +836,49 @@ static void flying_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rid /** rct2: 0x007C7064 */ static void flying_rc_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { flying_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C7074 */ static void flying_rc_track_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { flying_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C7084 */ static void flying_rc_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { flying_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C7094 */ static void flying_rc_track_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { flying_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C70A4 */ static void flying_rc_track_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { flying_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C70B4 */ static void flying_rc_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { flying_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C70C4 */ static void flying_rc_track_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -1200,7 +1200,7 @@ static void flying_rc_track_left_quarter_turn_5(paint_session * session, uint8 r /** rct2: 0x007C70D4 */ static void flying_rc_track_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; flying_rc_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -1208,7 +1208,7 @@ static void flying_rc_track_right_quarter_turn_5(paint_session * session, uint8 /** rct2: 0x007C70E4 */ static void flying_rc_track_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -1284,7 +1284,7 @@ static void flying_rc_track_flat_to_left_bank(paint_session * session, uint8 rid /** rct2: 0x007C70F4 */ static void flying_rc_track_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -1360,7 +1360,7 @@ static void flying_rc_track_flat_to_right_bank(paint_session * session, uint8 ri /** rct2: 0x007C7104 */ static void flying_rc_track_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -1436,7 +1436,7 @@ static void flying_rc_track_left_bank_to_flat(paint_session * session, uint8 rid /** rct2: 0x007C7114 */ static void flying_rc_track_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -1512,7 +1512,7 @@ static void flying_rc_track_right_bank_to_flat(paint_session * session, uint8 ri /** rct2: 0x007C7124 */ static void flying_rc_track_banked_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -1838,7 +1838,7 @@ static void flying_rc_track_banked_left_quarter_turn_5(paint_session * session, /** rct2: 0x007C7134 */ static void flying_rc_track_banked_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; flying_rc_track_banked_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -1846,7 +1846,7 @@ static void flying_rc_track_banked_right_quarter_turn_5(paint_session * session, /** rct2: 0x007C7144 */ static void flying_rc_track_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -1953,7 +1953,7 @@ static void flying_rc_track_left_bank_to_25_deg_up(paint_session * session, uint /** rct2: 0x007C7154 */ static void flying_rc_track_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -2060,7 +2060,7 @@ static void flying_rc_track_right_bank_to_25_deg_up(paint_session * session, uin /** rct2: 0x007C7164 */ static void flying_rc_track_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -2167,7 +2167,7 @@ static void flying_rc_track_25_deg_up_to_left_bank(paint_session * session, uint /** rct2: 0x007C7174 */ static void flying_rc_track_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -2274,35 +2274,35 @@ static void flying_rc_track_25_deg_up_to_right_bank(paint_session * session, uin /** rct2: 0x007C7184 */ static void flying_rc_track_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { flying_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C7194 */ static void flying_rc_track_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { flying_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C71A4 */ static void flying_rc_track_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { flying_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C71B4 */ static void flying_rc_track_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { flying_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C71C4 */ static void flying_rc_track_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -2374,14 +2374,14 @@ static void flying_rc_track_left_bank(paint_session * session, uint8 rideIndex, /** rct2: 0x007C71D4 */ static void flying_rc_track_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { flying_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C71E4 */ static void flying_rc_track_left_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -2698,7 +2698,7 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sessio /** rct2: 0x007C71F4 */ static void flying_rc_track_right_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -3015,7 +3015,7 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up(paint_session * sessi /** rct2: 0x007C7204 */ static void flying_rc_track_left_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; flying_rc_track_right_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); @@ -3023,7 +3023,7 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_down(paint_session * sess /** rct2: 0x007C7214 */ static void flying_rc_track_right_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; flying_rc_track_left_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -3031,7 +3031,7 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_down(paint_session * ses /** rct2: 0x007C7224 */ static void flying_rc_track_s_bend_left(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -3321,7 +3321,7 @@ static void flying_rc_track_s_bend_left(paint_session * session, uint8 rideIndex /** rct2: 0x007C7234 */ static void flying_rc_track_s_bend_right(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -3611,7 +3611,7 @@ static void flying_rc_track_s_bend_right(paint_session * session, uint8 rideInde /** rct2: 0x007C7274 */ static void flying_rc_track_left_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -3819,7 +3819,7 @@ static void flying_rc_track_left_quarter_turn_3(paint_session * session, uint8 r /** rct2: 0x007C7284 */ static void flying_rc_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; flying_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -3827,7 +3827,7 @@ static void flying_rc_track_right_quarter_turn_3(paint_session * session, uint8 /** rct2: 0x007C7294 */ static void flying_rc_track_left_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -4039,7 +4039,7 @@ static void flying_rc_track_left_quarter_turn_3_bank(paint_session * session, ui /** rct2: 0x007C72A4 */ static void flying_rc_track_right_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; flying_rc_track_left_quarter_turn_3_bank(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -4047,7 +4047,7 @@ static void flying_rc_track_right_quarter_turn_3_bank(paint_session * session, u /** rct2: 0x007C72B4 */ static void flying_rc_track_left_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -4205,7 +4205,7 @@ static void flying_rc_track_left_quarter_turn_3_25_deg_up(paint_session * sessio /** rct2: 0x007C72C4 */ static void flying_rc_track_right_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -4369,7 +4369,7 @@ static void flying_rc_track_right_quarter_turn_3_25_deg_up(paint_session * sessi /** rct2: 0x007C72D4 */ static void flying_rc_track_left_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; flying_rc_track_right_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); @@ -4377,7 +4377,7 @@ static void flying_rc_track_left_quarter_turn_3_25_deg_down(paint_session * sess /** rct2: 0x007C72E4 */ static void flying_rc_track_right_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; flying_rc_track_left_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -4385,7 +4385,7 @@ static void flying_rc_track_right_quarter_turn_3_25_deg_down(paint_session * ses /** rct2: 0x007C7314 */ static void flying_rc_track_left_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -4795,7 +4795,7 @@ static void flying_rc_track_left_half_banked_helix_up_small(paint_session * sess /** rct2: 0x007C7324 */ static void flying_rc_track_right_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -5205,7 +5205,7 @@ static void flying_rc_track_right_half_banked_helix_up_small(paint_session * ses /** rct2: 0x007C7334 */ static void flying_rc_track_left_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 4) { @@ -5219,7 +5219,7 @@ static void flying_rc_track_left_half_banked_helix_down_small(paint_session * se /** rct2: 0x007C7344 */ static void flying_rc_track_right_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 4) { @@ -5232,7 +5232,7 @@ static void flying_rc_track_right_half_banked_helix_down_small(paint_session * s /** rct2: 0x007C7354 */ static void flying_rc_track_left_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -5870,7 +5870,7 @@ static void flying_rc_track_left_half_banked_helix_up_large(paint_session * sess /** rct2: 0x007C7364 */ static void flying_rc_track_right_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -6508,7 +6508,7 @@ static void flying_rc_track_right_half_banked_helix_up_large(paint_session * ses /** rct2: 0x007C7374 */ static void flying_rc_track_left_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 7) { @@ -6522,7 +6522,7 @@ static void flying_rc_track_left_half_banked_helix_down_large(paint_session * se /** rct2: 0x007C7384 */ static void flying_rc_track_right_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 7) { @@ -6535,7 +6535,7 @@ static void flying_rc_track_right_half_banked_helix_down_large(paint_session * s /** rct2: 0x007C73B4 */ static void flying_rc_track_left_quarter_turn_1_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -6605,7 +6605,7 @@ static void flying_rc_track_left_quarter_turn_1_60_deg_up(paint_session * sessio /** rct2: 0x007C7394 */ static void flying_rc_track_right_quarter_turn_1_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -6674,21 +6674,21 @@ static void flying_rc_track_right_quarter_turn_1_60_deg_up(paint_session * sessi /** rct2: 0x007C73A4 */ static void flying_rc_track_left_quarter_turn_1_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { flying_rc_track_right_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x007C73C4 */ static void flying_rc_track_right_quarter_turn_1_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { flying_rc_track_left_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x007C73D4 */ static void flying_rc_track_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -6746,7 +6746,7 @@ static void flying_rc_track_brakes(paint_session * session, uint8 rideIndex, uin /** rct2: 0x007C7674 */ static void flying_rc_track_left_quarter_banked_helix_large_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -7074,7 +7074,7 @@ static void flying_rc_track_left_quarter_banked_helix_large_up(paint_session * s /** rct2: 0x007C7684 */ static void flying_rc_track_right_quarter_banked_helix_large_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -7402,7 +7402,7 @@ static void flying_rc_track_right_quarter_banked_helix_large_up(paint_session * /** rct2: 0x007C7694 */ static void flying_rc_track_left_quarter_banked_helix_large_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -7730,7 +7730,7 @@ static void flying_rc_track_left_quarter_banked_helix_large_down(paint_session * /** rct2: 0x007C76A4 */ static void flying_rc_track_right_quarter_banked_helix_large_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -8058,7 +8058,7 @@ static void flying_rc_track_right_quarter_banked_helix_large_down(paint_session /** rct2: 0x007C78B4 */ static void flying_rc_track_25_deg_up_left_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -8159,7 +8159,7 @@ static void flying_rc_track_25_deg_up_left_banked(paint_session * session, uint8 /** rct2: 0x007C78C4 */ static void flying_rc_track_25_deg_up_right_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -8260,7 +8260,7 @@ static void flying_rc_track_25_deg_up_right_banked(paint_session * session, uint /** rct2: 0x007C73E4 */ static void flying_rc_track_on_ride_photo(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -8358,21 +8358,21 @@ static void flying_rc_track_on_ride_photo(paint_session * session, uint8 rideInd /** rct2: 0x007C78D4 */ static void flying_rc_track_25_deg_down_left_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { flying_rc_track_25_deg_up_right_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C78E4 */ static void flying_rc_track_25_deg_down_right_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { flying_rc_track_25_deg_up_left_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C7404 */ static void flying_rc_track_left_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -8649,7 +8649,7 @@ static void flying_rc_track_left_eighth_to_diag(paint_session * session, uint8 r /** rct2: 0x007C7414 */ static void flying_rc_track_right_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -8926,7 +8926,7 @@ static void flying_rc_track_right_eighth_to_diag(paint_session * session, uint8 /** rct2: 0x007C7424 */ static void flying_rc_track_left_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; flying_rc_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -8934,7 +8934,7 @@ static void flying_rc_track_left_eighth_to_orthogonal(paint_session * session, u /** rct2: 0x007C7434 */ static void flying_rc_track_right_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; flying_rc_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); @@ -8942,7 +8942,7 @@ static void flying_rc_track_right_eighth_to_orthogonal(paint_session * session, /** rct2: 0x007C7444 */ static void flying_rc_track_left_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -9219,7 +9219,7 @@ static void flying_rc_track_left_eighth_bank_to_diag(paint_session * session, ui /** rct2: 0x007C7454 */ static void flying_rc_track_right_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -9496,7 +9496,7 @@ static void flying_rc_track_right_eighth_bank_to_diag(paint_session * session, u /** rct2: 0x007C7464 */ static void flying_rc_track_left_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; flying_rc_track_right_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -9504,7 +9504,7 @@ static void flying_rc_track_left_eighth_bank_to_orthogonal(paint_session * sessi /** rct2: 0x007C7474 */ static void flying_rc_track_right_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; flying_rc_track_left_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); @@ -9512,7 +9512,7 @@ static void flying_rc_track_right_eighth_bank_to_orthogonal(paint_session * sess /** rct2: 0x007C73F4 */ static void flying_rc_track_diag_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -9779,7 +9779,7 @@ static void flying_rc_track_diag_flat(paint_session * session, uint8 rideIndex, /** rct2: 0x007C74A4 */ static void flying_rc_track_diag_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -10046,7 +10046,7 @@ static void flying_rc_track_diag_25_deg_up(paint_session * session, uint8 rideIn /** rct2: 0x007C7504 */ static void flying_rc_track_diag_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -10261,7 +10261,7 @@ static void flying_rc_track_diag_60_deg_up(paint_session * session, uint8 rideIn /** rct2: 0x007C7484 */ static void flying_rc_track_diag_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -10528,7 +10528,7 @@ static void flying_rc_track_diag_flat_to_25_deg_up(paint_session * session, uint /** rct2: 0x007C74E4 */ static void flying_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -10743,7 +10743,7 @@ static void flying_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * session, /** rct2: 0x007C74F4 */ static void flying_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -10958,7 +10958,7 @@ static void flying_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * session, /** rct2: 0x007C7494 */ static void flying_rc_track_diag_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -11225,7 +11225,7 @@ static void flying_rc_track_diag_25_deg_up_to_flat(paint_session * session, uint /** rct2: 0x007C74D4 */ static void flying_rc_track_diag_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -11440,7 +11440,7 @@ static void flying_rc_track_diag_25_deg_down(paint_session * session, uint8 ride /** rct2: 0x007C7534 */ static void flying_rc_track_diag_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -11655,7 +11655,7 @@ static void flying_rc_track_diag_60_deg_down(paint_session * session, uint8 ride /** rct2: 0x007C74B4 */ static void flying_rc_track_diag_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -11863,7 +11863,7 @@ static void flying_rc_track_diag_flat_to_25_deg_down(paint_session * session, ui /** rct2: 0x007C7514 */ static void flying_rc_track_diag_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -12078,7 +12078,7 @@ static void flying_rc_track_diag_25_deg_down_to_60_deg_down(paint_session * sess /** rct2: 0x007C7524 */ static void flying_rc_track_diag_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -12293,7 +12293,7 @@ static void flying_rc_track_diag_60_deg_down_to_25_deg_down(paint_session * sess /** rct2: 0x007C74C4 */ static void flying_rc_track_diag_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -12508,7 +12508,7 @@ static void flying_rc_track_diag_25_deg_down_to_flat(paint_session * session, ui /** rct2: 0x007C7564 */ static void flying_rc_track_diag_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -12660,7 +12660,7 @@ static void flying_rc_track_diag_flat_to_left_bank(paint_session * session, uint /** rct2: 0x007C7574 */ static void flying_rc_track_diag_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -12812,7 +12812,7 @@ static void flying_rc_track_diag_flat_to_right_bank(paint_session * session, uin /** rct2: 0x007C7584 */ static void flying_rc_track_diag_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -12964,7 +12964,7 @@ static void flying_rc_track_diag_left_bank_to_flat(paint_session * session, uint /** rct2: 0x007C7594 */ static void flying_rc_track_diag_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -13116,7 +13116,7 @@ static void flying_rc_track_diag_right_bank_to_flat(paint_session * session, uin /** rct2: 0x007C75C4 */ static void flying_rc_track_diag_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -13267,7 +13267,7 @@ static void flying_rc_track_diag_left_bank_to_25_deg_up(paint_session * session, /** rct2: 0x007C75D4 */ static void flying_rc_track_diag_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -13418,7 +13418,7 @@ static void flying_rc_track_diag_right_bank_to_25_deg_up(paint_session * session /** rct2: 0x007C75A4 */ static void flying_rc_track_diag_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -13569,7 +13569,7 @@ static void flying_rc_track_diag_25_deg_up_to_left_bank(paint_session * session, /** rct2: 0x007C75B4 */ static void flying_rc_track_diag_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -13720,7 +13720,7 @@ static void flying_rc_track_diag_25_deg_up_to_right_bank(paint_session * session /** rct2: 0x007C75E4 */ static void flying_rc_track_diag_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -13864,7 +13864,7 @@ static void flying_rc_track_diag_left_bank_to_25_deg_down(paint_session * sessio /** rct2: 0x007C75F4 */ static void flying_rc_track_diag_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -14008,7 +14008,7 @@ static void flying_rc_track_diag_right_bank_to_25_deg_down(paint_session * sessi /** rct2: 0x007C7604 */ static void flying_rc_track_diag_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -14159,7 +14159,7 @@ static void flying_rc_track_diag_25_deg_down_to_left_bank(paint_session * sessio /** rct2: 0x007C7614 */ static void flying_rc_track_diag_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -14310,7 +14310,7 @@ static void flying_rc_track_diag_25_deg_down_to_right_bank(paint_session * sessi /** rct2: 0x007C7544 */ static void flying_rc_track_diag_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -14460,7 +14460,7 @@ static void flying_rc_track_diag_left_bank(paint_session * session, uint8 rideIn /** rct2: 0x007C7554 */ static void flying_rc_track_diag_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -14610,7 +14610,7 @@ static void flying_rc_track_diag_right_bank(paint_session * session, uint8 rideI /** rct2: 0x007C7624 */ static void flying_rc_track_left_flyer_twist_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -14828,7 +14828,7 @@ static void flying_rc_track_left_flyer_twist_up(paint_session * session, uint8 r /** rct2: 0x007C7634 */ static void flying_rc_track_right_flyer_twist_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -15046,7 +15046,7 @@ static void flying_rc_track_right_flyer_twist_up(paint_session * session, uint8 /** rct2: 0x007C7644 */ static void flying_rc_track_left_flyer_twist_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -15264,7 +15264,7 @@ static void flying_rc_track_left_flyer_twist_down(paint_session * session, uint8 /** rct2: 0x007C7654 */ static void flying_rc_track_right_flyer_twist_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -15482,7 +15482,7 @@ static void flying_rc_track_right_flyer_twist_down(paint_session * session, uint /** rct2: 0x007C72F4 */ static void flying_rc_track_flyer_half_loop_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -15718,7 +15718,7 @@ static void flying_rc_track_flyer_half_loop_up(paint_session * session, uint8 ri /** rct2: 0x007C7304 */ static void flying_rc_track_flyer_half_loop_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -15954,7 +15954,7 @@ static void flying_rc_track_flyer_half_loop_down(paint_session * session, uint8 /** rct2: 0x007C7664 */ static void flying_rc_track_block_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -16009,7 +16009,7 @@ static void flying_rc_track_block_brakes(paint_session * session, uint8 rideInde /** rct2: 0x007C76B4 */ static void flying_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -16170,7 +16170,7 @@ static void flying_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session * /** rct2: 0x007C76C4 */ static void flying_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -16338,7 +16338,7 @@ static void flying_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_session /** rct2: 0x007C76D4 */ static void flying_rc_track_left_banked_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; flying_rc_track_right_banked_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, @@ -16348,7 +16348,7 @@ static void flying_rc_track_left_banked_quarter_turn_3_25_deg_down(paint_session /** rct2: 0x007C76E4 */ static void flying_rc_track_right_banked_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; flying_rc_track_left_banked_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, @@ -16357,7 +16357,7 @@ static void flying_rc_track_right_banked_quarter_turn_3_25_deg_down(paint_sessio /** rct2: 0x007C76F4 */ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -16677,7 +16677,7 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * /** rct2: 0x007C7704 */ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -16998,7 +16998,7 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session /** rct2: 0x007C7714 */ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; flying_rc_track_right_banked_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, @@ -17008,7 +17008,7 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_down(paint_session /** rct2: 0x007C7724 */ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; flying_rc_track_left_banked_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, @@ -17017,7 +17017,7 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_down(paint_sessio /** rct2: 0x007C7734 */ static void flying_rc_track_25_deg_up_to_left_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -17120,7 +17120,7 @@ static void flying_rc_track_25_deg_up_to_left_banked_25_deg_up(paint_session * s /** rct2: 0x007C7744 */ static void flying_rc_track_25_deg_up_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -17223,7 +17223,7 @@ static void flying_rc_track_25_deg_up_to_right_banked_25_deg_up(paint_session * /** rct2: 0x007C7754 */ static void flying_rc_track_left_banked_25_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -17326,7 +17326,7 @@ static void flying_rc_track_left_banked_25_deg_up_to_25_deg_up(paint_session * s /** rct2: 0x007C7764 */ static void flying_rc_track_right_banked_25_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -17430,7 +17430,7 @@ static void flying_rc_track_right_banked_25_deg_up_to_25_deg_up(paint_session * /** rct2: 0x007C7774 */ static void flying_rc_track_25_deg_down_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { flying_rc_track_right_banked_25_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -17439,7 +17439,7 @@ static void flying_rc_track_25_deg_down_to_left_banked_25_deg_down(paint_session /** rct2: 0x007C7784 */ static void flying_rc_track_25_deg_down_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { flying_rc_track_left_banked_25_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -17448,7 +17448,7 @@ static void flying_rc_track_25_deg_down_to_right_banked_25_deg_down(paint_sessio /** rct2: 0x007C7794 */ static void flying_rc_track_left_banked_25_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { flying_rc_track_25_deg_up_to_right_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -17457,7 +17457,7 @@ static void flying_rc_track_left_banked_25_deg_down_to_25_deg_down(paint_session /** rct2: 0x007C77A4 */ static void flying_rc_track_right_banked_25_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { flying_rc_track_25_deg_up_to_left_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -17466,7 +17466,7 @@ static void flying_rc_track_right_banked_25_deg_down_to_25_deg_down(paint_sessio /** rct2: 0x007C77B4 */ static void flying_rc_track_left_banked_flat_to_left_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -17568,7 +17568,7 @@ static void flying_rc_track_left_banked_flat_to_left_banked_25_deg_up(paint_sess /** rct2: 0x007C77C4 */ static void flying_rc_track_right_banked_flat_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -17670,7 +17670,7 @@ static void flying_rc_track_right_banked_flat_to_right_banked_25_deg_up(paint_se /** rct2: 0x007C77F4 */ static void flying_rc_track_left_banked_25_deg_up_to_left_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -17772,7 +17772,7 @@ static void flying_rc_track_left_banked_25_deg_up_to_left_banked_flat(paint_sess /** rct2: 0x007C7804 */ static void flying_rc_track_right_banked_25_deg_up_to_right_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -17874,7 +17874,7 @@ static void flying_rc_track_right_banked_25_deg_up_to_right_banked_flat(paint_se /** rct2: 0x007C7814 */ static void flying_rc_track_left_banked_flat_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { flying_rc_track_right_banked_25_deg_up_to_right_banked_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -17883,7 +17883,7 @@ static void flying_rc_track_left_banked_flat_to_left_banked_25_deg_down(paint_se /** rct2: 0x007C7824 */ static void flying_rc_track_right_banked_flat_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { flying_rc_track_left_banked_25_deg_up_to_left_banked_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -17892,7 +17892,7 @@ static void flying_rc_track_right_banked_flat_to_right_banked_25_deg_down(paint_ /** rct2: 0x007C77D4 */ static void flying_rc_track_left_banked_25_deg_down_to_left_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { flying_rc_track_right_banked_flat_to_right_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -17901,7 +17901,7 @@ static void flying_rc_track_left_banked_25_deg_down_to_left_banked_flat(paint_se /** rct2: 0x007C77E4 */ static void flying_rc_track_right_banked_25_deg_down_to_right_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { flying_rc_track_left_banked_flat_to_left_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -17909,7 +17909,7 @@ static void flying_rc_track_right_banked_25_deg_down_to_right_banked_flat(paint_ /** rct2: 0x007C7834 */ static void flying_rc_track_flat_to_left_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -18012,7 +18012,7 @@ static void flying_rc_track_flat_to_left_banked_25_deg_up(paint_session * sessio /** rct2: 0x007C7844 */ static void flying_rc_track_flat_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -18115,7 +18115,7 @@ static void flying_rc_track_flat_to_right_banked_25_deg_up(paint_session * sessi /** rct2: 0x007C7854 */ static void flying_rc_track_left_banked_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -18218,7 +18218,7 @@ static void flying_rc_track_left_banked_25_deg_up_to_flat(paint_session * sessio /** rct2: 0x007C7864 */ static void flying_rc_track_right_banked_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -18321,28 +18321,28 @@ static void flying_rc_track_right_banked_25_deg_up_to_flat(paint_session * sessi /** rct2: 0x007C7874 */ static void flying_rc_track_flat_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { flying_rc_track_right_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C7884 */ static void flying_rc_track_flat_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { flying_rc_track_left_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C7894 */ static void flying_rc_track_left_banked_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { flying_rc_track_flat_to_right_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x007C78A4 */ static void flying_rc_track_right_banked_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { flying_rc_track_flat_to_left_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } diff --git a/src/openrct2/ride/coaster/GigaCoaster.cpp b/src/openrct2/ride/coaster/GigaCoaster.cpp index 1f099d83b6..82c873b7e8 100644 --- a/src/openrct2/ride/coaster/GigaCoaster.cpp +++ b/src/openrct2/ride/coaster/GigaCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" #include "../../paint/paint.h" #include "../../paint/supports.h" #include "../../sprites.h" @@ -28,7 +28,7 @@ /** rct2: 0x008AD674 */ static void giga_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { if (track_element_is_cable_lift(mapElement)) { @@ -103,7 +103,7 @@ static void giga_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 t } static void giga_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { static const uint32 imageIds[4][3] = { { 18084, 18076, SPR_STATION_BASE_A_SW_NE }, @@ -133,7 +133,7 @@ static void giga_rc_track_station(paint_session * session, uint8 rideIndex, uint /** rct2: 0x008AD684 */ static void giga_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_cable_lift(mapElement)) { @@ -228,7 +228,7 @@ static void giga_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, ui /** rct2: 0x008AD694 */ static void giga_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_cable_lift(mapElement)) { @@ -297,7 +297,7 @@ static void giga_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, ui /** rct2: 0x008AD6A4 */ static void giga_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_cable_lift(mapElement)) { @@ -392,7 +392,7 @@ static void giga_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rideI /** rct2: 0x008AD6B4 */ static void giga_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_cable_lift(mapElement)) { @@ -469,7 +469,7 @@ static void giga_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 /** rct2: 0x008AD6C4 */ static void giga_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_cable_lift(mapElement)) { @@ -546,7 +546,7 @@ static void giga_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 /** rct2: 0x008AD6D4 */ static void giga_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_cable_lift(mapElement)) { @@ -641,49 +641,49 @@ static void giga_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rideI /** rct2: 0x008AD6E4 */ static void giga_rc_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { giga_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AD6F4 */ static void giga_rc_track_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { giga_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AD704 */ static void giga_rc_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { giga_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AD714 */ static void giga_rc_track_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { giga_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AD724 */ static void giga_rc_track_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { giga_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AD734 */ static void giga_rc_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { giga_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AD744 */ static void giga_rc_track_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -837,7 +837,7 @@ static void giga_rc_track_left_quarter_turn_5(paint_session * session, uint8 rid /** rct2: 0x008AD754 */ static void giga_rc_track_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; giga_rc_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -845,7 +845,7 @@ static void giga_rc_track_right_quarter_turn_5(paint_session * session, uint8 ri /** rct2: 0x008AD764 */ static void giga_rc_track_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -882,7 +882,7 @@ static void giga_rc_track_flat_to_left_bank(paint_session * session, uint8 rideI /** rct2: 0x008AD774 */ static void giga_rc_track_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -919,7 +919,7 @@ static void giga_rc_track_flat_to_right_bank(paint_session * session, uint8 ride /** rct2: 0x008AD784 */ static void giga_rc_track_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -956,7 +956,7 @@ static void giga_rc_track_left_bank_to_flat(paint_session * session, uint8 rideI /** rct2: 0x008AD794 */ static void giga_rc_track_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -993,7 +993,7 @@ static void giga_rc_track_right_bank_to_flat(paint_session * session, uint8 ride /** rct2: 0x008AD7A4 */ static void giga_rc_track_banked_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1151,7 +1151,7 @@ static void giga_rc_track_banked_left_quarter_turn_5(paint_session * session, ui /** rct2: 0x008AD7B4 */ static void giga_rc_track_banked_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; giga_rc_track_banked_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -1159,7 +1159,7 @@ static void giga_rc_track_banked_right_quarter_turn_5(paint_session * session, u /** rct2: 0x008AD7C4 */ static void giga_rc_track_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1203,7 +1203,7 @@ static void giga_rc_track_left_bank_to_25_deg_up(paint_session * session, uint8 /** rct2: 0x008AD7D4 */ static void giga_rc_track_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1247,7 +1247,7 @@ static void giga_rc_track_right_bank_to_25_deg_up(paint_session * session, uint8 /** rct2: 0x008AD7E4 */ static void giga_rc_track_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1291,7 +1291,7 @@ static void giga_rc_track_25_deg_up_to_left_bank(paint_session * session, uint8 /** rct2: 0x008AD7F4 */ static void giga_rc_track_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1335,35 +1335,35 @@ static void giga_rc_track_25_deg_up_to_right_bank(paint_session * session, uint8 /** rct2: 0x008AD804 */ static void giga_rc_track_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { giga_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AD814 */ static void giga_rc_track_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { giga_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AD824 */ static void giga_rc_track_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { giga_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AD834 */ static void giga_rc_track_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { giga_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AD844 */ static void giga_rc_track_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1396,14 +1396,14 @@ static void giga_rc_track_left_bank(paint_session * session, uint8 rideIndex, ui /** rct2: 0x008AD854 */ static void giga_rc_track_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { giga_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AD864 */ static void giga_rc_track_left_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1552,7 +1552,7 @@ static void giga_rc_track_left_quarter_turn_5_25_deg_up(paint_session * session, /** rct2: 0x008AD874 */ static void giga_rc_track_right_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1701,7 +1701,7 @@ static void giga_rc_track_right_quarter_turn_5_25_deg_up(paint_session * session /** rct2: 0x008AD884 */ static void giga_rc_track_left_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; giga_rc_track_right_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); @@ -1709,7 +1709,7 @@ static void giga_rc_track_left_quarter_turn_5_25_deg_down(paint_session * sessio /** rct2: 0x008AD894 */ static void giga_rc_track_right_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; giga_rc_track_left_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -1717,7 +1717,7 @@ static void giga_rc_track_right_quarter_turn_5_25_deg_down(paint_session * sessi /** rct2: 0x008AD8A4 */ static void giga_rc_track_s_bend_left(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1841,7 +1841,7 @@ static void giga_rc_track_s_bend_left(paint_session * session, uint8 rideIndex, /** rct2: 0x008AD8B4 */ static void giga_rc_track_s_bend_right(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1965,7 +1965,7 @@ static void giga_rc_track_s_bend_right(paint_session * session, uint8 rideIndex, /** rct2: 0x008AD8F4 */ static void giga_rc_track_left_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2064,7 +2064,7 @@ static void giga_rc_track_left_quarter_turn_3(paint_session * session, uint8 rid /** rct2: 0x008AD904 */ static void giga_rc_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; giga_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -2072,7 +2072,7 @@ static void giga_rc_track_right_quarter_turn_3(paint_session * session, uint8 ri /** rct2: 0x008AD914 */ static void giga_rc_track_left_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2175,7 +2175,7 @@ static void giga_rc_track_left_quarter_turn_3_bank(paint_session * session, uint /** rct2: 0x008AD924 */ static void giga_rc_track_right_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; giga_rc_track_left_quarter_turn_3_bank(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -2183,7 +2183,7 @@ static void giga_rc_track_right_quarter_turn_3_bank(paint_session * session, uin /** rct2: 0x008AD934 */ static void giga_rc_track_left_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2253,7 +2253,7 @@ static void giga_rc_track_left_quarter_turn_3_25_deg_up(paint_session * session, /** rct2: 0x008AD944 */ static void giga_rc_track_right_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2326,7 +2326,7 @@ static void giga_rc_track_right_quarter_turn_3_25_deg_up(paint_session * session /** rct2: 0x008AD954 */ static void giga_rc_track_left_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; giga_rc_track_right_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); @@ -2334,7 +2334,7 @@ static void giga_rc_track_left_quarter_turn_3_25_deg_down(paint_session * sessio /** rct2: 0x008AD964 */ static void giga_rc_track_right_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; giga_rc_track_left_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -2342,7 +2342,7 @@ static void giga_rc_track_right_quarter_turn_3_25_deg_down(paint_session * sessi /** rct2: 0x008AD974 */ static void giga_rc_track_left_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2543,7 +2543,7 @@ static void giga_rc_track_left_half_banked_helix_up_small(paint_session * sessio /** rct2: 0x008AD984 */ static void giga_rc_track_right_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2744,7 +2744,7 @@ static void giga_rc_track_right_half_banked_helix_up_small(paint_session * sessi /** rct2: 0x008AD994 */ static void giga_rc_track_left_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 4) { @@ -2757,7 +2757,7 @@ static void giga_rc_track_left_half_banked_helix_down_small(paint_session * sess /** rct2: 0x008AD9A4 */ static void giga_rc_track_right_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 4) { @@ -2770,7 +2770,7 @@ static void giga_rc_track_right_half_banked_helix_down_small(paint_session * ses /** rct2: 0x008AD9B4 */ static void giga_rc_track_left_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3081,7 +3081,7 @@ static void giga_rc_track_left_half_banked_helix_up_large(paint_session * sessio /** rct2: 0x008AD9C4 */ static void giga_rc_track_right_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3398,7 +3398,7 @@ static void giga_rc_track_right_half_banked_helix_up_large(paint_session * sessi /** rct2: 0x008AD9D4 */ static void giga_rc_track_left_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 7) { @@ -3411,7 +3411,7 @@ static void giga_rc_track_left_half_banked_helix_down_large(paint_session * sess /** rct2: 0x008AD9E4 */ static void giga_rc_track_right_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 7) { @@ -3424,7 +3424,7 @@ static void giga_rc_track_right_half_banked_helix_down_large(paint_session * ses /** rct2: 0x008ADA14 */ static void giga_rc_track_left_quarter_turn_1_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -3460,7 +3460,7 @@ static void giga_rc_track_left_quarter_turn_1_60_deg_up(paint_session * session, /** rct2: 0x008AD9F4 */ static void giga_rc_track_right_quarter_turn_1_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -3496,21 +3496,21 @@ static void giga_rc_track_right_quarter_turn_1_60_deg_up(paint_session * session /** rct2: 0x008ADA04 */ static void giga_rc_track_left_quarter_turn_1_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { giga_rc_track_right_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008ADA24 */ static void giga_rc_track_right_quarter_turn_1_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { giga_rc_track_left_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008ADA34 */ static void giga_rc_track_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (direction) { @@ -3541,7 +3541,7 @@ static void giga_rc_track_brakes(paint_session * session, uint8 rideIndex, uint8 /** rct2: 0x008ADC84 */ static void giga_rc_track_25_deg_up_left_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -3581,7 +3581,7 @@ static void giga_rc_track_25_deg_up_left_banked(paint_session * session, uint8 r /** rct2: 0x008ADC94 */ static void giga_rc_track_25_deg_up_right_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -3621,7 +3621,7 @@ static void giga_rc_track_25_deg_up_right_banked(paint_session * session, uint8 /** rct2: 0x008ADA44 */ static void giga_rc_track_on_ride_photo(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -3662,21 +3662,21 @@ static void giga_rc_track_on_ride_photo(paint_session * session, uint8 rideIndex /** rct2: 0x008ADCA4 */ static void giga_rc_track_25_deg_down_left_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { giga_rc_track_25_deg_up_right_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ADCB4 */ static void giga_rc_track_25_deg_down_right_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { giga_rc_track_25_deg_up_left_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ADED4 */ static void giga_rc_track_flat_to_60_deg_up_long_base(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3934,7 +3934,7 @@ static void giga_rc_track_flat_to_60_deg_up_long_base(paint_session * session, u /** rct2: 0x008ADEE4 */ static void giga_rc_track_60_deg_up_to_flat_long_base(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4068,21 +4068,21 @@ static void giga_rc_track_60_deg_up_to_flat_long_base(paint_session * session, u /** rct2: 0x008ADEF4 */ static void giga_rc_track_flat_to_60_deg_down_long_base(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { giga_rc_track_flat_to_60_deg_up_long_base(session, rideIndex, 3 - trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ADF04 */ static void giga_rc_track_60_deg_up_to_flat_long_base122(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { giga_rc_track_60_deg_up_to_flat_long_base(session, rideIndex, 3 - trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ADF14 */ static void giga_rc_track_cable_lift_hill(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4239,7 +4239,7 @@ static void giga_rc_track_cable_lift_hill(paint_session * session, uint8 rideInd /** rct2: 0x008ADA64 */ static void giga_rc_track_left_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4363,7 +4363,7 @@ static void giga_rc_track_left_eighth_to_diag(paint_session * session, uint8 rid /** rct2: 0x008ADA74 */ static void giga_rc_track_right_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4487,7 +4487,7 @@ static void giga_rc_track_right_eighth_to_diag(paint_session * session, uint8 ri /** rct2: 0x008ADA84 */ static void giga_rc_track_left_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; giga_rc_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -4495,7 +4495,7 @@ static void giga_rc_track_left_eighth_to_orthogonal(paint_session * session, uin /** rct2: 0x008ADA94 */ static void giga_rc_track_right_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; giga_rc_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); @@ -4503,7 +4503,7 @@ static void giga_rc_track_right_eighth_to_orthogonal(paint_session * session, ui /** rct2: 0x008ADAA4 */ static void giga_rc_track_left_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4627,7 +4627,7 @@ static void giga_rc_track_left_eighth_bank_to_diag(paint_session * session, uint /** rct2: 0x008ADAB4 */ static void giga_rc_track_right_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4751,7 +4751,7 @@ static void giga_rc_track_right_eighth_bank_to_diag(paint_session * session, uin /** rct2: 0x008ADAC4 */ static void giga_rc_track_left_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; giga_rc_track_right_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -4759,7 +4759,7 @@ static void giga_rc_track_left_eighth_bank_to_orthogonal(paint_session * session /** rct2: 0x008ADAD4 */ static void giga_rc_track_right_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; giga_rc_track_left_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); @@ -4767,7 +4767,7 @@ static void giga_rc_track_right_eighth_bank_to_orthogonal(paint_session * sessio /** rct2: 0x008ADA54 */ static void giga_rc_track_diag_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4904,7 +4904,7 @@ static void giga_rc_track_diag_flat(paint_session * session, uint8 rideIndex, ui /** rct2: 0x008ADB04 */ static void giga_rc_track_diag_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5041,7 +5041,7 @@ static void giga_rc_track_diag_25_deg_up(paint_session * session, uint8 rideInde /** rct2: 0x008ADB64 */ static void giga_rc_track_diag_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5108,7 +5108,7 @@ static void giga_rc_track_diag_60_deg_up(paint_session * session, uint8 rideInde /** rct2: 0x008ADAE4 */ static void giga_rc_track_diag_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5245,7 +5245,7 @@ static void giga_rc_track_diag_flat_to_25_deg_up(paint_session * session, uint8 /** rct2: 0x008ADB44 */ static void giga_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5312,7 +5312,7 @@ static void giga_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * session, u /** rct2: 0x008ADB54 */ static void giga_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5379,7 +5379,7 @@ static void giga_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * session, u /** rct2: 0x008ADAF4 */ static void giga_rc_track_diag_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5516,7 +5516,7 @@ static void giga_rc_track_diag_25_deg_up_to_flat(paint_session * session, uint8 /** rct2: 0x008ADB34 */ static void giga_rc_track_diag_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5653,7 +5653,7 @@ static void giga_rc_track_diag_25_deg_down(paint_session * session, uint8 rideIn /** rct2: 0x008ADB94 */ static void giga_rc_track_diag_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5720,7 +5720,7 @@ static void giga_rc_track_diag_60_deg_down(paint_session * session, uint8 rideIn /** rct2: 0x008ADB14 */ static void giga_rc_track_diag_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5855,7 +5855,7 @@ static void giga_rc_track_diag_flat_to_25_deg_down(paint_session * session, uint /** rct2: 0x008ADB74 */ static void giga_rc_track_diag_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5922,7 +5922,7 @@ static void giga_rc_track_diag_25_deg_down_to_60_deg_down(paint_session * sessio /** rct2: 0x008ADB84 */ static void giga_rc_track_diag_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5989,7 +5989,7 @@ static void giga_rc_track_diag_60_deg_down_to_25_deg_down(paint_session * sessio /** rct2: 0x008ADB24 */ static void giga_rc_track_diag_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6126,7 +6126,7 @@ static void giga_rc_track_diag_25_deg_down_to_flat(paint_session * session, uint /** rct2: 0x008ADBC4 */ static void giga_rc_track_diag_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6195,7 +6195,7 @@ static void giga_rc_track_diag_flat_to_left_bank(paint_session * session, uint8 /** rct2: 0x008ADBD4 */ static void giga_rc_track_diag_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6264,7 +6264,7 @@ static void giga_rc_track_diag_flat_to_right_bank(paint_session * session, uint8 /** rct2: 0x008ADBE4 */ static void giga_rc_track_diag_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6333,7 +6333,7 @@ static void giga_rc_track_diag_left_bank_to_flat(paint_session * session, uint8 /** rct2: 0x008ADBF4 */ static void giga_rc_track_diag_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6402,7 +6402,7 @@ static void giga_rc_track_diag_right_bank_to_flat(paint_session * session, uint8 /** rct2: 0x008ADC24 */ static void giga_rc_track_diag_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6471,7 +6471,7 @@ static void giga_rc_track_diag_left_bank_to_25_deg_up(paint_session * session, u /** rct2: 0x008ADC34 */ static void giga_rc_track_diag_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6540,7 +6540,7 @@ static void giga_rc_track_diag_right_bank_to_25_deg_up(paint_session * session, /** rct2: 0x008ADC04 */ static void giga_rc_track_diag_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6609,7 +6609,7 @@ static void giga_rc_track_diag_25_deg_up_to_left_bank(paint_session * session, u /** rct2: 0x008ADC14 */ static void giga_rc_track_diag_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6678,7 +6678,7 @@ static void giga_rc_track_diag_25_deg_up_to_right_bank(paint_session * session, /** rct2: 0x008ADC44 */ static void giga_rc_track_diag_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6745,7 +6745,7 @@ static void giga_rc_track_diag_left_bank_to_25_deg_down(paint_session * session, /** rct2: 0x008ADC54 */ static void giga_rc_track_diag_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6812,7 +6812,7 @@ static void giga_rc_track_diag_right_bank_to_25_deg_down(paint_session * session /** rct2: 0x008ADC64 */ static void giga_rc_track_diag_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6881,7 +6881,7 @@ static void giga_rc_track_diag_25_deg_down_to_left_bank(paint_session * session, /** rct2: 0x008ADC74 */ static void giga_rc_track_diag_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6950,7 +6950,7 @@ static void giga_rc_track_diag_25_deg_down_to_right_bank(paint_session * session /** rct2: 0x008ADBA4 */ static void giga_rc_track_diag_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7017,7 +7017,7 @@ static void giga_rc_track_diag_left_bank(paint_session * session, uint8 rideInde /** rct2: 0x008ADBB4 */ static void giga_rc_track_diag_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7084,7 +7084,7 @@ static void giga_rc_track_diag_right_bank(paint_session * session, uint8 rideInd /** rct2: 0x008ADEC4 */ static void giga_rc_track_block_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -7115,7 +7115,7 @@ static void giga_rc_track_block_brakes(paint_session * session, uint8 rideIndex, /** rct2: 0x008ADCC4 */ static void giga_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7188,7 +7188,7 @@ static void giga_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session * s /** rct2: 0x008ADCD4 */ static void giga_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7264,7 +7264,7 @@ static void giga_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_session * /** rct2: 0x008ADCE4 */ static void giga_rc_track_left_banked_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; giga_rc_track_right_banked_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, @@ -7273,7 +7273,7 @@ static void giga_rc_track_left_banked_quarter_turn_3_25_deg_down(paint_session * /** rct2: 0x008ADCF4 */ static void giga_rc_track_right_banked_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; giga_rc_track_left_banked_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, @@ -7282,7 +7282,7 @@ static void giga_rc_track_right_banked_quarter_turn_3_25_deg_down(paint_session /** rct2: 0x008ADD04 */ static void giga_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7434,7 +7434,7 @@ static void giga_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * s /** rct2: 0x008ADD14 */ static void giga_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7586,7 +7586,7 @@ static void giga_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session * /** rct2: 0x008ADD24 */ static void giga_rc_track_left_banked_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; giga_rc_track_right_banked_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, @@ -7595,7 +7595,7 @@ static void giga_rc_track_left_banked_quarter_turn_5_25_deg_down(paint_session * /** rct2: 0x008ADD34 */ static void giga_rc_track_right_banked_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; giga_rc_track_left_banked_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, @@ -7604,7 +7604,7 @@ static void giga_rc_track_right_banked_quarter_turn_5_25_deg_down(paint_session /** rct2: 0x008ADD44 */ static void giga_rc_track_25_deg_up_to_left_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -7646,7 +7646,7 @@ static void giga_rc_track_25_deg_up_to_left_banked_25_deg_up(paint_session * ses /** rct2: 0x008ADD54 */ static void giga_rc_track_25_deg_up_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -7688,7 +7688,7 @@ static void giga_rc_track_25_deg_up_to_right_banked_25_deg_up(paint_session * se /** rct2: 0x008ADD64 */ static void giga_rc_track_left_banked_25_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -7730,7 +7730,7 @@ static void giga_rc_track_left_banked_25_deg_up_to_25_deg_up(paint_session * ses /** rct2: 0x008ADD74 */ static void giga_rc_track_right_banked_25_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -7772,7 +7772,7 @@ static void giga_rc_track_right_banked_25_deg_up_to_25_deg_up(paint_session * se /** rct2: 0x008ADD84 */ static void giga_rc_track_25_deg_down_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { giga_rc_track_right_banked_25_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -7780,7 +7780,7 @@ static void giga_rc_track_25_deg_down_to_left_banked_25_deg_down(paint_session * /** rct2: 0x008ADD94 */ static void giga_rc_track_25_deg_down_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { giga_rc_track_left_banked_25_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -7788,7 +7788,7 @@ static void giga_rc_track_25_deg_down_to_right_banked_25_deg_down(paint_session /** rct2: 0x008ADDA4 */ static void giga_rc_track_left_banked_25_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { giga_rc_track_25_deg_up_to_right_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -7796,7 +7796,7 @@ static void giga_rc_track_left_banked_25_deg_down_to_25_deg_down(paint_session * /** rct2: 0x008ADDB4 */ static void giga_rc_track_right_banked_25_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { giga_rc_track_25_deg_up_to_left_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -7805,7 +7805,7 @@ static void giga_rc_track_right_banked_25_deg_down_to_25_deg_down(paint_session /** rct2: 0x008ADDC4 */ static void giga_rc_track_left_banked_flat_to_left_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (direction) { @@ -7846,7 +7846,7 @@ static void giga_rc_track_left_banked_flat_to_left_banked_25_deg_up(paint_sessio /** rct2: 0x008ADDD4 */ static void giga_rc_track_right_banked_flat_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (direction) { @@ -7887,7 +7887,7 @@ static void giga_rc_track_right_banked_flat_to_right_banked_25_deg_up(paint_sess /** rct2: 0x008ADE04 */ static void giga_rc_track_left_banked_25_deg_up_to_left_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (direction) { @@ -7928,7 +7928,7 @@ static void giga_rc_track_left_banked_25_deg_up_to_left_banked_flat(paint_sessio /** rct2: 0x008ADE14 */ static void giga_rc_track_right_banked_25_deg_up_to_right_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (direction) { @@ -7969,7 +7969,7 @@ static void giga_rc_track_right_banked_25_deg_up_to_right_banked_flat(paint_sess /** rct2: 0x008ADE24 */ static void giga_rc_track_left_banked_flat_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { giga_rc_track_right_banked_25_deg_up_to_right_banked_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -7978,7 +7978,7 @@ static void giga_rc_track_left_banked_flat_to_left_banked_25_deg_down(paint_sess /** rct2: 0x008ADE34 */ static void giga_rc_track_right_banked_flat_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { giga_rc_track_left_banked_25_deg_up_to_left_banked_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -7987,7 +7987,7 @@ static void giga_rc_track_right_banked_flat_to_right_banked_25_deg_down(paint_se /** rct2: 0x008ADDE4 */ static void giga_rc_track_left_banked_25_deg_down_to_left_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { giga_rc_track_right_banked_flat_to_right_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -7996,7 +7996,7 @@ static void giga_rc_track_left_banked_25_deg_down_to_left_banked_flat(paint_sess /** rct2: 0x008ADDF4 */ static void giga_rc_track_right_banked_25_deg_down_to_right_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { giga_rc_track_left_banked_flat_to_left_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -8004,7 +8004,7 @@ static void giga_rc_track_right_banked_25_deg_down_to_right_banked_flat(paint_se /** rct2: 0x008ADE44 */ static void giga_rc_track_flat_to_left_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -8046,7 +8046,7 @@ static void giga_rc_track_flat_to_left_banked_25_deg_up(paint_session * session, /** rct2: 0x008ADE54 */ static void giga_rc_track_flat_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -8088,7 +8088,7 @@ static void giga_rc_track_flat_to_right_banked_25_deg_up(paint_session * session /** rct2: 0x008ADE64 */ static void giga_rc_track_left_banked_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -8130,7 +8130,7 @@ static void giga_rc_track_left_banked_25_deg_up_to_flat(paint_session * session, /** rct2: 0x008ADE74 */ static void giga_rc_track_right_banked_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -8172,34 +8172,34 @@ static void giga_rc_track_right_banked_25_deg_up_to_flat(paint_session * session /** rct2: 0x008ADE84 */ static void giga_rc_track_flat_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { giga_rc_track_right_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ADE94 */ static void giga_rc_track_flat_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { giga_rc_track_left_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ADEA4 */ static void giga_rc_track_left_banked_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { giga_rc_track_flat_to_right_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ADEB4 */ static void giga_rc_track_right_banked_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { giga_rc_track_flat_to_left_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } static void giga_rc_track_booster(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { // These offsets could be moved to the g2.dat file when that supports offsets. sint8 ne_sw_offsetX = 7; diff --git a/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp b/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp index e8f2c380b9..442f1e5dc9 100644 --- a/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp +++ b/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" #include "../../paint/paint.h" #include "../../paint/supports.h" #include "../../sprites.h" @@ -28,7 +28,7 @@ /** rct2: 0x0087694C */ static void heartline_twister_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -92,7 +92,7 @@ static void heartline_twister_rc_track_flat(paint_session * session, uint8 rideI } static void heartline_twister_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][3] = { { 19732, SPR_STATION_BASE_B_SW_NE }, @@ -114,7 +114,7 @@ static void heartline_twister_rc_track_station(paint_session * session, uint8 ri /** rct2: 0x0087695C */ static void heartline_twister_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -198,7 +198,7 @@ static void heartline_twister_rc_track_25_deg_up(paint_session * session, uint8 /** rct2: 0x008769FC */ static void heartline_twister_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -282,7 +282,7 @@ static void heartline_twister_rc_track_60_deg_up(paint_session * session, uint8 /** rct2: 0x0087696C */ static void heartline_twister_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -366,7 +366,7 @@ static void heartline_twister_rc_track_flat_to_25_deg_up(paint_session * session /** rct2: 0x008769BC */ static void heartline_twister_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -450,7 +450,7 @@ static void heartline_twister_rc_track_25_deg_up_to_60_deg_up(paint_session * se /** rct2: 0x008769CC */ static void heartline_twister_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -534,7 +534,7 @@ static void heartline_twister_rc_track_60_deg_up_to_25_deg_up(paint_session * se /** rct2: 0x0087697C */ static void heartline_twister_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -618,28 +618,28 @@ static void heartline_twister_rc_track_25_deg_up_to_flat(paint_session * session /** rct2: 0x0087698C */ static void heartline_twister_rc_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { heartline_twister_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00876A0C */ static void heartline_twister_rc_track_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { heartline_twister_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0087699C */ static void heartline_twister_rc_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { heartline_twister_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008769DC */ static void heartline_twister_rc_track_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { heartline_twister_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -647,7 +647,7 @@ static void heartline_twister_rc_track_25_deg_down_to_60_deg_down(paint_session /** rct2: 0x008769EC */ static void heartline_twister_rc_track_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { heartline_twister_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -655,14 +655,14 @@ static void heartline_twister_rc_track_60_deg_down_to_25_deg_down(paint_session /** rct2: 0x008769AC */ static void heartline_twister_rc_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { heartline_twister_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00876A6C */ static void heartline_twister_rc_track_heartline_transfer_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -839,7 +839,7 @@ static void heartline_twister_rc_track_heartline_transfer_up(paint_session * ses /** rct2: 0x00876A7C */ static void heartline_twister_rc_track_heartline_transfer_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1016,7 +1016,7 @@ static void heartline_twister_rc_track_heartline_transfer_down(paint_session * s /** rct2: 0x00876A4C */ static void heartline_twister_rc_track_left_heartline_roll(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1237,7 +1237,7 @@ static void heartline_twister_rc_track_left_heartline_roll(paint_session * sessi /** rct2: 0x00876A5C */ static void heartline_twister_rc_track_right_heartline_roll(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { diff --git a/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp b/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp index 37ddf0ff1f..af71d50c44 100644 --- a/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" #include "../../paint/paint.h" #include "../../paint/supports.h" #include "../../sprites.h" @@ -28,7 +28,7 @@ /** rct2: 0x00890CB4 */ static void inverted_hairpin_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -83,7 +83,7 @@ static void inverted_hairpin_rc_track_flat(paint_session * session, uint8 rideIn /** rct2: 0x00890D84, 0x00890D94, 0x00890DA4 */ static void inverted_hairpin_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][3] = { { SPR_STATION_BASE_C_SW_NE, 17028, SPR_STATION_INVERTED_BAR_0_SW_NE }, @@ -107,7 +107,7 @@ static void inverted_hairpin_rc_track_station(paint_session * session, uint8 rid /** rct2: 0x00890CC4 */ static void inverted_hairpin_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -192,7 +192,7 @@ static void inverted_hairpin_rc_track_25_deg_up(paint_session * session, uint8 r /** rct2: 0x00890CD4 */ static void inverted_hairpin_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -253,7 +253,7 @@ static void inverted_hairpin_rc_track_60_deg_up(paint_session * session, uint8 r /** rct2: 0x00890CE4 */ static void inverted_hairpin_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -338,7 +338,7 @@ static void inverted_hairpin_rc_track_flat_to_25_deg_up(paint_session * session, /** rct2: 0x00890CF4 */ static void inverted_hairpin_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -407,7 +407,7 @@ static void inverted_hairpin_rc_track_25_deg_up_to_60_deg_up(paint_session * ses /** rct2: 0x00890D04 */ static void inverted_hairpin_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -500,7 +500,7 @@ static void inverted_hairpin_rc_track_60_deg_up_to_25_deg_up(paint_session * ses /** rct2: 0x00890D14 */ static void inverted_hairpin_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -585,28 +585,28 @@ static void inverted_hairpin_rc_track_25_deg_up_to_flat(paint_session * session, /** rct2: 0x00890D24 */ static void inverted_hairpin_rc_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_hairpin_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00890D34 */ static void inverted_hairpin_rc_track_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_hairpin_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00890D44 */ static void inverted_hairpin_rc_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_hairpin_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00890D54 */ static void inverted_hairpin_rc_track_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_hairpin_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -614,7 +614,7 @@ static void inverted_hairpin_rc_track_25_deg_down_to_60_deg_down(paint_session * /** rct2: 0x00890D64 */ static void inverted_hairpin_rc_track_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_hairpin_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -622,14 +622,14 @@ static void inverted_hairpin_rc_track_60_deg_down_to_25_deg_down(paint_session * /** rct2: 0x00890D74 */ static void inverted_hairpin_rc_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_hairpin_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00890DB4 */ static void inverted_hairpin_rc_track_left_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -736,7 +736,7 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3(paint_session * sessio /** rct2: 0x00890DC4 */ static void inverted_hairpin_rc_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; inverted_hairpin_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -745,7 +745,7 @@ static void inverted_hairpin_rc_track_right_quarter_turn_3(paint_session * sessi /** rct2: 0x00890DD4 */ static void inverted_hairpin_rc_track_left_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -824,7 +824,7 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3_25_deg_up(paint_sessio /** rct2: 0x00890DE4 */ static void inverted_hairpin_rc_track_right_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -903,7 +903,7 @@ static void inverted_hairpin_rc_track_right_quarter_turn_3_25_deg_up(paint_sessi /** rct2: 0x00890DF4 */ static void inverted_hairpin_rc_track_left_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; inverted_hairpin_rc_track_right_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, @@ -913,7 +913,7 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3_25_deg_down(paint_sess /** rct2: 0x00890E04 */ static void inverted_hairpin_rc_track_right_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; inverted_hairpin_rc_track_left_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, @@ -922,7 +922,7 @@ static void inverted_hairpin_rc_track_right_quarter_turn_3_25_deg_down(paint_ses /** rct2: 0x00890E64 */ static void inverted_hairpin_rc_track_left_quarter_turn_1(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -967,14 +967,14 @@ static void inverted_hairpin_rc_track_left_quarter_turn_1(paint_session * sessio /** rct2: 0x00890E74 */ static void inverted_hairpin_rc_track_right_quarter_turn_1(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_hairpin_rc_track_left_quarter_turn_1(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x00890E24 */ static void inverted_hairpin_rc_track_flat_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -1043,7 +1043,7 @@ static void inverted_hairpin_rc_track_flat_to_60_deg_up(paint_session * session, /** rct2: 0x00890E34 */ static void inverted_hairpin_rc_track_60_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -1133,21 +1133,21 @@ static void inverted_hairpin_rc_track_60_deg_up_to_flat(paint_session * session, /** rct2: 0x00890E44 */ static void inverted_hairpin_rc_track_flat_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_hairpin_rc_track_60_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00890E54 */ static void inverted_hairpin_rc_track_60_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_hairpin_rc_track_flat_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00890E14 */ static void inverted_hairpin_rc_track_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1177,7 +1177,7 @@ static void inverted_hairpin_rc_track_brakes(paint_session * session, uint8 ride /** rct2: 0x00890E84 */ static void inverted_hairpin_rc_track_block_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { diff --git a/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp b/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp index 139989794f..a49184b484 100644 --- a/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" #include "../../paint/paint.h" #include "../../paint/supports.h" #include "../../sprites.h" @@ -28,7 +28,7 @@ /** rct2: 0x008B0460 */ static void inverted_impulse_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -58,7 +58,7 @@ static void inverted_impulse_rc_track_flat(paint_session * session, uint8 rideIn /** rct2: 0x008B0470, 0x008B0480, 0x008B0490 */ static void inverted_impulse_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][3] = { { SPR_STATION_BASE_C_SW_NE, 19662, SPR_STATION_INVERTED_BAR_B_SW_NE }, @@ -83,7 +83,7 @@ static void inverted_impulse_rc_track_station(paint_session * session, uint8 rid /** rct2: 0x008B04A0 */ static void inverted_impulse_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -143,7 +143,7 @@ static void inverted_impulse_rc_track_25_deg_up(paint_session * session, uint8 r /** rct2: 0x008B04B0 */ static void inverted_impulse_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -179,7 +179,7 @@ static void inverted_impulse_rc_track_60_deg_up(paint_session * session, uint8 r /** rct2: 0x008B04C0 */ static void inverted_impulse_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -236,7 +236,7 @@ static void inverted_impulse_rc_track_flat_to_25_deg_up(paint_session * session, /** rct2: 0x008B04D0 */ static void inverted_impulse_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -276,7 +276,7 @@ static void inverted_impulse_rc_track_25_deg_up_to_60_deg_up(paint_session * ses /** rct2: 0x008B04E0 */ static void inverted_impulse_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -316,7 +316,7 @@ static void inverted_impulse_rc_track_60_deg_up_to_25_deg_up(paint_session * ses /** rct2: 0x008B04F0 */ static void inverted_impulse_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -373,28 +373,28 @@ static void inverted_impulse_rc_track_25_deg_up_to_flat(paint_session * session, /** rct2: 0x008B0500 */ static void inverted_impulse_rc_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_impulse_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008B0510 */ static void inverted_impulse_rc_track_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_impulse_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008B0520 */ static void inverted_impulse_rc_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_impulse_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008B0530 */ static void inverted_impulse_rc_track_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_impulse_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -402,7 +402,7 @@ static void inverted_impulse_rc_track_25_deg_down_to_60_deg_down(paint_session * /** rct2: 0x008B0540 */ static void inverted_impulse_rc_track_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_impulse_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -410,14 +410,14 @@ static void inverted_impulse_rc_track_60_deg_down_to_25_deg_down(paint_session * /** rct2: 0x008B0550 */ static void inverted_impulse_rc_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_impulse_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008B05A0 */ static void inverted_impulse_rc_track_90_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -453,14 +453,14 @@ static void inverted_impulse_rc_track_90_deg_up(paint_session * session, uint8 r /** rct2: 0x008B05B0 */ static void inverted_impulse_rc_track_90_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_impulse_rc_track_90_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008B0560 */ static void inverted_impulse_rc_track_60_deg_up_to_90_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -500,7 +500,7 @@ static void inverted_impulse_rc_track_60_deg_up_to_90_deg_up(paint_session * ses /** rct2: 0x008B0570 */ static void inverted_impulse_rc_track_90_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_impulse_rc_track_60_deg_up_to_90_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -508,7 +508,7 @@ static void inverted_impulse_rc_track_90_deg_down_to_60_deg_down(paint_session * /** rct2: 0x008B0580 */ static void inverted_impulse_rc_track_90_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -545,7 +545,7 @@ static void inverted_impulse_rc_track_90_deg_up_to_60_deg_up(paint_session * ses /** rct2: 0x008B0590 */ static void inverted_impulse_rc_track_60_deg_down_to_90_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -585,7 +585,7 @@ static void inverted_impulse_rc_track_60_deg_down_to_90_deg_down(paint_session * /** rct2: 0x008B05C0 */ static void inverted_impulse_rc_track_left_quarter_turn_1_90_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -628,7 +628,7 @@ static void inverted_impulse_rc_track_left_quarter_turn_1_90_deg_up(paint_sessio /** rct2: 0x008B05D0 */ static void inverted_impulse_rc_track_right_quarter_turn_1_90_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -671,7 +671,7 @@ static void inverted_impulse_rc_track_right_quarter_turn_1_90_deg_up(paint_sessi /** rct2: 0x008B05E0 */ static void inverted_impulse_rc_track_left_quarter_turn_1_90_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { inverted_impulse_rc_track_right_quarter_turn_1_90_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); @@ -680,7 +680,7 @@ static void inverted_impulse_rc_track_left_quarter_turn_1_90_deg_down(paint_sess /** rct2: 0x008B05F0 */ static void inverted_impulse_rc_track_right_quarter_turn_1_90_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { inverted_impulse_rc_track_left_quarter_turn_1_90_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); diff --git a/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp b/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp index 004ced00f6..bcecb2f81d 100644 --- a/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" #include "../../paint/paint.h" #include "../../paint/supports.h" #include "../../sprites.h" @@ -28,7 +28,7 @@ /** rct2: 0x008A92E8 */ static void inverted_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -76,7 +76,7 @@ static void inverted_rc_track_flat(paint_session * session, uint8 rideIndex, uin /** rct2: 0x008A9558, 0x008A9568, 0x008A9578 */ static void inverted_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][3] = { { SPR_STATION_BASE_C_SW_NE, 27131, SPR_STATION_INVERTED_BAR_C_SW_NE }, @@ -101,7 +101,7 @@ static void inverted_rc_track_station(paint_session * session, uint8 rideIndex, /** rct2: 0x008A92F8 */ static void inverted_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -186,7 +186,7 @@ static void inverted_rc_track_25_deg_up(paint_session * session, uint8 rideIndex /** rct2: 0x008A9308 */ static void inverted_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -222,7 +222,7 @@ static void inverted_rc_track_60_deg_up(paint_session * session, uint8 rideIndex /** rct2: 0x008A9318 */ static void inverted_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -307,7 +307,7 @@ static void inverted_rc_track_flat_to_25_deg_up(paint_session * session, uint8 r /** rct2: 0x008A9328 */ static void inverted_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -347,7 +347,7 @@ static void inverted_rc_track_25_deg_up_to_60_deg_up(paint_session * session, ui /** rct2: 0x008A9338 */ static void inverted_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -411,7 +411,7 @@ static void inverted_rc_track_60_deg_up_to_25_deg_up(paint_session * session, ui /** rct2: 0x008A9348 */ static void inverted_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -496,49 +496,49 @@ static void inverted_rc_track_25_deg_up_to_flat(paint_session * session, uint8 r /** rct2: 0x008A9358 */ static void inverted_rc_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { inverted_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A9368 */ static void inverted_rc_track_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { inverted_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A9378 */ static void inverted_rc_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A9388 */ static void inverted_rc_track_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A9398 */ static void inverted_rc_track_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A93A8 */ static void inverted_rc_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A93B8 */ static void inverted_rc_track_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -693,7 +693,7 @@ static void inverted_rc_track_left_quarter_turn_5(paint_session * session, uint8 /** rct2: 0x008A93C8 */ static void inverted_rc_track_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; inverted_rc_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -701,7 +701,7 @@ static void inverted_rc_track_right_quarter_turn_5(paint_session * session, uint /** rct2: 0x008A93D8 */ static void inverted_rc_track_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -738,7 +738,7 @@ static void inverted_rc_track_flat_to_left_bank(paint_session * session, uint8 r /** rct2: 0x008A93E8 */ static void inverted_rc_track_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -775,7 +775,7 @@ static void inverted_rc_track_flat_to_right_bank(paint_session * session, uint8 /** rct2: 0x008A93F8 */ static void inverted_rc_track_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -812,7 +812,7 @@ static void inverted_rc_track_left_bank_to_flat(paint_session * session, uint8 r /** rct2: 0x008A9408 */ static void inverted_rc_track_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -849,7 +849,7 @@ static void inverted_rc_track_right_bank_to_flat(paint_session * session, uint8 /** rct2: 0x008A9418 */ static void inverted_rc_track_banked_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1004,7 +1004,7 @@ static void inverted_rc_track_banked_left_quarter_turn_5(paint_session * session /** rct2: 0x008A9428 */ static void inverted_rc_track_banked_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; inverted_rc_track_banked_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -1012,7 +1012,7 @@ static void inverted_rc_track_banked_right_quarter_turn_5(paint_session * sessio /** rct2: 0x008A9438 */ static void inverted_rc_track_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1074,7 +1074,7 @@ static void inverted_rc_track_left_bank_to_25_deg_up(paint_session * session, ui /** rct2: 0x008A9448 */ static void inverted_rc_track_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1136,7 +1136,7 @@ static void inverted_rc_track_right_bank_to_25_deg_up(paint_session * session, u /** rct2: 0x008A9458 */ static void inverted_rc_track_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1198,7 +1198,7 @@ static void inverted_rc_track_25_deg_up_to_left_bank(paint_session * session, ui /** rct2: 0x008A9468 */ static void inverted_rc_track_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1260,35 +1260,35 @@ static void inverted_rc_track_25_deg_up_to_right_bank(paint_session * session, u /** rct2: 0x008A9478 */ static void inverted_rc_track_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A9488 */ static void inverted_rc_track_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A9498 */ static void inverted_rc_track_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A94A8 */ static void inverted_rc_track_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A94B8 */ static void inverted_rc_track_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1325,14 +1325,14 @@ static void inverted_rc_track_left_bank(paint_session * session, uint8 rideIndex /** rct2: 0x008A94C8 */ static void inverted_rc_track_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { inverted_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A94D8 */ static void inverted_rc_track_left_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1472,7 +1472,7 @@ static void inverted_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sess /** rct2: 0x008A94E8 */ static void inverted_rc_track_right_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1612,7 +1612,7 @@ static void inverted_rc_track_right_quarter_turn_5_25_deg_up(paint_session * ses /** rct2: 0x008A94F8 */ static void inverted_rc_track_left_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; inverted_rc_track_right_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, @@ -1621,7 +1621,7 @@ static void inverted_rc_track_left_quarter_turn_5_25_deg_down(paint_session * se /** rct2: 0x008A9508 */ static void inverted_rc_track_right_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; inverted_rc_track_left_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -1629,7 +1629,7 @@ static void inverted_rc_track_right_quarter_turn_5_25_deg_down(paint_session * s /** rct2: 0x008A9518 */ static void inverted_rc_track_s_bend_left(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1779,7 +1779,7 @@ static void inverted_rc_track_s_bend_left(paint_session * session, uint8 rideInd /** rct2: 0x008A9528 */ static void inverted_rc_track_s_bend_right(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1929,7 +1929,7 @@ static void inverted_rc_track_s_bend_right(paint_session * session, uint8 rideIn /** rct2: 0x008A9538 */ static void inverted_rc_track_left_vertical_loop(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2199,7 +2199,7 @@ static void inverted_rc_track_left_vertical_loop(paint_session * session, uint8 /** rct2: 0x008A9548 */ static void inverted_rc_track_right_vertical_loop(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2469,7 +2469,7 @@ static void inverted_rc_track_right_vertical_loop(paint_session * session, uint8 /** rct2: 0x008A9588 */ static void inverted_rc_track_left_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2573,7 +2573,7 @@ static void inverted_rc_track_left_quarter_turn_3(paint_session * session, uint8 /** rct2: 0x008A9598 */ static void inverted_rc_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; inverted_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -2581,7 +2581,7 @@ static void inverted_rc_track_right_quarter_turn_3(paint_session * session, uint /** rct2: 0x008A95A8 */ static void inverted_rc_track_left_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2686,7 +2686,7 @@ static void inverted_rc_track_left_quarter_turn_3_bank(paint_session * session, /** rct2: 0x008A95B8 */ static void inverted_rc_track_right_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; inverted_rc_track_left_quarter_turn_3_bank(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -2694,7 +2694,7 @@ static void inverted_rc_track_right_quarter_turn_3_bank(paint_session * session, /** rct2: 0x008A95C8 */ static void inverted_rc_track_left_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2770,7 +2770,7 @@ static void inverted_rc_track_left_quarter_turn_3_25_deg_up(paint_session * sess /** rct2: 0x008A95D8 */ static void inverted_rc_track_right_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2846,7 +2846,7 @@ static void inverted_rc_track_right_quarter_turn_3_25_deg_up(paint_session * ses /** rct2: 0x008A95E8 */ static void inverted_rc_track_left_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; inverted_rc_track_right_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, @@ -2855,7 +2855,7 @@ static void inverted_rc_track_left_quarter_turn_3_25_deg_down(paint_session * se /** rct2: 0x008A95F8 */ static void inverted_rc_track_right_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; inverted_rc_track_left_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -2863,7 +2863,7 @@ static void inverted_rc_track_right_quarter_turn_3_25_deg_down(paint_session * s /** rct2: 0x008A9608 */ static void inverted_rc_track_left_twist_down_to_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2955,7 +2955,7 @@ static void inverted_rc_track_left_twist_down_to_up(paint_session * session, uin /** rct2: 0x008A9618 */ static void inverted_rc_track_right_twist_down_to_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3047,7 +3047,7 @@ static void inverted_rc_track_right_twist_down_to_up(paint_session * session, ui /** rct2: 0x008A9628 */ static void inverted_rc_track_left_twist_up_to_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3139,7 +3139,7 @@ static void inverted_rc_track_left_twist_up_to_down(paint_session * session, uin /** rct2: 0x008A9638 */ static void inverted_rc_track_right_twist_up_to_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3231,7 +3231,7 @@ static void inverted_rc_track_right_twist_up_to_down(paint_session * session, ui /** rct2: 0x008A9648 */ static void inverted_rc_track_half_loop_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3366,14 +3366,14 @@ static void inverted_rc_track_half_loop_up(paint_session * session, uint8 rideIn /** rct2: 0x008A9658 */ static void inverted_rc_track_half_loop_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { inverted_rc_track_half_loop_up(session, rideIndex, 3 - trackSequence, direction, height, mapElement); } /** rct2: 0x008A9668 */ static void inverted_rc_track_left_corkscrew_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3476,7 +3476,7 @@ static void inverted_rc_track_left_corkscrew_up(paint_session * session, uint8 r /** rct2: 0x008A9678 */ static void inverted_rc_track_right_corkscrew_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3579,21 +3579,21 @@ static void inverted_rc_track_right_corkscrew_up(paint_session * session, uint8 /** rct2: 0x008A9688 */ static void inverted_rc_track_left_corkscrew_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_rc_track_right_corkscrew_up(session, rideIndex, 2 - trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A9698 */ static void inverted_rc_track_right_corkscrew_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_rc_track_left_corkscrew_up(session, rideIndex, 2 - trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A96D8 */ static void inverted_rc_track_left_quarter_turn_1_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -3629,7 +3629,7 @@ static void inverted_rc_track_left_quarter_turn_1_60_deg_up(paint_session * sess /** rct2: 0x008A96B8 */ static void inverted_rc_track_right_quarter_turn_1_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -3665,7 +3665,7 @@ static void inverted_rc_track_right_quarter_turn_1_60_deg_up(paint_session * ses /** rct2: 0x008A96C8 */ static void inverted_rc_track_left_quarter_turn_1_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_rc_track_right_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); @@ -3673,14 +3673,14 @@ static void inverted_rc_track_left_quarter_turn_1_60_deg_down(paint_session * se /** rct2: 0x008A96E8 */ static void inverted_rc_track_right_quarter_turn_1_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_rc_track_left_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A96A8 */ static void inverted_rc_track_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -3709,7 +3709,7 @@ static void inverted_rc_track_brakes(paint_session * session, uint8 rideIndex, u /** rct2: 0x008A96F8 */ static void inverted_rc_track_left_quarter_banked_helix_large_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3869,7 +3869,7 @@ static void inverted_rc_track_left_quarter_banked_helix_large_up(paint_session * /** rct2: 0x008A9708 */ static void inverted_rc_track_right_quarter_banked_helix_large_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4030,7 +4030,7 @@ static void inverted_rc_track_right_quarter_banked_helix_large_up(paint_session /** rct2: 0x008A9718 */ static void inverted_rc_track_left_quarter_banked_helix_large_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -4191,7 +4191,7 @@ static void inverted_rc_track_left_quarter_banked_helix_large_down(paint_session /** rct2: 0x008A9728 */ static void inverted_rc_track_right_quarter_banked_helix_large_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -4351,7 +4351,7 @@ static void inverted_rc_track_right_quarter_banked_helix_large_down(paint_sessio /** rct2: 0x008A9A38 */ static void inverted_rc_track_25_deg_up_left_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -4411,7 +4411,7 @@ static void inverted_rc_track_25_deg_up_left_banked(paint_session * session, uin /** rct2: 0x008A9A48 */ static void inverted_rc_track_25_deg_up_right_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -4471,7 +4471,7 @@ static void inverted_rc_track_25_deg_up_right_banked(paint_session * session, ui /** rct2: 0x008A9738 */ static void inverted_rc_track_on_ride_photo(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -4512,21 +4512,21 @@ static void inverted_rc_track_on_ride_photo(paint_session * session, uint8 rideI /** rct2: 0x008A9A58 */ static void inverted_rc_track_25_deg_down_left_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_rc_track_25_deg_up_right_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A9A68 */ static void inverted_rc_track_25_deg_down_right_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_rc_track_25_deg_up_left_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A9748 */ static void inverted_rc_track_left_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4669,7 +4669,7 @@ static void inverted_rc_track_left_eighth_to_diag(paint_session * session, uint8 /** rct2: 0x008A9758 */ static void inverted_rc_track_right_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4812,7 +4812,7 @@ static void inverted_rc_track_right_eighth_to_diag(paint_session * session, uint /** rct2: 0x008A9768 */ static void inverted_rc_track_left_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; inverted_rc_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -4820,7 +4820,7 @@ static void inverted_rc_track_left_eighth_to_orthogonal(paint_session * session, /** rct2: 0x008A9778 */ static void inverted_rc_track_right_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; inverted_rc_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); @@ -4828,7 +4828,7 @@ static void inverted_rc_track_right_eighth_to_orthogonal(paint_session * session /** rct2: 0x008A9938 */ static void inverted_rc_track_left_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4972,7 +4972,7 @@ static void inverted_rc_track_left_eighth_bank_to_diag(paint_session * session, /** rct2: 0x008A9948 */ static void inverted_rc_track_right_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5116,7 +5116,7 @@ static void inverted_rc_track_right_eighth_bank_to_diag(paint_session * session, /** rct2: 0x008A9958 */ static void inverted_rc_track_left_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; inverted_rc_track_right_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -5124,7 +5124,7 @@ static void inverted_rc_track_left_eighth_bank_to_orthogonal(paint_session * ses /** rct2: 0x008A9968 */ static void inverted_rc_track_right_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; inverted_rc_track_left_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); @@ -5132,7 +5132,7 @@ static void inverted_rc_track_right_eighth_bank_to_orthogonal(paint_session * se /** rct2: 0x008A9788 */ static void inverted_rc_track_diag_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5262,7 +5262,7 @@ static void inverted_rc_track_diag_flat(paint_session * session, uint8 rideIndex /** rct2: 0x008A97B8 */ static void inverted_rc_track_diag_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5392,7 +5392,7 @@ static void inverted_rc_track_diag_25_deg_up(paint_session * session, uint8 ride /** rct2: 0x008A9818 */ static void inverted_rc_track_diag_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5470,7 +5470,7 @@ static void inverted_rc_track_diag_60_deg_up(paint_session * session, uint8 ride /** rct2: 0x008A9798 */ static void inverted_rc_track_diag_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5600,7 +5600,7 @@ static void inverted_rc_track_diag_flat_to_25_deg_up(paint_session * session, ui /** rct2: 0x008A97F8 */ static void inverted_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5678,7 +5678,7 @@ static void inverted_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * sessio /** rct2: 0x008A9808 */ static void inverted_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5756,7 +5756,7 @@ static void inverted_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * sessio /** rct2: 0x008A97A8 */ static void inverted_rc_track_diag_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5886,7 +5886,7 @@ static void inverted_rc_track_diag_25_deg_up_to_flat(paint_session * session, ui /** rct2: 0x008A97E8 */ static void inverted_rc_track_diag_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6016,7 +6016,7 @@ static void inverted_rc_track_diag_25_deg_down(paint_session * session, uint8 ri /** rct2: 0x008A9848 */ static void inverted_rc_track_diag_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6094,7 +6094,7 @@ static void inverted_rc_track_diag_60_deg_down(paint_session * session, uint8 ri /** rct2: 0x008A97C8 */ static void inverted_rc_track_diag_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6221,7 +6221,7 @@ static void inverted_rc_track_diag_flat_to_25_deg_down(paint_session * session, /** rct2: 0x008A9828 */ static void inverted_rc_track_diag_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6299,7 +6299,7 @@ static void inverted_rc_track_diag_25_deg_down_to_60_deg_down(paint_session * se /** rct2: 0x008A9838 */ static void inverted_rc_track_diag_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6377,7 +6377,7 @@ static void inverted_rc_track_diag_60_deg_down_to_25_deg_down(paint_session * se /** rct2: 0x008A97D8 */ static void inverted_rc_track_diag_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6507,7 +6507,7 @@ static void inverted_rc_track_diag_25_deg_down_to_flat(paint_session * session, /** rct2: 0x008A9878 */ static void inverted_rc_track_diag_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6586,7 +6586,7 @@ static void inverted_rc_track_diag_flat_to_left_bank(paint_session * session, ui /** rct2: 0x008A9888 */ static void inverted_rc_track_diag_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6665,7 +6665,7 @@ static void inverted_rc_track_diag_flat_to_right_bank(paint_session * session, u /** rct2: 0x008A9898 */ static void inverted_rc_track_diag_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6744,7 +6744,7 @@ static void inverted_rc_track_diag_left_bank_to_flat(paint_session * session, ui /** rct2: 0x008A98A8 */ static void inverted_rc_track_diag_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6823,7 +6823,7 @@ static void inverted_rc_track_diag_right_bank_to_flat(paint_session * session, u /** rct2: 0x008A98D8 */ static void inverted_rc_track_diag_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6901,7 +6901,7 @@ static void inverted_rc_track_diag_left_bank_to_25_deg_up(paint_session * sessio /** rct2: 0x008A98E8 */ static void inverted_rc_track_diag_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6979,7 +6979,7 @@ static void inverted_rc_track_diag_right_bank_to_25_deg_up(paint_session * sessi /** rct2: 0x008A98B8 */ static void inverted_rc_track_diag_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7057,7 +7057,7 @@ static void inverted_rc_track_diag_25_deg_up_to_left_bank(paint_session * sessio /** rct2: 0x008A98C8 */ static void inverted_rc_track_diag_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7135,7 +7135,7 @@ static void inverted_rc_track_diag_25_deg_up_to_right_bank(paint_session * sessi /** rct2: 0x008A98F8 */ static void inverted_rc_track_diag_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7210,7 +7210,7 @@ static void inverted_rc_track_diag_left_bank_to_25_deg_down(paint_session * sess /** rct2: 0x008A9908 */ static void inverted_rc_track_diag_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7285,7 +7285,7 @@ static void inverted_rc_track_diag_right_bank_to_25_deg_down(paint_session * ses /** rct2: 0x008A9918 */ static void inverted_rc_track_diag_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7363,7 +7363,7 @@ static void inverted_rc_track_diag_25_deg_down_to_left_bank(paint_session * sess /** rct2: 0x008A9928 */ static void inverted_rc_track_diag_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7441,7 +7441,7 @@ static void inverted_rc_track_diag_25_deg_down_to_right_bank(paint_session * ses /** rct2: 0x008A9858 */ static void inverted_rc_track_diag_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7520,7 +7520,7 @@ static void inverted_rc_track_diag_left_bank(paint_session * session, uint8 ride /** rct2: 0x008A9868 */ static void inverted_rc_track_diag_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7599,7 +7599,7 @@ static void inverted_rc_track_diag_right_bank(paint_session * session, uint8 rid /** rct2: 0x008A9978 */ static void inverted_rc_track_left_large_half_loop_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7796,7 +7796,7 @@ static void inverted_rc_track_left_large_half_loop_up(paint_session * session, u /** rct2: 0x008A9988 */ static void inverted_rc_track_right_large_half_loop_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7993,21 +7993,21 @@ static void inverted_rc_track_right_large_half_loop_up(paint_session * session, /** rct2: 0x008A9998 */ static void inverted_rc_track_right_large_half_loop_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_rc_track_right_large_half_loop_up(session, rideIndex, 6 - trackSequence, direction, height, mapElement); } /** rct2: 0x008A99A8 */ static void inverted_rc_track_left_large_half_loop_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_rc_track_left_large_half_loop_up(session, rideIndex, 6 - trackSequence, direction, height, mapElement); } /** rct2: 0x008A96A8 */ static void inverted_rc_track_block_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -8037,7 +8037,7 @@ static void inverted_rc_track_block_brakes(paint_session * session, uint8 rideIn /** rct2: 0x008A9A78 */ static void inverted_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -8114,7 +8114,7 @@ static void inverted_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session /** rct2: 0x008A9A88 */ static void inverted_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -8191,7 +8191,7 @@ static void inverted_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_sessio /** rct2: 0x008A9A98 */ static void inverted_rc_track_left_banked_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; inverted_rc_track_right_banked_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, @@ -8201,7 +8201,7 @@ static void inverted_rc_track_left_banked_quarter_turn_3_25_deg_down(paint_sessi /** rct2: 0x008A9AA8 */ static void inverted_rc_track_right_banked_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; inverted_rc_track_left_banked_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, @@ -8211,7 +8211,7 @@ static void inverted_rc_track_right_banked_quarter_turn_3_25_deg_down(paint_sess /** rct2: 0x008A9BB8 */ static void inverted_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -8352,7 +8352,7 @@ static void inverted_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session /** rct2: 0x008A9BC8 */ static void inverted_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -8493,7 +8493,7 @@ static void inverted_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_sessio /** rct2: 0x008A9BD8 */ static void inverted_rc_track_left_banked_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; inverted_rc_track_right_banked_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, @@ -8503,7 +8503,7 @@ static void inverted_rc_track_left_banked_quarter_turn_5_25_deg_down(paint_sessi /** rct2: 0x008A9BE8 */ static void inverted_rc_track_right_banked_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; inverted_rc_track_left_banked_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, @@ -8512,7 +8512,7 @@ static void inverted_rc_track_right_banked_quarter_turn_5_25_deg_down(paint_sess /** rct2: 0x008A9AB8 */ static void inverted_rc_track_25_deg_up_to_left_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -8572,7 +8572,7 @@ static void inverted_rc_track_25_deg_up_to_left_banked_25_deg_up(paint_session * /** rct2: 0x008A9AC8 */ static void inverted_rc_track_25_deg_up_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -8632,7 +8632,7 @@ static void inverted_rc_track_25_deg_up_to_right_banked_25_deg_up(paint_session /** rct2: 0x008A9AD8 */ static void inverted_rc_track_left_banked_25_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -8692,7 +8692,7 @@ static void inverted_rc_track_left_banked_25_deg_up_to_25_deg_up(paint_session * /** rct2: 0x008A9AE8 */ static void inverted_rc_track_right_banked_25_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -8753,7 +8753,7 @@ static void inverted_rc_track_right_banked_25_deg_up_to_25_deg_up(paint_session /** rct2: 0x008A9AF8 */ static void inverted_rc_track_25_deg_down_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { inverted_rc_track_right_banked_25_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -8762,7 +8762,7 @@ static void inverted_rc_track_25_deg_down_to_left_banked_25_deg_down(paint_sessi /** rct2: 0x008A9B08 */ static void inverted_rc_track_25_deg_down_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { inverted_rc_track_left_banked_25_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -8771,7 +8771,7 @@ static void inverted_rc_track_25_deg_down_to_right_banked_25_deg_down(paint_sess /** rct2: 0x008A9B18 */ static void inverted_rc_track_left_banked_25_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { inverted_rc_track_25_deg_up_to_right_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -8780,7 +8780,7 @@ static void inverted_rc_track_left_banked_25_deg_down_to_25_deg_down(paint_sessi /** rct2: 0x008A9B28 */ static void inverted_rc_track_right_banked_25_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { inverted_rc_track_25_deg_up_to_left_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -8789,7 +8789,7 @@ static void inverted_rc_track_right_banked_25_deg_down_to_25_deg_down(paint_sess /** rct2: 0x008A9B38 */ static void inverted_rc_track_left_banked_flat_to_left_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (direction) { @@ -8850,7 +8850,7 @@ static void inverted_rc_track_left_banked_flat_to_left_banked_25_deg_up(paint_se /** rct2: 0x008A9B48 */ static void inverted_rc_track_right_banked_flat_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (direction) { @@ -8911,7 +8911,7 @@ static void inverted_rc_track_right_banked_flat_to_right_banked_25_deg_up(paint_ /** rct2: 0x008A9B58 */ static void inverted_rc_track_left_banked_25_deg_up_to_left_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (direction) { @@ -8972,7 +8972,7 @@ static void inverted_rc_track_left_banked_25_deg_up_to_left_banked_flat(paint_se /** rct2: 0x008A9B68 */ static void inverted_rc_track_right_banked_25_deg_up_to_right_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (direction) { @@ -9033,7 +9033,7 @@ static void inverted_rc_track_right_banked_25_deg_up_to_right_banked_flat(paint_ /** rct2: 0x008A9B78 */ static void inverted_rc_track_left_banked_flat_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { inverted_rc_track_right_banked_25_deg_up_to_right_banked_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -9042,7 +9042,7 @@ static void inverted_rc_track_left_banked_flat_to_left_banked_25_deg_down(paint_ /** rct2: 0x008A9B88 */ static void inverted_rc_track_right_banked_flat_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { inverted_rc_track_left_banked_25_deg_up_to_left_banked_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -9051,7 +9051,7 @@ static void inverted_rc_track_right_banked_flat_to_right_banked_25_deg_down(pain /** rct2: 0x008A9B98 */ static void inverted_rc_track_left_banked_25_deg_down_to_left_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { inverted_rc_track_right_banked_flat_to_right_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -9060,7 +9060,7 @@ static void inverted_rc_track_left_banked_25_deg_down_to_left_banked_flat(paint_ /** rct2: 0x008A9BA8 */ static void inverted_rc_track_right_banked_25_deg_down_to_right_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { inverted_rc_track_left_banked_flat_to_left_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -9068,7 +9068,7 @@ static void inverted_rc_track_right_banked_25_deg_down_to_right_banked_flat(pain /** rct2: 0x008A99B8 */ static void inverted_rc_track_flat_to_left_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -9128,7 +9128,7 @@ static void inverted_rc_track_flat_to_left_banked_25_deg_up(paint_session * sess /** rct2: 0x008A99C8 */ static void inverted_rc_track_flat_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -9188,7 +9188,7 @@ static void inverted_rc_track_flat_to_right_banked_25_deg_up(paint_session * ses /** rct2: 0x008A99D8 */ static void inverted_rc_track_left_banked_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -9248,7 +9248,7 @@ static void inverted_rc_track_left_banked_25_deg_up_to_flat(paint_session * sess /** rct2: 0x008A99E8 */ static void inverted_rc_track_right_banked_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -9308,7 +9308,7 @@ static void inverted_rc_track_right_banked_25_deg_up_to_flat(paint_session * ses /** rct2: 0x008A99F8 */ static void inverted_rc_track_flat_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_rc_track_right_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -9316,14 +9316,14 @@ static void inverted_rc_track_flat_to_left_banked_25_deg_down(paint_session * se /** rct2: 0x008A9A08 */ static void inverted_rc_track_flat_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_rc_track_left_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A9A18 */ static void inverted_rc_track_left_banked_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_rc_track_flat_to_right_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -9331,7 +9331,7 @@ static void inverted_rc_track_left_banked_25_deg_down_to_flat(paint_session * se /** rct2: 0x008A9A28 */ static void inverted_rc_track_right_banked_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { inverted_rc_track_flat_to_left_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } diff --git a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp index 1e8b515676..3f808c4075 100644 --- a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp @@ -1623,7 +1623,7 @@ static const uint32 junior_rc_track_pieces_diag_60_deg_down_to_25_deg_down[2][4] }; void junior_rc_paint_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, - rct_map_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) + rct_tile_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) { uint32 imageId = junior_rc_track_pieces_flat[chainType][direction] | session->TrackColours[SCHEME_TRACK]; sub_98196C_rotated(session, direction, imageId, 0, 6, 32, 20, 1, height); @@ -1641,11 +1641,11 @@ void junior_rc_paint_track_flat(paint_session * session, uint8 rideIndex, uint8 } void junior_rc_paint_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, - rct_map_element * mapElement, uint8 rideType) + rct_tile_element * mapElement, uint8 rideType) { uint32 imageId; - bool isBraked = (bool)(mapElement->flags & MAP_ELEMENT_FLAG_BLOCK_BRAKE_CLOSED); + bool isBraked = (bool)(mapElement->flags & TILE_ELEMENT_FLAG_BLOCK_BRAKE_CLOSED); if (direction == 0 || direction == 2) { @@ -1698,7 +1698,7 @@ void junior_rc_paint_station(paint_session * session, uint8 rideIndex, uint8 tra } void junior_rc_paint_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - uint16 height, rct_map_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) + uint16 height, rct_tile_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) { uint32 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); @@ -1719,7 +1719,7 @@ void junior_rc_paint_track_25_deg_up(paint_session * session, uint8 rideIndex, u } void junior_rc_paint_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - uint16 height, rct_map_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) + uint16 height, rct_tile_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) { uint32 imageId = junior_rc_track_pieces_flat_to_25_deg_up[chainType][direction] | session->TrackColours[SCHEME_TRACK]; @@ -1746,7 +1746,7 @@ void junior_rc_paint_track_flat_to_25_deg_up(paint_session * session, uint8 ride } void junior_rc_paint_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - uint16 height, rct_map_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) + uint16 height, rct_tile_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) { uint32 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); @@ -1792,7 +1792,7 @@ static const sint8 junior_rc_track_right_quarter_turn_5_tiles_support_height_off }; static void junior_rc_right_quarter_turn_5_tiles_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { track_paint_util_right_quarter_turn_5_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -1867,7 +1867,7 @@ static const uint8 junior_rc_left_quarter_turn_5_tiles_to_right_turn_map[] = { 6 /* rct2: 0x0051917A */ static void junior_rc_left_quarter_turn_5_tiles_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = junior_rc_left_quarter_turn_5_tiles_to_right_turn_map[trackSequence]; junior_rc_right_quarter_turn_5_tiles_paint_setup(session, rideIndex, trackSequence, (direction + 1) % 4, height, @@ -1878,7 +1878,7 @@ static void junior_rc_left_quarter_turn_5_tiles_paint_setup(paint_session * sess * rct2: 0x008AAFC0, 0x00521593, 0x005216A1, 0x005217AF, 0x00521884 */ static void junior_rc_flat_to_left_bank_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint32 image_id; @@ -1926,7 +1926,7 @@ static void junior_rc_flat_to_left_bank_paint_setup(paint_session * session, uin * rct2: 0x008AAFD0, 0x00521959, 0x00521A2E, 0x00521B03, 0x00521C11 */ static void junior_rc_flat_to_right_bank_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint32 image_id; @@ -1971,13 +1971,13 @@ static void junior_rc_flat_to_right_bank_paint_setup(paint_session * session, ui } static void junior_rc_left_bank_to_flat_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { junior_rc_flat_to_right_bank_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } static void junior_rc_right_bank_to_flat_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { junior_rc_flat_to_left_bank_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } @@ -2043,7 +2043,7 @@ const LocationXYZ16 junior_rc_banked_right_quarter_turn_5_tiles_bound_offsets[4] /* rct2: 0x008AB010, 0x0052304C */ static void junior_rc_banked_right_quarter_turn_5_tiles_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { uint8 thickness = 1; if (direction == 2 && (trackSequence == 0 || trackSequence == 6)) @@ -2133,7 +2133,7 @@ static void junior_rc_banked_right_quarter_turn_5_tiles_paint_setup(paint_sessio /* rct2: 0x008AB000 */ static void junior_rc_banked_left_quarter_turn_5_tiles_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = junior_rc_left_quarter_turn_5_tiles_to_right_turn_map[trackSequence]; junior_rc_banked_right_quarter_turn_5_tiles_paint_setup(session, rideIndex, trackSequence, (direction + 1) % 4, height, @@ -2144,7 +2144,7 @@ static void junior_rc_banked_left_quarter_turn_5_tiles_paint_setup(paint_session * rct2: 0x008AB020, 0x00522073, 0x00522182, 0x00522291, 0x00522367 */ static void junior_rc_left_bank_to_25_deg_up_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint32 image_id; @@ -2204,7 +2204,7 @@ static void junior_rc_left_bank_to_25_deg_up_paint_setup(paint_session * session * rct2: 0x008AB030, 0x0052243D, 0x00522513, 0x005225E9, 0x005226F8 */ static void junior_rc_right_bank_to_25_deg_up_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint32 image_id; @@ -2264,7 +2264,7 @@ static void junior_rc_right_bank_to_25_deg_up_paint_setup(paint_session * sessio * rct2: 0x008AB040, 0x00522807, 0x0052291A, 0x00522A2D, 0x00522B07 */ static void junior_rc_25_deg_up_to_left_bank_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint32 image_id; @@ -2325,7 +2325,7 @@ static void junior_rc_25_deg_up_to_left_bank_paint_setup(paint_session * session * rct2: 0x008AB050, 0x00522BE1, 0x00522CBB, 0x00522D95, 0x00522EA8 */ static void junior_rc_25_deg_up_to_right_bank_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint32 image_id; @@ -2386,7 +2386,7 @@ static void junior_rc_25_deg_up_to_right_bank_paint_setup(paint_session * sessio * rct2: 0x008AB060 */ static void junior_rc_left_bank_to_25_deg_down_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { junior_rc_25_deg_up_to_right_bank_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } @@ -2395,7 +2395,7 @@ static void junior_rc_left_bank_to_25_deg_down_paint_setup(paint_session * sessi * rct2: 0x008AB070 */ static void junior_rc_right_bank_to_25_deg_down_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { junior_rc_25_deg_up_to_left_bank_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } @@ -2404,7 +2404,7 @@ static void junior_rc_right_bank_to_25_deg_down_paint_setup(paint_session * sess * rct2: 0x008AB080 */ static void junior_rc_25_deg_down_to_left_bank_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { junior_rc_right_bank_to_25_deg_up_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } @@ -2413,7 +2413,7 @@ static void junior_rc_25_deg_down_to_left_bank_paint_setup(paint_session * sessi * rct2: 0x008AB090 */ static void junior_rc_25_deg_down_to_right_bank_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { junior_rc_left_bank_to_25_deg_up_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } @@ -2436,7 +2436,7 @@ static const LocationXY16 junior_rc_left_bank_bound_offsets[4] = { * rct2: 0x008AB0A0, 0x00521D1F, 0x00521DF4, 0x00521EC9, 0x00521F9E */ static void junior_rc_left_bank_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 image_id; @@ -2471,13 +2471,13 @@ static void junior_rc_left_bank_paint_setup(paint_session * session, uint8 rideI * rct2: 0x008AB0B0 */ static void junior_rc_right_bank_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { junior_rc_left_bank_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } void junior_rc_paint_track_left_quarter_turn_5_tiles_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, uint16 height, rct_map_element * mapElement, + uint8 direction, uint16 height, rct_tile_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) { track_paint_util_right_quarter_turn_5_tiles_paint(session, 1, height, direction, trackSequence, @@ -2555,7 +2555,7 @@ void junior_rc_paint_track_left_quarter_turn_5_tiles_25_deg_up(paint_session * s } void junior_rc_paint_track_right_quarter_turn_5_tiles_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, uint16 height, rct_map_element * mapElement, + uint8 direction, uint16 height, rct_tile_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) { track_paint_util_right_quarter_turn_5_tiles_paint( @@ -2633,7 +2633,7 @@ void junior_rc_paint_track_right_quarter_turn_5_tiles_25_deg_up(paint_session * /* rct2: 0x008AAE10, 0x00519D88, 0x00519DAC, 0x00519DD0, 0x00519DF4 */ static void junior_rc_left_quarter_turn_5_tiles_25_deg_up_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_left_quarter_turn_5_tiles_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, @@ -2644,7 +2644,7 @@ static void junior_rc_left_quarter_turn_5_tiles_25_deg_up_paint_setup(paint_sess /* rct2: 0x008AAE20, 0x00519E18, 0x0051A148, 0x0051A452, 0x0051A738 */ static void junior_rc_right_quarter_turn_5_tiles_25_deg_up_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_right_quarter_turn_5_tiles_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, @@ -2655,7 +2655,7 @@ static void junior_rc_right_quarter_turn_5_tiles_25_deg_up_paint_setup(paint_ses /* rct2: 0x008AAE30, 0x0051AA42, 0x0051AA68, 0x0051AA8C, 0x0051AAB0 */ static void junior_rc_left_quarter_turn_5_tiles_25_deg_down_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { 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, @@ -2665,7 +2665,7 @@ static void junior_rc_left_quarter_turn_5_tiles_25_deg_down_paint_setup(paint_se /* rct2: 0x008AAE40, 0x0051AAD4, 0x0051AE04, 0x0051B10E, 0x0051B3F4 */ static void junior_rc_right_quarter_turn_5_tiles_25_deg_down_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { 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, @@ -2674,7 +2674,7 @@ static void junior_rc_right_quarter_turn_5_tiles_25_deg_down_paint_setup(paint_s /* rct2: 0x008AAE50, 0x0051B6FE, 0x0051B946, 0x0051BB8E, 0x0051BBA8 */ static void junior_rc_s_bend_left_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (direction == 2 || direction == 3) { @@ -2774,7 +2774,7 @@ static void junior_rc_s_bend_left_paint_setup(paint_session * session, uint8 rid /* rct2: 0x008AAE60, 0x0051BBC0, 0x0051BE06, 0x0051C04E, 0x0051C068 */ static void junior_rc_s_bend_right_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (direction == 2 || direction == 3) { @@ -2874,7 +2874,7 @@ static void junior_rc_s_bend_right_paint_setup(paint_session * session, uint8 ri /** rct2: 0x008AAEB0, 0x0051C0E0, 0x0051C2C1, 0x0051C47F, 0x0051C61D */ static void junior_rc_right_quarter_turn_3_tiles_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { track_paint_util_right_quarter_turn_3_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -2912,7 +2912,7 @@ static void junior_rc_right_quarter_turn_3_tiles_paint_setup(paint_session * ses /** rct2: 0x008AAEA0 */ static void junior_rc_left_quarter_turn_3_tiles_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; junior_rc_right_quarter_turn_3_tiles_paint_setup(session, rideIndex, trackSequence, (direction + 1) % 4, height, @@ -2963,7 +2963,7 @@ const LocationXYZ16 junior_rc_right_quarter_turn_3_tiles_bank_offsets[4][3] = { /** rct2: 0x008AA0D0, 0x00523EA0, 0x005240CC, 0x0052430F, 0x00524500*/ static void junior_rc_right_quarter_turn_3_tiles_bank_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint8 thickness[4][4] = { { 1, 1, 1, 1 }, { 1, 1, 1, 1 }, { 26, 1, 1, 26 }, { 1, 1, 1, 1 } }; @@ -3013,7 +3013,7 @@ static void junior_rc_right_quarter_turn_3_tiles_bank_paint_setup(paint_session } void junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, uint16 height, rct_map_element * mapElement, + uint8 direction, uint16 height, rct_tile_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) { uint32 imageId = 0; @@ -3091,7 +3091,7 @@ void junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_up(paint_session * } void junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, uint16 height, rct_map_element * mapElement, + uint8 direction, uint16 height, rct_tile_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) { uint32 imageId = 0; @@ -3170,7 +3170,7 @@ void junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_down(paint_session /** rct2: 0x008AA0C0 */ static void junior_rc_left_quarter_turn_3_tiles_bank_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; junior_rc_right_quarter_turn_3_tiles_bank_paint_setup(session, rideIndex, trackSequence, (direction + 1) % 4, height, @@ -3180,7 +3180,7 @@ static void junior_rc_left_quarter_turn_3_tiles_bank_paint_setup(paint_session * /** rct2: 0x008AAED0, 0x0051C83C, 0x0051C9EC, 0x0051CB76, 0x0051CCDC*/ static void junior_rc_right_quarter_turn_3_tiles_25_deg_up_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, @@ -3191,7 +3191,7 @@ static void junior_rc_right_quarter_turn_3_tiles_25_deg_up_paint_setup(paint_ses /** rct2: 0x008AAEF0, 0x0051CEC8, 0x0051D078, 0x0051D202, 0x0051D368*/ static void junior_rc_right_quarter_turn_3_tiles_25_deg_down_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_down( @@ -3204,7 +3204,7 @@ static const uint8 junior_rc_left_quarter_turn_3_tiles_to_right_turn_map[] = { 3 /** rct2: 0x008AAEC0 */ static void junior_rc_left_quarter_turn_3_tiles_25_deg_up_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { 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(session, rideIndex, trackSequence, (direction + 1) % 4, height, @@ -3214,7 +3214,7 @@ static void junior_rc_left_quarter_turn_3_tiles_25_deg_up_paint_setup(paint_sess /** rct2: 0x008AAEE0 */ static void junior_rc_left_quarter_turn_3_tiles_25_deg_down_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { 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(session, rideIndex, trackSequence, (direction + 1) % 4, height, @@ -3224,7 +3224,7 @@ static void junior_rc_left_quarter_turn_3_tiles_25_deg_down_paint_setup(paint_se /** rct2: 0x008AB0F0, 0x0052B3A4, 0x0052B5F8, 0x0052B863, 0x0052BA78 */ static void junior_rc_right_half_banked_helix_up_small_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { const sint8 thickness[2] = { 1, 26 }; @@ -3290,7 +3290,7 @@ static void junior_rc_right_half_banked_helix_up_small_paint_setup(paint_session /** rct2: 0x008AB110, 0x0052BD80, 0x0052BFD4, 0x0052C23B, 0x0052C450 */ static void junior_rc_right_half_banked_helix_down_small_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { const sint8 thickness[2] = { 1, 26 }; @@ -3355,7 +3355,7 @@ static void junior_rc_right_half_banked_helix_down_small_paint_setup(paint_sessi /** rct2: 0x008AB0E0 */ static void junior_rc_left_half_banked_helix_up_small_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence > 3) { @@ -3371,7 +3371,7 @@ static void junior_rc_left_half_banked_helix_up_small_paint_setup(paint_session /** rct2: 0x008AB100 */ static void junior_rc_left_half_banked_helix_down_small_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { if (trackSequence > 3) { @@ -3387,7 +3387,7 @@ static void junior_rc_left_half_banked_helix_down_small_paint_setup(paint_sessio /** rct2: 0x008AB130, 0x0052C7BC, 0x0052CB6B, 0x0052CF32, 0x0052D2B3 */ static void junior_rc_right_half_banked_helix_up_large_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { const sint8 thickness[2] = { 1, 26 }; @@ -3469,7 +3469,7 @@ static void junior_rc_right_half_banked_helix_up_large_paint_setup(paint_session /** rct2: 0x008AB150, 0x0052D778, 0x0052DB27, 0x0052DEEA, 0x0052E26B */ static void junior_rc_right_half_banked_helix_down_large_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { const sint8 thickness[2] = { 1, 26 }; @@ -3550,7 +3550,7 @@ static void junior_rc_right_half_banked_helix_down_large_paint_setup(paint_sessi /** rct2: 0x008AB120 */ static void junior_rc_left_half_banked_helix_up_large_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence > 6) { @@ -3566,7 +3566,7 @@ static void junior_rc_left_half_banked_helix_up_large_paint_setup(paint_session /** rct2: 0x008AB140 */ static void junior_rc_left_half_banked_helix_down_large_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { if (trackSequence > 6) { @@ -3583,7 +3583,7 @@ static void junior_rc_left_half_banked_helix_down_large_paint_setup(paint_sessio * rct2: 0x008AAF00, 0x0051851C, 0x005185D8 */ static void junior_rc_brake_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 image_id; @@ -3617,11 +3617,11 @@ static void junior_rc_brake_paint_setup(paint_session * session, uint8 rideIndex * rct2: 0x008AB280, 0x00518694, 0x00518759 */ static void junior_rc_block_brake_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 image_id; - bool isBraked = (bool)(mapElement->flags & MAP_ELEMENT_FLAG_BLOCK_BRAKE_CLOSED); + bool isBraked = (bool)(mapElement->flags & TILE_ELEMENT_FLAG_BLOCK_BRAKE_CLOSED); image_id = junior_rc_track_pieces_block_brake[isBraked][direction] | session->TrackColours[SCHEME_TRACK]; if (direction & 1) @@ -3651,7 +3651,7 @@ static void junior_rc_block_brake_paint_setup(paint_session * session, uint8 rid /** rct2: 0x008AAF80 */ static void junior_rc_left_eighth_to_diag_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { track_paint_util_eighth_to_diag_tiles_paint(session, defaultEighthToDiagThickness, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_left_eight_to_diag, @@ -3713,7 +3713,7 @@ static void junior_rc_left_eighth_to_diag_paint_setup(paint_session * session, u /** rct2: 0x008AAF90 */ static void junior_rc_right_eighth_to_diag_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { track_paint_util_eighth_to_diag_tiles_paint(session, defaultEighthToDiagThickness, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_right_eight_to_diag, @@ -3775,7 +3775,7 @@ static void junior_rc_right_eighth_to_diag_paint_setup(paint_session * session, /** rct2: 0x008AAFA0 */ static void junior_rc_left_eighth_to_orthogonal_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { const uint8 map[] = { 4, 2, 3, 1, 0 }; trackSequence = map[trackSequence]; @@ -3784,7 +3784,7 @@ static void junior_rc_left_eighth_to_orthogonal_paint_setup(paint_session * sess /** rct2: 0x008AAFB0 */ static void junior_rc_right_eighth_to_orthogonal_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { const uint8 map[] = { 4, 2, 3, 1, 0 }; trackSequence = map[trackSequence]; @@ -3874,7 +3874,7 @@ static const sint8 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 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { track_paint_util_eighth_to_diag_tiles_paint(session, junior_rc_left_eighth_to_diag_bank_thickness, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -4018,7 +4018,7 @@ static const sint8 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 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { track_paint_util_eighth_to_diag_tiles_paint(session, junior_rc_right_eighth_to_diag_bank_thickness, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -4081,7 +4081,7 @@ static void junior_rc_right_eighth_to_diag_bank_paint_setup(paint_session * sess /** rct2: 0x008AB180 */ static void junior_rc_left_eighth_to_orthogonal_bank_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { const uint8 map[] = { 4, 2, 3, 1, 0 }; trackSequence = map[trackSequence]; @@ -4090,7 +4090,7 @@ static void junior_rc_left_eighth_to_orthogonal_bank_paint_setup(paint_session * /** rct2: 0x008AB190 */ static void junior_rc_right_eighth_to_orthogonal_bank_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { const uint8 map[] = { 4, 2, 3, 1, 0 }; trackSequence = map[trackSequence]; @@ -4105,7 +4105,7 @@ static const sint32 junior_rc_diag_blocked_segments[] = { SEGMENT_C4 | SEGMENT_C static const uint8 junior_rc_diag_support_segment[] = { 1, 0, 2, 3 }; void junior_rc_paint_track_diag_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - uint16 height, rct_map_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) + uint16 height, rct_tile_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_flat[chainType], defaultDiagTileOffsets, @@ -4124,7 +4124,7 @@ void junior_rc_paint_track_diag_flat(paint_session * session, uint8 rideIndex, u } void junior_rc_paint_track_diag_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - uint16 height, rct_map_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) + uint16 height, rct_tile_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_25_deg_up[chainType], defaultDiagTileOffsets, @@ -4142,7 +4142,7 @@ void junior_rc_paint_track_diag_25_deg_up(paint_session * session, uint8 rideInd } void junior_rc_paint_track_diag_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, uint16 height, rct_map_element * mapElement, + uint8 direction, uint16 height, rct_tile_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -4161,7 +4161,7 @@ void junior_rc_paint_track_diag_flat_to_25_deg_up(paint_session * session, uint8 } void junior_rc_paint_track_diag_flat_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, uint16 height, rct_map_element * mapElement, + uint8 direction, uint16 height, rct_tile_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) { // There is no specific chain for the Water Coaster, use the Junior RC chain instead @@ -4183,7 +4183,7 @@ void junior_rc_paint_track_diag_flat_to_60_deg_up(paint_session * session, uint8 } void junior_rc_paint_track_diag_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, uint16 height, rct_map_element * mapElement, + uint8 direction, uint16 height, rct_tile_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -4202,7 +4202,7 @@ void junior_rc_paint_track_diag_25_deg_up_to_flat(paint_session * session, uint8 } void junior_rc_paint_track_diag_60_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, uint16 height, rct_map_element * mapElement, + uint8 direction, uint16 height, rct_tile_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) { // There is no specific chain for the Water Coaster, use the Junior RC chain instead @@ -4224,7 +4224,7 @@ void junior_rc_paint_track_diag_60_deg_up_to_flat(paint_session * session, uint8 } void junior_rc_paint_track_diag_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - uint16 height, rct_map_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) + uint16 height, rct_tile_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -4243,7 +4243,7 @@ void junior_rc_paint_track_diag_25_deg_down(paint_session * session, uint8 rideI } void junior_rc_paint_track_diag_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, uint16 height, rct_map_element * mapElement, + uint8 direction, uint16 height, rct_tile_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -4262,7 +4262,7 @@ void junior_rc_paint_track_diag_flat_to_25_deg_down(paint_session * session, uin } void junior_rc_paint_track_diag_flat_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, uint16 height, rct_map_element * mapElement, + uint8 direction, uint16 height, rct_tile_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) { // There is no specific chain for the Water Coaster, use the Junior RC chain instead @@ -4284,7 +4284,7 @@ void junior_rc_paint_track_diag_flat_to_60_deg_down(paint_session * session, uin } void junior_rc_paint_track_diag_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, uint16 height, rct_map_element * mapElement, + uint8 direction, uint16 height, rct_tile_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -4303,7 +4303,7 @@ void junior_rc_paint_track_diag_25_deg_down_to_flat(paint_session * session, uin } void junior_rc_paint_track_diag_60_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, uint16 height, rct_map_element * mapElement, + uint8 direction, uint16 height, rct_tile_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) { // There is no specific chain for the Water Coaster, use the Junior RC chain instead @@ -4326,7 +4326,7 @@ void junior_rc_paint_track_diag_60_deg_down_to_flat(paint_session * session, uin /** rct2: 0x008AAF10 */ static void junior_rc_diag_flat_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_flat(session, rideIndex, trackSequence, direction, height, mapElement, @@ -4335,7 +4335,7 @@ static void junior_rc_diag_flat_paint_setup(paint_session * session, uint8 rideI /** rct2: 0x008AAF40 */ static void junior_rc_diag_25_deg_up_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, @@ -4344,7 +4344,7 @@ static void junior_rc_diag_25_deg_up_paint_setup(paint_session * session, uint8 /** rct2: 0x008AAF20 */ static void junior_rc_diag_flat_to_25_deg_up_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_flat_to_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, @@ -4352,7 +4352,7 @@ static void junior_rc_diag_flat_to_25_deg_up_paint_setup(paint_session * session } static void junior_rc_diag_flat_to_60_deg_up_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_flat_to_60_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, @@ -4361,7 +4361,7 @@ static void junior_rc_diag_flat_to_60_deg_up_paint_setup(paint_session * session /** rct2: 0x008AAF30 */ static void junior_rc_diag_25_deg_up_to_flat_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_25_deg_up_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, @@ -4369,7 +4369,7 @@ static void junior_rc_diag_25_deg_up_to_flat_paint_setup(paint_session * session } static void junior_rc_diag_60_deg_up_to_flat_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_60_deg_up_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, @@ -4378,7 +4378,7 @@ static void junior_rc_diag_60_deg_up_to_flat_paint_setup(paint_session * session /** rct2: 0x008AAF70 */ static void junior_rc_diag_25_deg_down_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, @@ -4387,7 +4387,7 @@ static void junior_rc_diag_25_deg_down_paint_setup(paint_session * session, uint /** rct2: 0x008AAF50 */ static void junior_rc_diag_flat_to_25_deg_down_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_flat_to_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, @@ -4395,7 +4395,7 @@ static void junior_rc_diag_flat_to_25_deg_down_paint_setup(paint_session * sessi } static void junior_rc_diag_flat_to_60_deg_down_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_flat_to_60_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, @@ -4404,7 +4404,7 @@ static void junior_rc_diag_flat_to_60_deg_down_paint_setup(paint_session * sessi /** rct2: 0x008AAF60 */ static void junior_rc_diag_25_deg_down_to_flat_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_25_deg_down_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, @@ -4412,7 +4412,7 @@ static void junior_rc_diag_25_deg_down_to_flat_paint_setup(paint_session * sessi } static void junior_rc_diag_60_deg_down_to_flat_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_60_deg_down_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, @@ -4421,7 +4421,7 @@ static void junior_rc_diag_60_deg_down_to_flat_paint_setup(paint_session * sessi /** rct2: 0x008AB1C0 */ static void junior_rc_diag_flat_to_left_bank_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_flat_to_left_bank, defaultDiagTileOffsets, @@ -4447,7 +4447,7 @@ static void junior_rc_diag_flat_to_left_bank_paint_setup(paint_session * session /** rct2: 0x008AB1D0 */ static void junior_rc_diag_flat_to_right_bank_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_flat_to_right_bank, defaultDiagTileOffsets, @@ -4473,7 +4473,7 @@ static void junior_rc_diag_flat_to_right_bank_paint_setup(paint_session * sessio /** rct2: 0x008AB1E0 */ static void junior_rc_diag_left_bank_to_flat_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_left_bank_to_flat, defaultDiagTileOffsets, @@ -4499,7 +4499,7 @@ static void junior_rc_diag_left_bank_to_flat_paint_setup(paint_session * session /** rct2: 0x008AB1F0 */ static void junior_rc_diag_right_bank_to_flat_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_right_bank_to_flat, defaultDiagTileOffsets, @@ -4525,7 +4525,7 @@ static void junior_rc_diag_right_bank_to_flat_paint_setup(paint_session * sessio /** rct2: 0x008AB220 */ static void junior_rc_diag_left_bank_to_25_deg_up_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_left_bank_to_25_deg_up, defaultDiagTileOffsets, @@ -4550,7 +4550,7 @@ static void junior_rc_diag_left_bank_to_25_deg_up_paint_setup(paint_session * se /** rct2: 0x008AB230 */ static void junior_rc_diag_right_bank_to_25_deg_up_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_right_bank_to_25_deg_up, defaultDiagTileOffsets, @@ -4575,7 +4575,7 @@ static void junior_rc_diag_right_bank_to_25_deg_up_paint_setup(paint_session * s /** rct2: 0x008AB200 */ static void junior_rc_diag_25_deg_up_to_left_bank_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_25_deg_up_to_left_bank, defaultDiagTileOffsets, @@ -4600,7 +4600,7 @@ static void junior_rc_diag_25_deg_up_to_left_bank_paint_setup(paint_session * se /** rct2: 0x008AB210 */ static void junior_rc_diag_25_deg_up_to_right_bank_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_25_deg_up_to_right_bank, defaultDiagTileOffsets, @@ -4625,7 +4625,7 @@ static void junior_rc_diag_25_deg_up_to_right_bank_paint_setup(paint_session * s /** rct2: 0x008AB200 */ static void junior_rc_diag_left_bank_to_25_deg_down_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_left_bank_to_25_deg_down, defaultDiagTileOffsets, @@ -4650,7 +4650,7 @@ static void junior_rc_diag_left_bank_to_25_deg_down_paint_setup(paint_session * /** rct2: 0x008AB210 */ static void junior_rc_diag_right_bank_to_25_deg_down_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_right_bank_to_25_deg_down, defaultDiagTileOffsets, @@ -4675,7 +4675,7 @@ static void junior_rc_diag_right_bank_to_25_deg_down_paint_setup(paint_session * /** rct2: 0x008AB220 */ static void junior_rc_diag_25_deg_down_to_left_bank_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_25_deg_down_to_left_bank, defaultDiagTileOffsets, @@ -4700,7 +4700,7 @@ static void junior_rc_diag_25_deg_down_to_left_bank_paint_setup(paint_session * /** rct2: 0x008AB230 */ static void junior_rc_diag_25_deg_down_to_right_bank_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_25_deg_down_to_right_bank, defaultDiagTileOffsets, @@ -4739,7 +4739,7 @@ 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 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint8 thickness = direction == 0 ? 0 : 1; track_paint_util_diag_tiles_paint(session, thickness, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -4760,7 +4760,7 @@ static void junior_rc_diag_left_bank_paint_setup(paint_session * session, uint8 /** rct2: 0x008AB1B0 */ static void junior_rc_diag_right_bank_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint8 thickness = direction == 2 ? 0 : 1; track_paint_util_diag_tiles_paint(session, thickness, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -4803,7 +4803,7 @@ static const LocationXY16 junior_rc_60_deg_up_bound_lengths[4] = { }; void junior_rc_paint_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - uint16 height, rct_map_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) + uint16 height, rct_tile_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) { uint32 image_id = session->TrackColours[SCHEME_TRACK]; @@ -4846,7 +4846,7 @@ void junior_rc_paint_track_60_deg_up(paint_session * session, uint8 rideIndex, u } static void junior_rc_60_deg_up_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_60_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, @@ -4854,7 +4854,7 @@ static void junior_rc_60_deg_up_paint_setup(paint_session * session, uint8 rideI } static void junior_rc_60_deg_down_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { junior_rc_60_deg_up_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } @@ -4876,7 +4876,7 @@ static const LocationXY16 junior_rc_25_deg_up_to_60_deg_up_bound_offsets[4][2] = }; void junior_rc_paint_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, uint16 height, rct_map_element * mapElement, + uint8 direction, uint16 height, rct_tile_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) { uint32 image_id = session->TrackColours[SCHEME_TRACK]; @@ -4937,7 +4937,7 @@ void junior_rc_paint_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 } static void junior_rc_25_deg_up_to_60_deg_up_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, @@ -4945,13 +4945,13 @@ static void junior_rc_25_deg_up_to_60_deg_up_paint_setup(paint_session * session } static void junior_rc_60_deg_down_to_25_deg_down_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { junior_rc_25_deg_up_to_60_deg_up_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } void junior_rc_paint_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, uint16 height, rct_map_element * mapElement, + uint8 direction, uint16 height, rct_tile_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) { uint32 image_id = session->TrackColours[SCHEME_TRACK]; @@ -5011,7 +5011,7 @@ void junior_rc_paint_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 } static void junior_rc_60_deg_up_to_25_deg_up_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, @@ -5019,13 +5019,13 @@ static void junior_rc_60_deg_up_to_25_deg_up_paint_setup(paint_session * session } static void junior_rc_25_deg_down_to_60_deg_down_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { junior_rc_60_deg_up_to_25_deg_up_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } void junior_rc_paint_track_diag_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - uint16 height, rct_map_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) + uint16 height, rct_tile_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_60_deg_up[chainType], defaultDiagTileOffsets, @@ -5043,7 +5043,7 @@ void junior_rc_paint_track_diag_60_deg_up(paint_session * session, uint8 rideInd } void junior_rc_paint_track_diag_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - uint16 height, rct_map_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) + uint16 height, rct_tile_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_diag_60_deg_down[chainType], defaultDiagTileOffsets, @@ -5061,7 +5061,7 @@ void junior_rc_paint_track_diag_60_deg_down(paint_session * session, uint8 rideI } void junior_rc_paint_track_diag_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, uint16 height, rct_map_element * mapElement, + uint8 direction, uint16 height, rct_tile_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -5080,7 +5080,7 @@ void junior_rc_paint_track_diag_25_deg_up_to_60_deg_up(paint_session * session, } void junior_rc_paint_track_diag_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, uint16 height, rct_map_element * mapElement, + uint8 direction, uint16 height, rct_tile_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) { if (direction == 1 && trackSequence == 3) @@ -5109,7 +5109,7 @@ void junior_rc_paint_track_diag_60_deg_up_to_25_deg_up(paint_session * session, } void junior_rc_paint_track_diag_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, uint16 height, rct_map_element * mapElement, + uint8 direction, uint16 height, rct_tile_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) { if (direction == 3 && trackSequence == 0) @@ -5138,7 +5138,7 @@ void junior_rc_paint_track_diag_25_deg_down_to_60_deg_down(paint_session * sessi } void junior_rc_paint_track_diag_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, uint16 height, rct_map_element * mapElement, + uint8 direction, uint16 height, rct_tile_element * mapElement, JUNIOR_RC_CHAINTYPE chainType) { track_paint_util_diag_tiles_paint(session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -5157,7 +5157,7 @@ void junior_rc_paint_track_diag_60_deg_down_to_25_deg_down(paint_session * sessi } static void junior_rc_diag_60_deg_up_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_60_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, @@ -5165,7 +5165,7 @@ static void junior_rc_diag_60_deg_up_paint_setup(paint_session * session, uint8 } static void junior_rc_diag_60_deg_down_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_60_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, @@ -5173,7 +5173,7 @@ static void junior_rc_diag_60_deg_down_paint_setup(paint_session * session, uint } static void junior_rc_diag_25_deg_up_to_60_deg_up_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, @@ -5181,7 +5181,7 @@ static void junior_rc_diag_25_deg_up_to_60_deg_up_paint_setup(paint_session * se } static void junior_rc_diag_60_deg_up_to_25_deg_up_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, @@ -5189,7 +5189,7 @@ static void junior_rc_diag_60_deg_up_to_25_deg_up_paint_setup(paint_session * se } static void junior_rc_diag_25_deg_down_to_60_deg_down_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_25_deg_down_to_60_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, @@ -5197,7 +5197,7 @@ static void junior_rc_diag_25_deg_down_to_60_deg_down_paint_setup(paint_session } static void junior_rc_diag_60_deg_down_to_25_deg_down_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_60_deg_down_to_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, @@ -5229,7 +5229,7 @@ static const LocationXY16 junior_rc_60_deg_up_to_flat_tile_offsets[4][2] = { }; static void junior_rc_flat_to_60_deg_up_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint32 image_id = session->TrackColours[SCHEME_TRACK]; @@ -5291,13 +5291,13 @@ static void junior_rc_flat_to_60_deg_up_paint_setup(paint_session * session, uin } static void junior_rc_60_deg_down_to_flat_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { junior_rc_flat_to_60_deg_up_paint_setup(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } static void junior_rc_60_deg_up_to_flat_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint32 image_id = session->TrackColours[SCHEME_TRACK]; @@ -5359,14 +5359,14 @@ static void junior_rc_60_deg_up_to_flat_paint_setup(paint_session * session, uin } static void junior_rc_flat_to_60_deg_down_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { junior_rc_60_deg_up_to_flat_paint_setup(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /* rct2: 0x00518394 */ static void junior_rc_flat_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_flat(session, rideIndex, trackSequence, direction, height, mapElement, @@ -5375,14 +5375,14 @@ static void junior_rc_flat_paint_setup(paint_session * session, uint8 rideIndex, /* rct2: 0x00515629, 0x00514D22, 0x005151B9 */ static void paint_junior_rc_station_track(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { junior_rc_paint_station(session, rideIndex, trackSequence, direction, height, mapElement, RIDE_TYPE_JUNIOR_ROLLER_COASTER); } /* rct2: 0x0051881E */ static void junior_rc_25_deg_up_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, @@ -5391,7 +5391,7 @@ static void junior_rc_25_deg_up_paint_setup(paint_session * session, uint8 rideI /* rct2: 0x00518B42 */ static void junior_rc_flat_to_25_deg_up_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_flat_to_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, @@ -5400,7 +5400,7 @@ static void junior_rc_flat_to_25_deg_up_paint_setup(paint_session * session, uin /* rct2: 0x00518E56 */ static void junior_rc_25_deg_up_to_flat_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_25_deg_up_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, @@ -5409,7 +5409,7 @@ static void junior_rc_25_deg_up_to_flat_paint_setup(paint_session * session, uin /* rct2: 0x005189B0 */ static void junior_rc_25_deg_down_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { junior_rc_25_deg_up_paint_setup(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -5417,7 +5417,7 @@ static void junior_rc_25_deg_down_paint_setup(paint_session * session, uint8 rid /* rct2: 0x00518FE8 */ static void junior_rc_flat_to_25_deg_down_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { junior_rc_25_deg_up_to_flat_paint_setup(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -5425,14 +5425,14 @@ static void junior_rc_flat_to_25_deg_down_paint_setup(paint_session * session, u /* rct2: 0x00518CCC */ static void junior_rc_25_deg_down_to_flat_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { junior_rc_flat_to_25_deg_up_paint_setup(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } static void junior_rc_booster_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { sint32 XoffsetNESW = 12; sint32 YoffsetNESW = -10; diff --git a/src/openrct2/ride/coaster/JuniorRollerCoaster.h b/src/openrct2/ride/coaster/JuniorRollerCoaster.h index a2f292feae..7252e7bb2e 100644 --- a/src/openrct2/ride/coaster/JuniorRollerCoaster.h +++ b/src/openrct2/ride/coaster/JuniorRollerCoaster.h @@ -18,7 +18,7 @@ #define _JUNIOR_ROLLER_COASTER_H #include "../../common.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" typedef enum JUNIOR_RC_CHAINTYPE { @@ -27,38 +27,38 @@ typedef enum JUNIOR_RC_CHAINTYPE JUNIOR_RC_CHAIN_CHAIN_LIFT, } JUNIOR_RC_CHAINTYPE; -void junior_rc_paint_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element* mapElement, uint8 rideType); +void junior_rc_paint_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element* mapElement, uint8 rideType); -void junior_rc_paint_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); -void junior_rc_paint_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); -void junior_rc_paint_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); -void junior_rc_paint_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); -void junior_rc_paint_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); -void junior_rc_paint_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); -void junior_rc_paint_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); +void junior_rc_paint_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); +void junior_rc_paint_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); +void junior_rc_paint_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); +void junior_rc_paint_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); +void junior_rc_paint_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); +void junior_rc_paint_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); +void junior_rc_paint_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); -void junior_rc_paint_track_left_quarter_turn_5_tiles_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); -void junior_rc_paint_track_right_quarter_turn_5_tiles_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); +void junior_rc_paint_track_left_quarter_turn_5_tiles_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); +void junior_rc_paint_track_right_quarter_turn_5_tiles_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); -void junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); -void junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); +void junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); +void junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); -void junior_rc_paint_track_diag_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); -void junior_rc_paint_track_diag_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); -void junior_rc_paint_track_diag_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); -void junior_rc_paint_track_diag_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); -void junior_rc_paint_track_diag_flat_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); -void junior_rc_paint_track_diag_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); -void junior_rc_paint_track_diag_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); -void junior_rc_paint_track_diag_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); -void junior_rc_paint_track_diag_60_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); -void junior_rc_paint_track_diag_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); -void junior_rc_paint_track_diag_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); -void junior_rc_paint_track_diag_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); -void junior_rc_paint_track_diag_flat_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); -void junior_rc_paint_track_diag_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); -void junior_rc_paint_track_diag_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); -void junior_rc_paint_track_diag_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); -void junior_rc_paint_track_diag_60_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); +void junior_rc_paint_track_diag_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); +void junior_rc_paint_track_diag_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); +void junior_rc_paint_track_diag_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); +void junior_rc_paint_track_diag_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); +void junior_rc_paint_track_diag_flat_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); +void junior_rc_paint_track_diag_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); +void junior_rc_paint_track_diag_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); +void junior_rc_paint_track_diag_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); +void junior_rc_paint_track_diag_60_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); +void junior_rc_paint_track_diag_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); +void junior_rc_paint_track_diag_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); +void junior_rc_paint_track_diag_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); +void junior_rc_paint_track_diag_flat_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); +void junior_rc_paint_track_diag_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); +void junior_rc_paint_track_diag_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); +void junior_rc_paint_track_diag_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element* mapElement, JUNIOR_RC_CHAINTYPE chainType); +void junior_rc_paint_track_diag_60_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element* mapElement, 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 4272854c54..3933e5872e 100644 --- a/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" #include "../../paint/paint.h" #include "../../paint/supports.h" #include "../../sprites.h" @@ -28,7 +28,7 @@ /** rct2: 0x0082491C */ static void lay_down_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -135,7 +135,7 @@ static void lay_down_rc_track_flat(paint_session * session, uint8 rideIndex, uin /** rct2: 0x00824B8C, 0x00824B9C, 0x00824BAC */ static void lay_down_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_inverted(mapElement)) { @@ -188,7 +188,7 @@ static void lay_down_rc_track_station(paint_session * session, uint8 rideIndex, /** rct2: 0x0082492C */ static void lay_down_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -344,7 +344,7 @@ static void lay_down_rc_track_25_deg_up(paint_session * session, uint8 rideIndex /** rct2: 0x0082493C */ static void lay_down_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -451,7 +451,7 @@ static void lay_down_rc_track_60_deg_up(paint_session * session, uint8 rideIndex /** rct2: 0x0082494C */ static void lay_down_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -607,7 +607,7 @@ static void lay_down_rc_track_flat_to_25_deg_up(paint_session * session, uint8 r /** rct2: 0x0082495C */ static void lay_down_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -726,7 +726,7 @@ static void lay_down_rc_track_25_deg_up_to_60_deg_up(paint_session * session, ui /** rct2: 0x0082496C */ static void lay_down_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -869,7 +869,7 @@ static void lay_down_rc_track_60_deg_up_to_25_deg_up(paint_session * session, ui /** rct2: 0x0082497C */ static void lay_down_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -1025,49 +1025,49 @@ static void lay_down_rc_track_25_deg_up_to_flat(paint_session * session, uint8 r /** rct2: 0x0082498C */ static void lay_down_rc_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { lay_down_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0082499C */ static void lay_down_rc_track_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { lay_down_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008249AC */ static void lay_down_rc_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { lay_down_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008249BC */ static void lay_down_rc_track_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { lay_down_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008249CC */ static void lay_down_rc_track_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { lay_down_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008249DC */ static void lay_down_rc_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { lay_down_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008249EC */ static void lay_down_rc_track_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -1389,7 +1389,7 @@ static void lay_down_rc_track_left_quarter_turn_5(paint_session * session, uint8 /** rct2: 0x008249FC */ static void lay_down_rc_track_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; lay_down_rc_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -1397,7 +1397,7 @@ static void lay_down_rc_track_right_quarter_turn_5(paint_session * session, uint /** rct2: 0x00824A0C */ static void lay_down_rc_track_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -1473,7 +1473,7 @@ static void lay_down_rc_track_flat_to_left_bank(paint_session * session, uint8 r /** rct2: 0x00824A1C */ static void lay_down_rc_track_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -1549,7 +1549,7 @@ static void lay_down_rc_track_flat_to_right_bank(paint_session * session, uint8 /** rct2: 0x00824A2C */ static void lay_down_rc_track_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -1625,7 +1625,7 @@ static void lay_down_rc_track_left_bank_to_flat(paint_session * session, uint8 r /** rct2: 0x00824A3C */ static void lay_down_rc_track_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -1701,7 +1701,7 @@ static void lay_down_rc_track_right_bank_to_flat(paint_session * session, uint8 /** rct2: 0x00824A4C */ static void lay_down_rc_track_banked_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -2027,7 +2027,7 @@ static void lay_down_rc_track_banked_left_quarter_turn_5(paint_session * session /** rct2: 0x00824A5C */ static void lay_down_rc_track_banked_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; lay_down_rc_track_banked_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -2035,7 +2035,7 @@ static void lay_down_rc_track_banked_right_quarter_turn_5(paint_session * sessio /** rct2: 0x00824A6C */ static void lay_down_rc_track_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -2142,7 +2142,7 @@ static void lay_down_rc_track_left_bank_to_25_deg_up(paint_session * session, ui /** rct2: 0x00824A7C */ static void lay_down_rc_track_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -2249,7 +2249,7 @@ static void lay_down_rc_track_right_bank_to_25_deg_up(paint_session * session, u /** rct2: 0x00824A8C */ static void lay_down_rc_track_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -2356,7 +2356,7 @@ static void lay_down_rc_track_25_deg_up_to_left_bank(paint_session * session, ui /** rct2: 0x00824A9C */ static void lay_down_rc_track_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -2463,35 +2463,35 @@ static void lay_down_rc_track_25_deg_up_to_right_bank(paint_session * session, u /** rct2: 0x00824AAC */ static void lay_down_rc_track_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { lay_down_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00824ABC */ static void lay_down_rc_track_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { lay_down_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00824ACC */ static void lay_down_rc_track_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { lay_down_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00824ADC */ static void lay_down_rc_track_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { lay_down_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00824AEC */ static void lay_down_rc_track_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -2563,14 +2563,14 @@ static void lay_down_rc_track_left_bank(paint_session * session, uint8 rideIndex /** rct2: 0x00824AFC */ static void lay_down_rc_track_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { lay_down_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00824B0C */ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -2887,7 +2887,7 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sess /** rct2: 0x00824B1C */ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -3204,7 +3204,7 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up(paint_session * ses /** rct2: 0x00824B2C */ static void lay_down_rc_track_left_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; lay_down_rc_track_right_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, @@ -3213,7 +3213,7 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_down(paint_session * se /** rct2: 0x00824B3C */ static void lay_down_rc_track_right_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; lay_down_rc_track_left_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -3221,7 +3221,7 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_down(paint_session * s /** rct2: 0x00824B4C */ static void lay_down_rc_track_s_bend_left(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -3511,7 +3511,7 @@ static void lay_down_rc_track_s_bend_left(paint_session * session, uint8 rideInd /** rct2: 0x00824B5C */ static void lay_down_rc_track_s_bend_right(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -3801,7 +3801,7 @@ static void lay_down_rc_track_s_bend_right(paint_session * session, uint8 rideIn /** rct2: 0x00824B6C */ static void lay_down_rc_track_left_vertical_loop(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -4309,7 +4309,7 @@ static void lay_down_rc_track_left_vertical_loop(paint_session * session, uint8 /** rct2: 0x00824B7C */ static void lay_down_rc_track_right_vertical_loop(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -4727,7 +4727,7 @@ static void lay_down_rc_track_right_vertical_loop(paint_session * session, uint8 /** rct2: 0x00824BBC */ static void lay_down_rc_track_left_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -4935,7 +4935,7 @@ static void lay_down_rc_track_left_quarter_turn_3(paint_session * session, uint8 /** rct2: 0x00824BCC */ static void lay_down_rc_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; lay_down_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -4943,7 +4943,7 @@ static void lay_down_rc_track_right_quarter_turn_3(paint_session * session, uint /** rct2: 0x00824BDC */ static void lay_down_rc_track_left_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -5155,7 +5155,7 @@ static void lay_down_rc_track_left_quarter_turn_3_bank(paint_session * session, /** rct2: 0x00824BEC */ static void lay_down_rc_track_right_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; lay_down_rc_track_left_quarter_turn_3_bank(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -5163,7 +5163,7 @@ static void lay_down_rc_track_right_quarter_turn_3_bank(paint_session * session, /** rct2: 0x00824BFC */ static void lay_down_rc_track_left_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -5321,7 +5321,7 @@ static void lay_down_rc_track_left_quarter_turn_3_25_deg_up(paint_session * sess /** rct2: 0x00824C0C */ static void lay_down_rc_track_right_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -5485,7 +5485,7 @@ static void lay_down_rc_track_right_quarter_turn_3_25_deg_up(paint_session * ses /** rct2: 0x00824C1C */ static void lay_down_rc_track_left_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; lay_down_rc_track_right_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, @@ -5494,7 +5494,7 @@ static void lay_down_rc_track_left_quarter_turn_3_25_deg_down(paint_session * se /** rct2: 0x00824C2C */ static void lay_down_rc_track_right_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; lay_down_rc_track_left_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -5502,7 +5502,7 @@ static void lay_down_rc_track_right_quarter_turn_3_25_deg_down(paint_session * s /** rct2: 0x00824C9C */ static void lay_down_rc_track_left_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -5912,7 +5912,7 @@ static void lay_down_rc_track_left_half_banked_helix_up_small(paint_session * se /** rct2: 0x00824CAC */ static void lay_down_rc_track_right_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -6322,7 +6322,7 @@ static void lay_down_rc_track_right_half_banked_helix_up_small(paint_session * s /** rct2: 0x00824CBC */ static void lay_down_rc_track_left_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 4) { @@ -6336,7 +6336,7 @@ static void lay_down_rc_track_left_half_banked_helix_down_small(paint_session * /** rct2: 0x00824CCC */ static void lay_down_rc_track_right_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 4) { @@ -6350,7 +6350,7 @@ static void lay_down_rc_track_right_half_banked_helix_down_small(paint_session * /** rct2: 0x00824CDC */ static void lay_down_rc_track_left_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -6988,7 +6988,7 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(paint_session * se /** rct2: 0x00824CEC */ static void lay_down_rc_track_right_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -7626,7 +7626,7 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(paint_session * s /** rct2: 0x00824CFC */ static void lay_down_rc_track_left_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 7) { @@ -7640,7 +7640,7 @@ static void lay_down_rc_track_left_half_banked_helix_down_large(paint_session * /** rct2: 0x00824D0C */ static void lay_down_rc_track_right_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 7) { @@ -7654,7 +7654,7 @@ static void lay_down_rc_track_right_half_banked_helix_down_large(paint_session * /** rct2: 0x00824D3C */ static void lay_down_rc_track_left_quarter_turn_1_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -7723,7 +7723,7 @@ static void lay_down_rc_track_left_quarter_turn_1_60_deg_up(paint_session * sess /** rct2: 0x00824D1C */ static void lay_down_rc_track_right_quarter_turn_1_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -7793,7 +7793,7 @@ static void lay_down_rc_track_right_quarter_turn_1_60_deg_up(paint_session * ses /** rct2: 0x00824D2C */ static void lay_down_rc_track_left_quarter_turn_1_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { lay_down_rc_track_right_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); @@ -7801,14 +7801,14 @@ static void lay_down_rc_track_left_quarter_turn_1_60_deg_down(paint_session * se /** rct2: 0x00824D4C */ static void lay_down_rc_track_right_quarter_turn_1_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { lay_down_rc_track_left_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x00824D5C */ static void lay_down_rc_track_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -7866,7 +7866,7 @@ static void lay_down_rc_track_brakes(paint_session * session, uint8 rideIndex, u /** rct2: 0x00824D6C */ static void lay_down_rc_track_on_ride_photo(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -7964,7 +7964,7 @@ static void lay_down_rc_track_on_ride_photo(paint_session * session, uint8 rideI /** rct2: 0x00824D8C */ static void lay_down_rc_track_left_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -8241,7 +8241,7 @@ static void lay_down_rc_track_left_eighth_to_diag(paint_session * session, uint8 /** rct2: 0x00824D9C */ static void lay_down_rc_track_right_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -8518,7 +8518,7 @@ static void lay_down_rc_track_right_eighth_to_diag(paint_session * session, uint /** rct2: 0x00824DAC */ static void lay_down_rc_track_left_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; lay_down_rc_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -8526,7 +8526,7 @@ static void lay_down_rc_track_left_eighth_to_orthogonal(paint_session * session, /** rct2: 0x00824DBC */ static void lay_down_rc_track_right_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; lay_down_rc_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); @@ -8534,7 +8534,7 @@ static void lay_down_rc_track_right_eighth_to_orthogonal(paint_session * session /** rct2: 0x00824DCC */ static void lay_down_rc_track_left_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -8811,7 +8811,7 @@ static void lay_down_rc_track_left_eighth_bank_to_diag(paint_session * session, /** rct2: 0x00824DDC */ static void lay_down_rc_track_right_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -9088,7 +9088,7 @@ static void lay_down_rc_track_right_eighth_bank_to_diag(paint_session * session, /** rct2: 0x00824DEC */ static void lay_down_rc_track_left_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; lay_down_rc_track_right_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -9096,7 +9096,7 @@ static void lay_down_rc_track_left_eighth_bank_to_orthogonal(paint_session * ses /** rct2: 0x00824DFC */ static void lay_down_rc_track_right_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; lay_down_rc_track_left_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); @@ -9104,7 +9104,7 @@ static void lay_down_rc_track_right_eighth_bank_to_orthogonal(paint_session * se /** rct2: 0x00824D7C */ static void lay_down_rc_track_diag_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -9371,7 +9371,7 @@ static void lay_down_rc_track_diag_flat(paint_session * session, uint8 rideIndex /** rct2: 0x00824E2C */ static void lay_down_rc_track_diag_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -9638,7 +9638,7 @@ static void lay_down_rc_track_diag_25_deg_up(paint_session * session, uint8 ride /** rct2: 0x00824E8C */ static void lay_down_rc_track_diag_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -9853,7 +9853,7 @@ static void lay_down_rc_track_diag_60_deg_up(paint_session * session, uint8 ride /** rct2: 0x00824E0C */ static void lay_down_rc_track_diag_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -10120,7 +10120,7 @@ static void lay_down_rc_track_diag_flat_to_25_deg_up(paint_session * session, ui /** rct2: 0x00824E6C */ static void lay_down_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -10335,7 +10335,7 @@ static void lay_down_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * sessio /** rct2: 0x00824E7C */ static void lay_down_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -10550,7 +10550,7 @@ static void lay_down_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * sessio /** rct2: 0x00824E1C */ static void lay_down_rc_track_diag_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -10817,7 +10817,7 @@ static void lay_down_rc_track_diag_25_deg_up_to_flat(paint_session * session, ui /** rct2: 0x00824E5C */ static void lay_down_rc_track_diag_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -11032,7 +11032,7 @@ static void lay_down_rc_track_diag_25_deg_down(paint_session * session, uint8 ri /** rct2: 0x00824EBC */ static void lay_down_rc_track_diag_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -11247,7 +11247,7 @@ static void lay_down_rc_track_diag_60_deg_down(paint_session * session, uint8 ri /** rct2: 0x00824E3C */ static void lay_down_rc_track_diag_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -11455,7 +11455,7 @@ static void lay_down_rc_track_diag_flat_to_25_deg_down(paint_session * session, /** rct2: 0x00824E9C */ static void lay_down_rc_track_diag_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -11670,7 +11670,7 @@ static void lay_down_rc_track_diag_25_deg_down_to_60_deg_down(paint_session * se /** rct2: 0x00824EAC */ static void lay_down_rc_track_diag_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -11885,7 +11885,7 @@ static void lay_down_rc_track_diag_60_deg_down_to_25_deg_down(paint_session * se /** rct2: 0x00824E4C */ static void lay_down_rc_track_diag_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -12100,7 +12100,7 @@ static void lay_down_rc_track_diag_25_deg_down_to_flat(paint_session * session, /** rct2: 0x00824EEC */ static void lay_down_rc_track_diag_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -12252,7 +12252,7 @@ static void lay_down_rc_track_diag_flat_to_left_bank(paint_session * session, ui /** rct2: 0x00824EFC */ static void lay_down_rc_track_diag_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -12404,7 +12404,7 @@ static void lay_down_rc_track_diag_flat_to_right_bank(paint_session * session, u /** rct2: 0x00824F0C */ static void lay_down_rc_track_diag_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -12556,7 +12556,7 @@ static void lay_down_rc_track_diag_left_bank_to_flat(paint_session * session, ui /** rct2: 0x00824F1C */ static void lay_down_rc_track_diag_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -12708,7 +12708,7 @@ static void lay_down_rc_track_diag_right_bank_to_flat(paint_session * session, u /** rct2: 0x00824F4C */ static void lay_down_rc_track_diag_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -12859,7 +12859,7 @@ static void lay_down_rc_track_diag_left_bank_to_25_deg_up(paint_session * sessio /** rct2: 0x00824F5C */ static void lay_down_rc_track_diag_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -13010,7 +13010,7 @@ static void lay_down_rc_track_diag_right_bank_to_25_deg_up(paint_session * sessi /** rct2: 0x00824F2C */ static void lay_down_rc_track_diag_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -13161,7 +13161,7 @@ static void lay_down_rc_track_diag_25_deg_up_to_left_bank(paint_session * sessio /** rct2: 0x00824F3C */ static void lay_down_rc_track_diag_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -13312,7 +13312,7 @@ static void lay_down_rc_track_diag_25_deg_up_to_right_bank(paint_session * sessi /** rct2: 0x00824F6C */ static void lay_down_rc_track_diag_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -13456,7 +13456,7 @@ static void lay_down_rc_track_diag_left_bank_to_25_deg_down(paint_session * sess /** rct2: 0x00824F7C */ static void lay_down_rc_track_diag_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -13600,7 +13600,7 @@ static void lay_down_rc_track_diag_right_bank_to_25_deg_down(paint_session * ses /** rct2: 0x00824F8C */ static void lay_down_rc_track_diag_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -13751,7 +13751,7 @@ static void lay_down_rc_track_diag_25_deg_down_to_left_bank(paint_session * sess /** rct2: 0x00824F9C */ static void lay_down_rc_track_diag_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -13902,7 +13902,7 @@ static void lay_down_rc_track_diag_25_deg_down_to_right_bank(paint_session * ses /** rct2: 0x00824ECC */ static void lay_down_rc_track_diag_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -14052,7 +14052,7 @@ static void lay_down_rc_track_diag_left_bank(paint_session * session, uint8 ride /** rct2: 0x00824EDC */ static void lay_down_rc_track_diag_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -14202,7 +14202,7 @@ static void lay_down_rc_track_diag_right_bank(paint_session * session, uint8 rid /** rct2: 0x00824FAC */ static void lay_down_rc_track_left_flyer_twist_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -14412,7 +14412,7 @@ static void lay_down_rc_track_left_flyer_twist_up(paint_session * session, uint8 /** rct2: 0x00824FBC */ static void lay_down_rc_track_right_flyer_twist_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -14622,7 +14622,7 @@ static void lay_down_rc_track_right_flyer_twist_up(paint_session * session, uint /** rct2: 0x00824FCC */ static void lay_down_rc_track_left_flyer_twist_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -14832,7 +14832,7 @@ static void lay_down_rc_track_left_flyer_twist_down(paint_session * session, uin /** rct2: 0x00824FDC */ static void lay_down_rc_track_right_flyer_twist_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -15042,7 +15042,7 @@ static void lay_down_rc_track_right_flyer_twist_down(paint_session * session, ui /** rct2: 0x00824C3C */ static void lay_down_rc_track_flyer_half_loop_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -15278,7 +15278,7 @@ static void lay_down_rc_track_flyer_half_loop_up(paint_session * session, uint8 /** rct2: 0x00824C4C */ static void lay_down_rc_track_flyer_half_loop_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -15514,7 +15514,7 @@ static void lay_down_rc_track_flyer_half_loop_down(paint_session * session, uint /** rct2: 0x00824C5C */ static void lay_down_rc_track_left_flyer_corkscrew_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -15742,7 +15742,7 @@ static void lay_down_rc_track_left_flyer_corkscrew_up(paint_session * session, u /** rct2: 0x00824C6C */ static void lay_down_rc_track_right_flyer_corkscrew_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -15944,7 +15944,7 @@ static void lay_down_rc_track_right_flyer_corkscrew_up(paint_session * session, /** rct2: 0x00824C7C */ static void lay_down_rc_track_left_flyer_corkscrew_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -16146,14 +16146,14 @@ static void lay_down_rc_track_left_flyer_corkscrew_down(paint_session * session, /** rct2: 0x00824C8C */ static void lay_down_rc_track_right_flyer_corkscrew_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { lay_down_rc_track_left_flyer_corkscrew_up(session, rideIndex, 2 - trackSequence, (direction + 3) % 4, height, mapElement); } /** rct2: 0x00824FEC */ static void lay_down_rc_track_block_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -16207,7 +16207,7 @@ static void lay_down_rc_track_block_brakes(paint_session * session, uint8 rideIn } static void lay_down_rc_track_left_quarter_banked_helix_large_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -16368,7 +16368,7 @@ static void lay_down_rc_track_left_quarter_banked_helix_large_up(paint_session * } static void lay_down_rc_track_right_quarter_banked_helix_large_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -16530,7 +16530,7 @@ static void lay_down_rc_track_right_quarter_banked_helix_large_up(paint_session static void lay_down_rc_track_left_quarter_banked_helix_large_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -16692,7 +16692,7 @@ static void lay_down_rc_track_left_quarter_banked_helix_large_down(paint_session static void lay_down_rc_track_right_quarter_banked_helix_large_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { diff --git a/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp b/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp index bced87f8cc..5fd623218b 100644 --- a/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" #include "../../paint/paint.h" #include "../../paint/supports.h" #include "../../sprites.h" @@ -28,7 +28,7 @@ /** rct2: 0x008A6D50, 0x008A6D60, 0x008A6D70 */ static void lim_launched_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][3] = { { 15018, 15020, SPR_STATION_BASE_B_SW_NE }, @@ -58,7 +58,7 @@ static void lim_launched_rc_track_station(paint_session * session, uint8 rideInd /** rct2: 0x008A65E0 */ static void lim_launched_rc_track_left_vertical_loop(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -274,7 +274,7 @@ static void lim_launched_rc_track_left_vertical_loop(paint_session * session, ui /** rct2: 0x008A65F0 */ static void lim_launched_rc_track_right_vertical_loop(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -458,7 +458,7 @@ static void lim_launched_rc_track_right_vertical_loop(paint_session * session, u /** rct2: 0x008A6D10 */ static void lim_launched_rc_track_left_twist_down_to_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -581,7 +581,7 @@ static void lim_launched_rc_track_left_twist_down_to_up(paint_session * session, /** rct2: 0x008A6D20 */ static void lim_launched_rc_track_right_twist_down_to_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -704,7 +704,7 @@ static void lim_launched_rc_track_right_twist_down_to_up(paint_session * session /** rct2: 0x008A6D30 */ static void lim_launched_rc_track_left_twist_up_to_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -827,7 +827,7 @@ static void lim_launched_rc_track_left_twist_up_to_down(paint_session * session, /** rct2: 0x008A6D40 */ static void lim_launched_rc_track_right_twist_up_to_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -950,7 +950,7 @@ static void lim_launched_rc_track_right_twist_up_to_down(paint_session * session /** rct2: 0x008A6CD0 */ static void lim_launched_rc_track_left_corkscrew_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1048,7 +1048,7 @@ static void lim_launched_rc_track_left_corkscrew_up(paint_session * session, uin /** rct2: 0x008A6CE0 */ static void lim_launched_rc_track_right_corkscrew_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1147,21 +1147,21 @@ static void lim_launched_rc_track_right_corkscrew_up(paint_session * session, ui /** rct2: 0x008A6CF0 */ static void lim_launched_rc_track_left_corkscrew_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { lim_launched_rc_track_right_corkscrew_up(session, rideIndex, 2 - trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A6D00 */ static void lim_launched_rc_track_right_corkscrew_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { lim_launched_rc_track_left_corkscrew_up(session, rideIndex, 2 - trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A6D80 */ static void lim_launched_rc_track_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1188,7 +1188,7 @@ static void lim_launched_rc_track_brakes(paint_session * session, uint8 rideInde /** rct2: 0x008A6C10 */ static void lim_launched_rc_track_90_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1224,14 +1224,14 @@ static void lim_launched_rc_track_90_deg_up(paint_session * session, uint8 rideI /** rct2: 0x008A6C20 */ static void lim_launched_rc_track_90_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { lim_launched_rc_track_90_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6C30 */ static void lim_launched_rc_track_60_deg_up_to_90_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1271,14 +1271,14 @@ static void lim_launched_rc_track_60_deg_up_to_90_deg_up(paint_session * session /** rct2: 0x008A6C40 */ static void lim_launched_rc_track_90_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { lim_launched_rc_track_60_deg_up_to_90_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6C50 */ static void lim_launched_rc_track_90_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1315,7 +1315,7 @@ static void lim_launched_rc_track_90_deg_up_to_60_deg_up(paint_session * session /** rct2: 0x008A6C60 */ static void lim_launched_rc_track_60_deg_down_to_90_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1355,7 +1355,7 @@ static void lim_launched_rc_track_60_deg_down_to_90_deg_down(paint_session * ses /** rct2: 0x008A6C70 */ static void lim_launched_rc_track_90_deg_to_inverted_flat_quarter_loop_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -1441,7 +1441,7 @@ static void lim_launched_rc_track_90_deg_to_inverted_flat_quarter_loop_up(paint_ /** rct2: 0x008A6C80 */ static void lim_launched_rc_track_inverted_flat_to_90_deg_quarter_loop_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { lim_launched_rc_track_90_deg_to_inverted_flat_quarter_loop_up(session, rideIndex, 2 - trackSequence, direction, height, mapElement); @@ -1449,7 +1449,7 @@ static void lim_launched_rc_track_inverted_flat_to_90_deg_quarter_loop_down(pain /** rct2: 0x008A6D90 */ static void lim_launched_rc_track_block_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1475,7 +1475,7 @@ static void lim_launched_rc_track_block_brakes(paint_session * session, uint8 ri } static void lim_launched_rc_track_left_quarter_turn_1_90_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1515,7 +1515,7 @@ static void lim_launched_rc_track_left_quarter_turn_1_90_deg_up(paint_session * /** rct2: 0x008A6CA0 */ static void lim_launched_rc_track_right_quarter_turn_1_90_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1555,7 +1555,7 @@ static void lim_launched_rc_track_right_quarter_turn_1_90_deg_up(paint_session * /** rct2: 0x008A6CB0 */ static void lim_launched_rc_track_left_quarter_turn_1_90_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { lim_launched_rc_track_right_quarter_turn_1_90_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); @@ -1564,7 +1564,7 @@ static void lim_launched_rc_track_left_quarter_turn_1_90_deg_down(paint_session /** rct2: 0x008A6CC0 */ static void lim_launched_rc_track_right_quarter_turn_1_90_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { lim_launched_rc_track_left_quarter_turn_1_90_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); diff --git a/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp b/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp index fd3546f0ed..d28c110436 100644 --- a/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" #include "../../paint/paint.h" #include "../../paint/supports.h" #include "../../sprites.h" @@ -28,7 +28,7 @@ /** rct2: 0x008A6370 */ static void looping_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -83,7 +83,7 @@ static void looping_rc_track_flat(paint_session * session, uint8 rideIndex, uint } static void looping_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { 15016, SPR_STATION_BASE_B_SW_NE }, @@ -105,7 +105,7 @@ static void looping_rc_track_station(paint_session * session, uint8 rideIndex, u /** rct2: 0x008A6380 */ static void looping_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -174,7 +174,7 @@ static void looping_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, /** rct2: 0x008A6390 */ static void looping_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -243,7 +243,7 @@ static void looping_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, /** rct2: 0x008A63A0 */ static void looping_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -312,7 +312,7 @@ static void looping_rc_track_flat_to_25_deg_up(paint_session * session, uint8 ri /** rct2: 0x008A63B0 */ static void looping_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -389,7 +389,7 @@ static void looping_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uin /** rct2: 0x008A63C0 */ static void looping_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -466,7 +466,7 @@ static void looping_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uin /** rct2: 0x008A63D0 */ static void looping_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -535,49 +535,49 @@ static void looping_rc_track_25_deg_up_to_flat(paint_session * session, uint8 ri /** rct2: 0x008A63E0 */ static void looping_rc_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { looping_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A63F0 */ static void looping_rc_track_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { looping_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6400 */ static void looping_rc_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { looping_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6410 */ static void looping_rc_track_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { looping_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6420 */ static void looping_rc_track_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { looping_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6430 */ static void looping_rc_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { looping_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6440 */ static void looping_rc_track_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -731,7 +731,7 @@ static void looping_rc_track_left_quarter_turn_5(paint_session * session, uint8 /** rct2: 0x008A6450 */ static void looping_rc_track_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; looping_rc_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -739,7 +739,7 @@ static void looping_rc_track_right_quarter_turn_5(paint_session * session, uint8 /** rct2: 0x008A6460 */ static void looping_rc_track_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -776,7 +776,7 @@ static void looping_rc_track_flat_to_left_bank(paint_session * session, uint8 ri /** rct2: 0x008A6470 */ static void looping_rc_track_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -813,7 +813,7 @@ static void looping_rc_track_flat_to_right_bank(paint_session * session, uint8 r /** rct2: 0x008A6480 */ static void looping_rc_track_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -850,7 +850,7 @@ static void looping_rc_track_left_bank_to_flat(paint_session * session, uint8 ri /** rct2: 0x008A6490 */ static void looping_rc_track_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -887,7 +887,7 @@ static void looping_rc_track_right_bank_to_flat(paint_session * session, uint8 r /** rct2: 0x008A64A0 */ static void looping_rc_track_banked_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1045,7 +1045,7 @@ static void looping_rc_track_banked_left_quarter_turn_5(paint_session * session, /** rct2: 0x008A64B0 */ static void looping_rc_track_banked_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; looping_rc_track_banked_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -1053,7 +1053,7 @@ static void looping_rc_track_banked_right_quarter_turn_5(paint_session * session /** rct2: 0x008A64C0 */ static void looping_rc_track_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1097,7 +1097,7 @@ static void looping_rc_track_left_bank_to_25_deg_up(paint_session * session, uin /** rct2: 0x008A64D0 */ static void looping_rc_track_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1141,7 +1141,7 @@ static void looping_rc_track_right_bank_to_25_deg_up(paint_session * session, ui /** rct2: 0x008A64E0 */ static void looping_rc_track_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1185,7 +1185,7 @@ static void looping_rc_track_25_deg_up_to_left_bank(paint_session * session, uin /** rct2: 0x008A64F0 */ static void looping_rc_track_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1229,35 +1229,35 @@ static void looping_rc_track_25_deg_up_to_right_bank(paint_session * session, ui /** rct2: 0x008A6500 */ static void looping_rc_track_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { looping_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6510 */ static void looping_rc_track_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { looping_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6520 */ static void looping_rc_track_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { looping_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6530 */ static void looping_rc_track_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { looping_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6540 */ static void looping_rc_track_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1290,14 +1290,14 @@ static void looping_rc_track_left_bank(paint_session * session, uint8 rideIndex, /** rct2: 0x008A6550 */ static void looping_rc_track_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { looping_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6560 */ static void looping_rc_track_left_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1446,7 +1446,7 @@ static void looping_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sessi /** rct2: 0x008A6570 */ static void looping_rc_track_right_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1595,7 +1595,7 @@ static void looping_rc_track_right_quarter_turn_5_25_deg_up(paint_session * sess /** rct2: 0x008A6580 */ static void looping_rc_track_left_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; looping_rc_track_right_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); @@ -1603,7 +1603,7 @@ static void looping_rc_track_left_quarter_turn_5_25_deg_down(paint_session * ses /** rct2: 0x008A6590 */ static void looping_rc_track_right_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; looping_rc_track_left_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -1611,7 +1611,7 @@ static void looping_rc_track_right_quarter_turn_5_25_deg_down(paint_session * se /** rct2: 0x008A65A0 */ static void looping_rc_track_s_bend_left(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1735,7 +1735,7 @@ static void looping_rc_track_s_bend_left(paint_session * session, uint8 rideInde /** rct2: 0x008A65B0 */ static void looping_rc_track_s_bend_right(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1859,7 +1859,7 @@ static void looping_rc_track_s_bend_right(paint_session * session, uint8 rideInd /** rct2: 0x008A65C0 */ static void looping_rc_track_left_vertical_loop(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2097,7 +2097,7 @@ static void looping_rc_track_left_vertical_loop(paint_session * session, uint8 r /** rct2: 0x008A65D0 */ static void looping_rc_track_right_vertical_loop(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2309,7 +2309,7 @@ static void looping_rc_track_right_vertical_loop(paint_session * session, uint8 /** rct2: 0x008A6630 */ static void looping_rc_track_left_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2408,7 +2408,7 @@ static void looping_rc_track_left_quarter_turn_3(paint_session * session, uint8 /** rct2: 0x008A6640 */ static void looping_rc_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; looping_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -2416,7 +2416,7 @@ static void looping_rc_track_right_quarter_turn_3(paint_session * session, uint8 /** rct2: 0x008A6650 */ static void looping_rc_track_left_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2519,7 +2519,7 @@ static void looping_rc_track_left_quarter_turn_3_bank(paint_session * session, u /** rct2: 0x008A6660 */ static void looping_rc_track_right_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; looping_rc_track_left_quarter_turn_3_bank(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -2527,7 +2527,7 @@ static void looping_rc_track_right_quarter_turn_3_bank(paint_session * session, /** rct2: 0x008A6670 */ static void looping_rc_track_left_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2597,7 +2597,7 @@ static void looping_rc_track_left_quarter_turn_3_25_deg_up(paint_session * sessi /** rct2: 0x008A6680 */ static void looping_rc_track_right_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2670,7 +2670,7 @@ static void looping_rc_track_right_quarter_turn_3_25_deg_up(paint_session * sess /** rct2: 0x008A6690 */ static void looping_rc_track_left_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; looping_rc_track_right_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); @@ -2678,7 +2678,7 @@ static void looping_rc_track_left_quarter_turn_3_25_deg_down(paint_session * ses /** rct2: 0x008A66A0 */ static void looping_rc_track_right_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; looping_rc_track_left_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -2686,7 +2686,7 @@ static void looping_rc_track_right_quarter_turn_3_25_deg_down(paint_session * se /** rct2: 0x008A66B0 */ static void looping_rc_track_left_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2887,7 +2887,7 @@ static void looping_rc_track_left_half_banked_helix_up_small(paint_session * ses /** rct2: 0x008A66C0 */ static void looping_rc_track_right_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3088,7 +3088,7 @@ static void looping_rc_track_right_half_banked_helix_up_small(paint_session * se /** rct2: 0x008A66D0 */ static void looping_rc_track_left_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 4) { @@ -3102,7 +3102,7 @@ static void looping_rc_track_left_half_banked_helix_down_small(paint_session * s /** rct2: 0x008A66E0 */ static void looping_rc_track_right_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 4) { @@ -3116,7 +3116,7 @@ static void looping_rc_track_right_half_banked_helix_down_small(paint_session * /** rct2: 0x008A66F0 */ static void looping_rc_track_left_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3427,7 +3427,7 @@ static void looping_rc_track_left_half_banked_helix_up_large(paint_session * ses /** rct2: 0x008A6700 */ static void looping_rc_track_right_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3738,7 +3738,7 @@ static void looping_rc_track_right_half_banked_helix_up_large(paint_session * se /** rct2: 0x008A6710 */ static void looping_rc_track_left_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 7) { @@ -3752,7 +3752,7 @@ static void looping_rc_track_left_half_banked_helix_down_large(paint_session * s /** rct2: 0x008A6720 */ static void looping_rc_track_right_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 7) { @@ -3766,7 +3766,7 @@ static void looping_rc_track_right_half_banked_helix_down_large(paint_session * /** rct2: 0x008A6750 */ static void looping_rc_track_left_quarter_turn_1_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -3802,7 +3802,7 @@ static void looping_rc_track_left_quarter_turn_1_60_deg_up(paint_session * sessi /** rct2: 0x008A6730 */ static void looping_rc_track_right_quarter_turn_1_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -3838,21 +3838,21 @@ static void looping_rc_track_right_quarter_turn_1_60_deg_up(paint_session * sess /** rct2: 0x008A6740 */ static void looping_rc_track_left_quarter_turn_1_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { looping_rc_track_right_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A6760 */ static void looping_rc_track_right_quarter_turn_1_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { looping_rc_track_left_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A6770 */ static void looping_rc_track_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -3883,7 +3883,7 @@ static void looping_rc_track_brakes(paint_session * session, uint8 rideIndex, ui /** rct2: 0x008A6A40 */ static void looping_rc_track_25_deg_up_left_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -3923,7 +3923,7 @@ static void looping_rc_track_25_deg_up_left_banked(paint_session * session, uint /** rct2: 0x008A6A50 */ static void looping_rc_track_25_deg_up_right_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -3963,7 +3963,7 @@ static void looping_rc_track_25_deg_up_right_banked(paint_session * session, uin /** rct2: 0x008A6780 */ static void looping_rc_track_on_ride_photo(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -4008,21 +4008,21 @@ static void looping_rc_track_on_ride_photo(paint_session * session, uint8 rideIn /** rct2: 0x008A6A60 */ static void looping_rc_track_25_deg_down_left_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { looping_rc_track_25_deg_up_right_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6A70 */ static void looping_rc_track_25_deg_down_right_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { looping_rc_track_25_deg_up_left_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6860 */ static void looping_rc_track_left_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4146,7 +4146,7 @@ static void looping_rc_track_left_eighth_to_diag(paint_session * session, uint8 /** rct2: 0x008A6870 */ static void looping_rc_track_right_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4270,7 +4270,7 @@ static void looping_rc_track_right_eighth_to_diag(paint_session * session, uint8 /** rct2: 0x008A6880 */ static void looping_rc_track_left_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; looping_rc_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -4278,7 +4278,7 @@ static void looping_rc_track_left_eighth_to_orthogonal(paint_session * session, /** rct2: 0x008A6890 */ static void looping_rc_track_right_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; looping_rc_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); @@ -4286,7 +4286,7 @@ static void looping_rc_track_right_eighth_to_orthogonal(paint_session * session, /** rct2: 0x008A68A0 */ static void looping_rc_track_left_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4410,7 +4410,7 @@ static void looping_rc_track_left_eighth_bank_to_diag(paint_session * session, u /** rct2: 0x008A68B0 */ static void looping_rc_track_right_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4534,7 +4534,7 @@ static void looping_rc_track_right_eighth_bank_to_diag(paint_session * session, /** rct2: 0x008A68C0 */ static void looping_rc_track_left_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; looping_rc_track_right_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -4542,7 +4542,7 @@ static void looping_rc_track_left_eighth_bank_to_orthogonal(paint_session * sess /** rct2: 0x008A68D0 */ static void looping_rc_track_right_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; looping_rc_track_left_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); @@ -4550,7 +4550,7 @@ static void looping_rc_track_right_eighth_bank_to_orthogonal(paint_session * ses /** rct2: 0x008A6790 */ static void looping_rc_track_diag_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4687,7 +4687,7 @@ static void looping_rc_track_diag_flat(paint_session * session, uint8 rideIndex, /** rct2: 0x008A67C0 */ static void looping_rc_track_diag_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4824,7 +4824,7 @@ static void looping_rc_track_diag_25_deg_up(paint_session * session, uint8 rideI /** rct2: 0x008A67F0 */ static void looping_rc_track_diag_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4961,7 +4961,7 @@ static void looping_rc_track_diag_60_deg_up(paint_session * session, uint8 rideI /** rct2: 0x008A67A0 */ static void looping_rc_track_diag_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5098,7 +5098,7 @@ static void looping_rc_track_diag_flat_to_25_deg_up(paint_session * session, uin /** rct2: 0x008A67D0 */ static void looping_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5235,7 +5235,7 @@ static void looping_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * session /** rct2: 0x008A67E0 */ static void looping_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5372,7 +5372,7 @@ static void looping_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * session /** rct2: 0x008A67B0 */ static void looping_rc_track_diag_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5509,7 +5509,7 @@ static void looping_rc_track_diag_25_deg_up_to_flat(paint_session * session, uin /** rct2: 0x008A6820 */ static void looping_rc_track_diag_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5646,7 +5646,7 @@ static void looping_rc_track_diag_25_deg_down(paint_session * session, uint8 rid /** rct2: 0x008A6850 */ static void looping_rc_track_diag_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5783,7 +5783,7 @@ static void looping_rc_track_diag_60_deg_down(paint_session * session, uint8 rid /** rct2: 0x008A6800 */ static void looping_rc_track_diag_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5918,7 +5918,7 @@ static void looping_rc_track_diag_flat_to_25_deg_down(paint_session * session, u /** rct2: 0x008A6830 */ static void looping_rc_track_diag_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6055,7 +6055,7 @@ static void looping_rc_track_diag_25_deg_down_to_60_deg_down(paint_session * ses /** rct2: 0x008A6840 */ static void looping_rc_track_diag_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6192,7 +6192,7 @@ static void looping_rc_track_diag_60_deg_down_to_25_deg_down(paint_session * ses /** rct2: 0x008A6810 */ static void looping_rc_track_diag_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6329,7 +6329,7 @@ static void looping_rc_track_diag_25_deg_down_to_flat(paint_session * session, u /** rct2: 0x008A6900 */ static void looping_rc_track_diag_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6398,7 +6398,7 @@ static void looping_rc_track_diag_flat_to_left_bank(paint_session * session, uin /** rct2: 0x008A6910 */ static void looping_rc_track_diag_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6467,7 +6467,7 @@ static void looping_rc_track_diag_flat_to_right_bank(paint_session * session, ui /** rct2: 0x008A6920 */ static void looping_rc_track_diag_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6536,7 +6536,7 @@ static void looping_rc_track_diag_left_bank_to_flat(paint_session * session, uin /** rct2: 0x008A6930 */ static void looping_rc_track_diag_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6605,7 +6605,7 @@ static void looping_rc_track_diag_right_bank_to_flat(paint_session * session, ui /** rct2: 0x008A6960 */ static void looping_rc_track_diag_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6674,7 +6674,7 @@ static void looping_rc_track_diag_left_bank_to_25_deg_up(paint_session * session /** rct2: 0x008A6970 */ static void looping_rc_track_diag_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6743,7 +6743,7 @@ static void looping_rc_track_diag_right_bank_to_25_deg_up(paint_session * sessio /** rct2: 0x008A6940 */ static void looping_rc_track_diag_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6812,7 +6812,7 @@ static void looping_rc_track_diag_25_deg_up_to_left_bank(paint_session * session /** rct2: 0x008A6950 */ static void looping_rc_track_diag_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6881,7 +6881,7 @@ static void looping_rc_track_diag_25_deg_up_to_right_bank(paint_session * sessio /** rct2: 0x008A6980 */ static void looping_rc_track_diag_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6948,7 +6948,7 @@ static void looping_rc_track_diag_left_bank_to_25_deg_down(paint_session * sessi /** rct2: 0x008A6990 */ static void looping_rc_track_diag_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7015,7 +7015,7 @@ static void looping_rc_track_diag_right_bank_to_25_deg_down(paint_session * sess /** rct2: 0x008A69A0 */ static void looping_rc_track_diag_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7084,7 +7084,7 @@ static void looping_rc_track_diag_25_deg_down_to_left_bank(paint_session * sessi /** rct2: 0x008A69B0 */ static void looping_rc_track_diag_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7153,7 +7153,7 @@ static void looping_rc_track_diag_25_deg_down_to_right_bank(paint_session * sess /** rct2: 0x008A68E0 */ static void looping_rc_track_diag_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7220,7 +7220,7 @@ static void looping_rc_track_diag_left_bank(paint_session * session, uint8 rideI /** rct2: 0x008A68F0 */ static void looping_rc_track_diag_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7287,7 +7287,7 @@ static void looping_rc_track_diag_right_bank(paint_session * session, uint8 ride /** rct2: 0x008A6C00 */ static void looping_rc_track_block_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -7318,7 +7318,7 @@ static void looping_rc_track_block_brakes(paint_session * session, uint8 rideInd /** rct2: 0x008A6BC0 */ static void looping_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7392,7 +7392,7 @@ static void looping_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session /** rct2: 0x008A6BD0 */ static void looping_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -7469,7 +7469,7 @@ static void looping_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_session /** rct2: 0x008A6BE0 */ static void looping_rc_track_left_banked_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; looping_rc_track_right_banked_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, @@ -7479,7 +7479,7 @@ static void looping_rc_track_left_banked_quarter_turn_3_25_deg_down(paint_sessio /** rct2: 0x008A6BF0 */ static void looping_rc_track_right_banked_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; looping_rc_track_left_banked_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, @@ -7488,7 +7488,7 @@ static void looping_rc_track_right_banked_quarter_turn_3_25_deg_down(paint_sessi /** rct2: 0x008A6B80 */ static void looping_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7641,7 +7641,7 @@ static void looping_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session /** rct2: 0x008A6B90 */ static void looping_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -7794,7 +7794,7 @@ static void looping_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session /** rct2: 0x008A6BA0 */ static void looping_rc_track_left_banked_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; looping_rc_track_right_banked_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, @@ -7804,7 +7804,7 @@ static void looping_rc_track_left_banked_quarter_turn_5_25_deg_down(paint_sessio /** rct2: 0x008A6BB0 */ static void looping_rc_track_right_banked_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; looping_rc_track_left_banked_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, @@ -7813,7 +7813,7 @@ static void looping_rc_track_right_banked_quarter_turn_5_25_deg_down(paint_sessi /** rct2: 0x008A6A80 */ static void looping_rc_track_25_deg_up_to_left_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -7855,7 +7855,7 @@ static void looping_rc_track_25_deg_up_to_left_banked_25_deg_up(paint_session * /** rct2: 0x008A6A90 */ static void looping_rc_track_25_deg_up_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -7897,7 +7897,7 @@ static void looping_rc_track_25_deg_up_to_right_banked_25_deg_up(paint_session * /** rct2: 0x008A6AA0 */ static void looping_rc_track_left_banked_25_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -7939,7 +7939,7 @@ static void looping_rc_track_left_banked_25_deg_up_to_25_deg_up(paint_session * /** rct2: 0x008A6AB0 */ static void looping_rc_track_right_banked_25_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -7982,7 +7982,7 @@ static void looping_rc_track_right_banked_25_deg_up_to_25_deg_up(paint_session * /** rct2: 0x008A6AC0 */ static void looping_rc_track_25_deg_down_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { looping_rc_track_right_banked_25_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -7991,7 +7991,7 @@ static void looping_rc_track_25_deg_down_to_left_banked_25_deg_down(paint_sessio /** rct2: 0x008A6AD0 */ static void looping_rc_track_25_deg_down_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { looping_rc_track_left_banked_25_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -8000,7 +8000,7 @@ static void looping_rc_track_25_deg_down_to_right_banked_25_deg_down(paint_sessi /** rct2: 0x008A6AE0 */ static void looping_rc_track_left_banked_25_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { looping_rc_track_25_deg_up_to_right_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -8009,7 +8009,7 @@ static void looping_rc_track_left_banked_25_deg_down_to_25_deg_down(paint_sessio /** rct2: 0x008A6AF0 */ static void looping_rc_track_right_banked_25_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { looping_rc_track_25_deg_up_to_left_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -8018,7 +8018,7 @@ static void looping_rc_track_right_banked_25_deg_down_to_25_deg_down(paint_sessi /** rct2: 0x008A6B00 */ static void looping_rc_track_left_banked_flat_to_left_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (direction) { @@ -8059,7 +8059,7 @@ static void looping_rc_track_left_banked_flat_to_left_banked_25_deg_up(paint_ses /** rct2: 0x008A6B10 */ static void looping_rc_track_right_banked_flat_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (direction) { @@ -8100,7 +8100,7 @@ static void looping_rc_track_right_banked_flat_to_right_banked_25_deg_up(paint_s /** rct2: 0x008A6B40 */ static void looping_rc_track_left_banked_25_deg_up_to_left_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (direction) { @@ -8141,7 +8141,7 @@ static void looping_rc_track_left_banked_25_deg_up_to_left_banked_flat(paint_ses /** rct2: 0x008A6B50 */ static void looping_rc_track_right_banked_25_deg_up_to_right_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (direction) { @@ -8182,7 +8182,7 @@ static void looping_rc_track_right_banked_25_deg_up_to_right_banked_flat(paint_s /** rct2: 0x008A6B60 */ static void looping_rc_track_left_banked_flat_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { looping_rc_track_right_banked_25_deg_up_to_right_banked_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -8191,7 +8191,7 @@ static void looping_rc_track_left_banked_flat_to_left_banked_25_deg_down(paint_s /** rct2: 0x008A6B70 */ static void looping_rc_track_right_banked_flat_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { looping_rc_track_left_banked_25_deg_up_to_left_banked_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -8200,7 +8200,7 @@ static void looping_rc_track_right_banked_flat_to_right_banked_25_deg_down(paint /** rct2: 0x008A6B20 */ static void looping_rc_track_left_banked_25_deg_down_to_left_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { looping_rc_track_right_banked_flat_to_right_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -8209,7 +8209,7 @@ static void looping_rc_track_left_banked_25_deg_down_to_left_banked_flat(paint_s /** rct2: 0x008A6B30 */ static void looping_rc_track_right_banked_25_deg_down_to_right_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { looping_rc_track_left_banked_flat_to_left_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -8217,7 +8217,7 @@ static void looping_rc_track_right_banked_25_deg_down_to_right_banked_flat(paint /** rct2: 0x008A69C0 */ static void looping_rc_track_flat_to_left_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -8259,7 +8259,7 @@ static void looping_rc_track_flat_to_left_banked_25_deg_up(paint_session * sessi /** rct2: 0x008A69D0 */ static void looping_rc_track_flat_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -8301,7 +8301,7 @@ static void looping_rc_track_flat_to_right_banked_25_deg_up(paint_session * sess /** rct2: 0x008A69E0 */ static void looping_rc_track_left_banked_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -8343,7 +8343,7 @@ static void looping_rc_track_left_banked_25_deg_up_to_flat(paint_session * sessi /** rct2: 0x008A69F0 */ static void looping_rc_track_right_banked_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -8385,34 +8385,34 @@ static void looping_rc_track_right_banked_25_deg_up_to_flat(paint_session * sess /** rct2: 0x008A6A00 */ static void looping_rc_track_flat_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { looping_rc_track_right_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6A10 */ static void looping_rc_track_flat_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { looping_rc_track_left_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6A20 */ static void looping_rc_track_left_banked_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { looping_rc_track_flat_to_right_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A6A30 */ static void looping_rc_track_right_banked_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { looping_rc_track_flat_to_left_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } static void looping_rc_track_booster(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!is_csg_loaded()) { diff --git a/src/openrct2/ride/coaster/MineRide.cpp b/src/openrct2/ride/coaster/MineRide.cpp index 8c9aaf9be7..be3cde8f26 100644 --- a/src/openrct2/ride/coaster/MineRide.cpp +++ b/src/openrct2/ride/coaster/MineRide.cpp @@ -16,7 +16,7 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" #include "../../paint/paint.h" #include "../../paint/supports.h" #include "../../sprites.h" @@ -28,7 +28,7 @@ /** rct2: 0x008B08D0 */ static void mine_ride_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (direction) { @@ -59,7 +59,7 @@ static void mine_ride_track_flat(paint_session * session, uint8 rideIndex, uint8 } static void mine_ride_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][3] = { { 19338, SPR_STATION_BASE_A_SW_NE }, @@ -81,7 +81,7 @@ static void mine_ride_track_station(paint_session * session, uint8 rideIndex, ui /** rct2: 0x008B08E0 */ static void mine_ride_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -135,7 +135,7 @@ static void mine_ride_track_25_deg_up(paint_session * session, uint8 rideIndex, /** rct2: 0x008B08F0 */ static void mine_ride_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -189,7 +189,7 @@ static void mine_ride_track_flat_to_25_deg_up(paint_session * session, uint8 rid /** rct2: 0x008B0900 */ static void mine_ride_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -243,28 +243,28 @@ static void mine_ride_track_25_deg_up_to_flat(paint_session * session, uint8 rid /** rct2: 0x008B0910 */ static void mine_ride_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { mine_ride_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008B0920 */ static void mine_ride_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { mine_ride_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008B0930 */ static void mine_ride_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { mine_ride_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008B0940 */ static void mine_ride_track_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -428,7 +428,7 @@ static void mine_ride_track_left_quarter_turn_5(paint_session * session, uint8 r /** rct2: 0x008B0950 */ static void mine_ride_track_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mine_ride_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -436,7 +436,7 @@ static void mine_ride_track_right_quarter_turn_5(paint_session * session, uint8 /** rct2: 0x008B0960 */ static void mine_ride_track_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -487,7 +487,7 @@ static void mine_ride_track_flat_to_left_bank(paint_session * session, uint8 rid /** rct2: 0x008B0970 */ static void mine_ride_track_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -538,7 +538,7 @@ static void mine_ride_track_flat_to_right_bank(paint_session * session, uint8 ri /** rct2: 0x008B0980 */ static void mine_ride_track_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -589,7 +589,7 @@ static void mine_ride_track_left_bank_to_flat(paint_session * session, uint8 rid /** rct2: 0x008B0990 */ static void mine_ride_track_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -640,7 +640,7 @@ static void mine_ride_track_right_bank_to_flat(paint_session * session, uint8 ri /** rct2: 0x008B09A0 */ static void mine_ride_track_banked_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -808,7 +808,7 @@ static void mine_ride_track_banked_left_quarter_turn_5(paint_session * session, /** rct2: 0x008B09B0 */ static void mine_ride_track_banked_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mine_ride_track_banked_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -816,7 +816,7 @@ static void mine_ride_track_banked_right_quarter_turn_5(paint_session * session, /** rct2: 0x008B09C0 */ static void mine_ride_track_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -874,7 +874,7 @@ static void mine_ride_track_left_bank_to_25_deg_up(paint_session * session, uint /** rct2: 0x008B09D0 */ static void mine_ride_track_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -932,7 +932,7 @@ static void mine_ride_track_right_bank_to_25_deg_up(paint_session * session, uin /** rct2: 0x008B09E0 */ static void mine_ride_track_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -990,7 +990,7 @@ static void mine_ride_track_25_deg_up_to_left_bank(paint_session * session, uint /** rct2: 0x008B09F0 */ static void mine_ride_track_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1048,35 +1048,35 @@ static void mine_ride_track_25_deg_up_to_right_bank(paint_session * session, uin /** rct2: 0x008B0A00 */ static void mine_ride_track_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { mine_ride_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008B0A10 */ static void mine_ride_track_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { mine_ride_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008B0A20 */ static void mine_ride_track_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { mine_ride_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008B0A30 */ static void mine_ride_track_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { mine_ride_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008B0A40 */ static void mine_ride_track_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1123,14 +1123,14 @@ static void mine_ride_track_left_bank(paint_session * session, uint8 rideIndex, /** rct2: 0x008B0A50 */ static void mine_ride_track_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { mine_ride_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008B0A60 */ static void mine_ride_track_s_bend_left(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1266,7 +1266,7 @@ static void mine_ride_track_s_bend_left(paint_session * session, uint8 rideIndex /** rct2: 0x008B0A70 */ static void mine_ride_track_s_bend_right(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1402,7 +1402,7 @@ static void mine_ride_track_s_bend_right(paint_session * session, uint8 rideInde /** rct2: 0x008B0AB0 */ static void mine_ride_track_left_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1511,7 +1511,7 @@ static void mine_ride_track_left_quarter_turn_3(paint_session * session, uint8 r /** rct2: 0x008B0AC0 */ static void mine_ride_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mine_ride_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -1519,7 +1519,7 @@ static void mine_ride_track_right_quarter_turn_3(paint_session * session, uint8 /** rct2: 0x008B0AD0 */ static void mine_ride_track_left_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1632,7 +1632,7 @@ static void mine_ride_track_left_quarter_turn_3_bank(paint_session * session, ui /** rct2: 0x008B0AE0 */ static void mine_ride_track_right_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mine_ride_track_left_quarter_turn_3_bank(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -1640,7 +1640,7 @@ static void mine_ride_track_right_quarter_turn_3_bank(paint_session * session, u /** rct2: 0x008B0AF0 */ static void mine_ride_track_left_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1861,7 +1861,7 @@ static void mine_ride_track_left_half_banked_helix_up_small(paint_session * sess /** rct2: 0x008B0B00 */ static void mine_ride_track_right_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2082,7 +2082,7 @@ static void mine_ride_track_right_half_banked_helix_up_small(paint_session * ses /** rct2: 0x008B0B10 */ static void mine_ride_track_left_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 4) { @@ -2096,7 +2096,7 @@ static void mine_ride_track_left_half_banked_helix_down_small(paint_session * se /** rct2: 0x008B0B20 */ static void mine_ride_track_right_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 4) { @@ -2109,7 +2109,7 @@ static void mine_ride_track_right_half_banked_helix_down_small(paint_session * s /** rct2: 0x008B0B30 */ static void mine_ride_track_left_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2440,7 +2440,7 @@ static void mine_ride_track_left_half_banked_helix_up_large(paint_session * sess /** rct2: 0x008B0B40 */ static void mine_ride_track_right_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2771,7 +2771,7 @@ static void mine_ride_track_right_half_banked_helix_up_large(paint_session * ses /** rct2: 0x008B0B50 */ static void mine_ride_track_left_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 7) { @@ -2785,7 +2785,7 @@ static void mine_ride_track_left_half_banked_helix_down_large(paint_session * se /** rct2: 0x008B0B60 */ static void mine_ride_track_right_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 7) { @@ -2798,7 +2798,7 @@ static void mine_ride_track_right_half_banked_helix_down_large(paint_session * s /** rct2: 0x008B0B70 */ static void mine_ride_track_on_ride_photo(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -2839,7 +2839,7 @@ static void mine_ride_track_on_ride_photo(paint_session * session, uint8 rideInd /** rct2: 0x008B0B90 */ static void mine_ride_track_left_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2970,7 +2970,7 @@ static void mine_ride_track_left_eighth_to_diag(paint_session * session, uint8 r /** rct2: 0x008B0BA0 */ static void mine_ride_track_right_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3101,7 +3101,7 @@ static void mine_ride_track_right_eighth_to_diag(paint_session * session, uint8 /** rct2: 0x008B0BB0 */ static void mine_ride_track_left_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mine_ride_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -3109,7 +3109,7 @@ static void mine_ride_track_left_eighth_to_orthogonal(paint_session * session, u /** rct2: 0x008B0BC0 */ static void mine_ride_track_right_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mine_ride_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); @@ -3117,7 +3117,7 @@ static void mine_ride_track_right_eighth_to_orthogonal(paint_session * session, /** rct2: 0x008B0BD0 */ static void mine_ride_track_left_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3248,7 +3248,7 @@ static void mine_ride_track_left_eighth_bank_to_diag(paint_session * session, ui /** rct2: 0x008B0BE0 */ static void mine_ride_track_right_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3379,7 +3379,7 @@ static void mine_ride_track_right_eighth_bank_to_diag(paint_session * session, u /** rct2: 0x008B0BF0 */ static void mine_ride_track_left_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mine_ride_track_right_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -3387,7 +3387,7 @@ static void mine_ride_track_left_eighth_bank_to_orthogonal(paint_session * sessi /** rct2: 0x008B0C00 */ static void mine_ride_track_right_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mine_ride_track_left_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); @@ -3395,7 +3395,7 @@ static void mine_ride_track_right_eighth_bank_to_orthogonal(paint_session * sess /** rct2: 0x008B0B80 */ static void mine_ride_track_diag_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3464,7 +3464,7 @@ static void mine_ride_track_diag_flat(paint_session * session, uint8 rideIndex, /** rct2: 0x008B0C30 */ static void mine_ride_track_diag_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3533,7 +3533,7 @@ static void mine_ride_track_diag_25_deg_up(paint_session * session, uint8 rideIn /** rct2: 0x008B0C10 */ static void mine_ride_track_diag_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3602,7 +3602,7 @@ static void mine_ride_track_diag_flat_to_25_deg_up(paint_session * session, uint /** rct2: 0x008B0C20 */ static void mine_ride_track_diag_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3671,7 +3671,7 @@ static void mine_ride_track_diag_25_deg_up_to_flat(paint_session * session, uint /** rct2: 0x008B0C60 */ static void mine_ride_track_diag_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3740,7 +3740,7 @@ static void mine_ride_track_diag_25_deg_down(paint_session * session, uint8 ride /** rct2: 0x008B0C40 */ static void mine_ride_track_diag_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3807,7 +3807,7 @@ static void mine_ride_track_diag_flat_to_25_deg_down(paint_session * session, ui /** rct2: 0x008B0C50 */ static void mine_ride_track_diag_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3876,7 +3876,7 @@ static void mine_ride_track_diag_25_deg_down_to_flat(paint_session * session, ui /** rct2: 0x008B0C90 */ static void mine_ride_track_diag_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3947,7 +3947,7 @@ static void mine_ride_track_diag_flat_to_left_bank(paint_session * session, uint /** rct2: 0x008B0CA0 */ static void mine_ride_track_diag_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4018,7 +4018,7 @@ static void mine_ride_track_diag_flat_to_right_bank(paint_session * session, uin /** rct2: 0x008B0CB0 */ static void mine_ride_track_diag_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4089,7 +4089,7 @@ static void mine_ride_track_diag_left_bank_to_flat(paint_session * session, uint /** rct2: 0x008B0CC0 */ static void mine_ride_track_diag_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4160,7 +4160,7 @@ static void mine_ride_track_diag_right_bank_to_flat(paint_session * session, uin /** rct2: 0x008B0CF0 */ static void mine_ride_track_diag_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4231,7 +4231,7 @@ static void mine_ride_track_diag_left_bank_to_25_deg_up(paint_session * session, /** rct2: 0x008B0D00 */ static void mine_ride_track_diag_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4302,7 +4302,7 @@ static void mine_ride_track_diag_right_bank_to_25_deg_up(paint_session * session /** rct2: 0x008B0CD0 */ static void mine_ride_track_diag_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4373,7 +4373,7 @@ static void mine_ride_track_diag_25_deg_up_to_left_bank(paint_session * session, /** rct2: 0x008B0CE0 */ static void mine_ride_track_diag_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4444,7 +4444,7 @@ static void mine_ride_track_diag_25_deg_up_to_right_bank(paint_session * session /** rct2: 0x008B0D10 */ static void mine_ride_track_diag_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4513,7 +4513,7 @@ static void mine_ride_track_diag_left_bank_to_25_deg_down(paint_session * sessio /** rct2: 0x008B0D20 */ static void mine_ride_track_diag_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4582,7 +4582,7 @@ static void mine_ride_track_diag_right_bank_to_25_deg_down(paint_session * sessi /** rct2: 0x008B0D30 */ static void mine_ride_track_diag_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4653,7 +4653,7 @@ static void mine_ride_track_diag_25_deg_down_to_left_bank(paint_session * sessio /** rct2: 0x008B0D40 */ static void mine_ride_track_diag_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4724,7 +4724,7 @@ static void mine_ride_track_diag_25_deg_down_to_right_bank(paint_session * sessi /** rct2: 0x008B0C70 */ static void mine_ride_track_diag_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4793,7 +4793,7 @@ static void mine_ride_track_diag_left_bank(paint_session * session, uint8 rideIn /** rct2: 0x008B0C80 */ static void mine_ride_track_diag_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { diff --git a/src/openrct2/ride/coaster/MineTrainCoaster.cpp b/src/openrct2/ride/coaster/MineTrainCoaster.cpp index d80481fbc7..c876ff307a 100644 --- a/src/openrct2/ride/coaster/MineTrainCoaster.cpp +++ b/src/openrct2/ride/coaster/MineTrainCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" #include "../../paint/paint.h" #include "../../paint/supports.h" #include "../../sprites.h" @@ -28,7 +28,7 @@ /** rct2: 0x0071BFA4 */ static void mine_train_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -81,7 +81,7 @@ static void mine_train_rc_track_flat(paint_session * session, uint8 rideIndex, u /** rct2: 0x0071C154, 0x0071C164, 0x0071C174 */ static void mine_train_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][3] = { { 20064, 20060, SPR_STATION_BASE_B_SW_NE }, @@ -111,7 +111,7 @@ static void mine_train_rc_track_station(paint_session * session, uint8 rideIndex /** rct2: 0x0071BFB4 */ static void mine_train_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -179,7 +179,7 @@ static void mine_train_rc_track_25_deg_up(paint_session * session, uint8 rideInd /** rct2: 0x0071BFC4 */ static void mine_train_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -218,7 +218,7 @@ static void mine_train_rc_track_60_deg_up(paint_session * session, uint8 rideInd /** rct2: 0x0071BFD4 */ static void mine_train_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -286,7 +286,7 @@ static void mine_train_rc_track_flat_to_25_deg_up(paint_session * session, uint8 /** rct2: 0x0071BFE4 */ static void mine_train_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -329,7 +329,7 @@ static void mine_train_rc_track_25_deg_up_to_60_deg_up(paint_session * session, /** rct2: 0x0071BFF4 */ static void mine_train_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -372,7 +372,7 @@ static void mine_train_rc_track_60_deg_up_to_25_deg_up(paint_session * session, /** rct2: 0x0071C004 */ static void mine_train_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -440,49 +440,49 @@ static void mine_train_rc_track_25_deg_up_to_flat(paint_session * session, uint8 /** rct2: 0x0071C014 */ static void mine_train_rc_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { mine_train_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0071C024 */ static void mine_train_rc_track_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { mine_train_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0071C034 */ static void mine_train_rc_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { mine_train_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0071C044 */ static void mine_train_rc_track_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { mine_train_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0071C054 */ static void mine_train_rc_track_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { mine_train_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0071C064 */ static void mine_train_rc_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { mine_train_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0071C0B4 */ static void mine_train_rc_track_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -654,7 +654,7 @@ static void mine_train_rc_track_left_quarter_turn_5(paint_session * session, uin /** rct2: 0x0071C0C4 */ static void mine_train_rc_track_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mine_train_rc_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -662,7 +662,7 @@ static void mine_train_rc_track_right_quarter_turn_5(paint_session * session, ui /** rct2: 0x0071C074 */ static void mine_train_rc_track_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -698,7 +698,7 @@ static void mine_train_rc_track_flat_to_left_bank(paint_session * session, uint8 /** rct2: 0x0071C084 */ static void mine_train_rc_track_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -734,7 +734,7 @@ static void mine_train_rc_track_flat_to_right_bank(paint_session * session, uint /** rct2: 0x0071C094 */ static void mine_train_rc_track_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -770,7 +770,7 @@ static void mine_train_rc_track_left_bank_to_flat(paint_session * session, uint8 /** rct2: 0x0071C0A4 */ static void mine_train_rc_track_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -806,7 +806,7 @@ static void mine_train_rc_track_right_bank_to_flat(paint_session * session, uint /** rct2: 0x0071C0D4 */ static void mine_train_rc_track_banked_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -984,7 +984,7 @@ static void mine_train_rc_track_banked_left_quarter_turn_5(paint_session * sessi /** rct2: 0x0071C0E4 */ static void mine_train_rc_track_banked_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mine_train_rc_track_banked_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -992,7 +992,7 @@ static void mine_train_rc_track_banked_right_quarter_turn_5(paint_session * sess /** rct2: 0x0071C204 */ static void mine_train_rc_track_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1035,7 +1035,7 @@ static void mine_train_rc_track_left_bank_to_25_deg_up(paint_session * session, /** rct2: 0x0071C214 */ static void mine_train_rc_track_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1078,7 +1078,7 @@ static void mine_train_rc_track_right_bank_to_25_deg_up(paint_session * session, /** rct2: 0x0071C224 */ static void mine_train_rc_track_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1121,7 +1121,7 @@ static void mine_train_rc_track_25_deg_up_to_left_bank(paint_session * session, /** rct2: 0x0071C234 */ static void mine_train_rc_track_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1164,35 +1164,35 @@ static void mine_train_rc_track_25_deg_up_to_right_bank(paint_session * session, /** rct2: 0x0071C244 */ static void mine_train_rc_track_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { mine_train_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0071C254 */ static void mine_train_rc_track_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { mine_train_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0071C264 */ static void mine_train_rc_track_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { mine_train_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0071C274 */ static void mine_train_rc_track_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { mine_train_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0071C304 */ static void mine_train_rc_track_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1224,14 +1224,14 @@ static void mine_train_rc_track_left_bank(paint_session * session, uint8 rideInd /** rct2: 0x0071C314 */ static void mine_train_rc_track_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { mine_train_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0071C0F4 */ static void mine_train_rc_track_left_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1408,7 +1408,7 @@ static void mine_train_rc_track_left_quarter_turn_5_25_deg_up(paint_session * se /** rct2: 0x0071C104 */ static void mine_train_rc_track_right_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1585,7 +1585,7 @@ static void mine_train_rc_track_right_quarter_turn_5_25_deg_up(paint_session * s /** rct2: 0x0071C114 */ static void mine_train_rc_track_left_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mine_train_rc_track_right_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, @@ -1594,7 +1594,7 @@ static void mine_train_rc_track_left_quarter_turn_5_25_deg_down(paint_session * /** rct2: 0x0071C124 */ static void mine_train_rc_track_right_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mine_train_rc_track_left_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, @@ -1603,7 +1603,7 @@ static void mine_train_rc_track_right_quarter_turn_5_25_deg_down(paint_session * /** rct2: 0x0071C134 */ static void mine_train_rc_track_s_bend_left(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1735,7 +1735,7 @@ static void mine_train_rc_track_s_bend_left(paint_session * session, uint8 rideI /** rct2: 0x0071C144 */ static void mine_train_rc_track_s_bend_right(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1867,7 +1867,7 @@ static void mine_train_rc_track_s_bend_right(paint_session * session, uint8 ride /** rct2: 0x0071C184 */ static void mine_train_rc_track_left_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1984,7 +1984,7 @@ static void mine_train_rc_track_left_quarter_turn_3(paint_session * session, uin /** rct2: 0x0071C194 */ static void mine_train_rc_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mine_train_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -1992,7 +1992,7 @@ static void mine_train_rc_track_right_quarter_turn_3(paint_session * session, ui /** rct2: 0x0071C1A4 */ static void mine_train_rc_track_left_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2114,7 +2114,7 @@ static void mine_train_rc_track_left_quarter_turn_3_bank(paint_session * session /** rct2: 0x0071C1B4 */ static void mine_train_rc_track_right_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mine_train_rc_track_left_quarter_turn_3_bank(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -2122,7 +2122,7 @@ static void mine_train_rc_track_right_quarter_turn_3_bank(paint_session * sessio /** rct2: 0x0071C1C4 */ static void mine_train_rc_track_left_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2213,7 +2213,7 @@ static void mine_train_rc_track_left_quarter_turn_3_25_deg_up(paint_session * se /** rct2: 0x0071C1D4 */ static void mine_train_rc_track_right_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2304,7 +2304,7 @@ static void mine_train_rc_track_right_quarter_turn_3_25_deg_up(paint_session * s /** rct2: 0x0071C1E4 */ static void mine_train_rc_track_left_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mine_train_rc_track_right_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, @@ -2313,7 +2313,7 @@ static void mine_train_rc_track_left_quarter_turn_3_25_deg_down(paint_session * /** rct2: 0x0071C1F4 */ static void mine_train_rc_track_right_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mine_train_rc_track_left_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, @@ -2322,7 +2322,7 @@ static void mine_train_rc_track_right_quarter_turn_3_25_deg_down(paint_session * /** rct2: 0x0071C284 */ static void mine_train_rc_track_left_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2573,7 +2573,7 @@ static void mine_train_rc_track_left_half_banked_helix_up_small(paint_session * /** rct2: 0x0071C294 */ static void mine_train_rc_track_right_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2824,7 +2824,7 @@ static void mine_train_rc_track_right_half_banked_helix_up_small(paint_session * /** rct2: 0x0071C2A4 */ static void mine_train_rc_track_left_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 4) { @@ -2839,7 +2839,7 @@ static void mine_train_rc_track_left_half_banked_helix_down_small(paint_session /** rct2: 0x0071C2B4 */ static void mine_train_rc_track_right_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { if (trackSequence >= 4) { @@ -2853,7 +2853,7 @@ static void mine_train_rc_track_right_half_banked_helix_down_small(paint_session /** rct2: 0x0071C2C4 */ static void mine_train_rc_track_left_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3228,7 +3228,7 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(paint_session * /** rct2: 0x0071C2D4 */ static void mine_train_rc_track_right_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3595,7 +3595,7 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(paint_session * /** rct2: 0x0071C2E4 */ static void mine_train_rc_track_left_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 7) { @@ -3610,7 +3610,7 @@ static void mine_train_rc_track_left_half_banked_helix_down_large(paint_session /** rct2: 0x0071C2F4 */ static void mine_train_rc_track_right_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { if (trackSequence >= 7) { @@ -3624,7 +3624,7 @@ static void mine_train_rc_track_right_half_banked_helix_down_large(paint_session /** rct2: 0x0071C324 */ static void mine_train_rc_track_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -3648,7 +3648,7 @@ static void mine_train_rc_track_brakes(paint_session * session, uint8 rideIndex, /** rct2: 0x0071C334 */ static void mine_train_rc_track_on_ride_photo(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -3681,7 +3681,7 @@ static void mine_train_rc_track_on_ride_photo(paint_session * session, uint8 rid /** rct2: 0x0071C354 */ static void mine_train_rc_track_left_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3817,7 +3817,7 @@ static void mine_train_rc_track_left_eighth_to_diag(paint_session * session, uin /** rct2: 0x0071C364 */ static void mine_train_rc_track_right_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3953,7 +3953,7 @@ static void mine_train_rc_track_right_eighth_to_diag(paint_session * session, ui /** rct2: 0x0071C374 */ static void mine_train_rc_track_left_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mine_train_rc_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -3961,7 +3961,7 @@ static void mine_train_rc_track_left_eighth_to_orthogonal(paint_session * sessio /** rct2: 0x0071C384 */ static void mine_train_rc_track_right_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mine_train_rc_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); @@ -3969,7 +3969,7 @@ static void mine_train_rc_track_right_eighth_to_orthogonal(paint_session * sessi /** rct2: 0x0071C394 */ static void mine_train_rc_track_left_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4105,7 +4105,7 @@ static void mine_train_rc_track_left_eighth_bank_to_diag(paint_session * session /** rct2: 0x0071C3A4 */ static void mine_train_rc_track_right_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4241,7 +4241,7 @@ static void mine_train_rc_track_right_eighth_bank_to_diag(paint_session * sessio /** rct2: 0x0071C3B4 */ static void mine_train_rc_track_left_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mine_train_rc_track_right_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -4249,7 +4249,7 @@ static void mine_train_rc_track_left_eighth_bank_to_orthogonal(paint_session * s /** rct2: 0x0071C3C4 */ static void mine_train_rc_track_right_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mine_train_rc_track_left_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); @@ -4257,7 +4257,7 @@ static void mine_train_rc_track_right_eighth_bank_to_orthogonal(paint_session * /** rct2: 0x0071C344 */ static void mine_train_rc_track_diag_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4402,7 +4402,7 @@ static void mine_train_rc_track_diag_flat(paint_session * session, uint8 rideInd /** rct2: 0x0071C414 */ static void mine_train_rc_track_diag_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4547,7 +4547,7 @@ static void mine_train_rc_track_diag_25_deg_up(paint_session * session, uint8 ri /** rct2: 0x0071C474 */ static void mine_train_rc_track_diag_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4620,7 +4620,7 @@ static void mine_train_rc_track_diag_60_deg_up(paint_session * session, uint8 ri /** rct2: 0x0071C3F4 */ static void mine_train_rc_track_diag_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4765,7 +4765,7 @@ static void mine_train_rc_track_diag_flat_to_25_deg_up(paint_session * session, /** rct2: 0x0071C454 */ static void mine_train_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4838,7 +4838,7 @@ static void mine_train_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * sess /** rct2: 0x0071C464 */ static void mine_train_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4911,7 +4911,7 @@ static void mine_train_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * sess /** rct2: 0x0071C404 */ static void mine_train_rc_track_diag_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5056,7 +5056,7 @@ static void mine_train_rc_track_diag_25_deg_up_to_flat(paint_session * session, /** rct2: 0x0071C444 */ static void mine_train_rc_track_diag_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5201,7 +5201,7 @@ static void mine_train_rc_track_diag_25_deg_down(paint_session * session, uint8 /** rct2: 0x0071C4A4 */ static void mine_train_rc_track_diag_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5274,7 +5274,7 @@ static void mine_train_rc_track_diag_60_deg_down(paint_session * session, uint8 /** rct2: 0x0071C424 */ static void mine_train_rc_track_diag_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5417,7 +5417,7 @@ static void mine_train_rc_track_diag_flat_to_25_deg_down(paint_session * session /** rct2: 0x0071C484 */ static void mine_train_rc_track_diag_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5490,7 +5490,7 @@ static void mine_train_rc_track_diag_25_deg_down_to_60_deg_down(paint_session * /** rct2: 0x0071C494 */ static void mine_train_rc_track_diag_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5563,7 +5563,7 @@ static void mine_train_rc_track_diag_60_deg_down_to_25_deg_down(paint_session * /** rct2: 0x0071C434 */ static void mine_train_rc_track_diag_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5708,7 +5708,7 @@ static void mine_train_rc_track_diag_25_deg_down_to_flat(paint_session * session /** rct2: 0x0071C4D4 */ static void mine_train_rc_track_diag_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5783,7 +5783,7 @@ static void mine_train_rc_track_diag_flat_to_left_bank(paint_session * session, /** rct2: 0x0071C4B4 */ static void mine_train_rc_track_diag_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5858,7 +5858,7 @@ static void mine_train_rc_track_diag_flat_to_right_bank(paint_session * session, /** rct2: 0x0071C4C4 */ static void mine_train_rc_track_diag_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5933,7 +5933,7 @@ static void mine_train_rc_track_diag_left_bank_to_flat(paint_session * session, /** rct2: 0x0071C4E4 */ static void mine_train_rc_track_diag_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6008,7 +6008,7 @@ static void mine_train_rc_track_diag_right_bank_to_flat(paint_session * session, /** rct2: 0x0071C514 */ static void mine_train_rc_track_diag_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6083,7 +6083,7 @@ static void mine_train_rc_track_diag_left_bank_to_25_deg_up(paint_session * sess /** rct2: 0x0071C524 */ static void mine_train_rc_track_diag_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6158,7 +6158,7 @@ static void mine_train_rc_track_diag_right_bank_to_25_deg_up(paint_session * ses /** rct2: 0x0071C4F4 */ static void mine_train_rc_track_diag_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6233,7 +6233,7 @@ static void mine_train_rc_track_diag_25_deg_up_to_left_bank(paint_session * sess /** rct2: 0x0071C504 */ static void mine_train_rc_track_diag_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6308,7 +6308,7 @@ static void mine_train_rc_track_diag_25_deg_up_to_right_bank(paint_session * ses /** rct2: 0x0071C534 */ static void mine_train_rc_track_diag_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6378,7 +6378,7 @@ static void mine_train_rc_track_diag_left_bank_to_25_deg_down(paint_session * se /** rct2: 0x0071C544 */ static void mine_train_rc_track_diag_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6448,7 +6448,7 @@ static void mine_train_rc_track_diag_right_bank_to_25_deg_down(paint_session * s /** rct2: 0x0071C554 */ static void mine_train_rc_track_diag_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6523,7 +6523,7 @@ static void mine_train_rc_track_diag_25_deg_down_to_left_bank(paint_session * se /** rct2: 0x0071C564 */ static void mine_train_rc_track_diag_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6598,7 +6598,7 @@ static void mine_train_rc_track_diag_25_deg_down_to_right_bank(paint_session * s /** rct2: 0x0071C3D4 */ static void mine_train_rc_track_diag_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6675,7 +6675,7 @@ static void mine_train_rc_track_diag_left_bank(paint_session * session, uint8 ri /** rct2: 0x0071C3E4 */ static void mine_train_rc_track_diag_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6752,7 +6752,7 @@ static void mine_train_rc_track_diag_right_bank(paint_session * session, uint8 r /** rct2: 0x0071C574 */ static void mine_train_rc_track_block_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { diff --git a/src/openrct2/ride/coaster/MiniRollerCoaster.cpp b/src/openrct2/ride/coaster/MiniRollerCoaster.cpp index 71a6622771..b2ba7b4014 100644 --- a/src/openrct2/ride/coaster/MiniRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MiniRollerCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" #include "../../paint/paint.h" #include "../../paint/supports.h" #include "../../sprites.h" @@ -28,7 +28,7 @@ /** rct2: 0x008A4ABC */ static void mini_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -105,7 +105,7 @@ static void mini_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 t } static void mini_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { static const uint32 imageIds[4][3] = { { 18746, 18742, SPR_STATION_BASE_A_SW_NE }, @@ -135,7 +135,7 @@ static void mini_rc_track_station(paint_session * session, uint8 rideIndex, uint /** rct2: 0x008A4ACC */ static void mini_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -236,7 +236,7 @@ static void mini_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, ui /** rct2: 0x008A4ADC */ static void mini_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -290,7 +290,7 @@ static void mini_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, ui /** rct2: 0x008A4AEC */ static void mini_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -391,7 +391,7 @@ static void mini_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rideI /** rct2: 0x008A4AFC */ static void mini_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -449,7 +449,7 @@ static void mini_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 /** rct2: 0x008A4B0C */ static void mini_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -507,7 +507,7 @@ static void mini_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 /** rct2: 0x008A4B1C */ static void mini_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -608,49 +608,49 @@ static void mini_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rideI /** rct2: 0x008A4B2C */ static void mini_rc_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { mini_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A4B3C */ static void mini_rc_track_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { mini_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A4B4C */ static void mini_rc_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { mini_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A4B5C */ static void mini_rc_track_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { mini_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A4B6C */ static void mini_rc_track_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { mini_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A4B7C */ static void mini_rc_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { mini_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A4B8C */ static void mini_rc_track_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -814,7 +814,7 @@ static void mini_rc_track_left_quarter_turn_5(paint_session * session, uint8 rid /** rct2: 0x008A4B9C */ static void mini_rc_track_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mini_rc_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -822,7 +822,7 @@ static void mini_rc_track_right_quarter_turn_5(paint_session * session, uint8 ri /** rct2: 0x008A4BAC */ static void mini_rc_track_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -873,7 +873,7 @@ static void mini_rc_track_flat_to_left_bank(paint_session * session, uint8 rideI /** rct2: 0x008A4BBC */ static void mini_rc_track_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -924,7 +924,7 @@ static void mini_rc_track_flat_to_right_bank(paint_session * session, uint8 ride /** rct2: 0x008A4BCC */ static void mini_rc_track_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -975,7 +975,7 @@ static void mini_rc_track_left_bank_to_flat(paint_session * session, uint8 rideI /** rct2: 0x008A4BDC */ static void mini_rc_track_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1026,7 +1026,7 @@ static void mini_rc_track_right_bank_to_flat(paint_session * session, uint8 ride /** rct2: 0x008A4BEC */ static void mini_rc_track_banked_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1194,7 +1194,7 @@ static void mini_rc_track_banked_left_quarter_turn_5(paint_session * session, ui /** rct2: 0x008A4BFC */ static void mini_rc_track_banked_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mini_rc_track_banked_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -1202,7 +1202,7 @@ static void mini_rc_track_banked_right_quarter_turn_5(paint_session * session, u /** rct2: 0x008A4C0C */ static void mini_rc_track_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1260,7 +1260,7 @@ static void mini_rc_track_left_bank_to_25_deg_up(paint_session * session, uint8 /** rct2: 0x008A4C1C */ static void mini_rc_track_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1318,7 +1318,7 @@ static void mini_rc_track_right_bank_to_25_deg_up(paint_session * session, uint8 /** rct2: 0x008A4C2C */ static void mini_rc_track_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1376,7 +1376,7 @@ static void mini_rc_track_25_deg_up_to_left_bank(paint_session * session, uint8 /** rct2: 0x008A4C3C */ static void mini_rc_track_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1434,35 +1434,35 @@ static void mini_rc_track_25_deg_up_to_right_bank(paint_session * session, uint8 /** rct2: 0x008A4C4C */ static void mini_rc_track_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { mini_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A4C5C */ static void mini_rc_track_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { mini_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A4C6C */ static void mini_rc_track_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { mini_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A4C7C */ static void mini_rc_track_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { mini_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A4C8C */ static void mini_rc_track_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1509,14 +1509,14 @@ static void mini_rc_track_left_bank(paint_session * session, uint8 rideIndex, ui /** rct2: 0x008A4C9C */ static void mini_rc_track_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { mini_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A4CAC */ static void mini_rc_track_left_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1675,7 +1675,7 @@ static void mini_rc_track_left_quarter_turn_5_25_deg_up(paint_session * session, /** rct2: 0x008A4CBC */ static void mini_rc_track_right_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1834,7 +1834,7 @@ static void mini_rc_track_right_quarter_turn_5_25_deg_up(paint_session * session /** rct2: 0x008A4CCC */ static void mini_rc_track_left_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mini_rc_track_right_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); @@ -1842,7 +1842,7 @@ static void mini_rc_track_left_quarter_turn_5_25_deg_down(paint_session * sessio /** rct2: 0x008A4CDC */ static void mini_rc_track_right_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mini_rc_track_left_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -1850,7 +1850,7 @@ static void mini_rc_track_right_quarter_turn_5_25_deg_down(paint_session * sessi /** rct2: 0x008A4CEC */ static void mini_rc_track_s_bend_left(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1986,7 +1986,7 @@ static void mini_rc_track_s_bend_left(paint_session * session, uint8 rideIndex, /** rct2: 0x008A4CFC */ static void mini_rc_track_s_bend_right(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2122,7 +2122,7 @@ static void mini_rc_track_s_bend_right(paint_session * session, uint8 rideIndex, /** rct2: 0x008A4D3C */ static void mini_rc_track_left_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2231,7 +2231,7 @@ static void mini_rc_track_left_quarter_turn_3(paint_session * session, uint8 rid /** rct2: 0x008A4D4C */ static void mini_rc_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mini_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -2239,7 +2239,7 @@ static void mini_rc_track_right_quarter_turn_3(paint_session * session, uint8 ri /** rct2: 0x008A4D5C */ static void mini_rc_track_left_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2352,7 +2352,7 @@ static void mini_rc_track_left_quarter_turn_3_bank(paint_session * session, uint /** rct2: 0x008A4D6C */ static void mini_rc_track_right_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mini_rc_track_left_quarter_turn_3_bank(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -2360,7 +2360,7 @@ static void mini_rc_track_right_quarter_turn_3_bank(paint_session * session, uin /** rct2: 0x008A4D7C */ static void mini_rc_track_left_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2440,7 +2440,7 @@ static void mini_rc_track_left_quarter_turn_3_25_deg_up(paint_session * session, /** rct2: 0x008A4D8C */ static void mini_rc_track_right_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2520,7 +2520,7 @@ static void mini_rc_track_right_quarter_turn_3_25_deg_up(paint_session * session /** rct2: 0x008A4D9C */ static void mini_rc_track_left_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mini_rc_track_right_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); @@ -2528,7 +2528,7 @@ static void mini_rc_track_left_quarter_turn_3_25_deg_down(paint_session * sessio /** rct2: 0x008A4DAC */ static void mini_rc_track_right_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mini_rc_track_left_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -2536,7 +2536,7 @@ static void mini_rc_track_right_quarter_turn_3_25_deg_down(paint_session * sessi /** rct2: 0x008A4DBC */ static void mini_rc_track_left_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2757,7 +2757,7 @@ static void mini_rc_track_left_half_banked_helix_up_small(paint_session * sessio /** rct2: 0x008A4DCC */ static void mini_rc_track_right_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2978,7 +2978,7 @@ static void mini_rc_track_right_half_banked_helix_up_small(paint_session * sessi /** rct2: 0x008A4DDC */ static void mini_rc_track_left_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 4) { @@ -2991,7 +2991,7 @@ static void mini_rc_track_left_half_banked_helix_down_small(paint_session * sess /** rct2: 0x008A4DEC */ static void mini_rc_track_right_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 4) { @@ -3004,7 +3004,7 @@ static void mini_rc_track_right_half_banked_helix_down_small(paint_session * ses /** rct2: 0x008A4DFC */ static void mini_rc_track_left_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3335,7 +3335,7 @@ static void mini_rc_track_left_half_banked_helix_up_large(paint_session * sessio /** rct2: 0x008A4E0C */ static void mini_rc_track_right_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3666,7 +3666,7 @@ static void mini_rc_track_right_half_banked_helix_up_large(paint_session * sessi /** rct2: 0x008A4E1C */ static void mini_rc_track_left_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 7) { @@ -3679,7 +3679,7 @@ static void mini_rc_track_left_half_banked_helix_down_large(paint_session * sess /** rct2: 0x008A4E2C */ static void mini_rc_track_right_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 7) { @@ -3692,7 +3692,7 @@ static void mini_rc_track_right_half_banked_helix_down_large(paint_session * ses /** rct2: 0x008A4E5C */ static void mini_rc_track_left_quarter_turn_1_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -3728,7 +3728,7 @@ static void mini_rc_track_left_quarter_turn_1_60_deg_up(paint_session * session, /** rct2: 0x008A4E3C */ static void mini_rc_track_right_quarter_turn_1_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -3764,21 +3764,21 @@ static void mini_rc_track_right_quarter_turn_1_60_deg_up(paint_session * session /** rct2: 0x008A4E4C */ static void mini_rc_track_left_quarter_turn_1_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { mini_rc_track_right_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A4E6C */ static void mini_rc_track_right_quarter_turn_1_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { mini_rc_track_left_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A4E7C */ static void mini_rc_track_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (direction) { @@ -3810,7 +3810,7 @@ static void mini_rc_track_brakes(paint_session * session, uint8 rideIndex, uint8 /** rct2: 0x008A50CC */ static void mini_rc_track_25_deg_up_left_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -3864,7 +3864,7 @@ static void mini_rc_track_25_deg_up_left_banked(paint_session * session, uint8 r /** rct2: 0x008A50DC */ static void mini_rc_track_25_deg_up_right_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -3918,7 +3918,7 @@ static void mini_rc_track_25_deg_up_right_banked(paint_session * session, uint8 /** rct2: 0x008A4E8C */ static void mini_rc_track_on_ride_photo(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -3959,21 +3959,21 @@ static void mini_rc_track_on_ride_photo(paint_session * session, uint8 rideIndex /** rct2: 0x008A50EC */ static void mini_rc_track_25_deg_down_left_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { mini_rc_track_25_deg_up_right_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A50FC */ static void mini_rc_track_25_deg_down_right_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { mini_rc_track_25_deg_up_left_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A4EAC */ static void mini_rc_track_left_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4104,7 +4104,7 @@ static void mini_rc_track_left_eighth_to_diag(paint_session * session, uint8 rid /** rct2: 0x008A4EBC */ static void mini_rc_track_right_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4235,7 +4235,7 @@ static void mini_rc_track_right_eighth_to_diag(paint_session * session, uint8 ri /** rct2: 0x008A4ECC */ static void mini_rc_track_left_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mini_rc_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -4243,7 +4243,7 @@ static void mini_rc_track_left_eighth_to_orthogonal(paint_session * session, uin /** rct2: 0x008A4EDC */ static void mini_rc_track_right_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mini_rc_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); @@ -4251,7 +4251,7 @@ static void mini_rc_track_right_eighth_to_orthogonal(paint_session * session, ui /** rct2: 0x008A4EEC */ static void mini_rc_track_left_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4382,7 +4382,7 @@ static void mini_rc_track_left_eighth_bank_to_diag(paint_session * session, uint /** rct2: 0x008A4EFC */ static void mini_rc_track_right_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4513,7 +4513,7 @@ static void mini_rc_track_right_eighth_bank_to_diag(paint_session * session, uin /** rct2: 0x008A4F0C */ static void mini_rc_track_left_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mini_rc_track_right_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -4521,7 +4521,7 @@ static void mini_rc_track_left_eighth_bank_to_orthogonal(paint_session * session /** rct2: 0x008A4F1C */ static void mini_rc_track_right_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mini_rc_track_left_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); @@ -4529,7 +4529,7 @@ static void mini_rc_track_right_eighth_bank_to_orthogonal(paint_session * sessio /** rct2: 0x008A4E9C */ static void mini_rc_track_diag_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4666,7 +4666,7 @@ static void mini_rc_track_diag_flat(paint_session * session, uint8 rideIndex, ui /** rct2: 0x008A4F4C */ static void mini_rc_track_diag_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4803,7 +4803,7 @@ static void mini_rc_track_diag_25_deg_up(paint_session * session, uint8 rideInde /** rct2: 0x008A4FAC */ static void mini_rc_track_diag_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4872,7 +4872,7 @@ static void mini_rc_track_diag_60_deg_up(paint_session * session, uint8 rideInde /** rct2: 0x008A4F2C */ static void mini_rc_track_diag_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5009,7 +5009,7 @@ static void mini_rc_track_diag_flat_to_25_deg_up(paint_session * session, uint8 /** rct2: 0x008A4F8C */ static void mini_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5078,7 +5078,7 @@ static void mini_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * session, u /** rct2: 0x008A4F9C */ static void mini_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5147,7 +5147,7 @@ static void mini_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * session, u /** rct2: 0x008A4F3C */ static void mini_rc_track_diag_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5284,7 +5284,7 @@ static void mini_rc_track_diag_25_deg_up_to_flat(paint_session * session, uint8 /** rct2: 0x008A4F7C */ static void mini_rc_track_diag_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5421,7 +5421,7 @@ static void mini_rc_track_diag_25_deg_down(paint_session * session, uint8 rideIn /** rct2: 0x008A4FDC */ static void mini_rc_track_diag_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5490,7 +5490,7 @@ static void mini_rc_track_diag_60_deg_down(paint_session * session, uint8 rideIn /** rct2: 0x008A4F5C */ static void mini_rc_track_diag_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5625,7 +5625,7 @@ static void mini_rc_track_diag_flat_to_25_deg_down(paint_session * session, uint /** rct2: 0x008A4FBC */ static void mini_rc_track_diag_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5694,7 +5694,7 @@ static void mini_rc_track_diag_25_deg_down_to_60_deg_down(paint_session * sessio /** rct2: 0x008A4FCC */ static void mini_rc_track_diag_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5763,7 +5763,7 @@ static void mini_rc_track_diag_60_deg_down_to_25_deg_down(paint_session * sessio /** rct2: 0x008A4F6C */ static void mini_rc_track_diag_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5900,7 +5900,7 @@ static void mini_rc_track_diag_25_deg_down_to_flat(paint_session * session, uint /** rct2: 0x008A500C */ static void mini_rc_track_diag_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5971,7 +5971,7 @@ static void mini_rc_track_diag_flat_to_left_bank(paint_session * session, uint8 /** rct2: 0x008A501C */ static void mini_rc_track_diag_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6042,7 +6042,7 @@ static void mini_rc_track_diag_flat_to_right_bank(paint_session * session, uint8 /** rct2: 0x008A502C */ static void mini_rc_track_diag_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6113,7 +6113,7 @@ static void mini_rc_track_diag_left_bank_to_flat(paint_session * session, uint8 /** rct2: 0x008A503C */ static void mini_rc_track_diag_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6184,7 +6184,7 @@ static void mini_rc_track_diag_right_bank_to_flat(paint_session * session, uint8 /** rct2: 0x008A506C */ static void mini_rc_track_diag_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6255,7 +6255,7 @@ static void mini_rc_track_diag_left_bank_to_25_deg_up(paint_session * session, u /** rct2: 0x008A507C */ static void mini_rc_track_diag_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6326,7 +6326,7 @@ static void mini_rc_track_diag_right_bank_to_25_deg_up(paint_session * session, /** rct2: 0x008A504C */ static void mini_rc_track_diag_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6397,7 +6397,7 @@ static void mini_rc_track_diag_25_deg_up_to_left_bank(paint_session * session, u /** rct2: 0x008A505C */ static void mini_rc_track_diag_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6468,7 +6468,7 @@ static void mini_rc_track_diag_25_deg_up_to_right_bank(paint_session * session, /** rct2: 0x008A508C */ static void mini_rc_track_diag_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6537,7 +6537,7 @@ static void mini_rc_track_diag_left_bank_to_25_deg_down(paint_session * session, /** rct2: 0x008A509C */ static void mini_rc_track_diag_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6606,7 +6606,7 @@ static void mini_rc_track_diag_right_bank_to_25_deg_down(paint_session * session /** rct2: 0x008A50AC */ static void mini_rc_track_diag_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6677,7 +6677,7 @@ static void mini_rc_track_diag_25_deg_down_to_left_bank(paint_session * session, /** rct2: 0x008A50BC */ static void mini_rc_track_diag_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6748,7 +6748,7 @@ static void mini_rc_track_diag_25_deg_down_to_right_bank(paint_session * session /** rct2: 0x008A4FEC */ static void mini_rc_track_diag_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6817,7 +6817,7 @@ static void mini_rc_track_diag_left_bank(paint_session * session, uint8 rideInde /** rct2: 0x008A4FFC */ static void mini_rc_track_diag_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6886,7 +6886,7 @@ static void mini_rc_track_diag_right_bank(paint_session * session, uint8 rideInd /** rct2: 0x008A530C */ static void mini_rc_track_block_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -6918,7 +6918,7 @@ static void mini_rc_track_block_brakes(paint_session * session, uint8 rideIndex, /** rct2: 0x008A510C */ static void mini_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7001,7 +7001,7 @@ static void mini_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session * s /** rct2: 0x008A511C */ static void mini_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7084,7 +7084,7 @@ static void mini_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_session * /** rct2: 0x008A512C */ static void mini_rc_track_left_banked_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mini_rc_track_right_banked_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, @@ -7093,7 +7093,7 @@ static void mini_rc_track_left_banked_quarter_turn_3_25_deg_down(paint_session * /** rct2: 0x008A513C */ static void mini_rc_track_right_banked_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mini_rc_track_left_banked_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, @@ -7102,7 +7102,7 @@ static void mini_rc_track_right_banked_quarter_turn_3_25_deg_down(paint_session /** rct2: 0x008A514C */ static void mini_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7264,7 +7264,7 @@ static void mini_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * s /** rct2: 0x008A515C */ static void mini_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7426,7 +7426,7 @@ static void mini_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session * /** rct2: 0x008A516C */ static void mini_rc_track_left_banked_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mini_rc_track_right_banked_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, @@ -7435,7 +7435,7 @@ static void mini_rc_track_left_banked_quarter_turn_5_25_deg_down(paint_session * /** rct2: 0x008A517C */ static void mini_rc_track_right_banked_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mini_rc_track_left_banked_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, @@ -7444,7 +7444,7 @@ static void mini_rc_track_right_banked_quarter_turn_5_25_deg_down(paint_session /** rct2: 0x008A518C */ static void mini_rc_track_25_deg_up_to_left_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -7500,7 +7500,7 @@ static void mini_rc_track_25_deg_up_to_left_banked_25_deg_up(paint_session * ses /** rct2: 0x008A519C */ static void mini_rc_track_25_deg_up_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -7556,7 +7556,7 @@ static void mini_rc_track_25_deg_up_to_right_banked_25_deg_up(paint_session * se /** rct2: 0x008A51AC */ static void mini_rc_track_left_banked_25_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -7612,7 +7612,7 @@ static void mini_rc_track_left_banked_25_deg_up_to_25_deg_up(paint_session * ses /** rct2: 0x008A51BC */ static void mini_rc_track_right_banked_25_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -7668,7 +7668,7 @@ static void mini_rc_track_right_banked_25_deg_up_to_25_deg_up(paint_session * se /** rct2: 0x008A51CC */ static void mini_rc_track_25_deg_down_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { mini_rc_track_right_banked_25_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -7676,7 +7676,7 @@ static void mini_rc_track_25_deg_down_to_left_banked_25_deg_down(paint_session * /** rct2: 0x008A51DC */ static void mini_rc_track_25_deg_down_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { mini_rc_track_left_banked_25_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -7684,7 +7684,7 @@ static void mini_rc_track_25_deg_down_to_right_banked_25_deg_down(paint_session /** rct2: 0x008A51EC */ static void mini_rc_track_left_banked_25_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { mini_rc_track_25_deg_up_to_right_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -7692,7 +7692,7 @@ static void mini_rc_track_left_banked_25_deg_down_to_25_deg_down(paint_session * /** rct2: 0x008A51FC */ static void mini_rc_track_right_banked_25_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { mini_rc_track_25_deg_up_to_left_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -7701,7 +7701,7 @@ static void mini_rc_track_right_banked_25_deg_down_to_25_deg_down(paint_session /** rct2: 0x008A520C */ static void mini_rc_track_left_banked_flat_to_left_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (direction) { @@ -7756,7 +7756,7 @@ static void mini_rc_track_left_banked_flat_to_left_banked_25_deg_up(paint_sessio /** rct2: 0x008A521C */ static void mini_rc_track_right_banked_flat_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (direction) { @@ -7811,7 +7811,7 @@ static void mini_rc_track_right_banked_flat_to_right_banked_25_deg_up(paint_sess /** rct2: 0x008A524C */ static void mini_rc_track_left_banked_25_deg_up_to_left_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (direction) { @@ -7866,7 +7866,7 @@ static void mini_rc_track_left_banked_25_deg_up_to_left_banked_flat(paint_sessio /** rct2: 0x008A525C */ static void mini_rc_track_right_banked_25_deg_up_to_right_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (direction) { @@ -7921,7 +7921,7 @@ static void mini_rc_track_right_banked_25_deg_up_to_right_banked_flat(paint_sess /** rct2: 0x008A526C */ static void mini_rc_track_left_banked_flat_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { mini_rc_track_right_banked_25_deg_up_to_right_banked_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -7930,7 +7930,7 @@ static void mini_rc_track_left_banked_flat_to_left_banked_25_deg_down(paint_sess /** rct2: 0x008A527C */ static void mini_rc_track_right_banked_flat_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { mini_rc_track_left_banked_25_deg_up_to_left_banked_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -7939,7 +7939,7 @@ static void mini_rc_track_right_banked_flat_to_right_banked_25_deg_down(paint_se /** rct2: 0x008A522C */ static void mini_rc_track_left_banked_25_deg_down_to_left_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { mini_rc_track_right_banked_flat_to_right_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -7948,7 +7948,7 @@ static void mini_rc_track_left_banked_25_deg_down_to_left_banked_flat(paint_sess /** rct2: 0x008A523C */ static void mini_rc_track_right_banked_25_deg_down_to_right_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { mini_rc_track_left_banked_flat_to_left_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -7956,7 +7956,7 @@ static void mini_rc_track_right_banked_25_deg_down_to_right_banked_flat(paint_se /** rct2: 0x008A528C */ static void mini_rc_track_flat_to_left_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -8012,7 +8012,7 @@ static void mini_rc_track_flat_to_left_banked_25_deg_up(paint_session * session, /** rct2: 0x008A529C */ static void mini_rc_track_flat_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -8068,7 +8068,7 @@ static void mini_rc_track_flat_to_right_banked_25_deg_up(paint_session * session /** rct2: 0x008A52AC */ static void mini_rc_track_left_banked_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -8124,7 +8124,7 @@ static void mini_rc_track_left_banked_25_deg_up_to_flat(paint_session * session, /** rct2: 0x008A52BC */ static void mini_rc_track_right_banked_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -8180,34 +8180,34 @@ static void mini_rc_track_right_banked_25_deg_up_to_flat(paint_session * session /** rct2: 0x008A52CC */ static void mini_rc_track_flat_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { mini_rc_track_right_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A52DC */ static void mini_rc_track_flat_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { mini_rc_track_left_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A52EC */ static void mini_rc_track_left_banked_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { mini_rc_track_flat_to_right_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A52FC */ static void mini_rc_track_right_banked_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { mini_rc_track_flat_to_left_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } static void mini_rc_track_left_curved_lift_hill(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -8286,7 +8286,7 @@ static void mini_rc_track_left_curved_lift_hill(paint_session * session, uint8 r } static void mini_rc_track_right_curved_lift_hill(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -8365,7 +8365,7 @@ static void mini_rc_track_right_curved_lift_hill(paint_session * session, uint8 } static void mini_rc_track_booster(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { // These offsets could be moved to the g2.dat file when that supports offsets. sint8 ne_sw_offsetX = 7; diff --git a/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp b/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp index 5cfc2812d2..709dc3d3e9 100644 --- a/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp +++ b/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" #include "../../paint/paint.h" #include "../../paint/supports.h" #include "../../sprites.h" @@ -28,7 +28,7 @@ /** rct2: 0x008AFE9C */ static void mini_suspended_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -84,7 +84,7 @@ static void mini_suspended_rc_track_flat(paint_session * session, uint8 rideInde /** rct2: 0x008AFF4C, 0x008AFF5C, 0x008AFF6C */ static void mini_suspended_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][3] = { { SPR_STATION_BASE_C_SW_NE, 28433, SPR_STATION_INVERTED_BAR_E_SW_NE }, @@ -108,7 +108,7 @@ static void mini_suspended_rc_track_station(paint_session * session, uint8 rideI /** rct2: 0x008AFEAC */ static void mini_suspended_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -193,7 +193,7 @@ static void mini_suspended_rc_track_25_deg_up(paint_session * session, uint8 rid /** rct2: 0x008AFEBC */ static void mini_suspended_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -278,7 +278,7 @@ static void mini_suspended_rc_track_flat_to_25_deg_up(paint_session * session, u /** rct2: 0x008AFECC */ static void mini_suspended_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -363,28 +363,28 @@ static void mini_suspended_rc_track_25_deg_up_to_flat(paint_session * session, u /** rct2: 0x008AFEDC */ static void mini_suspended_rc_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { mini_suspended_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AFEEC */ static void mini_suspended_rc_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { mini_suspended_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AFEFC */ static void mini_suspended_rc_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { mini_suspended_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AFF0C */ static void mini_suspended_rc_track_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -548,7 +548,7 @@ static void mini_suspended_rc_track_left_quarter_turn_5(paint_session * session, /** rct2: 0x008AFF1C */ static void mini_suspended_rc_track_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; mini_suspended_rc_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -556,7 +556,7 @@ static void mini_suspended_rc_track_right_quarter_turn_5(paint_session * session /** rct2: 0x008AFF2C */ static void mini_suspended_rc_track_s_bend_left(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -718,7 +718,7 @@ static void mini_suspended_rc_track_s_bend_left(paint_session * session, uint8 r /** rct2: 0x008AFF3C */ static void mini_suspended_rc_track_s_bend_right(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -880,7 +880,7 @@ static void mini_suspended_rc_track_s_bend_right(paint_session * session, uint8 /** rct2: 0x008AFF7C */ static void mini_suspended_rc_track_left_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -997,7 +997,7 @@ static void mini_suspended_rc_track_left_quarter_turn_3(paint_session * session, /** rct2: 0x008AFF8C */ static void mini_suspended_rc_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; mini_suspended_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -1005,7 +1005,7 @@ static void mini_suspended_rc_track_right_quarter_turn_3(paint_session * session /** rct2: 0x008AFFAC */ static void mini_suspended_rc_track_left_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1161,7 +1161,7 @@ static void mini_suspended_rc_track_left_eighth_to_diag(paint_session * session, /** rct2: 0x008AFFBC */ static void mini_suspended_rc_track_right_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1317,7 +1317,7 @@ static void mini_suspended_rc_track_right_eighth_to_diag(paint_session * session /** rct2: 0x008AFFCC */ static void mini_suspended_rc_track_left_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mini_suspended_rc_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -1325,7 +1325,7 @@ static void mini_suspended_rc_track_left_eighth_to_orthogonal(paint_session * se /** rct2: 0x008AFFDC */ static void mini_suspended_rc_track_right_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; mini_suspended_rc_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); @@ -1333,7 +1333,7 @@ static void mini_suspended_rc_track_right_eighth_to_orthogonal(paint_session * s /** rct2: 0x008AFF9C */ static void mini_suspended_rc_track_diag_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1463,7 +1463,7 @@ static void mini_suspended_rc_track_diag_flat(paint_session * session, uint8 rid /** rct2: 0x008B000C */ static void mini_suspended_rc_track_diag_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1593,7 +1593,7 @@ static void mini_suspended_rc_track_diag_25_deg_up(paint_session * session, uint /** rct2: 0x008AFFEC */ static void mini_suspended_rc_track_diag_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1723,7 +1723,7 @@ static void mini_suspended_rc_track_diag_flat_to_25_deg_up(paint_session * sessi /** rct2: 0x008AFFFC */ static void mini_suspended_rc_track_diag_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1853,7 +1853,7 @@ static void mini_suspended_rc_track_diag_25_deg_up_to_flat(paint_session * sessi /** rct2: 0x008B003C */ static void mini_suspended_rc_track_diag_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1983,7 +1983,7 @@ static void mini_suspended_rc_track_diag_25_deg_down(paint_session * session, ui /** rct2: 0x008B001C */ static void mini_suspended_rc_track_diag_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2110,7 +2110,7 @@ static void mini_suspended_rc_track_diag_flat_to_25_deg_down(paint_session * ses /** rct2: 0x008B002C */ static void mini_suspended_rc_track_diag_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { diff --git a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp index a2f59578c9..f16d2b43a9 100644 --- a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" #include "../../paint/paint.h" #include "../../paint/supports.h" #include "../../sprites.h" @@ -28,7 +28,7 @@ /** rct2: 0x00792D88 */ static void multi_dimension_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -109,7 +109,7 @@ static void multi_dimension_rc_track_flat(paint_session * session, uint8 rideInd /** rct2: 0x00792F98, 0x00792FA8, 0x00792FB8 */ static void multi_dimension_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][3] = { { 15810, 15812, SPR_STATION_INVERTED_BAR_A_SW_NE }, @@ -164,7 +164,7 @@ static void multi_dimension_rc_track_station(paint_session * session, uint8 ride /** rct2: 0x00792D98 */ static void multi_dimension_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -294,7 +294,7 @@ static void multi_dimension_rc_track_25_deg_up(paint_session * session, uint8 ri /** rct2: 0x00792DA8 */ static void multi_dimension_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -370,7 +370,7 @@ static void multi_dimension_rc_track_60_deg_up(paint_session * session, uint8 ri /** rct2: 0x00792DB8 */ static void multi_dimension_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -500,7 +500,7 @@ static void multi_dimension_rc_track_flat_to_25_deg_up(paint_session * session, /** rct2: 0x00792DC8 */ static void multi_dimension_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -584,7 +584,7 @@ static void multi_dimension_rc_track_25_deg_up_to_60_deg_up(paint_session * sess /** rct2: 0x00792DD8 */ static void multi_dimension_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -692,7 +692,7 @@ static void multi_dimension_rc_track_60_deg_up_to_25_deg_up(paint_session * sess /** rct2: 0x00792DE8 */ static void multi_dimension_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -822,49 +822,49 @@ static void multi_dimension_rc_track_25_deg_up_to_flat(paint_session * session, /** rct2: 0x00792DF8 */ static void multi_dimension_rc_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { multi_dimension_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00792E08 */ static void multi_dimension_rc_track_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { multi_dimension_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00792E18 */ static void multi_dimension_rc_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { multi_dimension_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00792E28 */ static void multi_dimension_rc_track_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { multi_dimension_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00792E38 */ static void multi_dimension_rc_track_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { multi_dimension_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00792E48 */ static void multi_dimension_rc_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { multi_dimension_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00792E58 */ static void multi_dimension_rc_track_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -1185,7 +1185,7 @@ static void multi_dimension_rc_track_left_quarter_turn_5(paint_session * session /** rct2: 0x00792E68 */ static void multi_dimension_rc_track_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; multi_dimension_rc_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -1193,7 +1193,7 @@ static void multi_dimension_rc_track_right_quarter_turn_5(paint_session * sessio /** rct2: 0x00792E78 */ static void multi_dimension_rc_track_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -1268,7 +1268,7 @@ static void multi_dimension_rc_track_flat_to_left_bank(paint_session * session, /** rct2: 0x00792E88 */ static void multi_dimension_rc_track_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -1343,7 +1343,7 @@ static void multi_dimension_rc_track_flat_to_right_bank(paint_session * session, /** rct2: 0x00792E98 */ static void multi_dimension_rc_track_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -1418,7 +1418,7 @@ static void multi_dimension_rc_track_left_bank_to_flat(paint_session * session, /** rct2: 0x00792EA8 */ static void multi_dimension_rc_track_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -1493,7 +1493,7 @@ static void multi_dimension_rc_track_right_bank_to_flat(paint_session * session, /** rct2: 0x00792EB8 */ static void multi_dimension_rc_track_banked_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -1818,7 +1818,7 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5(paint_session * /** rct2: 0x00792EC8 */ static void multi_dimension_rc_track_banked_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; multi_dimension_rc_track_banked_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, @@ -1827,7 +1827,7 @@ static void multi_dimension_rc_track_banked_right_quarter_turn_5(paint_session * /** rct2: 0x00792ED8 */ static void multi_dimension_rc_track_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -1933,7 +1933,7 @@ static void multi_dimension_rc_track_left_bank_to_25_deg_up(paint_session * sess /** rct2: 0x00792EE8 */ static void multi_dimension_rc_track_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -2039,7 +2039,7 @@ static void multi_dimension_rc_track_right_bank_to_25_deg_up(paint_session * ses /** rct2: 0x00792EF8 */ static void multi_dimension_rc_track_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -2145,7 +2145,7 @@ static void multi_dimension_rc_track_25_deg_up_to_left_bank(paint_session * sess /** rct2: 0x00792F08 */ static void multi_dimension_rc_track_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -2251,7 +2251,7 @@ static void multi_dimension_rc_track_25_deg_up_to_right_bank(paint_session * ses /** rct2: 0x00792F18 */ static void multi_dimension_rc_track_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { multi_dimension_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -2259,14 +2259,14 @@ static void multi_dimension_rc_track_left_bank_to_25_deg_down(paint_session * se /** rct2: 0x00792F28 */ static void multi_dimension_rc_track_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { multi_dimension_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00792F38 */ static void multi_dimension_rc_track_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { multi_dimension_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -2274,14 +2274,14 @@ static void multi_dimension_rc_track_25_deg_down_to_left_bank(paint_session * se /** rct2: 0x00792F48 */ static void multi_dimension_rc_track_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { multi_dimension_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00792F58 */ static void multi_dimension_rc_track_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -2352,14 +2352,14 @@ static void multi_dimension_rc_track_left_bank(paint_session * session, uint8 ri /** rct2: 0x00792F68 */ static void multi_dimension_rc_track_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { multi_dimension_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00792F78 */ static void multi_dimension_rc_track_s_bend_left(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -2639,7 +2639,7 @@ static void multi_dimension_rc_track_s_bend_left(paint_session * session, uint8 /** rct2: 0x00792F88 */ static void multi_dimension_rc_track_s_bend_right(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -2919,7 +2919,7 @@ static void multi_dimension_rc_track_s_bend_right(paint_session * session, uint8 /** rct2: 0x00792FC8 */ static void multi_dimension_rc_track_left_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -3126,7 +3126,7 @@ static void multi_dimension_rc_track_left_quarter_turn_3(paint_session * session /** rct2: 0x00792FD8 */ static void multi_dimension_rc_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; multi_dimension_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -3134,7 +3134,7 @@ static void multi_dimension_rc_track_right_quarter_turn_3(paint_session * sessio /** rct2: 0x00792FE8 */ static void multi_dimension_rc_track_left_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -3345,7 +3345,7 @@ static void multi_dimension_rc_track_left_quarter_turn_3_bank(paint_session * se /** rct2: 0x00792FF8 */ static void multi_dimension_rc_track_right_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; multi_dimension_rc_track_left_quarter_turn_3_bank(session, rideIndex, trackSequence, (direction - 1) & 3, height, @@ -3355,7 +3355,7 @@ static void multi_dimension_rc_track_right_quarter_turn_3_bank(paint_session * s /** rct2: 0x00793008 */ static void multi_dimension_rc_track_left_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -3754,7 +3754,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_small(paint_sessi /** rct2: 0x00793018 */ static void multi_dimension_rc_track_right_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -4153,7 +4153,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_small(paint_sess /** rct2: 0x00793028 */ static void multi_dimension_rc_track_left_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { if (trackSequence >= 4) { @@ -4168,7 +4168,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_down_small(paint_ses /** rct2: 0x00793038 */ static void multi_dimension_rc_track_right_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { if (trackSequence >= 4) { @@ -4183,7 +4183,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_down_small(paint_se /** rct2: 0x00793048 */ static void multi_dimension_rc_track_left_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -4810,7 +4810,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large(paint_sessi /** rct2: 0x00793058 */ static void multi_dimension_rc_track_right_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -5437,7 +5437,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large(paint_sess /** rct2: 0x00793068 */ static void multi_dimension_rc_track_left_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { if (trackSequence >= 7) { @@ -5452,7 +5452,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_down_large(paint_ses /** rct2: 0x00793078 */ static void multi_dimension_rc_track_right_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { if (trackSequence >= 7) { @@ -5466,7 +5466,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_down_large(paint_se /** rct2: 0x00793088 */ static void multi_dimension_rc_track_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -5523,7 +5523,7 @@ static void multi_dimension_rc_track_brakes(paint_session * session, uint8 rideI /** rct2: 0x00793098 */ static void multi_dimension_rc_track_on_ride_photo(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -5621,7 +5621,7 @@ static void multi_dimension_rc_track_on_ride_photo(paint_session * session, uint /** rct2: 0x00793328 */ static void multi_dimension_rc_track_90_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -5693,14 +5693,14 @@ static void multi_dimension_rc_track_90_deg_up(paint_session * session, uint8 ri /** rct2: 0x00793338 */ static void multi_dimension_rc_track_90_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { multi_dimension_rc_track_90_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00793348 */ static void multi_dimension_rc_track_60_deg_up_to_90_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -5780,14 +5780,14 @@ static void multi_dimension_rc_track_60_deg_up_to_90_deg_up(paint_session * sess /** rct2: 0x00793358 */ static void multi_dimension_rc_track_90_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { multi_dimension_rc_track_60_deg_up_to_90_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00793368 */ static void multi_dimension_rc_track_90_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -5861,7 +5861,7 @@ static void multi_dimension_rc_track_90_deg_up_to_60_deg_up(paint_session * sess /** rct2: 0x00793378 */ static void multi_dimension_rc_track_60_deg_down_to_90_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -5939,7 +5939,7 @@ static void multi_dimension_rc_track_60_deg_down_to_90_deg_down(paint_session * /** rct2: 0x007930B8 */ static void multi_dimension_rc_track_left_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -6207,7 +6207,7 @@ static void multi_dimension_rc_track_left_eighth_to_diag(paint_session * session /** rct2: 0x007930C8 */ static void multi_dimension_rc_track_right_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -6475,7 +6475,7 @@ static void multi_dimension_rc_track_right_eighth_to_diag(paint_session * sessio /** rct2: 0x007930D8 */ static void multi_dimension_rc_track_left_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; multi_dimension_rc_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -6483,7 +6483,7 @@ static void multi_dimension_rc_track_left_eighth_to_orthogonal(paint_session * s /** rct2: 0x007930E8 */ static void multi_dimension_rc_track_right_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; multi_dimension_rc_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); @@ -6491,7 +6491,7 @@ static void multi_dimension_rc_track_right_eighth_to_orthogonal(paint_session * /** rct2: 0x007930F8 */ static void multi_dimension_rc_track_left_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -6759,7 +6759,7 @@ static void multi_dimension_rc_track_left_eighth_bank_to_diag(paint_session * se /** rct2: 0x00793108 */ static void multi_dimension_rc_track_right_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -7028,7 +7028,7 @@ static void multi_dimension_rc_track_right_eighth_bank_to_diag(paint_session * s /** rct2: 0x00793118 */ static void multi_dimension_rc_track_left_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; multi_dimension_rc_track_right_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, @@ -7038,7 +7038,7 @@ static void multi_dimension_rc_track_left_eighth_bank_to_orthogonal(paint_sessio /** rct2: 0x00793128 */ static void multi_dimension_rc_track_right_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; multi_dimension_rc_track_left_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, @@ -7047,7 +7047,7 @@ static void multi_dimension_rc_track_right_eighth_bank_to_orthogonal(paint_sessi /** rct2: 0x007930A8 */ static void multi_dimension_rc_track_diag_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -7314,7 +7314,7 @@ static void multi_dimension_rc_track_diag_flat(paint_session * session, uint8 ri /** rct2: 0x00793158 */ static void multi_dimension_rc_track_diag_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -7581,7 +7581,7 @@ static void multi_dimension_rc_track_diag_25_deg_up(paint_session * session, uin /** rct2: 0x007931B8 */ static void multi_dimension_rc_track_diag_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -7730,7 +7730,7 @@ static void multi_dimension_rc_track_diag_60_deg_up(paint_session * session, uin /** rct2: 0x00793138 */ static void multi_dimension_rc_track_diag_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -7997,7 +7997,7 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_up(paint_session * sess /** rct2: 0x00793198 */ static void multi_dimension_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -8146,7 +8146,7 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * /** rct2: 0x007931A8 */ static void multi_dimension_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -8295,7 +8295,7 @@ static void multi_dimension_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * /** rct2: 0x00793148 */ static void multi_dimension_rc_track_diag_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -8562,7 +8562,7 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_flat(paint_session * sess /** rct2: 0x00793188 */ static void multi_dimension_rc_track_diag_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -8777,7 +8777,7 @@ static void multi_dimension_rc_track_diag_25_deg_down(paint_session * session, u /** rct2: 0x007931E8 */ static void multi_dimension_rc_track_diag_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -8926,7 +8926,7 @@ static void multi_dimension_rc_track_diag_60_deg_down(paint_session * session, u /** rct2: 0x00793168 */ static void multi_dimension_rc_track_diag_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -9138,7 +9138,7 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_down(paint_session * se /** rct2: 0x007931C8 */ static void multi_dimension_rc_track_diag_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -9288,7 +9288,7 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_60_deg_down(paint_sessi /** rct2: 0x007931D8 */ static void multi_dimension_rc_track_diag_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -9437,7 +9437,7 @@ static void multi_dimension_rc_track_diag_60_deg_down_to_25_deg_down(paint_sessi /** rct2: 0x00793178 */ static void multi_dimension_rc_track_diag_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -9652,7 +9652,7 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_flat(paint_session * se /** rct2: 0x00793218 */ static void multi_dimension_rc_track_diag_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -9804,7 +9804,7 @@ static void multi_dimension_rc_track_diag_flat_to_left_bank(paint_session * sess /** rct2: 0x00793228 */ static void multi_dimension_rc_track_diag_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -9956,7 +9956,7 @@ static void multi_dimension_rc_track_diag_flat_to_right_bank(paint_session * ses /** rct2: 0x00793238 */ static void multi_dimension_rc_track_diag_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -10108,7 +10108,7 @@ static void multi_dimension_rc_track_diag_left_bank_to_flat(paint_session * sess /** rct2: 0x00793248 */ static void multi_dimension_rc_track_diag_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -10260,7 +10260,7 @@ static void multi_dimension_rc_track_diag_right_bank_to_flat(paint_session * ses /** rct2: 0x00793278 */ static void multi_dimension_rc_track_diag_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -10411,7 +10411,7 @@ static void multi_dimension_rc_track_diag_left_bank_to_25_deg_up(paint_session * /** rct2: 0x00793288 */ static void multi_dimension_rc_track_diag_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -10562,7 +10562,7 @@ static void multi_dimension_rc_track_diag_right_bank_to_25_deg_up(paint_session /** rct2: 0x00793258 */ static void multi_dimension_rc_track_diag_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -10713,7 +10713,7 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_left_bank(paint_session * /** rct2: 0x00793268 */ static void multi_dimension_rc_track_diag_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -10865,7 +10865,7 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_right_bank(paint_session /** rct2: 0x00793298 */ static void multi_dimension_rc_track_diag_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -11010,7 +11010,7 @@ static void multi_dimension_rc_track_diag_left_bank_to_25_deg_down(paint_session /** rct2: 0x007932A8 */ static void multi_dimension_rc_track_diag_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -11155,7 +11155,7 @@ static void multi_dimension_rc_track_diag_right_bank_to_25_deg_down(paint_sessio /** rct2: 0x007932B8 */ static void multi_dimension_rc_track_diag_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -11307,7 +11307,7 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_left_bank(paint_session /** rct2: 0x007932C8 */ static void multi_dimension_rc_track_diag_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -11458,7 +11458,7 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_right_bank(paint_sessio /** rct2: 0x007931F8 */ static void multi_dimension_rc_track_diag_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -11608,7 +11608,7 @@ static void multi_dimension_rc_track_diag_left_bank(paint_session * session, uin /** rct2: 0x00793208 */ static void multi_dimension_rc_track_diag_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -11758,7 +11758,7 @@ static void multi_dimension_rc_track_diag_right_bank(paint_session * session, ui /** rct2: 0x007932D8 */ static void multi_dimension_rc_track_left_flyer_twist_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -11968,7 +11968,7 @@ static void multi_dimension_rc_track_left_flyer_twist_up(paint_session * session /** rct2: 0x007932E8 */ static void multi_dimension_rc_track_right_flyer_twist_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -12178,7 +12178,7 @@ static void multi_dimension_rc_track_right_flyer_twist_up(paint_session * sessio /** rct2: 0x007932F8 */ static void multi_dimension_rc_track_left_flyer_twist_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -12388,7 +12388,7 @@ static void multi_dimension_rc_track_left_flyer_twist_down(paint_session * sessi /** rct2: 0x00793308 */ static void multi_dimension_rc_track_right_flyer_twist_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -12600,7 +12600,7 @@ static void multi_dimension_rc_track_right_flyer_twist_down(paint_session * sess static void multi_dimension_rc_track_multidim_inverted_flat_to_90_deg_quarter_loop_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -12774,7 +12774,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 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -12830,7 +12830,7 @@ static void multi_dimension_rc_track_block_brakes(paint_session * session, uint8 static void multi_dimension_rc_track_multidim_90_deg_up_to_inverted_flat_quarter_loop(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -13001,7 +13001,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 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { @@ -13175,7 +13175,7 @@ static void multi_dimension_rc_track_multidim_flat_to_90_deg_down_quarter_loop(p /** rct2: 0x00793388 */ static void multi_dimension_rc_track_elem_255(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (!track_element_is_inverted(mapElement)) { diff --git a/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp b/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp index 049996c4da..6649e20708 100644 --- a/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp +++ b/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" #include "../../paint/paint.h" #include "../../paint/supports.h" #include "../../sprites.h" @@ -201,7 +201,7 @@ static const uint32 reverse_freefall_rc_track_pieces_vertical_supports[4] = { }; static void paint_reverse_freefall_rc_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (direction & 1) { @@ -222,7 +222,7 @@ static void paint_reverse_freefall_rc_flat(paint_session * session, uint8 rideIn } static void paint_reverse_freefall_rc_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { Ride * ride = get_ride(rideIndex); const rct_ride_entrance_definition * entranceStyle = &RideEntranceDefinitions[ride->entrance_style]; @@ -268,7 +268,7 @@ static void paint_reverse_freefall_rc_station(paint_session * session, uint8 rid } static void paint_reverse_freefall_rc_slope(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { TESTPAINT_IGNORE_ALL(); @@ -360,7 +360,7 @@ static void paint_reverse_freefall_rc_slope(paint_session * session, uint8 rideI } static void paint_reverse_freefall_rc_vertical(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 supportsImageId, trackImageId; switch (trackSequence) diff --git a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp index 7b31b94c3a..54518cc096 100644 --- a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" #include "../../paint/paint.h" #include "../../paint/supports.h" #include "../../sprites.h" @@ -48,7 +48,7 @@ void vehicle_visual_reverser(paint_session * session, sint32 x, sint32 imageDire /** rct2: 0x0086E65C */ static void reverser_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -92,7 +92,7 @@ static void reverser_rc_track_flat(paint_session * session, uint8 rideIndex, uin } static void reverser_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][3] = { { 21506, SPR_STATION_BASE_A_SW_NE }, @@ -114,7 +114,7 @@ static void reverser_rc_track_station(paint_session * session, uint8 rideIndex, /** rct2: 0x0086E66C */ static void reverser_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -182,7 +182,7 @@ static void reverser_rc_track_25_deg_up(paint_session * session, uint8 rideIndex /** rct2: 0x0086E67C */ static void reverser_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -250,7 +250,7 @@ static void reverser_rc_track_flat_to_25_deg_up(paint_session * session, uint8 r /** rct2: 0x0086E68C */ static void reverser_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -318,28 +318,28 @@ static void reverser_rc_track_25_deg_up_to_flat(paint_session * session, uint8 r /** rct2: 0x0086E69C */ static void reverser_rc_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { reverser_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0086E6AC */ static void reverser_rc_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { reverser_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0086E6BC */ static void reverser_rc_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { reverser_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0086E6CC */ static void reverser_rc_track_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -496,7 +496,7 @@ static void reverser_rc_track_left_quarter_turn_5(paint_session * session, uint8 /** rct2: 0x0086E6DC */ static void reverser_rc_track_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; reverser_rc_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -504,7 +504,7 @@ static void reverser_rc_track_right_quarter_turn_5(paint_session * session, uint /** rct2: 0x0086E6EC */ static void reverser_rc_track_s_bend_left(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -640,7 +640,7 @@ static void reverser_rc_track_s_bend_left(paint_session * session, uint8 rideInd /** rct2: 0x0086E6FC */ static void reverser_rc_track_s_bend_right(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -776,7 +776,7 @@ static void reverser_rc_track_s_bend_right(paint_session * session, uint8 rideIn /** rct2: 0x0086E73C */ static void reverser_rc_track_left_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -879,7 +879,7 @@ static void reverser_rc_track_left_quarter_turn_3(paint_session * session, uint8 /** rct2: 0x0086E74C */ static void reverser_rc_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; reverser_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -887,7 +887,7 @@ static void reverser_rc_track_right_quarter_turn_3(paint_session * session, uint /** rct2: 0x0086E75C */ static void reverser_rc_track_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -911,7 +911,7 @@ static void reverser_rc_track_brakes(paint_session * session, uint8 rideIndex, u /** rct2: 0x0086E76C */ static void reverser_rc_track_left_reverser(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1095,7 +1095,7 @@ static void reverser_rc_track_left_reverser(paint_session * session, uint8 rideI /** rct2: 0x0086E77C */ static void reverser_rc_track_right_reverser(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { diff --git a/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp b/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp index 109373ea6d..d001ff70ce 100644 --- a/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" #include "../../paint/paint.h" #include "../../paint/supports.h" #include "../../sprites.h" @@ -28,7 +28,7 @@ /** rct2: 0x0077839C */ static void side_friction_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -93,7 +93,7 @@ static void side_friction_rc_track_flat(paint_session * session, uint8 rideIndex /** rct2: 0x007784AC, 0x007784BC, 0x007784CC */ static void side_friction_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4] = { 21610, @@ -113,7 +113,7 @@ static void side_friction_rc_track_station(paint_session * session, uint8 rideIn /** rct2: 0x007783AC */ static void side_friction_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -197,7 +197,7 @@ static void side_friction_rc_track_25_deg_up(paint_session * session, uint8 ride /** rct2: 0x007783CC */ static void side_friction_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -281,7 +281,7 @@ static void side_friction_rc_track_flat_to_25_deg_up(paint_session * session, ui /** rct2: 0x007783FC */ static void side_friction_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -365,28 +365,28 @@ static void side_friction_rc_track_25_deg_up_to_flat(paint_session * session, ui /** rct2: 0x0077840C */ static void side_friction_rc_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { side_friction_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0077842C */ static void side_friction_rc_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { side_friction_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0077845C */ static void side_friction_rc_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { side_friction_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0077846C */ static void side_friction_rc_track_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -583,7 +583,7 @@ static void side_friction_rc_track_left_quarter_turn_5(paint_session * session, /** rct2: 0x0077847C */ static void side_friction_rc_track_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; side_friction_rc_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -591,7 +591,7 @@ static void side_friction_rc_track_right_quarter_turn_5(paint_session * session, /** rct2: 0x0077848C */ static void side_friction_rc_track_s_bend_left(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -759,7 +759,7 @@ static void side_friction_rc_track_s_bend_left(paint_session * session, uint8 ri /** rct2: 0x0077849C */ static void side_friction_rc_track_s_bend_right(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -927,7 +927,7 @@ static void side_friction_rc_track_s_bend_right(paint_session * session, uint8 r /** rct2: 0x007784DC */ static void side_friction_rc_track_left_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1054,7 +1054,7 @@ static void side_friction_rc_track_left_quarter_turn_3(paint_session * session, /** rct2: 0x007784EC */ static void side_friction_rc_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; side_friction_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -1062,7 +1062,7 @@ static void side_friction_rc_track_right_quarter_turn_3(paint_session * session, /** rct2: 0x007784FC */ static void side_friction_rc_track_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1090,7 +1090,7 @@ static void side_friction_rc_track_brakes(paint_session * session, uint8 rideInd /** rct2: 0x007785DC */ static void side_friction_rc_track_left_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1258,7 +1258,7 @@ static void side_friction_rc_track_left_eighth_to_diag(paint_session * session, /** rct2: 0x007785EC */ static void side_friction_rc_track_right_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1426,7 +1426,7 @@ static void side_friction_rc_track_right_eighth_to_diag(paint_session * session, /** rct2: 0x007785FC */ static void side_friction_rc_track_left_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; side_friction_rc_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -1434,7 +1434,7 @@ static void side_friction_rc_track_left_eighth_to_orthogonal(paint_session * ses /** rct2: 0x0077860C */ static void side_friction_rc_track_right_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; side_friction_rc_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); @@ -1442,7 +1442,7 @@ static void side_friction_rc_track_right_eighth_to_orthogonal(paint_session * se /** rct2: 0x0077850C */ static void side_friction_rc_track_diag_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1595,7 +1595,7 @@ static void side_friction_rc_track_diag_flat(paint_session * session, uint8 ride /** rct2: 0x0077853C */ static void side_friction_rc_track_diag_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1748,7 +1748,7 @@ static void side_friction_rc_track_diag_25_deg_up(paint_session * session, uint8 /** rct2: 0x0077851C */ static void side_friction_rc_track_diag_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1901,7 +1901,7 @@ static void side_friction_rc_track_diag_flat_to_25_deg_up(paint_session * sessio /** rct2: 0x0077852C */ static void side_friction_rc_track_diag_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2054,7 +2054,7 @@ static void side_friction_rc_track_diag_25_deg_up_to_flat(paint_session * sessio /** rct2: 0x0077859C */ static void side_friction_rc_track_diag_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2207,7 +2207,7 @@ static void side_friction_rc_track_diag_25_deg_down(paint_session * session, uin /** rct2: 0x0077857C */ static void side_friction_rc_track_diag_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2355,7 +2355,7 @@ static void side_friction_rc_track_diag_flat_to_25_deg_down(paint_session * sess /** rct2: 0x0077858C */ static void side_friction_rc_track_diag_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { diff --git a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp index 59aa1d300a..874a37fa71 100644 --- a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" #include "../../paint/paint.h" #include "../../paint/supports.h" #include "../../sprites.h" @@ -28,7 +28,7 @@ /** rct2: 0x008A7114 */ static void stand_up_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -78,7 +78,7 @@ static void stand_up_rc_track_flat(paint_session * session, uint8 rideIndex, uin /** rct2: 0x008A7384, 0x008A7394, 0x008A73A4 */ static void stand_up_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][3] = { { 25567, 25571, SPR_STATION_BASE_A_SW_NE }, @@ -108,7 +108,7 @@ static void stand_up_rc_track_station(paint_session * session, uint8 rideIndex, /** rct2: 0x008A7124 */ static void stand_up_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -169,7 +169,7 @@ static void stand_up_rc_track_25_deg_up(paint_session * session, uint8 rideIndex /** rct2: 0x008A7134 */ static void stand_up_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -234,7 +234,7 @@ static void stand_up_rc_track_60_deg_up(paint_session * session, uint8 rideIndex /** rct2: 0x008A7144 */ static void stand_up_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -295,7 +295,7 @@ static void stand_up_rc_track_flat_to_25_deg_up(paint_session * session, uint8 r /** rct2: 0x008A7154 */ static void stand_up_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -368,7 +368,7 @@ static void stand_up_rc_track_25_deg_up_to_60_deg_up(paint_session * session, ui /** rct2: 0x008A7164 */ static void stand_up_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -441,7 +441,7 @@ static void stand_up_rc_track_60_deg_up_to_25_deg_up(paint_session * session, ui /** rct2: 0x008A7174 */ static void stand_up_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -502,49 +502,49 @@ static void stand_up_rc_track_25_deg_up_to_flat(paint_session * session, uint8 r /** rct2: 0x008A7184 */ static void stand_up_rc_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { stand_up_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A7194 */ static void stand_up_rc_track_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { stand_up_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A71A4 */ static void stand_up_rc_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { stand_up_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A71B4 */ static void stand_up_rc_track_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { stand_up_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A71C4 */ static void stand_up_rc_track_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { stand_up_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A71D4 */ static void stand_up_rc_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { stand_up_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A71E4 */ static void stand_up_rc_track_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -678,7 +678,7 @@ static void stand_up_rc_track_left_quarter_turn_5(paint_session * session, uint8 /** rct2: 0x008A71F4 */ static void stand_up_rc_track_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; stand_up_rc_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -686,7 +686,7 @@ static void stand_up_rc_track_right_quarter_turn_5(paint_session * session, uint /** rct2: 0x008A7204 */ static void stand_up_rc_track_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -715,7 +715,7 @@ static void stand_up_rc_track_flat_to_left_bank(paint_session * session, uint8 r /** rct2: 0x008A7214 */ static void stand_up_rc_track_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -744,7 +744,7 @@ static void stand_up_rc_track_flat_to_right_bank(paint_session * session, uint8 /** rct2: 0x008A7224 */ static void stand_up_rc_track_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -773,7 +773,7 @@ static void stand_up_rc_track_left_bank_to_flat(paint_session * session, uint8 r /** rct2: 0x008A7234 */ static void stand_up_rc_track_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -802,7 +802,7 @@ static void stand_up_rc_track_right_bank_to_flat(paint_session * session, uint8 /** rct2: 0x008A7244 */ static void stand_up_rc_track_banked_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -960,7 +960,7 @@ static void stand_up_rc_track_banked_left_quarter_turn_5(paint_session * session /** rct2: 0x008A7254 */ static void stand_up_rc_track_banked_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; stand_up_rc_track_banked_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -968,7 +968,7 @@ static void stand_up_rc_track_banked_right_quarter_turn_5(paint_session * sessio /** rct2: 0x008A7264 */ static void stand_up_rc_track_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1004,7 +1004,7 @@ static void stand_up_rc_track_left_bank_to_25_deg_up(paint_session * session, ui /** rct2: 0x008A7274 */ static void stand_up_rc_track_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1040,7 +1040,7 @@ static void stand_up_rc_track_right_bank_to_25_deg_up(paint_session * session, u /** rct2: 0x008A7284 */ static void stand_up_rc_track_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1076,7 +1076,7 @@ static void stand_up_rc_track_25_deg_up_to_left_bank(paint_session * session, ui /** rct2: 0x008A7294 */ static void stand_up_rc_track_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1112,35 +1112,35 @@ static void stand_up_rc_track_25_deg_up_to_right_bank(paint_session * session, u /** rct2: 0x008A72A4 */ static void stand_up_rc_track_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { stand_up_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A72B4 */ static void stand_up_rc_track_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { stand_up_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A72C4 */ static void stand_up_rc_track_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { stand_up_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A72D4 */ static void stand_up_rc_track_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { stand_up_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A72E4 */ static void stand_up_rc_track_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1169,14 +1169,14 @@ static void stand_up_rc_track_left_bank(paint_session * session, uint8 rideIndex /** rct2: 0x008A72F4 */ static void stand_up_rc_track_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { stand_up_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A7304 */ static void stand_up_rc_track_left_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1417,7 +1417,7 @@ static void stand_up_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sess /** rct2: 0x008A7314 */ static void stand_up_rc_track_right_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1658,7 +1658,7 @@ static void stand_up_rc_track_right_quarter_turn_5_25_deg_up(paint_session * ses /** rct2: 0x008A7324 */ static void stand_up_rc_track_left_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; stand_up_rc_track_right_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, @@ -1667,7 +1667,7 @@ static void stand_up_rc_track_left_quarter_turn_5_25_deg_down(paint_session * se /** rct2: 0x008A7334 */ static void stand_up_rc_track_right_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; stand_up_rc_track_left_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -1675,7 +1675,7 @@ static void stand_up_rc_track_right_quarter_turn_5_25_deg_down(paint_session * s /** rct2: 0x008A7344 */ static void stand_up_rc_track_s_bend_left(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1787,7 +1787,7 @@ static void stand_up_rc_track_s_bend_left(paint_session * session, uint8 rideInd /** rct2: 0x008A7354 */ static void stand_up_rc_track_s_bend_right(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1899,7 +1899,7 @@ static void stand_up_rc_track_s_bend_right(paint_session * session, uint8 rideIn /** rct2: 0x008A7364 */ static void stand_up_rc_track_left_vertical_loop(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2109,7 +2109,7 @@ static void stand_up_rc_track_left_vertical_loop(paint_session * session, uint8 /** rct2: 0x008A7374 */ static void stand_up_rc_track_right_vertical_loop(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2293,7 +2293,7 @@ static void stand_up_rc_track_right_vertical_loop(paint_session * session, uint8 /** rct2: 0x008A73B4 */ static void stand_up_rc_track_left_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2380,7 +2380,7 @@ static void stand_up_rc_track_left_quarter_turn_3(paint_session * session, uint8 /** rct2: 0x008A73C4 */ static void stand_up_rc_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; stand_up_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -2388,7 +2388,7 @@ static void stand_up_rc_track_right_quarter_turn_3(paint_session * session, uint /** rct2: 0x008A73D4 */ static void stand_up_rc_track_left_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2491,7 +2491,7 @@ static void stand_up_rc_track_left_quarter_turn_3_bank(paint_session * session, /** rct2: 0x008A73E4 */ static void stand_up_rc_track_right_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; stand_up_rc_track_left_quarter_turn_3_bank(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -2499,7 +2499,7 @@ static void stand_up_rc_track_right_quarter_turn_3_bank(paint_session * session, /** rct2: 0x008A73F4 */ static void stand_up_rc_track_left_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2613,7 +2613,7 @@ static void stand_up_rc_track_left_quarter_turn_3_25_deg_up(paint_session * sess /** rct2: 0x008A7404 */ static void stand_up_rc_track_right_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2741,7 +2741,7 @@ static void stand_up_rc_track_right_quarter_turn_3_25_deg_up(paint_session * ses /** rct2: 0x008A7414 */ static void stand_up_rc_track_left_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; stand_up_rc_track_right_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, @@ -2750,7 +2750,7 @@ static void stand_up_rc_track_left_quarter_turn_3_25_deg_down(paint_session * se /** rct2: 0x008A7424 */ static void stand_up_rc_track_right_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; stand_up_rc_track_left_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -2758,7 +2758,7 @@ static void stand_up_rc_track_right_quarter_turn_3_25_deg_down(paint_session * s /** rct2: 0x008A7434 */ static void stand_up_rc_track_half_loop_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2864,14 +2864,14 @@ static void stand_up_rc_track_half_loop_up(paint_session * session, uint8 rideIn /** rct2: 0x008A7444 */ static void stand_up_rc_track_half_loop_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { stand_up_rc_track_half_loop_up(session, rideIndex, 3 - trackSequence, direction, height, mapElement); } /** rct2: 0x008A7454 */ static void stand_up_rc_track_left_corkscrew_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2969,7 +2969,7 @@ static void stand_up_rc_track_left_corkscrew_up(paint_session * session, uint8 r /** rct2: 0x008A7464 */ static void stand_up_rc_track_right_corkscrew_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3068,21 +3068,21 @@ static void stand_up_rc_track_right_corkscrew_up(paint_session * session, uint8 /** rct2: 0x008A7474 */ static void stand_up_rc_track_left_corkscrew_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { stand_up_rc_track_right_corkscrew_up(session, rideIndex, 2 - trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008A7484 */ static void stand_up_rc_track_right_corkscrew_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { stand_up_rc_track_left_corkscrew_up(session, rideIndex, 2 - trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A7734 */ static void stand_up_rc_track_left_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3283,7 +3283,7 @@ static void stand_up_rc_track_left_half_banked_helix_up_small(paint_session * se /** rct2: 0x008A7744 */ static void stand_up_rc_track_right_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3484,7 +3484,7 @@ static void stand_up_rc_track_right_half_banked_helix_up_small(paint_session * s /** rct2: 0x008A7754 */ static void stand_up_rc_track_left_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 4) { @@ -3498,7 +3498,7 @@ static void stand_up_rc_track_left_half_banked_helix_down_small(paint_session * /** rct2: 0x008A7764 */ static void stand_up_rc_track_right_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 4) { @@ -3512,7 +3512,7 @@ static void stand_up_rc_track_right_half_banked_helix_down_small(paint_session * /** rct2: 0x008A76F4 */ static void stand_up_rc_track_left_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3823,7 +3823,7 @@ static void stand_up_rc_track_left_half_banked_helix_up_large(paint_session * se /** rct2: 0x008A7704 */ static void stand_up_rc_track_right_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4134,7 +4134,7 @@ static void stand_up_rc_track_right_half_banked_helix_up_large(paint_session * s /** rct2: 0x008A7714 */ static void stand_up_rc_track_left_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 7) { @@ -4148,7 +4148,7 @@ static void stand_up_rc_track_left_half_banked_helix_down_large(paint_session * /** rct2: 0x008A7724 */ static void stand_up_rc_track_right_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 7) { @@ -4162,7 +4162,7 @@ static void stand_up_rc_track_right_half_banked_helix_down_large(paint_session * /** rct2: 0x008A7494 */ static void stand_up_rc_track_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -4187,7 +4187,7 @@ static void stand_up_rc_track_brakes(paint_session * session, uint8 rideIndex, u /** rct2: 0x008A74A4 */ static void stand_up_rc_track_on_ride_photo(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -4228,7 +4228,7 @@ static void stand_up_rc_track_on_ride_photo(paint_session * session, uint8 rideI /** rct2: 0x008A74B4 */ static void stand_up_rc_track_left_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4352,7 +4352,7 @@ static void stand_up_rc_track_left_eighth_to_diag(paint_session * session, uint8 /** rct2: 0x008A74C4 */ static void stand_up_rc_track_right_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4476,7 +4476,7 @@ static void stand_up_rc_track_right_eighth_to_diag(paint_session * session, uint /** rct2: 0x008A74D4 */ static void stand_up_rc_track_left_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; stand_up_rc_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -4484,7 +4484,7 @@ static void stand_up_rc_track_left_eighth_to_orthogonal(paint_session * session, /** rct2: 0x008A74E4 */ static void stand_up_rc_track_right_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; stand_up_rc_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); @@ -4492,7 +4492,7 @@ static void stand_up_rc_track_right_eighth_to_orthogonal(paint_session * session /** rct2: 0x008A76A4 */ static void stand_up_rc_track_left_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4616,7 +4616,7 @@ static void stand_up_rc_track_left_eighth_bank_to_diag(paint_session * session, /** rct2: 0x008A76B4 */ static void stand_up_rc_track_right_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4740,7 +4740,7 @@ static void stand_up_rc_track_right_eighth_bank_to_diag(paint_session * session, /** rct2: 0x008A76C4 */ static void stand_up_rc_track_left_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; stand_up_rc_track_right_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -4748,7 +4748,7 @@ static void stand_up_rc_track_left_eighth_bank_to_orthogonal(paint_session * ses /** rct2: 0x008A76D4 */ static void stand_up_rc_track_right_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; stand_up_rc_track_left_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); @@ -4756,7 +4756,7 @@ static void stand_up_rc_track_right_eighth_bank_to_orthogonal(paint_session * se /** rct2: 0x008A74F4 */ static void stand_up_rc_track_diag_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4893,7 +4893,7 @@ static void stand_up_rc_track_diag_flat(paint_session * session, uint8 rideIndex /** rct2: 0x008A7524 */ static void stand_up_rc_track_diag_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5030,7 +5030,7 @@ static void stand_up_rc_track_diag_25_deg_up(paint_session * session, uint8 ride /** rct2: 0x008A7584 */ static void stand_up_rc_track_diag_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5167,7 +5167,7 @@ static void stand_up_rc_track_diag_60_deg_up(paint_session * session, uint8 ride /** rct2: 0x008A7504 */ static void stand_up_rc_track_diag_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5304,7 +5304,7 @@ static void stand_up_rc_track_diag_flat_to_25_deg_up(paint_session * session, ui /** rct2: 0x008A7564 */ static void stand_up_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5441,7 +5441,7 @@ static void stand_up_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * sessio /** rct2: 0x008A7574 */ static void stand_up_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5578,7 +5578,7 @@ static void stand_up_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * sessio /** rct2: 0x008A7514 */ static void stand_up_rc_track_diag_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5715,7 +5715,7 @@ static void stand_up_rc_track_diag_25_deg_up_to_flat(paint_session * session, ui /** rct2: 0x008A7554 */ static void stand_up_rc_track_diag_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5852,7 +5852,7 @@ static void stand_up_rc_track_diag_25_deg_down(paint_session * session, uint8 ri /** rct2: 0x008A75B4 */ static void stand_up_rc_track_diag_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5989,7 +5989,7 @@ static void stand_up_rc_track_diag_60_deg_down(paint_session * session, uint8 ri /** rct2: 0x008A7534 */ static void stand_up_rc_track_diag_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6124,7 +6124,7 @@ static void stand_up_rc_track_diag_flat_to_25_deg_down(paint_session * session, /** rct2: 0x008A7594 */ static void stand_up_rc_track_diag_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6261,7 +6261,7 @@ static void stand_up_rc_track_diag_25_deg_down_to_60_deg_down(paint_session * se /** rct2: 0x008A75A4 */ static void stand_up_rc_track_diag_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6398,7 +6398,7 @@ static void stand_up_rc_track_diag_60_deg_down_to_25_deg_down(paint_session * se /** rct2: 0x008A7544 */ static void stand_up_rc_track_diag_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6535,7 +6535,7 @@ static void stand_up_rc_track_diag_25_deg_down_to_flat(paint_session * session, /** rct2: 0x008A75E4 */ static void stand_up_rc_track_diag_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6604,7 +6604,7 @@ static void stand_up_rc_track_diag_flat_to_left_bank(paint_session * session, ui /** rct2: 0x008A75F4 */ static void stand_up_rc_track_diag_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6673,7 +6673,7 @@ static void stand_up_rc_track_diag_flat_to_right_bank(paint_session * session, u /** rct2: 0x008A7604 */ static void stand_up_rc_track_diag_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6742,7 +6742,7 @@ static void stand_up_rc_track_diag_left_bank_to_flat(paint_session * session, ui /** rct2: 0x008A7614 */ static void stand_up_rc_track_diag_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6811,7 +6811,7 @@ static void stand_up_rc_track_diag_right_bank_to_flat(paint_session * session, u /** rct2: 0x008A7644 */ static void stand_up_rc_track_diag_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6880,7 +6880,7 @@ static void stand_up_rc_track_diag_left_bank_to_25_deg_up(paint_session * sessio /** rct2: 0x008A7654 */ static void stand_up_rc_track_diag_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6949,7 +6949,7 @@ static void stand_up_rc_track_diag_right_bank_to_25_deg_up(paint_session * sessi /** rct2: 0x008A7624 */ static void stand_up_rc_track_diag_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7018,7 +7018,7 @@ static void stand_up_rc_track_diag_25_deg_up_to_left_bank(paint_session * sessio /** rct2: 0x008A7634 */ static void stand_up_rc_track_diag_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7087,7 +7087,7 @@ static void stand_up_rc_track_diag_25_deg_up_to_right_bank(paint_session * sessi /** rct2: 0x008A7664 */ static void stand_up_rc_track_diag_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7154,7 +7154,7 @@ static void stand_up_rc_track_diag_left_bank_to_25_deg_down(paint_session * sess /** rct2: 0x008A7674 */ static void stand_up_rc_track_diag_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7221,7 +7221,7 @@ static void stand_up_rc_track_diag_right_bank_to_25_deg_down(paint_session * ses /** rct2: 0x008A7684 */ static void stand_up_rc_track_diag_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7290,7 +7290,7 @@ static void stand_up_rc_track_diag_25_deg_down_to_left_bank(paint_session * sess /** rct2: 0x008A7694 */ static void stand_up_rc_track_diag_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7359,7 +7359,7 @@ static void stand_up_rc_track_diag_25_deg_down_to_right_bank(paint_session * ses /** rct2: 0x008A75C4 */ static void stand_up_rc_track_diag_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7426,7 +7426,7 @@ static void stand_up_rc_track_diag_left_bank(paint_session * session, uint8 ride /** rct2: 0x008A75D4 */ static void stand_up_rc_track_diag_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7493,7 +7493,7 @@ static void stand_up_rc_track_diag_right_bank(paint_session * session, uint8 rid /** rct2: 0x008A76E4 */ static void stand_up_rc_track_block_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { diff --git a/src/openrct2/ride/coaster/Steeplechase.cpp b/src/openrct2/ride/coaster/Steeplechase.cpp index 70465b0d11..b9b6ca97ce 100644 --- a/src/openrct2/ride/coaster/Steeplechase.cpp +++ b/src/openrct2/ride/coaster/Steeplechase.cpp @@ -16,7 +16,7 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" #include "../../paint/paint.h" #include "../../paint/supports.h" #include "../../sprites.h" @@ -28,7 +28,7 @@ /** rct2: 0x008A59A8 */ static void steeplechase_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -71,7 +71,7 @@ static void steeplechase_track_flat(paint_session * session, uint8 rideIndex, ui } static void steeplechase_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][3] = { { 28635, SPR_STATION_BASE_B_SW_NE }, @@ -93,7 +93,7 @@ static void steeplechase_track_station(paint_session * session, uint8 rideIndex, /** rct2: 0x008A59B8 */ static void steeplechase_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -158,7 +158,7 @@ static void steeplechase_track_25_deg_up(paint_session * session, uint8 rideInde /** rct2: 0x008A59C8 */ static void steeplechase_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -223,7 +223,7 @@ static void steeplechase_track_flat_to_25_deg_up(paint_session * session, uint8 /** rct2: 0x008A59D8 */ static void steeplechase_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -288,28 +288,28 @@ static void steeplechase_track_25_deg_up_to_flat(paint_session * session, uint8 /** rct2: 0x008A59E8 */ static void steeplechase_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { steeplechase_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A59F8 */ static void steeplechase_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { steeplechase_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A5A08 */ static void steeplechase_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { steeplechase_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A5A18 */ static void steeplechase_track_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -455,7 +455,7 @@ static void steeplechase_track_left_quarter_turn_5(paint_session * session, uint /** rct2: 0x008A5A28 */ static void steeplechase_track_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; steeplechase_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -463,7 +463,7 @@ static void steeplechase_track_right_quarter_turn_5(paint_session * session, uin /** rct2: 0x008A5A38 */ static void steeplechase_track_s_bend_left(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -587,7 +587,7 @@ static void steeplechase_track_s_bend_left(paint_session * session, uint8 rideIn /** rct2: 0x008A5A48 */ static void steeplechase_track_s_bend_right(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -713,7 +713,7 @@ static void steeplechase_track_s_bend_right(paint_session * session, uint8 rideI /** rct2: 0x008A5A88 */ static void steeplechase_track_left_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -811,7 +811,7 @@ static void steeplechase_track_left_quarter_turn_3(paint_session * session, uint /** rct2: 0x008A5A98 */ static void steeplechase_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; steeplechase_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -819,7 +819,7 @@ static void steeplechase_track_right_quarter_turn_3(paint_session * session, uin /** rct2: 0x008A5AA8 */ static void steeplechase_track_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -842,7 +842,7 @@ static void steeplechase_track_brakes(paint_session * session, uint8 rideIndex, /** rct2: 0x008A5AD8 */ static void steeplechase_track_left_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -973,7 +973,7 @@ static void steeplechase_track_left_eighth_to_diag(paint_session * session, uint /** rct2: 0x008A5AE8 */ static void steeplechase_track_right_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1104,7 +1104,7 @@ static void steeplechase_track_right_eighth_to_diag(paint_session * session, uin /** rct2: 0x008A5AF8 */ static void steeplechase_track_left_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; steeplechase_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -1112,7 +1112,7 @@ static void steeplechase_track_left_eighth_to_orthogonal(paint_session * session /** rct2: 0x008A5B08 */ static void steeplechase_track_right_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; steeplechase_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); @@ -1120,7 +1120,7 @@ static void steeplechase_track_right_eighth_to_orthogonal(paint_session * sessio /** rct2: 0x008A5AC8 */ static void steeplechase_track_diag_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1257,7 +1257,7 @@ static void steeplechase_track_diag_flat(paint_session * session, uint8 rideInde /** rct2: 0x008A5B38 */ static void steeplechase_track_diag_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1394,7 +1394,7 @@ static void steeplechase_track_diag_25_deg_up(paint_session * session, uint8 rid /** rct2: 0x008A5B18 */ static void steeplechase_track_diag_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1531,7 +1531,7 @@ static void steeplechase_track_diag_flat_to_25_deg_up(paint_session * session, u /** rct2: 0x008A5B28 */ static void steeplechase_track_diag_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1668,7 +1668,7 @@ static void steeplechase_track_diag_25_deg_up_to_flat(paint_session * session, u /** rct2: 0x008A5B68 */ static void steeplechase_track_diag_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1805,7 +1805,7 @@ static void steeplechase_track_diag_25_deg_down(paint_session * session, uint8 r /** rct2: 0x008A5B48 */ static void steeplechase_track_diag_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1940,7 +1940,7 @@ static void steeplechase_track_diag_flat_to_25_deg_down(paint_session * session, /** rct2: 0x008A5B58 */ static void steeplechase_track_diag_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2077,7 +2077,7 @@ static void steeplechase_track_diag_25_deg_down_to_flat(paint_session * session, /** rct2: 0x008A5AB8 */ static void steeplechase_track_block_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { diff --git a/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp b/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp index 94e9a34f66..f1a78bf173 100644 --- a/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp +++ b/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" #include "../../paint/paint.h" #include "../../paint/supports.h" #include "../../sprites.h" @@ -28,7 +28,7 @@ /** rct2: 0x008A8958 */ static void suspended_swinging_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -76,7 +76,7 @@ static void suspended_swinging_rc_track_flat(paint_session * session, uint8 ride /** rct2: 0x008A8AA8, 0x008A8AB8, 0x008A8AC8 */ static void suspended_swinging_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][3] = { { SPR_STATION_BASE_C_SW_NE, 25963, SPR_STATION_INVERTED_BAR_D_SW_NE }, @@ -101,7 +101,7 @@ static void suspended_swinging_rc_track_station(paint_session * session, uint8 r /** rct2: 0x008A8968 */ static void suspended_swinging_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -186,7 +186,7 @@ static void suspended_swinging_rc_track_25_deg_up(paint_session * session, uint8 /** rct2: 0x008A8978 */ static void suspended_swinging_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -222,7 +222,7 @@ static void suspended_swinging_rc_track_60_deg_up(paint_session * session, uint8 /** rct2: 0x008A8988 */ static void suspended_swinging_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -307,7 +307,7 @@ static void suspended_swinging_rc_track_flat_to_25_deg_up(paint_session * sessio /** rct2: 0x008A8998 */ static void suspended_swinging_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -347,7 +347,7 @@ static void suspended_swinging_rc_track_25_deg_up_to_60_deg_up(paint_session * s /** rct2: 0x008A89A8 */ static void suspended_swinging_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -440,7 +440,7 @@ static void suspended_swinging_rc_track_60_deg_up_to_25_deg_up(paint_session * s /** rct2: 0x008A89B8 */ static void suspended_swinging_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (track_element_is_lift_hill(mapElement)) { @@ -525,21 +525,21 @@ static void suspended_swinging_rc_track_25_deg_up_to_flat(paint_session * sessio /** rct2: 0x008A89C8 */ static void suspended_swinging_rc_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { suspended_swinging_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A89D8 */ static void suspended_swinging_rc_track_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { suspended_swinging_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A89E8 */ static void suspended_swinging_rc_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { suspended_swinging_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } @@ -547,7 +547,7 @@ static void suspended_swinging_rc_track_flat_to_25_deg_down(paint_session * sess /** rct2: 0x008A89F8 */ static void suspended_swinging_rc_track_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { suspended_swinging_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -556,7 +556,7 @@ static void suspended_swinging_rc_track_25_deg_down_to_60_deg_down(paint_session /** rct2: 0x008A8A08 */ static void suspended_swinging_rc_track_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { suspended_swinging_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -564,14 +564,14 @@ static void suspended_swinging_rc_track_60_deg_down_to_25_deg_down(paint_session /** rct2: 0x008A8A18 */ static void suspended_swinging_rc_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { suspended_swinging_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A8A28 */ static void suspended_swinging_rc_track_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -726,7 +726,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_5(paint_session * sess /** rct2: 0x008A8A38 */ static void suspended_swinging_rc_track_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; suspended_swinging_rc_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -735,7 +735,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_5(paint_session * ses /** rct2: 0x008A8A48 */ static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -877,7 +877,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_up(paint_sess /** rct2: 0x008A8A58 */ static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -1019,7 +1019,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_up(paint_ses /** rct2: 0x008A8A68 */ static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; suspended_swinging_rc_track_right_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, @@ -1029,7 +1029,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_down(paint_se /** rct2: 0x008A8A78 */ static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; suspended_swinging_rc_track_left_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, @@ -1038,7 +1038,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_down(paint_s /** rct2: 0x008A8A88 */ static void suspended_swinging_rc_track_s_bend_left(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1176,7 +1176,7 @@ static void suspended_swinging_rc_track_s_bend_left(paint_session * session, uin /** rct2: 0x008A8A98 */ static void suspended_swinging_rc_track_s_bend_right(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1314,7 +1314,7 @@ static void suspended_swinging_rc_track_s_bend_right(paint_session * session, ui /** rct2: 0x008A8AD8 */ static void suspended_swinging_rc_track_left_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1418,7 +1418,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_3(paint_session * sess /** rct2: 0x008A8AE8 */ static void suspended_swinging_rc_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; suspended_swinging_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -1427,7 +1427,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_3(paint_session * ses /** rct2: 0x008A8AF8 */ static void suspended_swinging_rc_track_left_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -1504,7 +1504,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_3_25_deg_up(paint_sess /** rct2: 0x008A8B08 */ static void suspended_swinging_rc_track_right_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -1581,7 +1581,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_3_25_deg_up(paint_ses /** rct2: 0x008A8B18 */ static void suspended_swinging_rc_track_left_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; suspended_swinging_rc_track_right_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, @@ -1591,7 +1591,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_3_25_deg_down(paint_se /** rct2: 0x008A8B28 */ static void suspended_swinging_rc_track_right_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; suspended_swinging_rc_track_left_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, @@ -1600,7 +1600,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_3_25_deg_down(paint_s /** rct2: 0x008A8B38 */ static void suspended_swinging_rc_track_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -1630,7 +1630,7 @@ static void suspended_swinging_rc_track_brakes(paint_session * session, uint8 ri /** rct2: 0x008A8B48 */ static void suspended_swinging_rc_track_left_quarter_helix_large_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -1791,7 +1791,7 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_up(paint_sessio /** rct2: 0x008A8B58 */ static void suspended_swinging_rc_track_right_quarter_helix_large_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -1952,7 +1952,7 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_up(paint_sessi /** rct2: 0x008A8B68 */ static void suspended_swinging_rc_track_left_quarter_helix_large_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -2113,7 +2113,7 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_down(paint_sess /** rct2: 0x008A8B78 */ static void suspended_swinging_rc_track_right_quarter_helix_large_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -2273,7 +2273,7 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_down(paint_ses /** rct2: 0x008A8B88 */ static void suspended_swinging_rc_track_left_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2417,7 +2417,7 @@ static void suspended_swinging_rc_track_left_eighth_to_diag(paint_session * sess /** rct2: 0x008A8B98 */ static void suspended_swinging_rc_track_right_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2561,7 +2561,7 @@ static void suspended_swinging_rc_track_right_eighth_to_diag(paint_session * ses /** rct2: 0x008A8BA8 */ static void suspended_swinging_rc_track_left_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; suspended_swinging_rc_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, @@ -2571,7 +2571,7 @@ static void suspended_swinging_rc_track_left_eighth_to_orthogonal(paint_session /** rct2: 0x008A8BB8 */ static void suspended_swinging_rc_track_right_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; suspended_swinging_rc_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); @@ -2579,7 +2579,7 @@ static void suspended_swinging_rc_track_right_eighth_to_orthogonal(paint_session /** rct2: 0x008A8BC8 */ static void suspended_swinging_rc_track_diag_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2709,7 +2709,7 @@ static void suspended_swinging_rc_track_diag_flat(paint_session * session, uint8 /** rct2: 0x008A8BF8 */ static void suspended_swinging_rc_track_diag_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2839,7 +2839,7 @@ static void suspended_swinging_rc_track_diag_25_deg_up(paint_session * session, /** rct2: 0x008A8C58 */ static void suspended_swinging_rc_track_diag_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2917,7 +2917,7 @@ static void suspended_swinging_rc_track_diag_60_deg_up(paint_session * session, /** rct2: 0x008A8BD8 */ static void suspended_swinging_rc_track_diag_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3048,7 +3048,7 @@ static void suspended_swinging_rc_track_diag_flat_to_25_deg_up(paint_session * s /** rct2: 0x008A8C38 */ static void suspended_swinging_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -3127,7 +3127,7 @@ static void suspended_swinging_rc_track_diag_25_deg_up_to_60_deg_up(paint_sessio /** rct2: 0x008A8C48 */ static void suspended_swinging_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -3205,7 +3205,7 @@ static void suspended_swinging_rc_track_diag_60_deg_up_to_25_deg_up(paint_sessio /** rct2: 0x008A8BE8 */ static void suspended_swinging_rc_track_diag_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3335,7 +3335,7 @@ static void suspended_swinging_rc_track_diag_25_deg_up_to_flat(paint_session * s /** rct2: 0x008A8C28 */ static void suspended_swinging_rc_track_diag_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3465,7 +3465,7 @@ static void suspended_swinging_rc_track_diag_25_deg_down(paint_session * session /** rct2: 0x008A8C88 */ static void suspended_swinging_rc_track_diag_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3522,7 +3522,7 @@ static void suspended_swinging_rc_track_diag_60_deg_down(paint_session * session /** rct2: 0x008A8C08 */ static void suspended_swinging_rc_track_diag_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3650,7 +3650,7 @@ static void suspended_swinging_rc_track_diag_flat_to_25_deg_down(paint_session * /** rct2: 0x008A8C68 */ static void suspended_swinging_rc_track_diag_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -3729,7 +3729,7 @@ static void suspended_swinging_rc_track_diag_25_deg_down_to_60_deg_down(paint_se /** rct2: 0x008A8C78 */ static void suspended_swinging_rc_track_diag_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -3807,7 +3807,7 @@ static void suspended_swinging_rc_track_diag_60_deg_down_to_25_deg_down(paint_se /** rct2: 0x008A8C18 */ static void suspended_swinging_rc_track_diag_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3937,7 +3937,7 @@ static void suspended_swinging_rc_track_diag_25_deg_down_to_flat(paint_session * /** rct2: 0x008A8B38 */ static void suspended_swinging_rc_track_block_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { diff --git a/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp b/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp index 3a16437f50..0263bcf486 100644 --- a/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" #include "../../paint/paint.h" #include "../../paint/supports.h" #include "../../sprites.h" @@ -29,35 +29,35 @@ /** rct2: 0x008AB6A4 */ static void twister_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB8F4, 0x008AB904, 0x008AB914 */ static void twister_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_station(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB6B4 */ static void twister_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB6C4 */ static void twister_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_60_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB6D4 */ static void twister_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_flat_to_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -65,7 +65,7 @@ static void twister_rc_track_flat_to_25_deg_up(paint_session * session, uint8 ri /** rct2: 0x008AB6E4 */ static void twister_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -73,7 +73,7 @@ static void twister_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uin /** rct2: 0x008AB6F4 */ static void twister_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -81,7 +81,7 @@ static void twister_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uin /** rct2: 0x008AB704 */ static void twister_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_up_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -89,7 +89,7 @@ static void twister_rc_track_25_deg_up_to_flat(paint_session * session, uint8 ri /** rct2: 0x008AB714 */ static void twister_rc_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -97,7 +97,7 @@ static void twister_rc_track_25_deg_down(paint_session * session, uint8 rideInde /** rct2: 0x008AB724 */ static void twister_rc_track_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_60_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -105,7 +105,7 @@ static void twister_rc_track_60_deg_down(paint_session * session, uint8 rideInde /** rct2: 0x008AB734 */ static void twister_rc_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_flat_to_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -113,7 +113,7 @@ static void twister_rc_track_flat_to_25_deg_down(paint_session * session, uint8 /** rct2: 0x008AB744 */ static void twister_rc_track_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_down_to_60_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -121,7 +121,7 @@ static void twister_rc_track_25_deg_down_to_60_deg_down(paint_session * session, /** rct2: 0x008AB754 */ static void twister_rc_track_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_60_deg_down_to_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -129,7 +129,7 @@ static void twister_rc_track_60_deg_down_to_25_deg_down(paint_session * session, /** rct2: 0x008AB764 */ static void twister_rc_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_down_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -137,7 +137,7 @@ static void twister_rc_track_25_deg_down_to_flat(paint_session * session, uint8 /** rct2: 0x008AB774 */ static void twister_rc_track_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_5(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -145,7 +145,7 @@ static void twister_rc_track_left_quarter_turn_5(paint_session * session, uint8 /** rct2: 0x008AB784 */ static void twister_rc_track_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_5(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -153,7 +153,7 @@ static void twister_rc_track_right_quarter_turn_5(paint_session * session, uint8 /** rct2: 0x008AB794 */ static void twister_rc_track_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_flat_to_left_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -161,7 +161,7 @@ static void twister_rc_track_flat_to_left_bank(paint_session * session, uint8 ri /** rct2: 0x008AB7A4 */ static void twister_rc_track_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_flat_to_right_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -169,7 +169,7 @@ static void twister_rc_track_flat_to_right_bank(paint_session * session, uint8 r /** rct2: 0x008AB7B4 */ static void twister_rc_track_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_bank_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -177,7 +177,7 @@ static void twister_rc_track_left_bank_to_flat(paint_session * session, uint8 ri /** rct2: 0x008AB7C4 */ static void twister_rc_track_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_bank_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -185,7 +185,7 @@ static void twister_rc_track_right_bank_to_flat(paint_session * session, uint8 r /** rct2: 0x008AB7D4 */ static void twister_rc_track_banked_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_banked_left_quarter_turn_5(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -193,7 +193,7 @@ static void twister_rc_track_banked_left_quarter_turn_5(paint_session * session, /** rct2: 0x008AB7E4 */ static void twister_rc_track_banked_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_banked_right_quarter_turn_5(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -201,7 +201,7 @@ static void twister_rc_track_banked_right_quarter_turn_5(paint_session * session /** rct2: 0x008AB7F4 */ static void twister_rc_track_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -209,7 +209,7 @@ static void twister_rc_track_left_bank_to_25_deg_up(paint_session * session, uin /** rct2: 0x008AB804 */ static void twister_rc_track_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -217,7 +217,7 @@ static void twister_rc_track_right_bank_to_25_deg_up(paint_session * session, ui /** rct2: 0x008AB814 */ static void twister_rc_track_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -225,7 +225,7 @@ static void twister_rc_track_25_deg_up_to_left_bank(paint_session * session, uin /** rct2: 0x008AB824 */ static void twister_rc_track_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -233,7 +233,7 @@ static void twister_rc_track_25_deg_up_to_right_bank(paint_session * session, ui /** rct2: 0x008AB834 */ static void twister_rc_track_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_bank_to_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -241,7 +241,7 @@ static void twister_rc_track_left_bank_to_25_deg_down(paint_session * session, u /** rct2: 0x008AB844 */ static void twister_rc_track_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_bank_to_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -249,7 +249,7 @@ static void twister_rc_track_right_bank_to_25_deg_down(paint_session * session, /** rct2: 0x008AB854 */ static void twister_rc_track_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_down_to_left_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -257,7 +257,7 @@ static void twister_rc_track_25_deg_down_to_left_bank(paint_session * session, u /** rct2: 0x008AB864 */ static void twister_rc_track_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_down_to_right_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -265,21 +265,21 @@ static void twister_rc_track_25_deg_down_to_right_bank(paint_session * session, /** rct2: 0x008AB874 */ static void twister_rc_track_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB884 */ static void twister_rc_track_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008AB894 */ static void twister_rc_track_left_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -287,7 +287,7 @@ static void twister_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sessi /** rct2: 0x008AB8A4 */ static void twister_rc_track_right_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -295,7 +295,7 @@ static void twister_rc_track_right_quarter_turn_5_25_deg_up(paint_session * sess /** rct2: 0x008AB8B4 */ static void twister_rc_track_left_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_5_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -303,7 +303,7 @@ static void twister_rc_track_left_quarter_turn_5_25_deg_down(paint_session * ses /** rct2: 0x008AB8C4 */ static void twister_rc_track_right_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_5_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -311,7 +311,7 @@ static void twister_rc_track_right_quarter_turn_5_25_deg_down(paint_session * se /** rct2: 0x008AB8D4 */ static void twister_rc_track_s_bend_left(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_s_bend_left(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -319,7 +319,7 @@ static void twister_rc_track_s_bend_left(paint_session * session, uint8 rideInde /** rct2: 0x008AB8E4 */ static void twister_rc_track_s_bend_right(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_s_bend_right(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -327,7 +327,7 @@ static void twister_rc_track_s_bend_right(paint_session * session, uint8 rideInd /** rct2: 0x008ABA84 */ static void twister_rc_track_left_vertical_loop(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_vertical_loop(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -335,7 +335,7 @@ static void twister_rc_track_left_vertical_loop(paint_session * session, uint8 r /** rct2: 0x008ABA94 */ static void twister_rc_track_right_vertical_loop(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_vertical_loop(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -343,7 +343,7 @@ static void twister_rc_track_right_vertical_loop(paint_session * session, uint8 /** rct2: 0x008AB924 */ static void twister_rc_track_left_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_3(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -351,7 +351,7 @@ static void twister_rc_track_left_quarter_turn_3(paint_session * session, uint8 /** rct2: 0x008AB934 */ static void twister_rc_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_3(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -359,7 +359,7 @@ static void twister_rc_track_right_quarter_turn_3(paint_session * session, uint8 /** rct2: 0x008AB944 */ static void twister_rc_track_left_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_3_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -367,7 +367,7 @@ static void twister_rc_track_left_quarter_turn_3_bank(paint_session * session, u /** rct2: 0x008AB954 */ static void twister_rc_track_right_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_3_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -375,7 +375,7 @@ static void twister_rc_track_right_quarter_turn_3_bank(paint_session * session, /** rct2: 0x008AB964 */ static void twister_rc_track_left_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -383,7 +383,7 @@ static void twister_rc_track_left_quarter_turn_3_25_deg_up(paint_session * sessi /** rct2: 0x008AB974 */ static void twister_rc_track_right_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -391,7 +391,7 @@ static void twister_rc_track_right_quarter_turn_3_25_deg_up(paint_session * sess /** rct2: 0x008AB984 */ static void twister_rc_track_left_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_3_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -399,7 +399,7 @@ static void twister_rc_track_left_quarter_turn_3_25_deg_down(paint_session * ses /** rct2: 0x008AB994 */ static void twister_rc_track_right_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_3_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -407,7 +407,7 @@ static void twister_rc_track_right_quarter_turn_3_25_deg_down(paint_session * se /** rct2: 0x008AB9A4 */ static void twister_rc_track_left_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_half_banked_helix_up_small(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -415,7 +415,7 @@ static void twister_rc_track_left_half_banked_helix_up_small(paint_session * ses /** rct2: 0x008AB9B4 */ static void twister_rc_track_right_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_half_banked_helix_up_small(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -423,7 +423,7 @@ static void twister_rc_track_right_half_banked_helix_up_small(paint_session * se /** rct2: 0x008AB9C4 */ static void twister_rc_track_left_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_half_banked_helix_down_small(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -431,7 +431,7 @@ static void twister_rc_track_left_half_banked_helix_down_small(paint_session * s /** rct2: 0x008AB9D4 */ static void twister_rc_track_right_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_half_banked_helix_down_small(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -439,7 +439,7 @@ static void twister_rc_track_right_half_banked_helix_down_small(paint_session * /** rct2: 0x008AB9E4 */ static void twister_rc_track_left_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_half_banked_helix_up_large(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -447,7 +447,7 @@ static void twister_rc_track_left_half_banked_helix_up_large(paint_session * ses /** rct2: 0x008AB9F4 */ static void twister_rc_track_right_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_half_banked_helix_up_large(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -455,7 +455,7 @@ static void twister_rc_track_right_half_banked_helix_up_large(paint_session * se /** rct2: 0x008ABA04 */ static void twister_rc_track_left_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_half_banked_helix_down_large(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -463,7 +463,7 @@ static void twister_rc_track_left_half_banked_helix_down_large(paint_session * s /** rct2: 0x008ABA14 */ static void twister_rc_track_right_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_half_banked_helix_down_large(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -471,7 +471,7 @@ static void twister_rc_track_right_half_banked_helix_down_large(paint_session * /** rct2: 0x008ABA44 */ static void twister_rc_track_left_quarter_turn_1_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -479,7 +479,7 @@ static void twister_rc_track_left_quarter_turn_1_60_deg_up(paint_session * sessi /** rct2: 0x008ABA24 */ static void twister_rc_track_right_quarter_turn_1_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -487,7 +487,7 @@ static void twister_rc_track_right_quarter_turn_1_60_deg_up(paint_session * sess /** rct2: 0x008ABA34 */ static void twister_rc_track_left_quarter_turn_1_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_1_60_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -495,7 +495,7 @@ static void twister_rc_track_left_quarter_turn_1_60_deg_down(paint_session * ses /** rct2: 0x008ABA54 */ static void twister_rc_track_right_quarter_turn_1_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_1_60_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -503,14 +503,14 @@ static void twister_rc_track_right_quarter_turn_1_60_deg_down(paint_session * se /** rct2: 0x008ABA64 */ static void twister_rc_track_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_brakes(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABE04 */ static void twister_rc_track_25_deg_up_left_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_up_left_banked(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -518,7 +518,7 @@ static void twister_rc_track_25_deg_up_left_banked(paint_session * session, uint /** rct2: 0x008ABE14 */ static void twister_rc_track_25_deg_up_right_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_up_right_banked(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -526,7 +526,7 @@ static void twister_rc_track_25_deg_up_right_banked(paint_session * session, uin /** rct2: 0x008ABA74 */ static void twister_rc_track_on_ride_photo(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_on_ride_photo(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -534,7 +534,7 @@ static void twister_rc_track_on_ride_photo(paint_session * session, uint8 rideIn /** rct2: 0x008ABE24 */ static void twister_rc_track_25_deg_down_left_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_down_left_banked(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -542,7 +542,7 @@ static void twister_rc_track_25_deg_down_left_banked(paint_session * session, ui /** rct2: 0x008ABE34 */ static void twister_rc_track_25_deg_down_right_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_down_right_banked(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -550,14 +550,14 @@ static void twister_rc_track_25_deg_down_right_banked(paint_session * session, u /** rct2: 0x008ABE44 */ static void twister_rc_track_90_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_90_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABE54 */ static void twister_rc_track_90_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_90_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -565,7 +565,7 @@ static void twister_rc_track_90_deg_down(paint_session * session, uint8 rideInde /** rct2: 0x008ABE64 */ static void twister_rc_track_60_deg_up_to_90_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_60_deg_up_to_90_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -573,7 +573,7 @@ static void twister_rc_track_60_deg_up_to_90_deg_up(paint_session * session, uin /** rct2: 0x008ABE74 */ static void twister_rc_track_90_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_90_deg_down_to_60_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -581,7 +581,7 @@ static void twister_rc_track_90_deg_down_to_60_deg_down(paint_session * session, /** rct2: 0x008ABE84 */ static void twister_rc_track_90_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_90_deg_up_to_60_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -589,7 +589,7 @@ static void twister_rc_track_90_deg_up_to_60_deg_up(paint_session * session, uin /** rct2: 0x008ABE94 */ static void twister_rc_track_60_deg_down_to_90_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_60_deg_down_to_90_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -597,7 +597,7 @@ static void twister_rc_track_60_deg_down_to_90_deg_down(paint_session * session, /** rct2: 0x008ABAB4 */ static void twister_rc_track_left_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_eighth_to_diag(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -605,7 +605,7 @@ static void twister_rc_track_left_eighth_to_diag(paint_session * session, uint8 /** rct2: 0x008ABAC4 */ static void twister_rc_track_right_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_eighth_to_diag(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -613,7 +613,7 @@ static void twister_rc_track_right_eighth_to_diag(paint_session * session, uint8 /** rct2: 0x008ABAD4 */ static void twister_rc_track_left_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_eighth_to_orthogonal(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -621,7 +621,7 @@ static void twister_rc_track_left_eighth_to_orthogonal(paint_session * session, /** rct2: 0x008ABAE4 */ static void twister_rc_track_right_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_eighth_to_orthogonal(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -629,7 +629,7 @@ static void twister_rc_track_right_eighth_to_orthogonal(paint_session * session, /** rct2: 0x008ABAF4 */ static void twister_rc_track_left_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_eighth_bank_to_diag(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -637,7 +637,7 @@ static void twister_rc_track_left_eighth_bank_to_diag(paint_session * session, u /** rct2: 0x008ABB04 */ static void twister_rc_track_right_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_eighth_bank_to_diag(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -645,7 +645,7 @@ static void twister_rc_track_right_eighth_bank_to_diag(paint_session * session, /** rct2: 0x008ABB14 */ static void twister_rc_track_left_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_eighth_bank_to_orthogonal(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -653,7 +653,7 @@ static void twister_rc_track_left_eighth_bank_to_orthogonal(paint_session * sess /** rct2: 0x008ABB24 */ static void twister_rc_track_right_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_eighth_bank_to_orthogonal(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -661,14 +661,14 @@ static void twister_rc_track_right_eighth_bank_to_orthogonal(paint_session * ses /** rct2: 0x008ABAA4 */ static void twister_rc_track_diag_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } /** rct2: 0x008ABB54 */ static void twister_rc_track_diag_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -676,7 +676,7 @@ static void twister_rc_track_diag_25_deg_up(paint_session * session, uint8 rideI /** rct2: 0x008ABBB4 */ static void twister_rc_track_diag_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_60_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -684,7 +684,7 @@ static void twister_rc_track_diag_60_deg_up(paint_session * session, uint8 rideI /** rct2: 0x008ABB34 */ static void twister_rc_track_diag_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_flat_to_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -692,7 +692,7 @@ static void twister_rc_track_diag_flat_to_25_deg_up(paint_session * session, uin /** rct2: 0x008ABB94 */ static void twister_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -700,7 +700,7 @@ static void twister_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * session /** rct2: 0x008ABBA4 */ static void twister_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -708,7 +708,7 @@ static void twister_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * session /** rct2: 0x008ABB44 */ static void twister_rc_track_diag_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_25_deg_up_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -716,7 +716,7 @@ static void twister_rc_track_diag_25_deg_up_to_flat(paint_session * session, uin /** rct2: 0x008ABB84 */ static void twister_rc_track_diag_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -724,7 +724,7 @@ static void twister_rc_track_diag_25_deg_down(paint_session * session, uint8 rid /** rct2: 0x008ABBE4 */ static void twister_rc_track_diag_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_60_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -732,7 +732,7 @@ static void twister_rc_track_diag_60_deg_down(paint_session * session, uint8 rid /** rct2: 0x008ABB64 */ static void twister_rc_track_diag_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_flat_to_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -740,7 +740,7 @@ static void twister_rc_track_diag_flat_to_25_deg_down(paint_session * session, u /** rct2: 0x008ABBC4 */ static void twister_rc_track_diag_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_25_deg_down_to_60_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -748,7 +748,7 @@ static void twister_rc_track_diag_25_deg_down_to_60_deg_down(paint_session * ses /** rct2: 0x008ABBD4 */ static void twister_rc_track_diag_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_60_deg_down_to_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -756,7 +756,7 @@ static void twister_rc_track_diag_60_deg_down_to_25_deg_down(paint_session * ses /** rct2: 0x008ABB74 */ static void twister_rc_track_diag_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_25_deg_down_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -764,7 +764,7 @@ static void twister_rc_track_diag_25_deg_down_to_flat(paint_session * session, u /** rct2: 0x008ABC14 */ static void twister_rc_track_diag_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_flat_to_left_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -772,7 +772,7 @@ static void twister_rc_track_diag_flat_to_left_bank(paint_session * session, uin /** rct2: 0x008ABC24 */ static void twister_rc_track_diag_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_flat_to_right_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -780,7 +780,7 @@ static void twister_rc_track_diag_flat_to_right_bank(paint_session * session, ui /** rct2: 0x008ABC34 */ static void twister_rc_track_diag_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_left_bank_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -788,7 +788,7 @@ static void twister_rc_track_diag_left_bank_to_flat(paint_session * session, uin /** rct2: 0x008ABC44 */ static void twister_rc_track_diag_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_right_bank_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -796,7 +796,7 @@ static void twister_rc_track_diag_right_bank_to_flat(paint_session * session, ui /** rct2: 0x008ABC74 */ static void twister_rc_track_diag_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_left_bank_to_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -804,7 +804,7 @@ static void twister_rc_track_diag_left_bank_to_25_deg_up(paint_session * session /** rct2: 0x008ABC84 */ static void twister_rc_track_diag_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_right_bank_to_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -812,7 +812,7 @@ static void twister_rc_track_diag_right_bank_to_25_deg_up(paint_session * sessio /** rct2: 0x008ABC54 */ static void twister_rc_track_diag_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_25_deg_up_to_left_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -820,7 +820,7 @@ static void twister_rc_track_diag_25_deg_up_to_left_bank(paint_session * session /** rct2: 0x008ABC64 */ static void twister_rc_track_diag_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_25_deg_up_to_right_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -828,7 +828,7 @@ static void twister_rc_track_diag_25_deg_up_to_right_bank(paint_session * sessio /** rct2: 0x008ABC94 */ static void twister_rc_track_diag_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_left_bank_to_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -836,7 +836,7 @@ static void twister_rc_track_diag_left_bank_to_25_deg_down(paint_session * sessi /** rct2: 0x008ABCA4 */ static void twister_rc_track_diag_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_right_bank_to_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -844,7 +844,7 @@ static void twister_rc_track_diag_right_bank_to_25_deg_down(paint_session * sess /** rct2: 0x008ABCB4 */ static void twister_rc_track_diag_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_25_deg_down_to_left_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -852,7 +852,7 @@ static void twister_rc_track_diag_25_deg_down_to_left_bank(paint_session * sessi /** rct2: 0x008ABCC4 */ static void twister_rc_track_diag_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_25_deg_down_to_right_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -860,7 +860,7 @@ static void twister_rc_track_diag_25_deg_down_to_right_bank(paint_session * sess /** rct2: 0x008ABBF4 */ static void twister_rc_track_diag_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_left_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -868,7 +868,7 @@ static void twister_rc_track_diag_left_bank(paint_session * session, uint8 rideI /** rct2: 0x008ABC04 */ static void twister_rc_track_diag_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_right_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -877,7 +877,7 @@ static void twister_rc_track_diag_right_bank(paint_session * session, uint8 ride /** rct2: 0x008ABD74 */ static void twister_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_left_bank_to_left_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -886,7 +886,7 @@ static void twister_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(paint_se /** rct2: 0x008ABD84 */ static void twister_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_right_bank_to_right_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -895,7 +895,7 @@ static void twister_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(paint_ /** rct2: 0x008ABD94 */ static void twister_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_3_25_deg_down_to_left_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -904,7 +904,7 @@ static void twister_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(paint_ /** rct2: 0x008ABDA4 */ static void twister_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_3_25_deg_down_to_right_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -912,7 +912,7 @@ static void twister_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank(pain /** rct2: 0x008AC0E4 */ static void twister_rc_track_block_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_block_brakes(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -920,7 +920,7 @@ static void twister_rc_track_block_brakes(paint_session * session, uint8 rideInd /** rct2: 0x008ABEA4 */ static void twister_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -929,7 +929,7 @@ static void twister_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session /** rct2: 0x008ABEB4 */ static void twister_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -938,7 +938,7 @@ static void twister_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_session /** rct2: 0x008ABEC4 */ static void twister_rc_track_left_banked_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -947,7 +947,7 @@ static void twister_rc_track_left_banked_quarter_turn_3_25_deg_down(paint_sessio /** rct2: 0x008ABED4 */ static void twister_rc_track_right_banked_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -955,7 +955,7 @@ static void twister_rc_track_right_banked_quarter_turn_3_25_deg_down(paint_sessi /** rct2: 0x008ABEE4 */ static void twister_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -964,7 +964,7 @@ static void twister_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session /** rct2: 0x008ABEF4 */ static void twister_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -973,7 +973,7 @@ static void twister_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session /** rct2: 0x008ABF04 */ static void twister_rc_track_left_banked_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -982,7 +982,7 @@ static void twister_rc_track_left_banked_quarter_turn_5_25_deg_down(paint_sessio /** rct2: 0x008ABF14 */ static void twister_rc_track_right_banked_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -990,7 +990,7 @@ static void twister_rc_track_right_banked_quarter_turn_5_25_deg_down(paint_sessi /** rct2: 0x008ABF24 */ static void twister_rc_track_25_deg_up_to_left_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_up_to_left_banked_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -998,7 +998,7 @@ static void twister_rc_track_25_deg_up_to_left_banked_25_deg_up(paint_session * /** rct2: 0x008ABF34 */ static void twister_rc_track_25_deg_up_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_up_to_right_banked_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1006,7 +1006,7 @@ static void twister_rc_track_25_deg_up_to_right_banked_25_deg_up(paint_session * /** rct2: 0x008ABF44 */ static void twister_rc_track_left_banked_25_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_banked_25_deg_up_to_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1014,7 +1014,7 @@ static void twister_rc_track_left_banked_25_deg_up_to_25_deg_up(paint_session * /** rct2: 0x008ABF54 */ static void twister_rc_track_right_banked_25_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_banked_25_deg_up_to_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1023,7 +1023,7 @@ static void twister_rc_track_right_banked_25_deg_up_to_25_deg_up(paint_session * /** rct2: 0x008ABF64 */ static void twister_rc_track_25_deg_down_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_down_to_left_banked_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1032,7 +1032,7 @@ static void twister_rc_track_25_deg_down_to_left_banked_25_deg_down(paint_sessio /** rct2: 0x008ABF74 */ static void twister_rc_track_25_deg_down_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_down_to_right_banked_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1041,7 +1041,7 @@ static void twister_rc_track_25_deg_down_to_right_banked_25_deg_down(paint_sessi /** rct2: 0x008ABF84 */ static void twister_rc_track_left_banked_25_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_left_banked_25_deg_down_to_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1050,7 +1050,7 @@ static void twister_rc_track_left_banked_25_deg_down_to_25_deg_down(paint_sessio /** rct2: 0x008ABF94 */ static void twister_rc_track_right_banked_25_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_right_banked_25_deg_down_to_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1059,7 +1059,7 @@ static void twister_rc_track_right_banked_25_deg_down_to_25_deg_down(paint_sessi /** rct2: 0x008ABFA4 */ static void twister_rc_track_left_banked_flat_to_left_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1068,7 +1068,7 @@ static void twister_rc_track_left_banked_flat_to_left_banked_25_deg_up(paint_ses /** rct2: 0x008ABFB4 */ static void twister_rc_track_right_banked_flat_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1077,7 +1077,7 @@ static void twister_rc_track_right_banked_flat_to_right_banked_25_deg_up(paint_s /** rct2: 0x008ABFE4 */ static void twister_rc_track_left_banked_25_deg_up_to_left_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_left_banked_25_deg_up_to_left_banked_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1086,7 +1086,7 @@ static void twister_rc_track_left_banked_25_deg_up_to_left_banked_flat(paint_ses /** rct2: 0x008ABFF4 */ static void twister_rc_track_right_banked_25_deg_up_to_right_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_right_banked_25_deg_up_to_right_banked_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1095,7 +1095,7 @@ static void twister_rc_track_right_banked_25_deg_up_to_right_banked_flat(paint_s /** rct2: 0x008AC004 */ static void twister_rc_track_left_banked_flat_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1104,7 +1104,7 @@ static void twister_rc_track_left_banked_flat_to_left_banked_25_deg_down(paint_s /** rct2: 0x008AC014 */ static void twister_rc_track_right_banked_flat_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1113,7 +1113,7 @@ static void twister_rc_track_right_banked_flat_to_right_banked_25_deg_down(paint /** rct2: 0x008ABFC4 */ static void twister_rc_track_left_banked_25_deg_down_to_left_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_left_banked_25_deg_down_to_left_banked_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1122,7 +1122,7 @@ static void twister_rc_track_left_banked_25_deg_down_to_left_banked_flat(paint_s /** rct2: 0x008ABFD4 */ static void twister_rc_track_right_banked_25_deg_down_to_right_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_right_banked_25_deg_down_to_right_banked_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1130,7 +1130,7 @@ static void twister_rc_track_right_banked_25_deg_down_to_right_banked_flat(paint /** rct2: 0x008AC024 */ static void twister_rc_track_flat_to_left_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_flat_to_left_banked_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1138,7 +1138,7 @@ static void twister_rc_track_flat_to_left_banked_25_deg_up(paint_session * sessi /** rct2: 0x008AC034 */ static void twister_rc_track_flat_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_flat_to_right_banked_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1146,7 +1146,7 @@ static void twister_rc_track_flat_to_right_banked_25_deg_up(paint_session * sess /** rct2: 0x008AC044 */ static void twister_rc_track_left_banked_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1154,7 +1154,7 @@ static void twister_rc_track_left_banked_25_deg_up_to_flat(paint_session * sessi /** rct2: 0x008AC054 */ static void twister_rc_track_right_banked_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1162,7 +1162,7 @@ static void twister_rc_track_right_banked_25_deg_up_to_flat(paint_session * sess /** rct2: 0x008AC064 */ static void twister_rc_track_flat_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_flat_to_left_banked_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1170,7 +1170,7 @@ static void twister_rc_track_flat_to_left_banked_25_deg_down(paint_session * ses /** rct2: 0x008AC074 */ static void twister_rc_track_flat_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_flat_to_right_banked_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1178,7 +1178,7 @@ static void twister_rc_track_flat_to_right_banked_25_deg_down(paint_session * se /** rct2: 0x008AC084 */ static void twister_rc_track_left_banked_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_banked_25_deg_down_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1186,7 +1186,7 @@ static void twister_rc_track_left_banked_25_deg_down_to_flat(paint_session * ses /** rct2: 0x008AC094 */ static void twister_rc_track_right_banked_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_banked_25_deg_down_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1194,7 +1194,7 @@ static void twister_rc_track_right_banked_25_deg_down_to_flat(paint_session * se /** rct2: 0x008AC0A4 */ static void twister_rc_track_left_quarter_turn_1_90_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_1_90_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1202,7 +1202,7 @@ static void twister_rc_track_left_quarter_turn_1_90_deg_up(paint_session * sessi /** rct2: 0x008AC0B4 */ static void twister_rc_track_right_quarter_turn_1_90_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_1_90_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1210,7 +1210,7 @@ static void twister_rc_track_right_quarter_turn_1_90_deg_up(paint_session * sess /** rct2: 0x008AC0C4 */ static void twister_rc_track_left_quarter_turn_1_90_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_1_90_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1218,7 +1218,7 @@ static void twister_rc_track_left_quarter_turn_1_90_deg_down(paint_session * ses /** rct2: 0x008AC0D4 */ static void twister_rc_track_right_quarter_turn_1_90_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_1_90_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1226,63 +1226,63 @@ static void twister_rc_track_right_quarter_turn_1_90_deg_down(paint_session * se /* 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 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_flat_to_60_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } static void twister_rc_track_60_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_60_deg_up_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } static void twister_rc_track_flat_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_flat_to_60_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } static void twister_rc_track_60_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_60_deg_up_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } static void twister_rc_track_brake_for_drop(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_brake_for_drop(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } static void twister_rc_track_diag_flat_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_flat_to_60_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } static void twister_rc_track_diag_60_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_60_deg_up_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } static void twister_rc_track_diag_flat_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_flat_to_60_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } static void twister_rc_track_diag_60_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_60_deg_down_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1291,7 +1291,7 @@ static void twister_rc_track_diag_60_deg_down_to_flat(paint_session * session, u /* The following track elements used to be specific to the Steel Twister */ /** rct2: 0x008ABCD4 */ static void twister_rc_track_half_loop_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_half_loop_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1299,7 +1299,7 @@ static void twister_rc_track_half_loop_up(paint_session * session, uint8 rideInd /** rct2: 0x008ABCE4 */ static void twister_rc_track_half_loop_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_half_loop_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1307,7 +1307,7 @@ static void twister_rc_track_half_loop_down(paint_session * session, uint8 rideI /** rct2: 0x008ABD34 */ static void twister_rc_track_left_corkscrew_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_corkscrew_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1315,7 +1315,7 @@ static void twister_rc_track_left_corkscrew_up(paint_session * session, uint8 ri /** rct2: 0x008ABD44 */ static void twister_rc_track_right_corkscrew_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_corkscrew_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1323,7 +1323,7 @@ static void twister_rc_track_right_corkscrew_up(paint_session * session, uint8 r /** rct2: 0x008ABD54 */ static void twister_rc_track_left_corkscrew_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_corkscrew_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1331,7 +1331,7 @@ static void twister_rc_track_left_corkscrew_down(paint_session * session, uint8 /** rct2: 0x008ABD64 */ static void twister_rc_track_right_corkscrew_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_corkscrew_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1339,7 +1339,7 @@ static void twister_rc_track_right_corkscrew_down(paint_session * session, uint8 /** rct2: 0x008AC0F4 */ static void twister_rc_track_flat_to_60_deg_up_long_base(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_flat_to_60_deg_up_long_base(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1347,7 +1347,7 @@ static void twister_rc_track_flat_to_60_deg_up_long_base(paint_session * session /** rct2: 0x008AC104 */ static void twister_rc_track_60_deg_up_to_flat_long_base(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_60_deg_up_to_flat_long_base(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1355,7 +1355,7 @@ static void twister_rc_track_60_deg_up_to_flat_long_base(paint_session * session /** rct2: 0x008AC114 */ static void twister_rc_track_flat_to_60_deg_down_long_base(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_flat_to_60_deg_down_long_base(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1363,7 +1363,7 @@ static void twister_rc_track_flat_to_60_deg_down_long_base(paint_session * sessi /** rct2: 0x008AC124 */ static void twister_rc_track_60_deg_up_to_flat_long_base122(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_60_deg_up_to_flat_long_base122(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1371,7 +1371,7 @@ static void twister_rc_track_60_deg_up_to_flat_long_base122(paint_session * sess /** rct2: 0x008ABCF4 */ static void twister_rc_track_left_barrel_roll_up_to_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_barrel_roll_up_to_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1379,7 +1379,7 @@ static void twister_rc_track_left_barrel_roll_up_to_down(paint_session * session /** rct2: 0x008ABD04 */ static void twister_rc_track_right_barrel_roll_up_to_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_barrel_roll_up_to_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1387,7 +1387,7 @@ static void twister_rc_track_right_barrel_roll_up_to_down(paint_session * sessio /** rct2: 0x008ABD14 */ static void twister_rc_track_left_barrel_roll_down_to_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_barrel_roll_down_to_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1395,7 +1395,7 @@ static void twister_rc_track_left_barrel_roll_down_to_up(paint_session * session /** rct2: 0x008ABD24 */ static void twister_rc_track_right_barrel_roll_down_to_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_barrel_roll_down_to_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1403,7 +1403,7 @@ static void twister_rc_track_right_barrel_roll_down_to_up(paint_session * sessio /** rct2: 0x008ABDB4 */ static void twister_rc_track_powered_lift(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_powered_lift(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1411,7 +1411,7 @@ static void twister_rc_track_powered_lift(paint_session * session, uint8 rideInd /** rct2: 0x008ABDC4 */ static void twister_rc_track_left_large_half_loop_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_large_half_loop_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1419,7 +1419,7 @@ static void twister_rc_track_left_large_half_loop_up(paint_session * session, ui /** rct2: 0x008ABDD4 */ static void twister_rc_track_right_large_half_loop_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_large_half_loop_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1427,7 +1427,7 @@ static void twister_rc_track_right_large_half_loop_up(paint_session * session, u /** rct2: 0x008ABDE4 */ static void twister_rc_track_right_large_half_loop_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_large_half_loop_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1435,7 +1435,7 @@ static void twister_rc_track_right_large_half_loop_down(paint_session * session, /** rct2: 0x008ABDF4 */ static void twister_rc_track_left_large_half_loop_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_large_half_loop_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1444,7 +1444,7 @@ static void twister_rc_track_left_large_half_loop_down(paint_session * session, /** rct2: 0x008AC134 */ static void twister_rc_track_90_deg_to_inverted_flat_quarter_loop_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); @@ -1453,14 +1453,14 @@ static void twister_rc_track_90_deg_to_inverted_flat_quarter_loop_up(paint_sessi /** rct2: 0x008AC144 */ static void twister_rc_track_inverted_flat_to_90_deg_quarter_loop_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_inverted_flat_to_90_deg_quarter_loop_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } static void twister_rc_track_booster(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_booster(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_TUBES); } diff --git a/src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp b/src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp index 393ed5fbc4..97ae7d0128 100644 --- a/src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp @@ -21,34 +21,34 @@ /** rct2: 0x008AA00C */ static void vertical_drop_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } static void vertical_drop_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_station(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA01C */ static void vertical_drop_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA02C */ static void vertical_drop_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_60_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA03C */ static void vertical_drop_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_flat_to_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -56,7 +56,7 @@ static void vertical_drop_rc_track_flat_to_25_deg_up(paint_session * session, ui /** rct2: 0x008AA04C */ static void vertical_drop_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -64,7 +64,7 @@ static void vertical_drop_rc_track_25_deg_up_to_60_deg_up(paint_session * sessio /** rct2: 0x008AA05C */ static void vertical_drop_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -72,7 +72,7 @@ static void vertical_drop_rc_track_60_deg_up_to_25_deg_up(paint_session * sessio /** rct2: 0x008AA06C */ static void vertical_drop_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_up_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -80,7 +80,7 @@ static void vertical_drop_rc_track_25_deg_up_to_flat(paint_session * session, ui /** rct2: 0x008AA07C */ static void vertical_drop_rc_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -88,7 +88,7 @@ static void vertical_drop_rc_track_25_deg_down(paint_session * session, uint8 ri /** rct2: 0x008AA08C */ static void vertical_drop_rc_track_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_60_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -96,7 +96,7 @@ static void vertical_drop_rc_track_60_deg_down(paint_session * session, uint8 ri /** rct2: 0x008AA09C */ static void vertical_drop_rc_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_flat_to_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -104,7 +104,7 @@ static void vertical_drop_rc_track_flat_to_25_deg_down(paint_session * session, /** rct2: 0x008AA0AC */ static void vertical_drop_rc_track_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_down_to_60_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -112,7 +112,7 @@ static void vertical_drop_rc_track_25_deg_down_to_60_deg_down(paint_session * se /** rct2: 0x008AA0BC */ static void vertical_drop_rc_track_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_60_deg_down_to_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -120,7 +120,7 @@ static void vertical_drop_rc_track_60_deg_down_to_25_deg_down(paint_session * se /** rct2: 0x008AA0CC */ static void vertical_drop_rc_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_down_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -128,7 +128,7 @@ static void vertical_drop_rc_track_25_deg_down_to_flat(paint_session * session, /** rct2: 0x008AA0DC */ static void vertical_drop_rc_track_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_5(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -136,7 +136,7 @@ static void vertical_drop_rc_track_left_quarter_turn_5(paint_session * session, /** rct2: 0x008AA0EC */ static void vertical_drop_rc_track_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_5(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -144,7 +144,7 @@ static void vertical_drop_rc_track_right_quarter_turn_5(paint_session * session, /** rct2: 0x008AA0FC */ static void vertical_drop_rc_track_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_flat_to_left_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -152,7 +152,7 @@ static void vertical_drop_rc_track_flat_to_left_bank(paint_session * session, ui /** rct2: 0x008AA10C */ static void vertical_drop_rc_track_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_flat_to_right_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -160,7 +160,7 @@ static void vertical_drop_rc_track_flat_to_right_bank(paint_session * session, u /** rct2: 0x008AA11C */ static void vertical_drop_rc_track_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_bank_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -168,7 +168,7 @@ static void vertical_drop_rc_track_left_bank_to_flat(paint_session * session, ui /** rct2: 0x008AA12C */ static void vertical_drop_rc_track_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_bank_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -176,7 +176,7 @@ static void vertical_drop_rc_track_right_bank_to_flat(paint_session * session, u /** rct2: 0x008AA13C */ static void vertical_drop_rc_track_banked_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_banked_left_quarter_turn_5(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -184,7 +184,7 @@ static void vertical_drop_rc_track_banked_left_quarter_turn_5(paint_session * se /** rct2: 0x008AA14C */ static void vertical_drop_rc_track_banked_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_banked_right_quarter_turn_5(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -192,7 +192,7 @@ static void vertical_drop_rc_track_banked_right_quarter_turn_5(paint_session * s /** rct2: 0x008AA15C */ static void vertical_drop_rc_track_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -200,7 +200,7 @@ static void vertical_drop_rc_track_left_bank_to_25_deg_up(paint_session * sessio /** rct2: 0x008AA16C */ static void vertical_drop_rc_track_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -208,7 +208,7 @@ static void vertical_drop_rc_track_right_bank_to_25_deg_up(paint_session * sessi /** rct2: 0x008AA17C */ static void vertical_drop_rc_track_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -216,7 +216,7 @@ static void vertical_drop_rc_track_25_deg_up_to_left_bank(paint_session * sessio /** rct2: 0x008AA18C */ static void vertical_drop_rc_track_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -224,7 +224,7 @@ static void vertical_drop_rc_track_25_deg_up_to_right_bank(paint_session * sessi /** rct2: 0x008AA19C */ static void vertical_drop_rc_track_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_bank_to_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -232,7 +232,7 @@ static void vertical_drop_rc_track_left_bank_to_25_deg_down(paint_session * sess /** rct2: 0x008AA1AC */ static void vertical_drop_rc_track_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_bank_to_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -240,7 +240,7 @@ static void vertical_drop_rc_track_right_bank_to_25_deg_down(paint_session * ses /** rct2: 0x008AA1BC */ static void vertical_drop_rc_track_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_down_to_left_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -248,7 +248,7 @@ static void vertical_drop_rc_track_25_deg_down_to_left_bank(paint_session * sess /** rct2: 0x008AA1CC */ static void vertical_drop_rc_track_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_down_to_right_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -256,21 +256,21 @@ static void vertical_drop_rc_track_25_deg_down_to_right_bank(paint_session * ses /** rct2: 0x008AA1DC */ static void vertical_drop_rc_track_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA1EC */ static void vertical_drop_rc_track_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA1FC */ static void vertical_drop_rc_track_left_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -278,7 +278,7 @@ static void vertical_drop_rc_track_left_quarter_turn_5_25_deg_up(paint_session * /** rct2: 0x008AA20C */ static void vertical_drop_rc_track_right_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -287,7 +287,7 @@ static void vertical_drop_rc_track_right_quarter_turn_5_25_deg_up(paint_session /** rct2: 0x008AA21C */ static void vertical_drop_rc_track_left_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_5_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -296,7 +296,7 @@ static void vertical_drop_rc_track_left_quarter_turn_5_25_deg_down(paint_session /** rct2: 0x008AA22C */ static void vertical_drop_rc_track_right_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_5_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -304,7 +304,7 @@ static void vertical_drop_rc_track_right_quarter_turn_5_25_deg_down(paint_sessio /** rct2: 0x008AA23C */ static void vertical_drop_rc_track_s_bend_left(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_s_bend_left(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -312,7 +312,7 @@ static void vertical_drop_rc_track_s_bend_left(paint_session * session, uint8 ri /** rct2: 0x008AA24C */ static void vertical_drop_rc_track_s_bend_right(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_s_bend_right(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -320,7 +320,7 @@ static void vertical_drop_rc_track_s_bend_right(paint_session * session, uint8 r /** rct2: 0x008AA49C */ static void vertical_drop_rc_track_left_vertical_loop(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_vertical_loop(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -328,7 +328,7 @@ static void vertical_drop_rc_track_left_vertical_loop(paint_session * session, u /** rct2: 0x008AA4AC */ static void vertical_drop_rc_track_right_vertical_loop(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_vertical_loop(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -336,7 +336,7 @@ static void vertical_drop_rc_track_right_vertical_loop(paint_session * session, /** rct2: 0x008AA28C */ static void vertical_drop_rc_track_left_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_3(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -344,7 +344,7 @@ static void vertical_drop_rc_track_left_quarter_turn_3(paint_session * session, /** rct2: 0x008AA29C */ static void vertical_drop_rc_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_3(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -352,7 +352,7 @@ static void vertical_drop_rc_track_right_quarter_turn_3(paint_session * session, /** rct2: 0x008AA2AC */ static void vertical_drop_rc_track_left_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_3_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -360,7 +360,7 @@ static void vertical_drop_rc_track_left_quarter_turn_3_bank(paint_session * sess /** rct2: 0x008AA2BC */ static void vertical_drop_rc_track_right_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_3_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -368,7 +368,7 @@ static void vertical_drop_rc_track_right_quarter_turn_3_bank(paint_session * ses /** rct2: 0x008AA2CC */ static void vertical_drop_rc_track_left_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -376,7 +376,7 @@ static void vertical_drop_rc_track_left_quarter_turn_3_25_deg_up(paint_session * /** rct2: 0x008AA2DC */ static void vertical_drop_rc_track_right_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -385,7 +385,7 @@ static void vertical_drop_rc_track_right_quarter_turn_3_25_deg_up(paint_session /** rct2: 0x008AA2EC */ static void vertical_drop_rc_track_left_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_3_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -394,7 +394,7 @@ static void vertical_drop_rc_track_left_quarter_turn_3_25_deg_down(paint_session /** rct2: 0x008AA2FC */ static void vertical_drop_rc_track_right_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_3_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -403,7 +403,7 @@ static void vertical_drop_rc_track_right_quarter_turn_3_25_deg_down(paint_sessio /** rct2: 0x008AA30C */ static void vertical_drop_rc_track_left_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_left_half_banked_helix_up_small(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -412,7 +412,7 @@ static void vertical_drop_rc_track_left_half_banked_helix_up_small(paint_session /** rct2: 0x008AA31C */ static void vertical_drop_rc_track_right_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_right_half_banked_helix_up_small(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -421,7 +421,7 @@ static void vertical_drop_rc_track_right_half_banked_helix_up_small(paint_sessio /** rct2: 0x008AA32C */ static void vertical_drop_rc_track_left_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_left_half_banked_helix_down_small(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -430,7 +430,7 @@ static void vertical_drop_rc_track_left_half_banked_helix_down_small(paint_sessi /** rct2: 0x008AA33C */ static void vertical_drop_rc_track_right_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_right_half_banked_helix_down_small(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -439,7 +439,7 @@ static void vertical_drop_rc_track_right_half_banked_helix_down_small(paint_sess /** rct2: 0x008AA34C */ static void vertical_drop_rc_track_left_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_left_half_banked_helix_up_large(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -448,7 +448,7 @@ static void vertical_drop_rc_track_left_half_banked_helix_up_large(paint_session /** rct2: 0x008AA35C */ static void vertical_drop_rc_track_right_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_right_half_banked_helix_up_large(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -457,7 +457,7 @@ static void vertical_drop_rc_track_right_half_banked_helix_up_large(paint_sessio /** rct2: 0x008AA36C */ static void vertical_drop_rc_track_left_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_left_half_banked_helix_down_large(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -466,7 +466,7 @@ static void vertical_drop_rc_track_left_half_banked_helix_down_large(paint_sessi /** rct2: 0x008AA37C */ static void vertical_drop_rc_track_right_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_right_half_banked_helix_down_large(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -474,7 +474,7 @@ static void vertical_drop_rc_track_right_half_banked_helix_down_large(paint_sess /** rct2: 0x008AA3AC */ static void vertical_drop_rc_track_left_quarter_turn_1_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -482,7 +482,7 @@ static void vertical_drop_rc_track_left_quarter_turn_1_60_deg_up(paint_session * /** rct2: 0x008AA38C */ static void vertical_drop_rc_track_right_quarter_turn_1_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -491,7 +491,7 @@ static void vertical_drop_rc_track_right_quarter_turn_1_60_deg_up(paint_session /** rct2: 0x008AA39C */ static void vertical_drop_rc_track_left_quarter_turn_1_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_1_60_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -500,7 +500,7 @@ static void vertical_drop_rc_track_left_quarter_turn_1_60_deg_down(paint_session /** rct2: 0x008AA3BC */ static void vertical_drop_rc_track_right_quarter_turn_1_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_1_60_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -508,14 +508,14 @@ static void vertical_drop_rc_track_right_quarter_turn_1_60_deg_down(paint_sessio /** rct2: 0x008AA40C */ static void vertical_drop_rc_track_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_brakes(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA7EC */ static void vertical_drop_rc_track_25_deg_up_left_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_up_left_banked(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -523,7 +523,7 @@ static void vertical_drop_rc_track_25_deg_up_left_banked(paint_session * session /** rct2: 0x008AA7FC */ static void vertical_drop_rc_track_25_deg_up_right_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_up_right_banked(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -531,7 +531,7 @@ static void vertical_drop_rc_track_25_deg_up_right_banked(paint_session * sessio /** rct2: 0x008AA41C */ static void vertical_drop_rc_track_on_ride_photo(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_on_ride_photo(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -539,7 +539,7 @@ static void vertical_drop_rc_track_on_ride_photo(paint_session * session, uint8 /** rct2: 0x008AA80C */ static void vertical_drop_rc_track_25_deg_down_left_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_down_left_banked(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -547,7 +547,7 @@ static void vertical_drop_rc_track_25_deg_down_left_banked(paint_session * sessi /** rct2: 0x008AA81C */ static void vertical_drop_rc_track_25_deg_down_right_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_down_right_banked(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -555,14 +555,14 @@ static void vertical_drop_rc_track_25_deg_down_right_banked(paint_session * sess /** rct2: 0x008AA42C */ static void vertical_drop_rc_track_90_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_90_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA43C */ static void vertical_drop_rc_track_90_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_90_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -570,7 +570,7 @@ static void vertical_drop_rc_track_90_deg_down(paint_session * session, uint8 ri /** rct2: 0x008AA44C */ static void vertical_drop_rc_track_60_deg_up_to_90_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_60_deg_up_to_90_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -578,7 +578,7 @@ static void vertical_drop_rc_track_60_deg_up_to_90_deg_up(paint_session * sessio /** rct2: 0x008AA45C */ static void vertical_drop_rc_track_90_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_90_deg_down_to_60_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -586,7 +586,7 @@ static void vertical_drop_rc_track_90_deg_down_to_60_deg_down(paint_session * se /** rct2: 0x008AA46C */ static void vertical_drop_rc_track_90_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_90_deg_up_to_60_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -594,7 +594,7 @@ static void vertical_drop_rc_track_90_deg_up_to_60_deg_up(paint_session * sessio /** rct2: 0x008AA47C */ static void vertical_drop_rc_track_60_deg_down_to_90_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_60_deg_down_to_90_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -602,7 +602,7 @@ static void vertical_drop_rc_track_60_deg_down_to_90_deg_down(paint_session * se /** rct2: 0x008AA4CC */ static void vertical_drop_rc_track_left_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_eighth_to_diag(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -610,7 +610,7 @@ static void vertical_drop_rc_track_left_eighth_to_diag(paint_session * session, /** rct2: 0x008AA4DC */ static void vertical_drop_rc_track_right_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_eighth_to_diag(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -618,7 +618,7 @@ static void vertical_drop_rc_track_right_eighth_to_diag(paint_session * session, /** rct2: 0x008AA4EC */ static void vertical_drop_rc_track_left_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_eighth_to_orthogonal(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -626,7 +626,7 @@ static void vertical_drop_rc_track_left_eighth_to_orthogonal(paint_session * ses /** rct2: 0x008AA4FC */ static void vertical_drop_rc_track_right_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_eighth_to_orthogonal(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -634,7 +634,7 @@ static void vertical_drop_rc_track_right_eighth_to_orthogonal(paint_session * se /** rct2: 0x008AA50C */ static void vertical_drop_rc_track_left_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_eighth_bank_to_diag(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -642,7 +642,7 @@ static void vertical_drop_rc_track_left_eighth_bank_to_diag(paint_session * sess /** rct2: 0x008AA51C */ static void vertical_drop_rc_track_right_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_eighth_bank_to_diag(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -650,7 +650,7 @@ static void vertical_drop_rc_track_right_eighth_bank_to_diag(paint_session * ses /** rct2: 0x008AA52C */ static void vertical_drop_rc_track_left_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_eighth_bank_to_orthogonal(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -659,7 +659,7 @@ static void vertical_drop_rc_track_left_eighth_bank_to_orthogonal(paint_session /** rct2: 0x008AA53C */ static void vertical_drop_rc_track_right_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_right_eighth_bank_to_orthogonal(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -667,14 +667,14 @@ static void vertical_drop_rc_track_right_eighth_bank_to_orthogonal(paint_session /** rct2: 0x008AA4BC */ static void vertical_drop_rc_track_diag_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } /** rct2: 0x008AA56C */ static void vertical_drop_rc_track_diag_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -682,7 +682,7 @@ static void vertical_drop_rc_track_diag_25_deg_up(paint_session * session, uint8 /** rct2: 0x008AA5CC */ static void vertical_drop_rc_track_diag_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_60_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -690,7 +690,7 @@ static void vertical_drop_rc_track_diag_60_deg_up(paint_session * session, uint8 /** rct2: 0x008AA54C */ static void vertical_drop_rc_track_diag_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_flat_to_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -698,7 +698,7 @@ static void vertical_drop_rc_track_diag_flat_to_25_deg_up(paint_session * sessio /** rct2: 0x008AA5AC */ static void vertical_drop_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -706,7 +706,7 @@ static void vertical_drop_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * s /** rct2: 0x008AA5BC */ static void vertical_drop_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -714,7 +714,7 @@ static void vertical_drop_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * s /** rct2: 0x008AA55C */ static void vertical_drop_rc_track_diag_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_25_deg_up_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -722,7 +722,7 @@ static void vertical_drop_rc_track_diag_25_deg_up_to_flat(paint_session * sessio /** rct2: 0x008AA59C */ static void vertical_drop_rc_track_diag_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -730,7 +730,7 @@ static void vertical_drop_rc_track_diag_25_deg_down(paint_session * session, uin /** rct2: 0x008AA5FC */ static void vertical_drop_rc_track_diag_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_60_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -738,7 +738,7 @@ static void vertical_drop_rc_track_diag_60_deg_down(paint_session * session, uin /** rct2: 0x008AA57C */ static void vertical_drop_rc_track_diag_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_flat_to_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -747,7 +747,7 @@ static void vertical_drop_rc_track_diag_flat_to_25_deg_down(paint_session * sess /** rct2: 0x008AA5DC */ static void vertical_drop_rc_track_diag_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_diag_25_deg_down_to_60_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -756,7 +756,7 @@ static void vertical_drop_rc_track_diag_25_deg_down_to_60_deg_down(paint_session /** rct2: 0x008AA5EC */ static void vertical_drop_rc_track_diag_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_diag_60_deg_down_to_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -764,7 +764,7 @@ static void vertical_drop_rc_track_diag_60_deg_down_to_25_deg_down(paint_session /** rct2: 0x008AA58C */ static void vertical_drop_rc_track_diag_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_25_deg_down_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -772,7 +772,7 @@ static void vertical_drop_rc_track_diag_25_deg_down_to_flat(paint_session * sess /** rct2: 0x008AA62C */ static void vertical_drop_rc_track_diag_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_flat_to_left_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -780,7 +780,7 @@ static void vertical_drop_rc_track_diag_flat_to_left_bank(paint_session * sessio /** rct2: 0x008AA63C */ static void vertical_drop_rc_track_diag_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_flat_to_right_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -788,7 +788,7 @@ static void vertical_drop_rc_track_diag_flat_to_right_bank(paint_session * sessi /** rct2: 0x008AA64C */ static void vertical_drop_rc_track_diag_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_left_bank_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -796,7 +796,7 @@ static void vertical_drop_rc_track_diag_left_bank_to_flat(paint_session * sessio /** rct2: 0x008AA65C */ static void vertical_drop_rc_track_diag_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_right_bank_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -804,7 +804,7 @@ static void vertical_drop_rc_track_diag_right_bank_to_flat(paint_session * sessi /** rct2: 0x008AA68C */ static void vertical_drop_rc_track_diag_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_left_bank_to_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -812,7 +812,7 @@ static void vertical_drop_rc_track_diag_left_bank_to_25_deg_up(paint_session * s /** rct2: 0x008AA69C */ static void vertical_drop_rc_track_diag_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_right_bank_to_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -820,7 +820,7 @@ static void vertical_drop_rc_track_diag_right_bank_to_25_deg_up(paint_session * /** rct2: 0x008AA66C */ static void vertical_drop_rc_track_diag_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_25_deg_up_to_left_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -828,7 +828,7 @@ static void vertical_drop_rc_track_diag_25_deg_up_to_left_bank(paint_session * s /** rct2: 0x008AA67C */ static void vertical_drop_rc_track_diag_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_25_deg_up_to_right_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -836,7 +836,7 @@ static void vertical_drop_rc_track_diag_25_deg_up_to_right_bank(paint_session * /** rct2: 0x008AA6AC */ static void vertical_drop_rc_track_diag_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_left_bank_to_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -844,7 +844,7 @@ static void vertical_drop_rc_track_diag_left_bank_to_25_deg_down(paint_session * /** rct2: 0x008AA6BC */ static void vertical_drop_rc_track_diag_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_right_bank_to_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -852,7 +852,7 @@ static void vertical_drop_rc_track_diag_right_bank_to_25_deg_down(paint_session /** rct2: 0x008AA6CC */ static void vertical_drop_rc_track_diag_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_25_deg_down_to_left_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -860,7 +860,7 @@ static void vertical_drop_rc_track_diag_25_deg_down_to_left_bank(paint_session * /** rct2: 0x008AA6DC */ static void vertical_drop_rc_track_diag_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_25_deg_down_to_right_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -868,7 +868,7 @@ static void vertical_drop_rc_track_diag_25_deg_down_to_right_bank(paint_session /** rct2: 0x008AA60C */ static void vertical_drop_rc_track_diag_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_left_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -876,7 +876,7 @@ static void vertical_drop_rc_track_diag_left_bank(paint_session * session, uint8 /** rct2: 0x008AA61C */ static void vertical_drop_rc_track_diag_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_right_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -885,7 +885,7 @@ static void vertical_drop_rc_track_diag_right_bank(paint_session * session, uint /** rct2: 0x008AA72C */ static void vertical_drop_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_bank_to_left_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -894,7 +894,7 @@ static void vertical_drop_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(pa /** rct2: 0x008AA73C */ static void vertical_drop_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_bank_to_right_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -903,7 +903,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 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_3_25_deg_down_to_left_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -912,7 +912,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 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_3_25_deg_down_to_right_bank(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -920,7 +920,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 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_block_brakes(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -929,7 +929,7 @@ static void vertical_drop_rc_track_block_brakes(paint_session * session, uint8 r /** rct2: 0x008AA96C */ static void vertical_drop_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -938,7 +938,7 @@ static void vertical_drop_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_se /** rct2: 0x008AA97C */ static void vertical_drop_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -947,7 +947,7 @@ static void vertical_drop_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_s /** rct2: 0x008AA98C */ static void vertical_drop_rc_track_left_banked_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -956,7 +956,7 @@ static void vertical_drop_rc_track_left_banked_quarter_turn_3_25_deg_down(paint_ /** rct2: 0x008AA99C */ static void vertical_drop_rc_track_right_banked_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -965,7 +965,7 @@ static void vertical_drop_rc_track_right_banked_quarter_turn_3_25_deg_down(paint /** rct2: 0x008AA8AC */ static void vertical_drop_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -974,7 +974,7 @@ static void vertical_drop_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_se /** rct2: 0x008AA8BC */ static void vertical_drop_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -983,7 +983,7 @@ static void vertical_drop_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_s /** rct2: 0x008AA8CC */ static void vertical_drop_rc_track_left_banked_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -992,7 +992,7 @@ static void vertical_drop_rc_track_left_banked_quarter_turn_5_25_deg_down(paint_ /** rct2: 0x008AA8DC */ static void vertical_drop_rc_track_right_banked_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1001,7 +1001,7 @@ static void vertical_drop_rc_track_right_banked_quarter_turn_5_25_deg_down(paint /** rct2: 0x008AA82C */ static void vertical_drop_rc_track_25_deg_up_to_left_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_up_to_left_banked_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1010,7 +1010,7 @@ static void vertical_drop_rc_track_25_deg_up_to_left_banked_25_deg_up(paint_sess /** rct2: 0x008AA83C */ static void vertical_drop_rc_track_25_deg_up_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_up_to_right_banked_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1019,7 +1019,7 @@ static void vertical_drop_rc_track_25_deg_up_to_right_banked_25_deg_up(paint_ses /** rct2: 0x008AA84C */ static void vertical_drop_rc_track_left_banked_25_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_left_banked_25_deg_up_to_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1028,7 +1028,7 @@ static void vertical_drop_rc_track_left_banked_25_deg_up_to_25_deg_up(paint_sess /** rct2: 0x008AA85C */ static void vertical_drop_rc_track_right_banked_25_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_right_banked_25_deg_up_to_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1037,7 +1037,7 @@ static void vertical_drop_rc_track_right_banked_25_deg_up_to_25_deg_up(paint_ses /** rct2: 0x008AA86C */ static void vertical_drop_rc_track_25_deg_down_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_down_to_left_banked_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1046,7 +1046,7 @@ static void vertical_drop_rc_track_25_deg_down_to_left_banked_25_deg_down(paint_ /** rct2: 0x008AA87C */ static void vertical_drop_rc_track_25_deg_down_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_25_deg_down_to_right_banked_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1055,7 +1055,7 @@ static void vertical_drop_rc_track_25_deg_down_to_right_banked_25_deg_down(paint /** rct2: 0x008AA88C */ static void vertical_drop_rc_track_left_banked_25_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_left_banked_25_deg_down_to_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1064,7 +1064,7 @@ static void vertical_drop_rc_track_left_banked_25_deg_down_to_25_deg_down(paint_ /** rct2: 0x008AA89C */ static void vertical_drop_rc_track_right_banked_25_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_right_banked_25_deg_down_to_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1073,7 +1073,7 @@ static void vertical_drop_rc_track_right_banked_25_deg_down_to_25_deg_down(paint /** rct2: 0x008AA8EC */ static void vertical_drop_rc_track_left_banked_flat_to_left_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1082,7 +1082,7 @@ static void vertical_drop_rc_track_left_banked_flat_to_left_banked_25_deg_up(pai /** rct2: 0x008AA8FC */ static void vertical_drop_rc_track_right_banked_flat_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1091,7 +1091,7 @@ static void vertical_drop_rc_track_right_banked_flat_to_right_banked_25_deg_up(p /** rct2: 0x008AA92C */ static void vertical_drop_rc_track_left_banked_25_deg_up_to_left_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_banked_25_deg_up_to_left_banked_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1100,7 +1100,7 @@ static void vertical_drop_rc_track_left_banked_25_deg_up_to_left_banked_flat(pai /** rct2: 0x008AA93C */ static void vertical_drop_rc_track_right_banked_25_deg_up_to_right_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_banked_25_deg_up_to_right_banked_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1109,7 +1109,7 @@ static void vertical_drop_rc_track_right_banked_25_deg_up_to_right_banked_flat(p /** rct2: 0x008AA94C */ static void vertical_drop_rc_track_left_banked_flat_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1118,7 +1118,7 @@ static void vertical_drop_rc_track_left_banked_flat_to_left_banked_25_deg_down(p /** rct2: 0x008AA95C */ static void vertical_drop_rc_track_right_banked_flat_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1127,7 +1127,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 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_banked_25_deg_down_to_left_banked_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1136,7 +1136,7 @@ static void vertical_drop_rc_track_left_banked_25_deg_down_to_left_banked_flat(p /** rct2: 0x008AA91C */ static void vertical_drop_rc_track_right_banked_25_deg_down_to_right_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_banked_25_deg_down_to_right_banked_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1144,7 +1144,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 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_flat_to_left_banked_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1152,7 +1152,7 @@ static void vertical_drop_rc_track_flat_to_left_banked_25_deg_up(paint_session * /** rct2: 0x008AA77C */ static void vertical_drop_rc_track_flat_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_flat_to_right_banked_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1160,7 +1160,7 @@ static void vertical_drop_rc_track_flat_to_right_banked_25_deg_up(paint_session /** rct2: 0x008AA78C */ static void vertical_drop_rc_track_left_banked_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1168,7 +1168,7 @@ static void vertical_drop_rc_track_left_banked_25_deg_up_to_flat(paint_session * /** rct2: 0x008AA79C */ static void vertical_drop_rc_track_right_banked_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1177,7 +1177,7 @@ static void vertical_drop_rc_track_right_banked_25_deg_up_to_flat(paint_session /** rct2: 0x008AA7AC */ static void vertical_drop_rc_track_flat_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_flat_to_left_banked_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1186,7 +1186,7 @@ static void vertical_drop_rc_track_flat_to_left_banked_25_deg_down(paint_session /** rct2: 0x008AA7BC */ static void vertical_drop_rc_track_flat_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_flat_to_right_banked_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1195,7 +1195,7 @@ static void vertical_drop_rc_track_flat_to_right_banked_25_deg_down(paint_sessio /** rct2: 0x008AA7CC */ static void vertical_drop_rc_track_left_banked_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_left_banked_25_deg_down_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1204,7 +1204,7 @@ static void vertical_drop_rc_track_left_banked_25_deg_down_to_flat(paint_session /** rct2: 0x008AA7DC */ static void vertical_drop_rc_track_right_banked_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_right_banked_25_deg_down_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1212,7 +1212,7 @@ static void vertical_drop_rc_track_right_banked_25_deg_down_to_flat(paint_sessio /** rct2: 0x008AA9AC */ static void vertical_drop_rc_track_left_quarter_turn_1_90_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_1_90_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1220,7 +1220,7 @@ static void vertical_drop_rc_track_left_quarter_turn_1_90_deg_up(paint_session * /** rct2: 0x008AA9BC */ static void vertical_drop_rc_track_right_quarter_turn_1_90_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_1_90_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1229,7 +1229,7 @@ static void vertical_drop_rc_track_right_quarter_turn_1_90_deg_up(paint_session /** rct2: 0x008AA9CC */ static void vertical_drop_rc_track_left_quarter_turn_1_90_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_left_quarter_turn_1_90_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1238,7 +1238,7 @@ static void vertical_drop_rc_track_left_quarter_turn_1_90_deg_down(paint_session /** rct2: 0x008AA9DC */ static void vertical_drop_rc_track_right_quarter_turn_1_90_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_right_quarter_turn_1_90_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1247,7 +1247,7 @@ static void vertical_drop_rc_track_right_quarter_turn_1_90_deg_down(paint_sessio /* The following elements used to be specific to the vertical_drop RC */ /** rct2: 0x008AA3CC */ static void vertical_drop_rc_track_flat_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_flat_to_60_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1255,7 +1255,7 @@ static void vertical_drop_rc_track_flat_to_60_deg_up(paint_session * session, ui /** rct2: 0x008AA3DC */ static void vertical_drop_rc_track_60_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_60_deg_up_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1263,7 +1263,7 @@ static void vertical_drop_rc_track_60_deg_up_to_flat(paint_session * session, ui /** rct2: 0x008AA3EC */ static void vertical_drop_rc_track_flat_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_flat_to_60_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1271,7 +1271,7 @@ static void vertical_drop_rc_track_flat_to_60_deg_down(paint_session * session, /** rct2: 0x008AA3FC */ static void vertical_drop_rc_track_60_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_60_deg_down_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1279,7 +1279,7 @@ static void vertical_drop_rc_track_60_deg_down_to_flat(paint_session * session, /** rct2: 0x008AA48C */ static void vertical_drop_rc_track_brake_for_drop(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_brake_for_drop(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1287,7 +1287,7 @@ static void vertical_drop_rc_track_brake_for_drop(paint_session * session, uint8 /** rct2: 0x008AA6EC */ static void vertical_drop_rc_track_diag_flat_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_flat_to_60_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1295,7 +1295,7 @@ static void vertical_drop_rc_track_diag_flat_to_60_deg_up(paint_session * sessio /** rct2: 0x008AA6FC */ static void vertical_drop_rc_track_diag_60_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_60_deg_up_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1303,7 +1303,7 @@ static void vertical_drop_rc_track_diag_60_deg_up_to_flat(paint_session * sessio /** rct2: 0x008AA70C */ static void vertical_drop_rc_track_diag_flat_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_flat_to_60_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1311,7 +1311,7 @@ static void vertical_drop_rc_track_diag_flat_to_60_deg_down(paint_session * sess /** rct2: 0x008AA71C */ static void vertical_drop_rc_track_diag_60_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_diag_60_deg_down_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1319,133 +1319,133 @@ static void vertical_drop_rc_track_diag_60_deg_down_to_flat(paint_session * sess /* 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 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_half_loop_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } static void vertical_drop_rc_track_half_loop_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_half_loop_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } static void vertical_drop_rc_track_left_corkscrew_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_corkscrew_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } static void vertical_drop_rc_track_right_corkscrew_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_corkscrew_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } static void vertical_drop_rc_track_left_corkscrew_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_corkscrew_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } static void vertical_drop_rc_track_right_corkscrew_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_corkscrew_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } static void vertical_drop_rc_track_flat_to_60_deg_up_long_base(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_flat_to_60_deg_up_long_base(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } static void vertical_drop_rc_track_60_deg_up_to_flat_long_base(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_60_deg_up_to_flat_long_base(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } static void vertical_drop_rc_track_flat_to_60_deg_down_long_base(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_flat_to_60_deg_down_long_base(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } static void vertical_drop_rc_track_60_deg_up_to_flat_long_base122(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_60_deg_up_to_flat_long_base122(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } static void vertical_drop_rc_track_left_barrel_roll_up_to_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_barrel_roll_up_to_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } static void vertical_drop_rc_track_right_barrel_roll_up_to_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_barrel_roll_up_to_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } static void vertical_drop_rc_track_left_barrel_roll_down_to_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_barrel_roll_down_to_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } static void vertical_drop_rc_track_right_barrel_roll_down_to_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_barrel_roll_down_to_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } static void vertical_drop_rc_track_powered_lift(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_powered_lift(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } static void vertical_drop_rc_track_left_large_half_loop_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_large_half_loop_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } static void vertical_drop_rc_track_right_large_half_loop_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_large_half_loop_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } static void vertical_drop_rc_track_right_large_half_loop_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_right_large_half_loop_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } static void vertical_drop_rc_track_left_large_half_loop_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_left_large_half_loop_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1453,7 +1453,7 @@ static void vertical_drop_rc_track_left_large_half_loop_down(paint_session * ses static void vertical_drop_rc_track_90_deg_to_inverted_flat_quarter_loop_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); @@ -1461,14 +1461,14 @@ static void vertical_drop_rc_track_90_deg_to_inverted_flat_quarter_loop_up(paint static void vertical_drop_rc_track_inverted_flat_to_90_deg_quarter_loop_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_inverted_flat_to_90_deg_quarter_loop_down(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } static void vertical_drop_rc_track_booster(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bolliger_mabillard_track_booster(session, rideIndex, trackSequence, direction, height, mapElement, METAL_SUPPORTS_BOXED); } diff --git a/src/openrct2/ride/coaster/VirginiaReel.cpp b/src/openrct2/ride/coaster/VirginiaReel.cpp index b9bee9e4cb..109a581ed0 100644 --- a/src/openrct2/ride/coaster/VirginiaReel.cpp +++ b/src/openrct2/ride/coaster/VirginiaReel.cpp @@ -231,7 +231,7 @@ void vehicle_visual_virginia_reel(paint_session * session, sint32 x, sint32 imag /** rct2: 0x00811264 */ static void paint_virginia_reel_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { const uint32 * sprites = virginia_reel_track_pieces_flat; if (mapElement->type & 0x80) @@ -259,7 +259,7 @@ static void paint_virginia_reel_track_flat(paint_session * session, uint8 rideIn /** rct2: 0x00811274 */ static void paint_virginia_reel_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { const uint32 * sprites = virginia_reel_track_pieces_25_deg_up; if (mapElement->type & 0x80) @@ -310,7 +310,7 @@ static void paint_virginia_reel_track_25_deg_up(paint_session * session, uint8 r /** rct2: 0x00811294 */ static void paint_virginia_reel_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { const uint32 * sprites = virginia_reel_track_pieces_flat_to_25_deg_up; if (mapElement->type & 0x80) @@ -356,7 +356,7 @@ static void paint_virginia_reel_track_flat_to_25_deg_up(paint_session * session, /** rct2: 0x00811294 */ static void paint_virginia_reel_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { const uint32 * sprites = virginia_reel_track_pieces_25_deg_up_to_flat; if (mapElement->type & 0x80) @@ -407,28 +407,28 @@ static void paint_virginia_reel_track_25_deg_up_to_flat(paint_session * session, /** rct2: 0x008112A4 */ static void paint_virginia_reel_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_virginia_reel_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x008112B4 */ static void paint_virginia_reel_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_virginia_reel_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x008112C4 */ static void paint_virginia_reel_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_virginia_reel_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x008112D4, 0x008112E4, 0x008112F4 */ static void paint_virginia_reel_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId; @@ -464,7 +464,7 @@ static const uint8 virginia_reel_left_quarter_turn_supports[] = { 5, 2, 3, 4 }; /** rct2: 0x00811304 */ static void paint_virginia_reel_track_left_quarter_turn_3_tiles(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { track_paint_util_left_quarter_turn_3_tiles_paint( session, 2, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -492,7 +492,7 @@ static const uint8 virginia_reel_right_quarter_turn_3_tiles_to_left_turn_map[] = /** rct2: 0x00811314 */ static void paint_virginia_reel_track_right_quarter_turn_3_tiles(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = virginia_reel_right_quarter_turn_3_tiles_to_left_turn_map[trackSequence]; paint_virginia_reel_track_left_quarter_turn_3_tiles(session, rideIndex, trackSequence, (direction + 3) % 4, height, @@ -501,7 +501,7 @@ static void paint_virginia_reel_track_right_quarter_turn_3_tiles(paint_session * /** rct2: 0x00811324 */ static void paint_virginia_reel_track_left_quarter_turn_1_tile(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { track_paint_util_left_quarter_turn_1_tile_paint(session, 2, height, 0, direction, session->TrackColours[SCHEME_TRACK], virginia_reel_track_pieces_flat_quarter_turn_1_tile, @@ -533,7 +533,7 @@ static void paint_virginia_reel_track_left_quarter_turn_1_tile(paint_session * s /** rct2: 0x00811334 */ static void paint_virginia_reel_track_right_quarter_turn_1_tile(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_virginia_reel_track_left_quarter_turn_1_tile(session, rideIndex, trackSequence, (direction + 3) % 4, height, mapElement); diff --git a/src/openrct2/ride/coaster/WildMouse.cpp b/src/openrct2/ride/coaster/WildMouse.cpp index a05a3e4656..4d1bacb596 100644 --- a/src/openrct2/ride/coaster/WildMouse.cpp +++ b/src/openrct2/ride/coaster/WildMouse.cpp @@ -16,7 +16,7 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" #include "../../paint/paint.h" #include "../../paint/supports.h" #include "../../sprites.h" @@ -171,7 +171,7 @@ static const uint32 _wild_mouse_block_brakes_image_ids[4] = { /** rct2: 0x0078B1E4 */ static void wild_mouse_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_WILD_MOUSE_FLAT_SW_NE, SPR_WILD_MOUSE_FLAT_CHAIN_SW_NE }, @@ -194,7 +194,7 @@ static void wild_mouse_track_flat(paint_session * session, uint8 rideIndex, uint } static void wild_mouse_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 baseImageIds[4] = { SPR_STATION_BASE_B_SW_NE, @@ -226,7 +226,7 @@ static void wild_mouse_track_station(paint_session * session, uint8 rideIndex, u /** rct2: 0x0078B1F4 */ static void wild_mouse_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_WILD_MOUSE_25_DEG_SW_NE, SPR_WILD_MOUSE_25_DEG_CHAIN_SW_NE }, @@ -257,7 +257,7 @@ static void wild_mouse_track_25_deg_up(paint_session * session, uint8 rideIndex, /** rct2: 0x0078B204 */ static void wild_mouse_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 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(paint_session * session, uint8 rideIndex, /** rct2: 0x0078B214 */ static void wild_mouse_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_WILD_MOUSE_FLAT_TO_25_DEG_SW_NE, SPR_WILD_MOUSE_FLAT_TO_25_DEG_CHAIN_SW_NE }, @@ -333,7 +333,7 @@ static void wild_mouse_track_flat_to_25_deg_up(paint_session * session, uint8 ri /** rct2: 0x0078B224 */ static void wild_mouse_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_WILD_MOUSE_25_DEG_TO_60_DEG_SW_NE, SPR_WILD_MOUSE_25_DEG_TO_60_DEG_CHAIN_SW_NE }, @@ -379,7 +379,7 @@ static void wild_mouse_track_25_deg_up_to_60_deg_up(paint_session * session, uin /** rct2: 0x0078B234 */ static void wild_mouse_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_WILD_MOUSE_60_DEG_TO_25_DEG_SW_NE, SPR_WILD_MOUSE_60_DEG_TO_25_DEG_CHAIN_SW_NE }, @@ -425,7 +425,7 @@ static void wild_mouse_track_60_deg_up_to_25_deg_up(paint_session * session, uin /** rct2: 0x0078B244 */ static void wild_mouse_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_WILD_MOUSE_25_DEG_TO_FLAT_SW_NE, SPR_WILD_MOUSE_25_DEG_TO_FLAT_CHAIN_SW_NE }, @@ -456,48 +456,48 @@ static void wild_mouse_track_25_deg_up_to_flat(paint_session * session, uint8 ri /** rct2: 0x0078B254 */ static void wild_mouse_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { wild_mouse_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0078B264 */ static void wild_mouse_track_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { wild_mouse_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0078B274 */ static void wild_mouse_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { wild_mouse_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0078B284 */ static void wild_mouse_track_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { wild_mouse_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0078B294 */ static void wild_mouse_track_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { wild_mouse_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0078B2A4 */ static void wild_mouse_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { wild_mouse_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } static void wild_mouse_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const sprite_bb imageIds[4][3] = { { @@ -552,7 +552,7 @@ static void wild_mouse_track_right_quarter_turn_3(paint_session * session, uint8 } static void wild_mouse_track_right_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const sprite_bb imageIds[4][2] = { { @@ -609,7 +609,7 @@ static void wild_mouse_track_right_quarter_turn_3_25_deg_down(paint_session * se } static void wild_mouse_track_left_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; wild_mouse_track_right_quarter_turn_3_25_deg_down(session, rideIndex, trackSequence, (direction + 1) % 4, height, @@ -618,7 +618,7 @@ static void wild_mouse_track_left_quarter_turn_3_25_deg_up(paint_session * sessi /** rct2: 0x0078B314 */ static void wild_mouse_track_right_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const sprite_bb imageIds[4][2] = { { @@ -684,14 +684,14 @@ static void wild_mouse_track_right_quarter_turn_3_25_deg_up(paint_session * sess /** rct2: 0x0078B324 */ static void wild_mouse_track_left_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; wild_mouse_track_right_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); } static void wild_mouse_track_left_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; wild_mouse_track_right_quarter_turn_3(session, rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); @@ -699,7 +699,7 @@ static void wild_mouse_track_left_quarter_turn_3(paint_session * session, uint8 /** rct2: 0x0078B394 */ static void wild_mouse_track_left_quarter_turn_1(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4] = { SPR_WILD_MOUSE_QUARTER_TURN_1_SW_NE, @@ -733,14 +733,14 @@ static void wild_mouse_track_left_quarter_turn_1(paint_session * session, uint8 /** rct2: 0x0078B3A4 */ static void wild_mouse_track_right_quarter_turn_1(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { wild_mouse_track_left_quarter_turn_1(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x0078B354 */ static void wild_mouse_track_flat_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_WILD_MOUSE_FLAT_TO_60_DEG_SW_NE, SPR_WILD_MOUSE_FLAT_TO_60_DEG_CHAIN_SW_NE }, @@ -786,7 +786,7 @@ static void wild_mouse_track_flat_to_60_deg_up(paint_session * session, uint8 ri /** rct2: 0x0078B364 */ static void wild_mouse_track_60_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_WILD_MOUSE_60_DEG_TO_FLAT_SW_NE, SPR_WILD_MOUSE_60_DEG_TO_FLAT_CHAIN_SW_NE }, @@ -839,21 +839,21 @@ static void wild_mouse_track_60_deg_up_to_flat(paint_session * session, uint8 ri /** rct2: 0x0078B374 */ static void wild_mouse_track_flat_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { wild_mouse_track_60_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0078B384 */ static void wild_mouse_track_60_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { wild_mouse_track_flat_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x0078B344 */ static void wild_mouse_track_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 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); @@ -869,7 +869,7 @@ static void wild_mouse_track_brakes(paint_session * session, uint8 rideIndex, ui /** rct2: 0x0078B3C4 */ static void wild_mouse_track_rotation_control_toggle(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4] = { SPR_WILD_MOUSE_ROTATION_CONTROL_TOGGLE_SW_NE, @@ -892,7 +892,7 @@ static void wild_mouse_track_rotation_control_toggle(paint_session * session, ui /** rct2: 0x0078B3B4 */ static void wild_mouse_track_block_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 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 ff625fdfd2..0d7951e07f 100644 --- a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp +++ b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp @@ -16,7 +16,7 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" #include "../../paint/paint.h" #include "../../paint/supports.h" #include "../../sprites.h" @@ -438,7 +438,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 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_WOODEN_RC_FLAT_SW_NE, SPR_WOODEN_RC_FLAT_CHAIN_SW_NE }, @@ -463,7 +463,7 @@ static void wooden_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 } static void wooden_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 stationImageIds[4][2] = { { SPR_WOODEN_RC_STATION_SW_NE, SPR_WOODEN_RC_STATION_RAILS_SW_NE }, @@ -493,7 +493,7 @@ static void wooden_rc_track_station(paint_session * session, uint8 rideIndex, ui /** rct2: 0x008AC578 */ static void wooden_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[2][4][4] = { { @@ -539,7 +539,7 @@ static void wooden_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, /** rct2: 0x008AC588 */ static void wooden_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_WOODEN_RC_60_DEG_SW_NE, SPR_WOODEN_RC_60_DEG_RAILS_SW_NE }, @@ -575,7 +575,7 @@ static void wooden_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, /** rct2: 0x008AC598 */ static void wooden_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[2][4][4] = { { @@ -621,7 +621,7 @@ static void wooden_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rid /** rct2: 0x008AC5A8 */ static void wooden_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][4] = { { SPR_WOODEN_RC_25_DEG_TO_60_DEG_SW_NE, SPR_WOODEN_RC_25_DEG_TO_60_DEG_RAILS_SW_NE, 0, 0 }, @@ -661,7 +661,7 @@ static void wooden_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uint /** rct2: 0x008AC5B8 */ static void wooden_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][4] = { { SPR_WOODEN_RC_60_DEG_TO_25_DEG_SW_NE, SPR_WOODEN_RC_60_DEG_TO_25_DEG_RAILS_SW_NE, 0, 0 }, @@ -701,7 +701,7 @@ static void wooden_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uint /** rct2: 0x008AC5C8 */ static void wooden_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[2][4][4] = { { @@ -747,48 +747,48 @@ static void wooden_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rid /** rct2: 0x008AC5D8 */ static void wooden_rc_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { wooden_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AC5E8 */ static void wooden_rc_track_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { wooden_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AC5F8 */ static void wooden_rc_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { wooden_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AC608 */ static void wooden_rc_track_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { wooden_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AC618 */ static void wooden_rc_track_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { wooden_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AC628 */ static void wooden_rc_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { wooden_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } static void wooden_rc_track_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const sprite_bb_2 imageIds[2][4][7] = { { { @@ -1032,7 +1032,7 @@ static void wooden_rc_track_right_quarter_turn_5(paint_session * session, uint8 } static void wooden_rc_track_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; wooden_rc_track_right_quarter_turn_5(session, rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); @@ -1040,7 +1040,7 @@ static void wooden_rc_track_left_quarter_turn_5(paint_session * session, uint8 r /** rct2: 0x008AC658 */ static void wooden_rc_track_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][4] = { { SPR_WOODEN_RC_FLAT_TO_LEFT_BANK_SW_NE, SPR_WOODEN_RC_FLAT_TO_LEFT_BANK_RAILS_SW_NE, 0, 0 }, @@ -1066,7 +1066,7 @@ static void wooden_rc_track_flat_to_left_bank(paint_session * session, uint8 rid /** rct2: 0x008AC668 */ static void wooden_rc_track_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][4] = { { SPR_WOODEN_RC_FLAT_TO_RIGHT_BANK_SW_NE, SPR_WOODEN_RC_FLAT_TO_RIGHT_BANK_RAILS_SW_NE, @@ -1092,20 +1092,20 @@ static void wooden_rc_track_flat_to_right_bank(paint_session * session, uint8 ri /** rct2: 0x008AC678 */ static void wooden_rc_track_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { wooden_rc_track_flat_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AC688 */ static void wooden_rc_track_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { wooden_rc_track_flat_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } static void wooden_rc_track_banked_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const sprite_bb_2 imageIds[2][4][7] = { { { @@ -1349,7 +1349,7 @@ static void wooden_rc_track_banked_right_quarter_turn_5(paint_session * session, } static void wooden_rc_track_banked_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; wooden_rc_track_banked_right_quarter_turn_5(session, rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); @@ -1357,7 +1357,7 @@ static void wooden_rc_track_banked_left_quarter_turn_5(paint_session * session, /** rct2: 0x008AC6B8 */ static void wooden_rc_track_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][4] = { { SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_SW_NE, SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_RAILS_SW_NE, 0, 0 }, @@ -1390,7 +1390,7 @@ static void wooden_rc_track_left_bank_to_25_deg_up(paint_session * session, uint /** rct2: 0x008AC6C8 */ static void wooden_rc_track_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][4] = { { SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_SW_NE, SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_RAILS_SW_NE, 0, 0 }, @@ -1423,7 +1423,7 @@ static void wooden_rc_track_right_bank_to_25_deg_up(paint_session * session, uin /** rct2: 0x008AC6D8 */ static void wooden_rc_track_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][4] = { { SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_SW_NE, SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_RAILS_SW_NE, 0, 0 }, @@ -1456,7 +1456,7 @@ static void wooden_rc_track_25_deg_up_to_left_bank(paint_session * session, uint /** rct2: 0x008AC6E8 */ static void wooden_rc_track_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][4] = { { SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_SW_NE, SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_RAILS_SW_NE, 0, 0 }, @@ -1489,35 +1489,35 @@ static void wooden_rc_track_25_deg_up_to_right_bank(paint_session * session, uin /** rct2: 0x008AC6F8 */ static void wooden_rc_track_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { wooden_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AC708 */ static void wooden_rc_track_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { wooden_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AC718 */ static void wooden_rc_track_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { wooden_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AC728 */ static void wooden_rc_track_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { wooden_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AC738 */ static void wooden_rc_track_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_WOODEN_RC_LEFT_BANK_SW_NE, SPR_WOODEN_RC_LEFT_BANK_RAILS_SW_NE }, @@ -1536,14 +1536,14 @@ static void wooden_rc_track_left_bank(paint_session * session, uint8 rideIndex, /** rct2: 0x008AC748 */ static void wooden_rc_track_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { wooden_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008AC758 */ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1804,7 +1804,7 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(paint_session * sessio /** rct2: 0x008AC768 */ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2065,7 +2065,7 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(paint_session * sessi /** rct2: 0x008AC778 */ static void wooden_rc_track_left_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; wooden_rc_track_right_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); @@ -2073,7 +2073,7 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_down(paint_session * sess /** rct2: 0x008AC788 */ static void wooden_rc_track_right_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; wooden_rc_track_left_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -2081,7 +2081,7 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_down(paint_session * ses /** rct2: 0x008AC798 */ static void wooden_rc_track_s_bend_left(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2281,7 +2281,7 @@ static void wooden_rc_track_s_bend_left(paint_session * session, uint8 rideIndex /** rct2: 0x008AC7A8 */ static void wooden_rc_track_s_bend_right(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2481,7 +2481,7 @@ static void wooden_rc_track_s_bend_right(paint_session * session, uint8 rideInde /** rct2: 0x008ACE18 */ static void wooden_rc_track_left_vertical_loop(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2691,7 +2691,7 @@ static void wooden_rc_track_left_vertical_loop(paint_session * session, uint8 ri /** rct2: 0x008ACE28 */ static void wooden_rc_track_right_vertical_loop(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -2875,7 +2875,7 @@ static void wooden_rc_track_right_vertical_loop(paint_session * session, uint8 r /** rct2: 0x008AC7E8 */ static void wooden_rc_track_left_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3026,7 +3026,7 @@ static void wooden_rc_track_left_quarter_turn_3(paint_session * session, uint8 r /** rct2: 0x008AC7F8 */ static void wooden_rc_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; wooden_rc_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -3034,7 +3034,7 @@ static void wooden_rc_track_right_quarter_turn_3(paint_session * session, uint8 /** rct2: 0x008AC808 */ static void wooden_rc_track_left_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3185,7 +3185,7 @@ static void wooden_rc_track_left_quarter_turn_3_bank(paint_session * session, ui /** rct2: 0x008AC818 */ static void wooden_rc_track_right_quarter_turn_3_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; wooden_rc_track_left_quarter_turn_3_bank(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -3193,7 +3193,7 @@ static void wooden_rc_track_right_quarter_turn_3_bank(paint_session * session, u /** rct2: 0x008AC828 */ static void wooden_rc_track_left_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3313,7 +3313,7 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_up(paint_session * sessio /** rct2: 0x008AC838 */ static void wooden_rc_track_right_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3433,7 +3433,7 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_up(paint_session * sessi /** rct2: 0x008AC848 */ static void wooden_rc_track_left_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; wooden_rc_track_right_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); @@ -3441,7 +3441,7 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_down(paint_session * sess /** rct2: 0x008AC858 */ static void wooden_rc_track_right_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; wooden_rc_track_left_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -3449,7 +3449,7 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_down(paint_session * ses /** rct2: 0x008ACAB8 */ static void wooden_rc_track_left_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -3788,7 +3788,7 @@ static void wooden_rc_track_left_half_banked_helix_up_small(paint_session * sess /** rct2: 0x008ACAC8 */ static void wooden_rc_track_right_half_banked_helix_up_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4127,7 +4127,7 @@ static void wooden_rc_track_right_half_banked_helix_up_small(paint_session * ses /** rct2: 0x008ACAD8 */ static void wooden_rc_track_left_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 4) { @@ -4141,7 +4141,7 @@ static void wooden_rc_track_left_half_banked_helix_down_small(paint_session * se /** rct2: 0x008ACAE8 */ static void wooden_rc_track_right_half_banked_helix_down_small(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 4) { @@ -4154,7 +4154,7 @@ static void wooden_rc_track_right_half_banked_helix_down_small(paint_session * s /** rct2: 0x008ACAF8 */ static void wooden_rc_track_left_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -4673,7 +4673,7 @@ static void wooden_rc_track_left_half_banked_helix_up_large(paint_session * sess /** rct2: 0x008ACB08 */ static void wooden_rc_track_right_half_banked_helix_up_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5192,7 +5192,7 @@ static void wooden_rc_track_right_half_banked_helix_up_large(paint_session * ses /** rct2: 0x008ACB18 */ static void wooden_rc_track_left_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 7) { @@ -5206,7 +5206,7 @@ static void wooden_rc_track_left_half_banked_helix_down_large(paint_session * se /** rct2: 0x008ACB28 */ static void wooden_rc_track_right_half_banked_helix_down_large(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence >= 7) { @@ -5219,7 +5219,7 @@ static void wooden_rc_track_right_half_banked_helix_down_large(paint_session * s /** rct2: 0x008ACB98 */ static void wooden_rc_track_left_quarter_turn_1_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -5271,7 +5271,7 @@ static void wooden_rc_track_left_quarter_turn_1_60_deg_up(paint_session * sessio /** rct2: 0x008ACB78 */ static void wooden_rc_track_right_quarter_turn_1_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -5323,21 +5323,21 @@ static void wooden_rc_track_right_quarter_turn_1_60_deg_up(paint_session * sessi /** rct2: 0x008ACB88 */ static void wooden_rc_track_left_quarter_turn_1_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { wooden_rc_track_right_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, mapElement); } /** rct2: 0x008ACBA8 */ static void wooden_rc_track_right_quarter_turn_1_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { wooden_rc_track_left_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008AC868 */ static void wooden_rc_track_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_WOODEN_RC_BRAKES_SW_NE, SPR_WOODEN_RC_BRAKES_RAILS_SW_NE }, @@ -5356,7 +5356,7 @@ static void wooden_rc_track_brakes(paint_session * session, uint8 rideIndex, uin /** rct2: 0x008ACC78 */ static void wooden_rc_track_25_deg_up_left_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -5411,7 +5411,7 @@ static void wooden_rc_track_25_deg_up_left_banked(paint_session * session, uint8 /** rct2: 0x008ACC88 */ static void wooden_rc_track_25_deg_up_right_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -5466,7 +5466,7 @@ static void wooden_rc_track_25_deg_up_right_banked(paint_session * session, uint /** rct2: 0x008AC878 */ static void wooden_rc_track_on_ride_photo(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -5504,21 +5504,21 @@ static void wooden_rc_track_on_ride_photo(paint_session * session, uint8 rideInd /** rct2: 0x008ACC98 */ static void wooden_rc_track_25_deg_down_left_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { wooden_rc_track_25_deg_up_right_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ACCA8 */ static void wooden_rc_track_25_deg_down_right_banked(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { wooden_rc_track_25_deg_up_left_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ACE08 */ static void wooden_rc_track_water_splash(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -5859,7 +5859,7 @@ static void wooden_rc_track_water_splash(paint_session * session, uint8 rideInde /** rct2: 0x008AC958 */ static void wooden_rc_track_left_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6059,7 +6059,7 @@ static void wooden_rc_track_left_eighth_to_diag(paint_session * session, uint8 r /** rct2: 0x008AC968 */ static void wooden_rc_track_right_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6259,7 +6259,7 @@ static void wooden_rc_track_right_eighth_to_diag(paint_session * session, uint8 /** rct2: 0x008AC978 */ static void wooden_rc_track_left_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; wooden_rc_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -6267,7 +6267,7 @@ static void wooden_rc_track_left_eighth_to_orthogonal(paint_session * session, u /** rct2: 0x008AC988 */ static void wooden_rc_track_right_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; wooden_rc_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); @@ -6275,7 +6275,7 @@ static void wooden_rc_track_right_eighth_to_orthogonal(paint_session * session, /** rct2: 0x008AC998 */ static void wooden_rc_track_left_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6475,7 +6475,7 @@ static void wooden_rc_track_left_eighth_bank_to_diag(paint_session * session, ui /** rct2: 0x008AC9A8 */ static void wooden_rc_track_right_eighth_bank_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6675,7 +6675,7 @@ static void wooden_rc_track_right_eighth_bank_to_diag(paint_session * session, u /** rct2: 0x008AC9B8 */ static void wooden_rc_track_left_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; wooden_rc_track_right_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -6683,7 +6683,7 @@ static void wooden_rc_track_left_eighth_bank_to_orthogonal(paint_session * sessi /** rct2: 0x008AC9C8 */ static void wooden_rc_track_right_eighth_bank_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; wooden_rc_track_left_eighth_bank_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); @@ -6691,7 +6691,7 @@ static void wooden_rc_track_right_eighth_bank_to_orthogonal(paint_session * sess /** rct2: 0x008AC888 */ static void wooden_rc_track_diag_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -6868,7 +6868,7 @@ static void wooden_rc_track_diag_flat(paint_session * session, uint8 rideIndex, /** rct2: 0x008AC8B8 */ static void wooden_rc_track_diag_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7045,7 +7045,7 @@ static void wooden_rc_track_diag_25_deg_up(paint_session * session, uint8 rideIn /** rct2: 0x008AC8E8 */ static void wooden_rc_track_diag_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7134,7 +7134,7 @@ static void wooden_rc_track_diag_60_deg_up(paint_session * session, uint8 rideIn /** rct2: 0x008AC898 */ static void wooden_rc_track_diag_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7311,7 +7311,7 @@ static void wooden_rc_track_diag_flat_to_25_deg_up(paint_session * session, uint /** rct2: 0x008AC8C8 */ static void wooden_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7400,7 +7400,7 @@ static void wooden_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * session, /** rct2: 0x008AC8D8 */ static void wooden_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7489,7 +7489,7 @@ static void wooden_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * session, /** rct2: 0x008AC8A8 */ static void wooden_rc_track_diag_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7666,7 +7666,7 @@ static void wooden_rc_track_diag_25_deg_up_to_flat(paint_session * session, uint /** rct2: 0x008AC918 */ static void wooden_rc_track_diag_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7843,7 +7843,7 @@ static void wooden_rc_track_diag_25_deg_down(paint_session * session, uint8 ride /** rct2: 0x008AC948 */ static void wooden_rc_track_diag_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -7932,7 +7932,7 @@ static void wooden_rc_track_diag_60_deg_down(paint_session * session, uint8 ride /** rct2: 0x008AC8F8 */ static void wooden_rc_track_diag_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -8104,7 +8104,7 @@ static void wooden_rc_track_diag_flat_to_25_deg_down(paint_session * session, ui /** rct2: 0x008AC928 */ static void wooden_rc_track_diag_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -8193,7 +8193,7 @@ static void wooden_rc_track_diag_25_deg_down_to_60_deg_down(paint_session * sess /** rct2: 0x008AC938 */ static void wooden_rc_track_diag_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -8282,7 +8282,7 @@ static void wooden_rc_track_diag_60_deg_down_to_25_deg_down(paint_session * sess /** rct2: 0x008AC908 */ static void wooden_rc_track_diag_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -8459,7 +8459,7 @@ static void wooden_rc_track_diag_25_deg_down_to_flat(paint_session * session, ui /** rct2: 0x008ACA18 */ static void wooden_rc_track_diag_flat_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -8548,7 +8548,7 @@ static void wooden_rc_track_diag_flat_to_left_bank(paint_session * session, uint /** rct2: 0x008AC9F8 */ static void wooden_rc_track_diag_flat_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -8637,7 +8637,7 @@ static void wooden_rc_track_diag_flat_to_right_bank(paint_session * session, uin /** rct2: 0x008ACA08 */ static void wooden_rc_track_diag_left_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -8726,7 +8726,7 @@ static void wooden_rc_track_diag_left_bank_to_flat(paint_session * session, uint /** rct2: 0x008ACA28 */ static void wooden_rc_track_diag_right_bank_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -8815,7 +8815,7 @@ static void wooden_rc_track_diag_right_bank_to_flat(paint_session * session, uin /** rct2: 0x008ACA58 */ static void wooden_rc_track_diag_left_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -8904,7 +8904,7 @@ static void wooden_rc_track_diag_left_bank_to_25_deg_up(paint_session * session, /** rct2: 0x008ACA68 */ static void wooden_rc_track_diag_right_bank_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -8993,7 +8993,7 @@ static void wooden_rc_track_diag_right_bank_to_25_deg_up(paint_session * session /** rct2: 0x008ACA38 */ static void wooden_rc_track_diag_25_deg_up_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -9082,7 +9082,7 @@ static void wooden_rc_track_diag_25_deg_up_to_left_bank(paint_session * session, /** rct2: 0x008ACA48 */ static void wooden_rc_track_diag_25_deg_up_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -9171,7 +9171,7 @@ static void wooden_rc_track_diag_25_deg_up_to_right_bank(paint_session * session /** rct2: 0x008ACA78 */ static void wooden_rc_track_diag_left_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -9255,7 +9255,7 @@ static void wooden_rc_track_diag_left_bank_to_25_deg_down(paint_session * sessio /** rct2: 0x008ACA88 */ static void wooden_rc_track_diag_right_bank_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -9339,7 +9339,7 @@ static void wooden_rc_track_diag_right_bank_to_25_deg_down(paint_session * sessi /** rct2: 0x008ACA98 */ static void wooden_rc_track_diag_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -9428,7 +9428,7 @@ static void wooden_rc_track_diag_25_deg_down_to_left_bank(paint_session * sessio /** rct2: 0x008ACAA8 */ static void wooden_rc_track_diag_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -9517,7 +9517,7 @@ static void wooden_rc_track_diag_25_deg_down_to_right_bank(paint_session * sessi /** rct2: 0x008AC9D8 */ static void wooden_rc_track_diag_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -9606,7 +9606,7 @@ static void wooden_rc_track_diag_left_bank(paint_session * session, uint8 rideIn /** rct2: 0x008AC9E8 */ static void wooden_rc_track_diag_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -9696,7 +9696,7 @@ static void wooden_rc_track_diag_right_bank(paint_session * session, uint8 rideI /** rct2: 0x008ACB38 */ static void wooden_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -9817,7 +9817,7 @@ static void wooden_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(paint_ses /** rct2: 0x008ACB48 */ static void wooden_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -9938,7 +9938,7 @@ static void wooden_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(paint_s /** rct2: 0x008ACB58 */ static void wooden_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -10059,7 +10059,7 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(paint_s /** rct2: 0x008ACB68 */ static void wooden_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (trackSequence) { @@ -10179,7 +10179,7 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank(paint /** rct2: 0x008ACDF8 */ static void wooden_rc_track_block_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { wooden_rc_track_paint(session, _wooden_rc_block_brakes_image_ids[direction][0], _wooden_rc_block_brakes_image_ids[direction][1], direction, 0, 2, 32, 25, 2, height, 0, 3, height); @@ -10191,7 +10191,7 @@ static void wooden_rc_track_block_brakes(paint_session * session, uint8 rideInde /** rct2: 0x008ACCB8 */ static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -10311,7 +10311,7 @@ static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_up(paint_session * /** rct2: 0x008ACCC8 */ static void wooden_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -10432,7 +10432,7 @@ static void wooden_rc_track_right_banked_quarter_turn_3_25_deg_up(paint_session /** rct2: 0x008ACCD8 */ static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; wooden_rc_track_right_banked_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, @@ -10442,7 +10442,7 @@ static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_down(paint_session /** rct2: 0x008ACCE8 */ static void wooden_rc_track_right_banked_quarter_turn_3_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; wooden_rc_track_left_banked_quarter_turn_3_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, @@ -10451,7 +10451,7 @@ static void wooden_rc_track_right_banked_quarter_turn_3_25_deg_down(paint_sessio /** rct2: 0x008ACC38 */ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -10712,7 +10712,7 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(paint_session * /** rct2: 0x008ACC48 */ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -10974,7 +10974,7 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(paint_session /** rct2: 0x008ACC58 */ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, @@ -10984,7 +10984,7 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_down(paint_session /** rct2: 0x008ACC68 */ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, @@ -10993,7 +10993,7 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_down(paint_sessio /** rct2: 0x008ACCF8 */ static void wooden_rc_track_25_deg_up_to_left_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -11040,7 +11040,7 @@ static void wooden_rc_track_25_deg_up_to_left_banked_25_deg_up(paint_session * s /** rct2: 0x008ACD08 */ static void wooden_rc_track_25_deg_up_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -11087,7 +11087,7 @@ static void wooden_rc_track_25_deg_up_to_right_banked_25_deg_up(paint_session * /** rct2: 0x008ACD18 */ static void wooden_rc_track_left_banked_25_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -11134,7 +11134,7 @@ static void wooden_rc_track_left_banked_25_deg_up_to_25_deg_up(paint_session * s /** rct2: 0x008ACD28 */ static void wooden_rc_track_right_banked_25_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -11182,7 +11182,7 @@ static void wooden_rc_track_right_banked_25_deg_up_to_25_deg_up(paint_session * /** rct2: 0x008ACD38 */ static void wooden_rc_track_25_deg_down_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { wooden_rc_track_right_banked_25_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -11191,7 +11191,7 @@ static void wooden_rc_track_25_deg_down_to_left_banked_25_deg_down(paint_session /** rct2: 0x008ACD48 */ static void wooden_rc_track_25_deg_down_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { wooden_rc_track_left_banked_25_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -11200,7 +11200,7 @@ static void wooden_rc_track_25_deg_down_to_right_banked_25_deg_down(paint_sessio /** rct2: 0x008ACD58 */ static void wooden_rc_track_left_banked_25_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { wooden_rc_track_25_deg_up_to_right_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -11209,7 +11209,7 @@ static void wooden_rc_track_left_banked_25_deg_down_to_25_deg_down(paint_session /** rct2: 0x008ACD68 */ static void wooden_rc_track_right_banked_25_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { wooden_rc_track_25_deg_up_to_left_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -11218,7 +11218,7 @@ static void wooden_rc_track_right_banked_25_deg_down_to_25_deg_down(paint_sessio /** rct2: 0x008ACD78 */ static void wooden_rc_track_left_banked_flat_to_left_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (direction) { @@ -11274,7 +11274,7 @@ static void wooden_rc_track_left_banked_flat_to_left_banked_25_deg_up(paint_sess /** rct2: 0x008ACD88 */ static void wooden_rc_track_right_banked_flat_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (direction) { @@ -11330,7 +11330,7 @@ static void wooden_rc_track_right_banked_flat_to_right_banked_25_deg_up(paint_se /** rct2: 0x008ACD98 */ static void wooden_rc_track_left_banked_25_deg_up_to_left_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (direction) { @@ -11386,7 +11386,7 @@ static void wooden_rc_track_left_banked_25_deg_up_to_left_banked_flat(paint_sess /** rct2: 0x008ACDA8 */ static void wooden_rc_track_right_banked_25_deg_up_to_right_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { switch (direction) { @@ -11442,7 +11442,7 @@ static void wooden_rc_track_right_banked_25_deg_up_to_right_banked_flat(paint_se /** rct2: 0x008ACDB8 */ static void wooden_rc_track_left_banked_flat_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { wooden_rc_track_right_banked_25_deg_up_to_right_banked_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -11451,7 +11451,7 @@ static void wooden_rc_track_left_banked_flat_to_left_banked_25_deg_down(paint_se /** rct2: 0x008ACDC8 */ static void wooden_rc_track_right_banked_flat_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { wooden_rc_track_left_banked_25_deg_up_to_left_banked_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -11460,7 +11460,7 @@ static void wooden_rc_track_right_banked_flat_to_right_banked_25_deg_down(paint_ /** rct2: 0x008ACDD8 */ static void wooden_rc_track_left_banked_25_deg_down_to_left_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { wooden_rc_track_right_banked_flat_to_right_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -11469,7 +11469,7 @@ static void wooden_rc_track_left_banked_25_deg_down_to_left_banked_flat(paint_se /** rct2: 0x008ACDE8 */ static void wooden_rc_track_right_banked_25_deg_down_to_right_banked_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { wooden_rc_track_left_banked_flat_to_left_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -11477,7 +11477,7 @@ static void wooden_rc_track_right_banked_25_deg_down_to_right_banked_flat(paint_ /** rct2: 0x008ACBB8 */ static void wooden_rc_track_flat_to_left_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -11532,7 +11532,7 @@ static void wooden_rc_track_flat_to_left_banked_25_deg_up(paint_session * sessio /** rct2: 0x008ACBC8 */ static void wooden_rc_track_flat_to_right_banked_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -11587,7 +11587,7 @@ static void wooden_rc_track_flat_to_right_banked_25_deg_up(paint_session * sessi /** rct2: 0x008ACBD8 */ static void wooden_rc_track_left_banked_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -11642,7 +11642,7 @@ static void wooden_rc_track_left_banked_25_deg_up_to_flat(paint_session * sessio /** rct2: 0x008ACBE8 */ static void wooden_rc_track_right_banked_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -11697,28 +11697,28 @@ static void wooden_rc_track_right_banked_25_deg_up_to_flat(paint_session * sessi /** rct2: 0x008ACBF8 */ static void wooden_rc_track_flat_to_left_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { wooden_rc_track_right_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ACC08 */ static void wooden_rc_track_flat_to_right_banked_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { wooden_rc_track_left_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ACC18 */ static void wooden_rc_track_left_banked_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { wooden_rc_track_flat_to_right_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008ACC28 */ static void wooden_rc_track_right_banked_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { wooden_rc_track_flat_to_left_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } diff --git a/src/openrct2/ride/coaster/WoodenWildMouse.cpp b/src/openrct2/ride/coaster/WoodenWildMouse.cpp index fe28d7612d..6f572e3674 100644 --- a/src/openrct2/ride/coaster/WoodenWildMouse.cpp +++ b/src/openrct2/ride/coaster/WoodenWildMouse.cpp @@ -16,7 +16,7 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" #include "../../paint/paint.h" #include "../../paint/supports.h" #include "../../sprites.h" @@ -130,7 +130,7 @@ enum /** rct2: 0x008A5464 */ static void wooden_wild_mouse_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4] = { SPR_WOODEN_WILD_MOUSE_FLAT_SW_NE, @@ -153,7 +153,7 @@ static void wooden_wild_mouse_track_flat(paint_session * session, uint8 rideInde } static void wooden_wild_mouse_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_WOODEN_WILD_MOUSE_FLAT_SW_NE, SPR_STATION_BASE_B_SW_NE }, @@ -175,7 +175,7 @@ static void wooden_wild_mouse_track_station(paint_session * session, uint8 rideI /** rct2: 0x008A5474 */ static void wooden_wild_mouse_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[2][4] = { { @@ -213,7 +213,7 @@ static void wooden_wild_mouse_track_25_deg_up(paint_session * session, uint8 rid /** rct2: 0x008A5484 */ static void wooden_wild_mouse_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[2][4] = { { @@ -259,7 +259,7 @@ static void wooden_wild_mouse_track_60_deg_up(paint_session * session, uint8 rid /** rct2: 0x008A5494 */ static void wooden_wild_mouse_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[2][4] = { { @@ -297,7 +297,7 @@ static void wooden_wild_mouse_track_flat_to_25_deg_up(paint_session * session, u /** rct2: 0x008A54A4 */ static void wooden_wild_mouse_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[2][4][2] = { { @@ -346,7 +346,7 @@ static void wooden_wild_mouse_track_25_deg_up_to_60_deg_up(paint_session * sessi } static void wooden_wild_mouse_track_60_deg_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[2][4][2] = { { @@ -396,7 +396,7 @@ static void wooden_wild_mouse_track_60_deg_to_25_deg_up(paint_session * session, /** rct2: 0x008A54C4 */ static void wooden_wild_mouse_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[2][4] = { { @@ -434,48 +434,48 @@ static void wooden_wild_mouse_track_25_deg_up_to_flat(paint_session * session, u /** rct2: 0x008A54D4 */ static void wooden_wild_mouse_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { wooden_wild_mouse_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A54E4 */ static void wooden_wild_mouse_track_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { wooden_wild_mouse_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A54F4 */ static void wooden_wild_mouse_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { wooden_wild_mouse_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A5504 */ static void wooden_wild_mouse_track_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { wooden_wild_mouse_track_60_deg_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A5514 */ static void wooden_wild_mouse_track_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { wooden_wild_mouse_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A5524 */ static void wooden_wild_mouse_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { wooden_wild_mouse_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } static void wooden_wild_mouse_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const sprite_bb imageIds[4][3] = { { @@ -531,14 +531,14 @@ static void wooden_wild_mouse_track_right_quarter_turn_3(paint_session * session } static void wooden_wild_mouse_track_left_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; wooden_wild_mouse_track_right_quarter_turn_3(session, rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); } static void wooden_wild_mouse_track_left_quarter_turn_1(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4] = { SPR_WOODEN_WILD_MOUSE_QUARTER_TURN_1_SW_NE, @@ -572,14 +572,14 @@ static void wooden_wild_mouse_track_left_quarter_turn_1(paint_session * session, /** rct2: 0x008A55D4 */ static void wooden_wild_mouse_track_right_quarter_turn_1(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { wooden_wild_mouse_track_left_quarter_turn_1(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); } /** rct2: 0x008A55E4 */ static void wooden_wild_mouse_track_flat_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[2][4][2] = { { @@ -628,7 +628,7 @@ static void wooden_wild_mouse_track_flat_to_60_deg_up(paint_session * session, u /** rct2: 0x008A55F4 */ static void wooden_wild_mouse_track_60_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[2][4][2] = { { @@ -677,14 +677,14 @@ static void wooden_wild_mouse_track_60_deg_up_to_flat(paint_session * session, u /** rct2: 0x008A5604 */ static void wooden_wild_mouse_track_flat_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { wooden_wild_mouse_track_60_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x008A5614 */ static void wooden_wild_mouse_track_60_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { wooden_wild_mouse_track_flat_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } diff --git a/src/openrct2/ride/gentle/CarRide.cpp b/src/openrct2/ride/gentle/CarRide.cpp index d81207fed9..b06e0a8b37 100644 --- a/src/openrct2/ride/gentle/CarRide.cpp +++ b/src/openrct2/ride/gentle/CarRide.cpp @@ -152,7 +152,7 @@ static const uint32 car_ride_track_pieces_quarter_turn_3_tiles[4][3] = { /** rct2: 0x006F72C8 */ static void paint_car_ride_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId = car_ride_track_pieces_flat[direction] | session->TrackColours[SCHEME_TRACK]; @@ -182,7 +182,7 @@ static void paint_car_ride_track_flat(paint_session * session, uint8 rideIndex, /** rct2: 0x006F72D8 */ static void paint_car_ride_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId = car_ride_track_pieces_25_deg_up[direction] | session->TrackColours[SCHEME_TRACK]; @@ -219,7 +219,7 @@ static void paint_car_ride_track_25_deg_up(paint_session * session, uint8 rideIn /** rct2: 0x006F72E8 */ static void paint_car_ride_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint32 imageId = car_ride_track_pieces_flat_to_25_deg_up[direction] | session->TrackColours[SCHEME_TRACK]; @@ -256,7 +256,7 @@ static void paint_car_ride_track_flat_to_25_deg_up(paint_session * session, uint /** rct2: 0x006F72F8 */ static void paint_car_ride_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint32 imageId = car_ride_track_pieces_25_deg_up_to_flat[direction] | session->TrackColours[SCHEME_TRACK]; @@ -293,28 +293,28 @@ static void paint_car_ride_track_25_deg_up_to_flat(paint_session * session, uint /** rct2: 0x006F7308 */ static void paint_car_ride_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { paint_car_ride_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x006F7318 */ static void paint_car_ride_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_car_ride_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x006F7328 */ static void paint_car_ride_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_car_ride_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x006F7338, 0x006F7348, 0x006F7358 */ static void paint_car_ride_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId; @@ -367,7 +367,7 @@ static void paint_car_ride_station(paint_session * session, uint8 rideIndex, uin /** rct2: 0x006F7378 */ static void paint_car_ride_track_right_quarter_turn_3_tiles(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { track_paint_util_right_quarter_turn_3_tiles_paint( session, 3, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -403,7 +403,7 @@ static void paint_car_ride_track_right_quarter_turn_3_tiles(paint_session * sess /** rct2: 0x006F7368 */ static void paint_car_ride_track_left_quarter_turn_3_tiles(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; paint_car_ride_track_right_quarter_turn_3_tiles(session, rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); @@ -411,7 +411,7 @@ static void paint_car_ride_track_left_quarter_turn_3_tiles(paint_session * sessi /** rct2: 0x006F7388 */ static void paint_car_ride_track_left_quarter_turn_1_tile(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint32 imageId = car_ride_track_pieces_left_quarter_turn_1_tile[direction] | session->TrackColours[SCHEME_TRACK]; @@ -441,14 +441,14 @@ static void paint_car_ride_track_left_quarter_turn_1_tile(paint_session * sessio /** rct2: 0x006F7398 */ static void paint_car_ride_track_right_quarter_turn_1_tile(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_car_ride_track_left_quarter_turn_1_tile(session, rideIndex, trackSequence, (direction + 3) % 4, height, mapElement); } /** rct2: 0x006F73A8 */ static void paint_car_ride_track_spinning_tunnel(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId = car_ride_track_pieces_flat[direction] | session->TrackColours[SCHEME_TRACK]; @@ -480,7 +480,7 @@ static void paint_car_ride_track_spinning_tunnel(paint_session * session, uint8 /** rct2: 0x006F73B8 */ static void paint_car_ride_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { LocationXY16 position = session->MapPosition; @@ -530,7 +530,7 @@ static void paint_car_ride_track_60_deg_up(paint_session * session, uint8 rideIn /** rct2: 0x006F73C8 */ static void paint_car_ride_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { LocationXY16 position = session->MapPosition; @@ -587,7 +587,7 @@ static void paint_car_ride_track_25_deg_up_to_60_deg_up(paint_session * session, /** rct2: 0x006F73D8 */ static void paint_car_ride_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { LocationXY16 position = session->MapPosition; @@ -644,28 +644,28 @@ static void paint_car_ride_track_60_deg_up_to_25_deg_up(paint_session * session, /** rct2: 0x006F73E8 */ static void paint_car_ride_track_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { paint_car_ride_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x006F73F8 */ static void paint_car_ride_track_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_car_ride_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x006F7408 */ static void paint_car_ride_track_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_car_ride_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x006F7418 */ static void paint_car_ride_track_log_bumps(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 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 4b8313d875..ae7a77c339 100644 --- a/src/openrct2/ride/gentle/CircusShow.cpp +++ b/src/openrct2/ride/gentle/CircusShow.cpp @@ -25,7 +25,7 @@ */ static void paint_circus_show_tent(paint_session * session, uint8 rideIndex, uint8 direction, sint8 al, sint8 cl, uint16 height) { - rct_map_element * savedMapElement = static_cast(session->CurrentlyDrawnItem); + rct_tile_element * savedMapElement = 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_circus_show_tent(paint_session * session, uint8 rideIndex, uin * rct2: 0x0076FAD4 */ static void paint_circus_show(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = track_map_3x3[direction][trackSequence]; diff --git a/src/openrct2/ride/gentle/CrookedHouse.cpp b/src/openrct2/ride/gentle/CrookedHouse.cpp index 4ac8107997..f29454f831 100644 --- a/src/openrct2/ride/gentle/CrookedHouse.cpp +++ b/src/openrct2/ride/gentle/CrookedHouse.cpp @@ -45,9 +45,9 @@ static const rct_crooked_house_bound_box crooked_house_data[] = { { 6, 0, 42, 24 static void paint_crooked_house_structure(paint_session * session, uint8 direction, uint8 x_offset, uint8 y_offset, uint32 segment, sint32 height) { - rct_map_element * original_map_element = static_cast(session->CurrentlyDrawnItem); + rct_tile_element * original_tile_element = static_cast(session->CurrentlyDrawnItem); - Ride * ride = get_ride(original_map_element->properties.track.ride_index); + Ride * ride = get_ride(original_tile_element->properties.track.ride_index); rct_ride_entry * rideEntry = get_ride_entry(ride->subtype); @@ -69,7 +69,7 @@ static void paint_crooked_house_structure(paint_session * session, uint8 directi } static void paint_crooked_house(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = track_map_3x3[direction][trackSequence]; diff --git a/src/openrct2/ride/gentle/Dodgems.cpp b/src/openrct2/ride/gentle/Dodgems.cpp index 22858ec7a9..f2ed194fba 100644 --- a/src/openrct2/ride/gentle/Dodgems.cpp +++ b/src/openrct2/ride/gentle/Dodgems.cpp @@ -44,7 +44,7 @@ static void paint_dodgems_roof(paint_session * session, sint32 height, sint32 of } static void paint_dodgems(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { uint8 relativeTrackSequence = track_map_4x4[direction][trackSequence]; diff --git a/src/openrct2/ride/gentle/FerrisWheel.cpp b/src/openrct2/ride/gentle/FerrisWheel.cpp index 90e5b02972..ed2f9a7344 100644 --- a/src/openrct2/ride/gentle/FerrisWheel.cpp +++ b/src/openrct2/ride/gentle/FerrisWheel.cpp @@ -58,7 +58,7 @@ static void paint_ferris_wheel_structure(paint_session * session, uint8 rideInde { uint32 imageId, baseImageId; - rct_map_element * savedMapElement = static_cast(session->CurrentlyDrawnItem); + rct_tile_element * savedMapElement = static_cast(session->CurrentlyDrawnItem); Ride * ride = get_ride(rideIndex); rct_ride_entry * rideEntry = get_ride_entry(ride->subtype); @@ -138,7 +138,7 @@ static void paint_ferris_wheel_structure(paint_session * session, uint8 rideInde * rct2: 0x008A8EC4 */ static void paint_ferris_wheel(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { uint8 relativeTrackSequence = track_map_1x4[direction][trackSequence]; diff --git a/src/openrct2/ride/gentle/FlyingSaucers.cpp b/src/openrct2/ride/gentle/FlyingSaucers.cpp index ef34bb1431..9161bc4435 100644 --- a/src/openrct2/ride/gentle/FlyingSaucers.cpp +++ b/src/openrct2/ride/gentle/FlyingSaucers.cpp @@ -40,7 +40,7 @@ static const uint32 flying_saucers_fence_sprites[] = { * rct2: 0x008873D8 */ static void paint_flying_saucers(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { uint8 relativeTrackSequence = track_map_4x4[direction][trackSequence]; diff --git a/src/openrct2/ride/gentle/GhostTrain.cpp b/src/openrct2/ride/gentle/GhostTrain.cpp index b97754f2d4..031d66e74f 100644 --- a/src/openrct2/ride/gentle/GhostTrain.cpp +++ b/src/openrct2/ride/gentle/GhostTrain.cpp @@ -136,7 +136,7 @@ static const uint32 ghost_train_track_pieces_brakes[4] = { /** rct2: 0x00770BEC */ static void paint_ghost_train_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { LocationXY16 position = session->MapPosition; @@ -172,7 +172,7 @@ static void paint_ghost_train_track_flat(paint_session * session, uint8 rideInde /** rct2: 0x00770BFC */ static void paint_ghost_train_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { LocationXY16 position = session->MapPosition; @@ -224,7 +224,7 @@ static void paint_ghost_train_track_25_deg_up(paint_session * session, uint8 rid /** rct2: 0x00770C0C */ static void paint_ghost_train_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { LocationXY16 position = session->MapPosition; @@ -275,7 +275,7 @@ static void paint_ghost_train_track_flat_to_25_deg_up(paint_session * session, u } static void paint_ghost_train_track_25_deg_up_to_flat_shared(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { LocationXY16 position = session->MapPosition; @@ -311,7 +311,7 @@ static void paint_ghost_train_track_25_deg_up_to_flat_shared(paint_session * ses /** rct2: 0x00770C1C */ static void paint_ghost_train_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_ghost_train_track_25_deg_up_to_flat_shared(session, rideIndex, trackSequence, direction, height, mapElement); @@ -334,14 +334,14 @@ static void paint_ghost_train_track_25_deg_up_to_flat(paint_session * session, u /** rct2: 0x00770C2C */ static void paint_ghost_train_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { paint_ghost_train_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x00770C3C */ static void paint_ghost_train_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_ghost_train_track_25_deg_up_to_flat_shared(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); @@ -365,14 +365,14 @@ static void paint_ghost_train_track_flat_to_25_deg_down(paint_session * session, /** rct2: 0x00770C4C */ static void paint_ghost_train_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_ghost_train_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x00770C5C, 0x00770C6C, 0x00770C7C */ static void paint_ghost_train_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId; @@ -425,7 +425,7 @@ static void paint_ghost_train_station(paint_session * session, uint8 rideIndex, /** rct2: 0x00770C9C */ static void paint_ghost_train_track_right_quarter_turn_3_tiles(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { track_paint_util_right_quarter_turn_3_tiles_paint( session, 3, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -461,7 +461,7 @@ static void paint_ghost_train_track_right_quarter_turn_3_tiles(paint_session * s /** rct2: 0x00770CAC */ static void paint_ghost_train_track_left_quarter_turn_3_tiles(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; paint_ghost_train_track_right_quarter_turn_3_tiles(session, rideIndex, trackSequence, (direction + 1) % 4, height, @@ -470,7 +470,7 @@ static void paint_ghost_train_track_left_quarter_turn_3_tiles(paint_session * se /** rct2: 0x00770CAC */ static void paint_ghost_train_track_left_quarter_turn_1_tile(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { 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, get_current_rotation()); @@ -483,7 +483,7 @@ static void paint_ghost_train_track_left_quarter_turn_1_tile(paint_session * ses /** rct2: 0x00770CBC */ static void paint_ghost_train_track_right_quarter_turn_1_tile(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_ghost_train_track_left_quarter_turn_1_tile(session, rideIndex, trackSequence, (direction + 3) % 4, height, mapElement); @@ -491,7 +491,7 @@ static void paint_ghost_train_track_right_quarter_turn_1_tile(paint_session * se /** rct2: 0x00770CCC */ static void paint_ghost_train_track_spinning_tunnel(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint32 imageId = ghost_train_track_pieces_spinning_tunnel_track[direction] | session->TrackColours[SCHEME_TRACK]; @@ -523,7 +523,7 @@ static void paint_ghost_train_track_spinning_tunnel(paint_session * session, uin /** rct2: 0x00770CDC */ static void paint_ghost_train_track_brakes(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { LocationXY16 position = session->MapPosition; diff --git a/src/openrct2/ride/gentle/HauntedHouse.cpp b/src/openrct2/ride/gentle/HauntedHouse.cpp index 107f7dc9ca..8e3b47c2f8 100644 --- a/src/openrct2/ride/gentle/HauntedHouse.cpp +++ b/src/openrct2/ride/gentle/HauntedHouse.cpp @@ -38,7 +38,7 @@ static haunted_house_bound_box haunted_house_data[] = { { 6, 0, 42, 24 }, { 0 }, static void paint_haunted_house_structure(paint_session * session, uint8 rideIndex, uint8 direction, sint8 xOffset, sint8 yOffset, uint8 part, uint16 height) { - rct_map_element * savedMapElement = static_cast(session->CurrentlyDrawnItem); + rct_tile_element * savedMapElement = static_cast(session->CurrentlyDrawnItem); uint8 frameNum = 0; @@ -91,7 +91,7 @@ static void paint_haunted_house_structure(paint_session * session, uint8 rideInd * rct2: 0x0076E9B0 */ static void paint_haunted_house(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = track_map_3x3[direction][trackSequence]; diff --git a/src/openrct2/ride/gentle/Maze.cpp b/src/openrct2/ride/gentle/Maze.cpp index 9e9effa177..16462bbc16 100644 --- a/src/openrct2/ride/gentle/Maze.cpp +++ b/src/openrct2/ride/gentle/Maze.cpp @@ -15,7 +15,7 @@ #pragma endregion #include "../../interface/viewport.h" -#include "../../paint/map_element/surface.h" +#include "../../paint/tile_element/surface.h" #include "../../paint/paint.h" #include "../../paint/supports.h" #include "../../sprites.h" @@ -52,7 +52,7 @@ enum * rct: 0x004ACF4A */ static void maze_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { uint16 maze_entry = mapElement->properties.track.maze_entry; maze_entry = rol16(maze_entry, direction * 4); diff --git a/src/openrct2/ride/gentle/MerryGoRound.cpp b/src/openrct2/ride/gentle/MerryGoRound.cpp index 5e03b41532..e864f14fdd 100644 --- a/src/openrct2/ride/gentle/MerryGoRound.cpp +++ b/src/openrct2/ride/gentle/MerryGoRound.cpp @@ -32,7 +32,7 @@ static const uint16 merry_go_round_breakdown_vibration[] = { 0, 1, 2, 3, 4, 3, 2 static void paint_merry_go_round_structure(paint_session * session, uint8 rideIndex, uint8 direction, sint8 xOffset, sint8 yOffset, uint16 height) { - rct_map_element * savedMapElement = static_cast(session->CurrentlyDrawnItem); + rct_tile_element * savedMapElement = static_cast(session->CurrentlyDrawnItem); height += 7; Ride * ride = get_ride(rideIndex); @@ -114,7 +114,7 @@ static void paint_merry_go_round_structure(paint_session * session, uint8 rideIn * rct2: 0x00761B0C */ static void paint_merry_go_round(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = track_map_3x3[direction][trackSequence]; diff --git a/src/openrct2/ride/gentle/MiniGolf.cpp b/src/openrct2/ride/gentle/MiniGolf.cpp index ad4bf2f515..8e39166118 100644 --- a/src/openrct2/ride/gentle/MiniGolf.cpp +++ b/src/openrct2/ride/gentle/MiniGolf.cpp @@ -390,7 +390,7 @@ static paint_struct * mini_golf_paint_util_7c(paint_session * session, uint8 dir z_offset, bound_box_offset_x, bound_box_offset_y, bound_box_offset_z, rotation); } -static bool mini_golf_paint_util_should_draw_fence(paint_session * session, rct_map_element * mapElement) +static bool mini_golf_paint_util_should_draw_fence(paint_session * session, rct_tile_element * mapElement) { if (!session->DidPassSurface) { @@ -398,7 +398,7 @@ static bool mini_golf_paint_util_should_draw_fence(paint_session * session, rct_ return false; } - rct_map_element * surfaceElement = session->SurfaceElement; + rct_tile_element * surfaceElement = session->SurfaceElement; if (surfaceElement->base_height != mapElement->base_height) { return true; @@ -414,7 +414,7 @@ static bool mini_golf_paint_util_should_draw_fence(paint_session * session, rct_ /** rct2: 0x0087F10C */ static void paint_mini_golf_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId; @@ -460,7 +460,7 @@ static void paint_mini_golf_track_flat(paint_session * session, uint8 rideIndex, /** rct2: 0x0087F11C */ static void paint_mini_golf_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId; @@ -498,7 +498,7 @@ static void paint_mini_golf_track_25_deg_up(paint_session * session, uint8 rideI /** rct2: 0x0087F12C */ static void paint_mini_golf_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint32 imageId; @@ -536,7 +536,7 @@ static void paint_mini_golf_track_flat_to_25_deg_up(paint_session * session, uin /** rct2: 0x0087F13C */ static void paint_mini_golf_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint32 imageId; @@ -574,28 +574,28 @@ static void paint_mini_golf_track_25_deg_up_to_flat(paint_session * session, uin /** rct2: 0x0087F14C */ static void paint_mini_golf_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { paint_mini_golf_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x0087F15C */ static void paint_mini_golf_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_mini_golf_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x0087F16C */ static void paint_mini_golf_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_mini_golf_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x0087F17C, 0x0087F18C, 0x0087F19C */ static void paint_mini_golf_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { LocationXY16 position = session->MapPosition; Ride * ride = get_ride(rideIndex); @@ -658,7 +658,7 @@ static void paint_mini_golf_station(paint_session * session, uint8 rideIndex, ui /** rct2: 0x0087F1AC */ static void paint_mini_golf_track_left_quarter_turn_1_tile(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint32 imageId; @@ -737,7 +737,7 @@ static void paint_mini_golf_track_left_quarter_turn_1_tile(paint_session * sessi /** rct2: 0x0087F1BC */ static void paint_mini_golf_track_right_quarter_turn_1_tile(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_mini_golf_track_left_quarter_turn_1_tile(session, rideIndex, trackSequence, (direction + 3) % 4, height, mapElement); } @@ -798,21 +798,21 @@ static void paint_mini_golf_hole_ab(paint_session * session, uint8 trackSequence /** rct2: 0x0087F1CC */ static void paint_mini_golf_hole_a(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { paint_mini_golf_hole_ab(session, trackSequence, direction, height, mini_golf_track_sprites_hole_a); } /** rct2: 0x0087F1DC */ static void paint_mini_golf_hole_b(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { paint_mini_golf_hole_ab(session, trackSequence, direction, height, mini_golf_track_sprites_hole_b); } /** rct2: 0x0087F1EC */ static void paint_mini_golf_hole_c(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId; LocationXY16 boundBox, boundBoxOffset; @@ -881,7 +881,7 @@ static void paint_mini_golf_hole_c(paint_session * session, uint8 rideIndex, uin /** rct2: 0x0087F1FC */ static void paint_mini_golf_hole_d(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId; LocationXY16 boundBox, boundBoxOffset; @@ -973,7 +973,7 @@ static void paint_mini_golf_hole_d(paint_session * session, uint8 rideIndex, uin /** rct2: 0x0087F1FC */ static void paint_mini_golf_hole_e(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId; LocationXY16 boundBox, boundBoxOffset; diff --git a/src/openrct2/ride/gentle/MiniHelicopters.cpp b/src/openrct2/ride/gentle/MiniHelicopters.cpp index 887bda985f..2afc55d77a 100644 --- a/src/openrct2/ride/gentle/MiniHelicopters.cpp +++ b/src/openrct2/ride/gentle/MiniHelicopters.cpp @@ -25,7 +25,7 @@ /** rct2: 0x */ static void paint_mini_helicopters_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId; @@ -62,7 +62,7 @@ static void paint_mini_helicopters_track_station(paint_session * session, uint8 /** rct2: 0x0081F348 */ static void paint_mini_helicopters_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { LocationXY16 position = session->MapPosition; uint32 imageId; @@ -93,7 +93,7 @@ static void paint_mini_helicopters_track_flat(paint_session * session, uint8 rid /** rct2: 0x0081F368 */ static void paint_mini_helicopters_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { LocationXY16 position = session->MapPosition; uint32 imageId; @@ -134,7 +134,7 @@ static void paint_mini_helicopters_track_flat_to_25_deg_up(paint_session * sessi /** rct2: 0x0081F358 */ static void paint_mini_helicopters_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { LocationXY16 position = session->MapPosition; uint32 imageId; @@ -175,7 +175,7 @@ static void paint_mini_helicopters_track_25_deg_up(paint_session * session, uint /** rct2: 0x0081F378 */ static void paint_mini_helicopters_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { LocationXY16 position = session->MapPosition; uint32 imageId; @@ -216,21 +216,21 @@ static void paint_mini_helicopters_track_25_deg_up_to_flat(paint_session * sessi /** rct2: 0x */ static void paint_mini_helicopters_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_mini_helicopters_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x0081F388 */ static void paint_mini_helicopters_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_mini_helicopters_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x0081F3A8 */ static void paint_mini_helicopters_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_mini_helicopters_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } @@ -238,7 +238,7 @@ static void paint_mini_helicopters_track_25_deg_down_to_flat(paint_session * ses /** rct2: 0x0081F3E8 */ static void paint_mini_helicopters_track_left_quarter_turn_3_tiles(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { track_paint_util_left_quarter_turn_3_tiles_paint( session, 3, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -271,7 +271,7 @@ static const uint8 mini_helicopters_right_quarter_turn_3_tiles_to_left_turn_map[ /** rct2: 0x0081F3F8 */ static void paint_mini_helicopters_track_right_quarter_turn_3_tiles(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mini_helicopters_right_quarter_turn_3_tiles_to_left_turn_map[trackSequence]; paint_mini_helicopters_track_left_quarter_turn_3_tiles(session, rideIndex, trackSequence, (direction + 3) % 4, height, @@ -280,7 +280,7 @@ static void paint_mini_helicopters_track_right_quarter_turn_3_tiles(paint_sessio /** rct2: 0x0081F408 */ static void paint_mini_helicopters_track_left_quarter_turn_1_tile(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { track_paint_util_left_quarter_turn_1_tile_paint(session, 1, height, 0, direction, session->TrackColours[SCHEME_TRACK], trackSpritesSubmarineRideMiniHelicoptersQuarterTurn1Tile, @@ -295,7 +295,7 @@ static void paint_mini_helicopters_track_left_quarter_turn_1_tile(paint_session /** rct2: 0x0081F418 */ static void paint_mini_helicopters_track_right_quarter_turn_1_tile(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { paint_mini_helicopters_track_left_quarter_turn_1_tile(session, rideIndex, trackSequence, (direction + 3) % 4, height, mapElement); diff --git a/src/openrct2/ride/gentle/MonorailCycles.cpp b/src/openrct2/ride/gentle/MonorailCycles.cpp index 07526a5cba..e84fa4139e 100644 --- a/src/openrct2/ride/gentle/MonorailCycles.cpp +++ b/src/openrct2/ride/gentle/MonorailCycles.cpp @@ -164,7 +164,7 @@ static paint_struct * paint_monorail_cycles_util_7c(paint_session * session, boo /** rct2: 0x0088AD48 */ static void paint_monorail_cycles_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId = monorail_cycles_track_pieces_flat[(direction & 1)] | session->TrackColours[SCHEME_TRACK]; paint_monorail_cycles_util_7c(session, (bool)(direction & 1), imageId, 0, 0, 32, 20, 3, height, 0, 6, height, @@ -189,7 +189,7 @@ static void paint_monorail_cycles_track_flat(paint_session * session, uint8 ride /** rct2: 0x0088ADD8 */ static void paint_monorail_cycles_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId; @@ -226,7 +226,7 @@ static void paint_monorail_cycles_station(paint_session * session, uint8 rideInd /** rct2: 0x0088AD88 */ static void paint_monorail_cycles_track_left_quarter_turn_3_tiles(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { track_paint_util_left_quarter_turn_3_tiles_paint( session, 3, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -259,7 +259,7 @@ static const uint8 monorail_cycles_right_quarter_turn_3_tiles_to_left_turn_map[] /** rct2: 0x0088AD98 */ static void paint_monorail_cycles_track_right_quarter_turn_3_tiles(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = monorail_cycles_right_quarter_turn_3_tiles_to_left_turn_map[trackSequence]; paint_monorail_cycles_track_left_quarter_turn_3_tiles(session, rideIndex, trackSequence, (direction + 3) % 4, height, @@ -283,7 +283,7 @@ static const sint8 monorail_cycles_track_right_quarter_turn_5_tiles_support_spec /** rct2: 0x0088ADB8 */ static void paint_monorail_cycles_track_right_quarter_turn_5_tiles(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { track_paint_util_right_quarter_turn_5_tiles_paint( session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -386,7 +386,7 @@ static void paint_monorail_cycles_track_right_quarter_turn_5_tiles(paint_session /** rct2: 0x0088ADA8 */ static void paint_monorail_cycles_track_left_quarter_turn_5_tiles(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; paint_monorail_cycles_track_right_quarter_turn_5_tiles(session, rideIndex, trackSequence, (direction + 1) % 4, height, @@ -395,7 +395,7 @@ static void paint_monorail_cycles_track_left_quarter_turn_5_tiles(paint_session /** rct2: 0x0088ADC8 */ static void paint_monorail_cycles_track_s_bend_left(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (direction == 2 || direction == 3) { @@ -498,7 +498,7 @@ static void paint_monorail_cycles_track_s_bend_left(paint_session * session, uin /** rct2: 0x*/ static void paint_monorail_cycles_track_s_bend_right(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (direction == 2 || direction == 3) { diff --git a/src/openrct2/ride/gentle/ObservationTower.cpp b/src/openrct2/ride/gentle/ObservationTower.cpp index d58ae9085a..258c329e49 100644 --- a/src/openrct2/ride/gentle/ObservationTower.cpp +++ b/src/openrct2/ride/gentle/ObservationTower.cpp @@ -81,7 +81,7 @@ void vehicle_visual_observation_tower(paint_session * session, sint32 x, sint32 /** rct2: 0x0070DD6C */ static void paint_observation_tower_base(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { trackSequence = track_map_3x3[direction][trackSequence]; @@ -157,7 +157,7 @@ static void paint_observation_tower_base(paint_session * session, uint8 rideInde /** rct2: 0x0070DD7C */ static void paint_observation_tower_section(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (trackSequence == 1) { @@ -167,8 +167,8 @@ static void paint_observation_tower_section(paint_session * session, uint8 rideI uint32 imageId = SPR_OBSERVATION_TOWER_SEGMENT | session->TrackColours[SCHEME_TRACK]; sub_98197C(session, imageId, 0, 0, 2, 2, 30, height, 8, 8, height, get_current_rotation()); - rct_map_element * nextMapElement = mapElement + 1; - if (map_element_is_last_for_tile(mapElement) || mapElement->clearance_height != nextMapElement->base_height) + rct_tile_element * nextMapElement = mapElement + 1; + if (tile_element_is_last_for_tile(mapElement) || mapElement->clearance_height != nextMapElement->base_height) { imageId = SPR_OBSERVATION_TOWER_SEGMENT_TOP | session->TrackColours[SCHEME_TRACK]; sub_98199C(session, imageId, 0, 0, 2, 2, 30, height, 8, 8, height, get_current_rotation()); diff --git a/src/openrct2/ride/gentle/SpaceRings.cpp b/src/openrct2/ride/gentle/SpaceRings.cpp index 88de4d1cf2..0bfc77837e 100644 --- a/src/openrct2/ride/gentle/SpaceRings.cpp +++ b/src/openrct2/ride/gentle/SpaceRings.cpp @@ -39,7 +39,7 @@ static const uint32 space_rings_fence_sprites[] = { /** rct2: 0x00768A3B */ static void paint_space_rings_structure(paint_session * session, Ride * ride, uint8 direction, uint32 segment, sint32 height) { - rct_map_element * savedMapElement = static_cast(session->CurrentlyDrawnItem); + rct_tile_element * savedMapElement = static_cast(session->CurrentlyDrawnItem); uint32 vehicleIndex = (segment - direction) & 0x3; @@ -90,7 +90,7 @@ static void paint_space_rings_structure(paint_session * session, Ride * ride, ui /** rct2: 0x00767C40 */ static void paint_space_rings(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = track_map_3x3[direction][trackSequence]; diff --git a/src/openrct2/ride/gentle/SpiralSlide.cpp b/src/openrct2/ride/gentle/SpiralSlide.cpp index 3a9e5a29ae..23d99cda19 100644 --- a/src/openrct2/ride/gentle/SpiralSlide.cpp +++ b/src/openrct2/ride/gentle/SpiralSlide.cpp @@ -53,7 +53,7 @@ enum }; static void spiral_slide_paint_tile_right(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 image_id = 0; @@ -70,7 +70,7 @@ static void spiral_slide_paint_tile_right(paint_session * session, uint8 rideInd } static void spiral_slide_paint_tile_left(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 image_id = 0; @@ -87,7 +87,7 @@ static void spiral_slide_paint_tile_left(paint_session * session, uint8 rideInde } static void spiral_slide_paint_tile_front(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 image_id = 0; @@ -194,7 +194,7 @@ static const uint32 spiral_slide_fence_sprites[] = { * rct: 0x007485C8 */ static void paint_spiral_slide(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = track_map_2x2[direction][trackSequence]; diff --git a/src/openrct2/ride/ride.c b/src/openrct2/ride/ride.c index 74bff41e83..4e5440478e 100644 --- a/src/openrct2/ride/ride.c +++ b/src/openrct2/ride/ride.c @@ -214,7 +214,7 @@ static void ride_shop_connected(Ride* ride, sint32 ride_idx); static void ride_spiral_slide_update(Ride *ride); static void ride_update(sint32 rideIndex); static void ride_update_vehicle_colours(sint32 rideIndex); -void loc_6DDF9C(Ride *ride, rct_map_element *mapElement); +void loc_6DDF9C(Ride *ride, rct_tile_element *mapElement); Ride *get_ride(sint32 index) { @@ -480,12 +480,12 @@ static money32 ride_calculate_income_per_hour(Ride *ride) */ bool ride_try_get_origin_element(sint32 rideIndex, rct_xy_element *output) { - rct_map_element *resultMapElement = NULL; + rct_tile_element *resultMapElement = NULL; - map_element_iterator it; - map_element_iterator_begin(&it); + tile_element_iterator it; + tile_element_iterator_begin(&it); do { - if (map_element_get_type(it.element) != MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(it.element) != TILE_ELEMENT_TYPE_TRACK) continue; if (rideIndex != it.element->properties.track.ride_index) continue; @@ -513,7 +513,7 @@ bool ride_try_get_origin_element(sint32 rideIndex, rct_xy_element *output) if (specialTrackPiece) { return true; } - } while (map_element_iterator_next(&it)); + } while (tile_element_iterator_next(&it)); return resultMapElement != NULL; } @@ -535,7 +535,7 @@ bool track_block_get_next_from_zero(sint16 x, sint16 y, sint16 z_start, uint8 ri y += TileDirectionDelta[direction_start].y; } - rct_map_element* mapElement = map_get_first_element_at(x / 32, y / 32); + rct_tile_element* mapElement = map_get_first_element_at(x / 32, y / 32); if (mapElement == NULL){ output->element = NULL; output->x = LOCATION_NULL; @@ -543,20 +543,20 @@ bool track_block_get_next_from_zero(sint16 x, sint16 y, sint16 z_start, uint8 ri } do{ - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; if (mapElement->properties.track.ride_index != rideIndex) continue; - if (map_element_get_track_sequence(mapElement) != 0) + if (tile_element_get_track_sequence(mapElement) != 0) continue; const rct_preview_track* nextTrackBlock = get_track_def_from_ride(ride, mapElement->properties.track.type); const rct_track_coordinates* nextTrackCoordinate = get_track_coord_from_ride(ride, mapElement->properties.track.type); uint8 nextRotation = - map_element_get_direction_with_offset(mapElement, nextTrackCoordinate->rotation_begin) | + tile_element_get_direction_with_offset(mapElement, nextTrackCoordinate->rotation_begin) | (nextTrackCoordinate->rotation_begin & (1 << 2)); if (nextRotation != direction_start) @@ -572,7 +572,7 @@ bool track_block_get_next_from_zero(sint16 x, sint16 y, sint16 z_start, uint8 ri output->y = y; output->element = mapElement; return 1; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); if (direction != NULL) *direction = direction_start; if (z != NULL) *z = z_start; @@ -592,7 +592,7 @@ bool track_block_get_next(rct_xy_element *input, rct_xy_element *output, sint32 Ride* ride = get_ride(rideIndex); const rct_preview_track* trackBlock = get_track_def_from_ride(ride, input->element->properties.track.type); - uint8 sequence = map_element_get_track_sequence(input->element); + uint8 sequence = tile_element_get_track_sequence(input->element); trackBlock += sequence; const rct_track_coordinates* trackCoordinate = get_track_coord_from_ride(ride, input->element->properties.track.type); @@ -601,7 +601,7 @@ bool track_block_get_next(rct_xy_element *input, rct_xy_element *output, sint32 sint32 y = input->y; sint32 OriginZ = input->element->base_height * 8; - uint8 rotation = map_element_get_direction(input->element); + uint8 rotation = tile_element_get_direction(input->element); switch (rotation){ case 0: x += trackCoordinate->x; @@ -632,7 +632,7 @@ bool track_block_get_next(rct_xy_element *input, rct_xy_element *output, sint32 OriginZ -= trackBlock->z; OriginZ += trackCoordinate->z_end; - uint8 directionStart = ((trackCoordinate->rotation_end + rotation) & MAP_ELEMENT_DIRECTION_MASK) | + uint8 directionStart = ((trackCoordinate->rotation_end + rotation) & TILE_ELEMENT_DIRECTION_MASK) | (trackCoordinate->rotation_end & (1 << 2)); return track_block_get_next_from_zero(x, y, OriginZ, rideIndex, directionStart, output, z, direction); @@ -657,7 +657,7 @@ bool track_block_get_previous_from_zero(sint16 x, sint16 y, sint16 z, uint8 ride y += TileDirectionDelta[direction].y; } - rct_map_element* mapElement = map_get_first_element_at(x / 32, y / 32); + rct_tile_element* mapElement = map_get_first_element_at(x / 32, y / 32); if (mapElement == NULL){ outTrackBeginEnd->end_x = x; outTrackBeginEnd->end_y = y; @@ -667,7 +667,7 @@ bool track_block_get_previous_from_zero(sint16 x, sint16 y, sint16 z, uint8 ride } do{ - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; if (mapElement->properties.track.ride_index != rideIndex) @@ -676,12 +676,12 @@ bool track_block_get_previous_from_zero(sint16 x, sint16 y, sint16 z, uint8 ride const rct_preview_track* nextTrackBlock = get_track_def_from_ride(ride, mapElement->properties.track.type); const rct_track_coordinates* nextTrackCoordinate = get_track_coord_from_ride(ride, mapElement->properties.track.type); - nextTrackBlock += map_element_get_track_sequence(mapElement); + nextTrackBlock += tile_element_get_track_sequence(mapElement); if ((nextTrackBlock + 1)->index != 255) continue; uint8 nextRotation = - map_element_get_direction_with_offset(mapElement, nextTrackCoordinate->rotation_end) | + tile_element_get_direction_with_offset(mapElement, nextTrackCoordinate->rotation_end) | (nextTrackCoordinate->rotation_end & (1 << 2)); if (nextRotation != directionStart) @@ -692,7 +692,7 @@ bool track_block_get_previous_from_zero(sint16 x, sint16 y, sint16 z, uint8 ride continue; nextRotation = - map_element_get_direction_with_offset(mapElement, nextTrackCoordinate->rotation_begin) | + tile_element_get_direction_with_offset(mapElement, nextTrackCoordinate->rotation_begin) | (nextTrackCoordinate->rotation_begin & (1 << 2)); outTrackBeginEnd->begin_element = mapElement; outTrackBeginEnd->begin_x = x; @@ -726,7 +726,7 @@ bool track_block_get_previous_from_zero(sint16 x, sint16 y, sint16 z, uint8 ride outTrackBeginEnd->begin_direction = nextRotation; outTrackBeginEnd->end_direction = directionStart ^ (1 << 1); return 1; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); outTrackBeginEnd->end_x = x; outTrackBeginEnd->end_y = y; @@ -744,20 +744,20 @@ bool track_block_get_previous_from_zero(sint16 x, sint16 y, sint16 z, uint8 ride * 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(sint32 x, sint32 y, rct_map_element *mapElement, track_begin_end *outTrackBeginEnd) +bool track_block_get_previous(sint32 x, sint32 y, rct_tile_element *mapElement, track_begin_end *outTrackBeginEnd) { uint8 rideIndex = mapElement->properties.track.ride_index; Ride* ride = get_ride(rideIndex); const rct_preview_track* trackBlock = get_track_def_from_ride(ride, mapElement->properties.track.type); - uint8 sequence = map_element_get_track_sequence(mapElement); + uint8 sequence = tile_element_get_track_sequence(mapElement); trackBlock += sequence; const rct_track_coordinates* trackCoordinate = get_track_coord_from_ride(ride, mapElement->properties.track.type); sint32 z = mapElement->base_height * 8; - uint8 rotation = map_element_get_direction(mapElement); + uint8 rotation = tile_element_get_direction(mapElement); switch (rotation){ case 0: x -= trackBlock->x; @@ -781,7 +781,7 @@ bool track_block_get_previous(sint32 x, sint32 y, rct_map_element *mapElement, t z += trackCoordinate->z_begin; rotation = - ((trackCoordinate->rotation_begin + rotation) & MAP_ELEMENT_DIRECTION_MASK) | + ((trackCoordinate->rotation_begin + rotation) & TILE_ELEMENT_DIRECTION_MASK) | (trackCoordinate->rotation_begin & (1 << 2)); return track_block_get_previous_from_zero(x, y, z, rideIndex, rotation, outTrackBeginEnd); @@ -802,7 +802,7 @@ sint32 ride_find_track_gap(rct_xy_element *input, rct_xy_element *output) track_circuit_iterator it = { 0 }, slowIt; sint32 rideIndex; - assert(map_element_get_type(input->element) == MAP_ELEMENT_TYPE_TRACK); + assert(tile_element_get_type(input->element) == TILE_ELEMENT_TYPE_TRACK); rideIndex = input->element->properties.track.ride_index; ride = get_ride(rideIndex); @@ -1131,9 +1131,9 @@ void ride_remove_peeps(sint32 rideIndex) exitX = location.x; exitY = location.y; exitZ = ride->station_heights[stationIndex]; - rct_map_element *mapElement = ride_get_station_exit_element(ride, exitX, exitY, exitZ); + rct_tile_element *mapElement = ride_get_station_exit_element(ride, exitX, exitY, exitZ); - exitDirection = (mapElement == NULL ? 0 : map_element_get_direction(mapElement)); + exitDirection = (mapElement == NULL ? 0 : tile_element_get_direction(mapElement)); exitX = (exitX * 32) - (word_981D6C[exitDirection].x * 20) + 16; exitY = (exitY * 32) - (word_981D6C[exitDirection].y * 20) + 16; exitZ = (exitZ * 8) + 2; @@ -1203,28 +1203,28 @@ void ride_remove_peeps(sint32 rideIndex) * di : output_element * bp : flags */ -sint32 sub_6C683D(sint32* x, sint32* y, sint32* z, sint32 direction, sint32 type, uint16 extra_params, rct_map_element** output_element, uint16 flags) +sint32 sub_6C683D(sint32* x, sint32* y, sint32* z, sint32 direction, sint32 type, uint16 extra_params, rct_tile_element** output_element, uint16 flags) { - rct_map_element *mapElement = map_get_first_element_at(*x / 32, *y / 32); - rct_map_element *successMapElement = NULL; + rct_tile_element *mapElement = map_get_first_element_at(*x / 32, *y / 32); + rct_tile_element *successMapElement = NULL; do { if (mapElement->base_height != *z / 8) continue; - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; - if ((map_element_get_direction(mapElement)) != direction) + if ((tile_element_get_direction(mapElement)) != direction) continue; if (type != mapElement->properties.track.type) continue; successMapElement = mapElement; - if (map_element_get_track_sequence(mapElement) == 0) + if (tile_element_get_track_sequence(mapElement) == 0) break; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); mapElement = successMapElement; if (mapElement == NULL) @@ -1233,23 +1233,23 @@ sint32 sub_6C683D(sint32* x, sint32* y, sint32* z, sint32 direction, sint32 type // Possibly z should be & 0xF8 const rct_preview_track *trackBlock = get_track_def_from_ride_index(mapElement->properties.track.ride_index, type); - sint32 sequence = map_element_get_track_sequence(mapElement); - uint8 mapDirection = map_element_get_direction(mapElement); + sint32 sequence = tile_element_get_track_sequence(mapElement); + uint8 mapDirection = tile_element_get_direction(mapElement); switch (mapDirection){ - case MAP_ELEMENT_DIRECTION_WEST: + case TILE_ELEMENT_DIRECTION_WEST: *x -= trackBlock[sequence].x; *y -= trackBlock[sequence].y; break; - case MAP_ELEMENT_DIRECTION_NORTH: + case TILE_ELEMENT_DIRECTION_NORTH: *x -= trackBlock[sequence].y; *y += trackBlock[sequence].x; break; - case MAP_ELEMENT_DIRECTION_EAST: + case TILE_ELEMENT_DIRECTION_EAST: *x += trackBlock[sequence].x; *y += trackBlock[sequence].y; break; - case MAP_ELEMENT_DIRECTION_SOUTH: + case TILE_ELEMENT_DIRECTION_SOUTH: *x += trackBlock[sequence].y; *y -= trackBlock[sequence].x; break; @@ -1261,19 +1261,19 @@ sint32 sub_6C683D(sint32* x, sint32* y, sint32* z, sint32 direction, sint32 type for (sint32 i = 0; trackBlock[i].index != 0xFF; ++i){ sint32 cur_x = start_x, cur_y = start_y, cur_z = start_z; switch (mapDirection){ - case MAP_ELEMENT_DIRECTION_WEST: + case TILE_ELEMENT_DIRECTION_WEST: cur_x += trackBlock[i].x; cur_y += trackBlock[i].y; break; - case MAP_ELEMENT_DIRECTION_NORTH: + case TILE_ELEMENT_DIRECTION_NORTH: cur_x += trackBlock[i].y; cur_y -= trackBlock[i].x; break; - case MAP_ELEMENT_DIRECTION_EAST: + case TILE_ELEMENT_DIRECTION_EAST: cur_x -= trackBlock[i].x; cur_y -= trackBlock[i].y; break; - case MAP_ELEMENT_DIRECTION_SOUTH: + case TILE_ELEMENT_DIRECTION_SOUTH: cur_x -= trackBlock[i].y; cur_y += trackBlock[i].x; break; @@ -1288,13 +1288,13 @@ sint32 sub_6C683D(sint32* x, sint32* y, sint32* z, sint32 direction, sint32 type if (mapElement->base_height != cur_z / 8) continue; - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; - if ((map_element_get_direction(mapElement)) != direction) + if ((tile_element_get_direction(mapElement)) != direction) continue; - if (map_element_get_track_sequence(mapElement) != trackBlock[i].index) + if (tile_element_get_track_sequence(mapElement) != trackBlock[i].index) continue; if (type == mapElement->properties.track.type) { @@ -1302,7 +1302,7 @@ sint32 sub_6C683D(sint32* x, sint32* y, sint32* z, sint32 direction, sint32 type break; } } - while (!map_element_is_last_for_tile(mapElement++)); + while (!tile_element_is_last_for_tile(mapElement++)); if (successMapElement == NULL) { @@ -1314,11 +1314,11 @@ sint32 sub_6C683D(sint32* x, sint32* y, sint32* z, sint32 direction, sint32 type } if (flags & (1 << 0)) { - mapElement->type &= ~MAP_ELEMENT_TYPE_FLAG_HIGHLIGHT; + mapElement->type &= ~TILE_ELEMENT_TYPE_FLAG_HIGHLIGHT; } if (flags & (1 << 1)) { - mapElement->type |= MAP_ELEMENT_TYPE_FLAG_HIGHLIGHT; + mapElement->type |= TILE_ELEMENT_TYPE_FLAG_HIGHLIGHT; } if (flags & (1 << 2)) { @@ -1388,7 +1388,7 @@ void ride_remove_provisional_track_piece() next_track.x, flags | ((direction & 3) << 8), next_track.y, - next_track.element->properties.track.type | (map_element_get_track_sequence(next_track.element) << 8), + next_track.element->properties.track.type | (tile_element_get_track_sequence(next_track.element) << 8), GAME_COMMAND_REMOVE_TRACK, z, 0 @@ -1494,7 +1494,7 @@ void ride_construction_set_default_next_piece() Ride *ride; track_begin_end trackBeginEnd; rct_xy_element xyElement; - rct_map_element *mapElement; + rct_tile_element *mapElement; _currentTrackPrice = MONEY32_UNDEFINED; switch (_rideConstructionState) { @@ -1638,7 +1638,7 @@ void ride_select_next_section() sint32 z = _currentTrackBeginZ; sint32 direction = _currentTrackPieceDirection; sint32 type = _currentTrackPieceType; - rct_map_element *mapElement; + rct_tile_element *mapElement; if (sub_6C683D(&x, &y, &z, direction & 3, type, 0, &mapElement, 0)) { _rideConstructionState = RIDE_CONSTRUCTION_STATE_0; window_ride_construction_update_active_elements(); @@ -1669,7 +1669,7 @@ void ride_select_next_section() _currentTrackBeginX = x; _currentTrackBeginY = y; _currentTrackBeginZ = z; - _currentTrackPieceDirection = map_element_get_direction(mapElement); + _currentTrackPieceDirection = tile_element_get_direction(mapElement); _currentTrackPieceType = mapElement->properties.track.type; _currentTrackSelectionFlags = 0; _rideConstructionArrowPulseTime = 0; @@ -1694,7 +1694,7 @@ void ride_select_previous_section() sint32 z = _currentTrackBeginZ; sint32 direction = _currentTrackPieceDirection; sint32 type = _currentTrackPieceType; - rct_map_element *mapElement; + rct_tile_element *mapElement; if (sub_6C683D(&x, &y, &z, direction & 3, type, 0, &mapElement, 0)) { _rideConstructionState = RIDE_CONSTRUCTION_STATE_0; window_ride_construction_update_active_elements(); @@ -1733,7 +1733,7 @@ void ride_select_previous_section() * * rct2: 0x006CC2CA */ -static sint32 ride_modify_entrance_or_exit(rct_map_element *mapElement, sint32 x, sint32 y) +static sint32 ride_modify_entrance_or_exit(rct_tile_element *mapElement, sint32 x, sint32 y) { sint32 rideIndex, entranceType; rct_window *constructionWindow; @@ -1791,7 +1791,7 @@ static sint32 ride_modify_entrance_or_exit(rct_map_element *mapElement, sint32 x * * rct2: 0x006CC287 */ -static sint32 ride_modify_maze(rct_map_element *mapElement, sint32 x, sint32 y) +static sint32 ride_modify_maze(rct_tile_element *mapElement, sint32 x, sint32 y) { _currentRideIndex = mapElement->properties.track.ride_index; _rideConstructionState = RIDE_CONSTRUCTION_STATE_MAZE_BUILD; @@ -1837,7 +1837,7 @@ sint32 ride_modify(rct_xy_element *input) ride_set_status(rideIndex, RIDE_STATUS_CLOSED); // Check if element is a station entrance or exit - if (map_element_get_type(mapElement.element) == MAP_ELEMENT_TYPE_ENTRANCE) + if (tile_element_get_type(mapElement.element) == TILE_ELEMENT_TYPE_ENTRANCE) return ride_modify_entrance_or_exit(mapElement.element, mapElement.x, mapElement.y); ride_create_or_find_construction_window(rideIndex); @@ -1853,7 +1853,7 @@ sint32 ride_modify(rct_xy_element *input) x = mapElement.x; y = mapElement.y; z = mapElement.element->base_height * 8; - direction = map_element_get_direction(mapElement.element); + direction = tile_element_get_direction(mapElement.element); type = mapElement.element->properties.track.type; if (sub_6C683D(&x, &y, &z, direction, type, 0, NULL, 0)) @@ -2173,11 +2173,11 @@ static void ride_spiral_slide_update(Ride *ride) sint32 x = ride->station_starts[i].x; sint32 y = ride->station_starts[i].y; - rct_map_element *mapElement = ride_get_station_start_track_element(ride, i); + rct_tile_element *mapElement = ride_get_station_start_track_element(ride, i); if (mapElement == NULL) continue; - sint32 rotation = map_element_get_direction(mapElement); + sint32 rotation = tile_element_get_direction(mapElement); x *= 32; y *= 32; x += ride_spiral_slide_main_tile_offset[rotation][current_rotation].x; @@ -2629,7 +2629,7 @@ rct_peep *ride_find_closest_mechanic(Ride *ride, sint32 forInspection) { sint32 x, y, z, stationIndex; LocationXY8 location; - rct_map_element *mapElement; + rct_tile_element *mapElement; // Get either exit position or entrance position if there is no exit stationIndex = ride->inspection_station; @@ -3197,7 +3197,7 @@ void ride_check_all_reachable() static sint32 ride_entrance_exit_is_reachable(LocationXY8 coordinates, Ride* ride, sint32 index) { sint32 x, y, z; - rct_map_element *mapElement; + rct_tile_element *mapElement; x = coordinates.x; y = coordinates.y; @@ -3205,15 +3205,15 @@ static sint32 ride_entrance_exit_is_reachable(LocationXY8 coordinates, Ride* rid mapElement = map_get_first_element_at(x, y); for (;;) { - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_ENTRANCE && z == mapElement->base_height) { + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_ENTRANCE && z == mapElement->base_height) { break; - } else if (map_element_is_last_for_tile(mapElement)) { + } else if (tile_element_is_last_for_tile(mapElement)) { return 1; } mapElement++; } - uint8 face_direction = map_element_get_direction(mapElement); + uint8 face_direction = tile_element_get_direction(mapElement); x *= 32; y *= 32; @@ -3260,7 +3260,7 @@ static void ride_entrance_exit_connected(Ride* ride, sint32 ride_idx) static void ride_shop_connected(Ride* ride, sint32 ride_idx) { sint32 x, y, count; - rct_map_element *mapElement; + rct_tile_element *mapElement; LocationXY8 coordinates = ride->station_starts[0]; if (coordinates.xy == RCT_XY8_UNDEFINED) @@ -3271,9 +3271,9 @@ static void ride_shop_connected(Ride* ride, sint32 ride_idx) mapElement = map_get_first_element_at(x, y); do { - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_TRACK && mapElement->properties.track.ride_index == ride_idx) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_TRACK && mapElement->properties.track.ride_index == ride_idx) break; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); uint16 entrance_directions = 0; uint8 track_type = mapElement->properties.track.type; @@ -3288,7 +3288,7 @@ static void ride_shop_connected(Ride* ride, sint32 ride_idx) entrance_directions = TrackSequenceProperties[track_type][0]; } - uint8 tile_direction = map_element_get_direction(mapElement); + uint8 tile_direction = tile_element_get_direction(mapElement); entrance_directions <<= tile_direction; entrance_directions = ((entrance_directions >> 12) | entrance_directions) & 0xF; @@ -3331,7 +3331,7 @@ static void ride_shop_connected(Ride* ride, sint32 ride_idx) #pragma region Interface -static void ride_track_set_map_tooltip(rct_map_element *mapElement) +static void ride_track_set_map_tooltip(rct_tile_element *mapElement) { sint32 rideIndex; Ride *ride; @@ -3350,7 +3350,7 @@ static void ride_track_set_map_tooltip(rct_map_element *mapElement) set_map_tooltip_format_arg(10, uint32, arg1); } -static void ride_station_set_map_tooltip(rct_map_element *mapElement) +static void ride_station_set_map_tooltip(rct_tile_element *mapElement) { sint32 i, rideIndex, stationIndex; Ride *ride; @@ -3358,7 +3358,7 @@ static void ride_station_set_map_tooltip(rct_map_element *mapElement) rideIndex = mapElement->properties.track.ride_index; ride = get_ride(rideIndex); - stationIndex = map_element_get_station(mapElement); + stationIndex = tile_element_get_station(mapElement); for (i = stationIndex; i >= 0; i--) if (ride->station_starts[i].xy == RCT_XY8_UNDEFINED) stationIndex--; @@ -3377,7 +3377,7 @@ static void ride_station_set_map_tooltip(rct_map_element *mapElement) set_map_tooltip_format_arg(16, uint32, arg1); } -static void ride_entrance_set_map_tooltip(rct_map_element *mapElement) +static void ride_entrance_set_map_tooltip(rct_tile_element *mapElement) { sint32 i, rideIndex, stationIndex; Ride *ride; @@ -3386,7 +3386,7 @@ static void ride_entrance_set_map_tooltip(rct_map_element *mapElement) ride = get_ride(rideIndex); // Get the station - stationIndex = map_element_get_station(mapElement); + stationIndex = tile_element_get_station(mapElement); for (i = stationIndex; i >= 0; i--) if (ride->station_starts[i].xy == RCT_XY8_UNDEFINED) stationIndex--; @@ -3412,7 +3412,7 @@ static void ride_entrance_set_map_tooltip(rct_map_element *mapElement) set_map_tooltip_format_arg(16, uint16, queueLength); } else { // Get the station - stationIndex = map_element_get_station(mapElement); + stationIndex = tile_element_get_station(mapElement); for (i = stationIndex; i >= 0; i--) if (ride->station_starts[i].xy == RCT_XY8_UNDEFINED) stationIndex--; @@ -3424,9 +3424,9 @@ static void ride_entrance_set_map_tooltip(rct_map_element *mapElement) } } -void ride_set_map_tooltip(rct_map_element *mapElement) +void ride_set_map_tooltip(rct_tile_element *mapElement) { - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_ENTRANCE) { + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_ENTRANCE) { ride_entrance_set_map_tooltip(mapElement); } else { if ( @@ -4016,7 +4016,7 @@ static money32 ride_set_setting(uint8 rideIndex, uint8 setting, uint8 value, uin LocationXYZ16 coord; coord.x = ride->overall_view.x * 32 + 16; coord.y = ride->overall_view.y * 32 + 16; - coord.z = map_element_height(coord.x, coord.y); + coord.z = tile_element_height(coord.x, coord.y); network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord); } @@ -4162,16 +4162,16 @@ static void sub_6B5952(sint32 rideIndex) sint32 y = location.y * 32; sint32 z = ride->station_heights[i]; - rct_map_element *mapElement = map_get_first_element_at(x / 32, y / 32); + rct_tile_element *mapElement = map_get_first_element_at(x / 32, y / 32); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_ENTRANCE) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_ENTRANCE) continue; if (mapElement->base_height != z) continue; - sint32 direction = map_element_get_direction(mapElement); + sint32 direction = tile_element_get_direction(mapElement); footpath_chain_ride_queue(rideIndex, i, x, y, mapElement, direction ^ 2); - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); } } @@ -4385,7 +4385,7 @@ static void ride_set_boat_hire_return_point(Ride *ride, rct_xy_element *startEle sint32 returnY = startElement->y; sint32 startX = returnX; sint32 startY = returnY; - rct_map_element *returnTrackElement = startElement->element; + rct_tile_element *returnTrackElement = startElement->element; track_begin_end trackBeginEnd; while (track_block_get_previous(returnX, returnY, returnTrackElement, &trackBeginEnd)) { // If previous track is back to the starting x, y, then break loop (otherwise possible infinite loop) @@ -4435,9 +4435,9 @@ static void ride_set_maze_entrance_exit_points(Ride *ride) sint32 y = (*position >> 8) << 5; sint32 z = ride->station_heights[0]; - rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); + rct_tile_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_ENTRANCE) continue; + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_ENTRANCE) continue; if ( mapElement->properties.entrance.type != ENTRANCE_TYPE_RIDE_ENTRANCE && mapElement->properties.entrance.type != ENTRANCE_TYPE_RIDE_EXIT @@ -4447,7 +4447,7 @@ static void ride_set_maze_entrance_exit_points(Ride *ride) if (mapElement->base_height != z) continue; maze_entrance_hedge_removal(x, y, mapElement); - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); } } @@ -4539,7 +4539,7 @@ static rct_vehicle *vehicle_create_car( sint32 y, sint32 z, sint32 *remainingDistance, - rct_map_element *mapElement + rct_tile_element *mapElement ) { registers regs = { 0 }; @@ -4597,14 +4597,14 @@ static rct_vehicle *vehicle_create_car( if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_31) { // loc_6DDCA4: vehicle->var_CD = 0; - sint32 direction = map_element_get_direction(mapElement); + sint32 direction = tile_element_get_direction(mapElement); x += word_9A3AB4[direction].x; y += word_9A3AB4[direction].y; z = mapElement->base_height * 8; vehicle->track_x = x; vehicle->track_y = y; vehicle->track_z = z; - vehicle->current_station = map_element_get_station(mapElement); + vehicle->current_station = tile_element_get_station(mapElement); z += RideData5[ride->type].z_offset; @@ -4655,7 +4655,7 @@ static rct_vehicle *vehicle_create_car( vehicle->track_x = x; vehicle->track_y = y; - sint32 direction = map_element_get_direction(mapElement); + sint32 direction = tile_element_get_direction(mapElement); vehicle->sprite_direction = direction << 3; if (ride->type == RIDE_TYPE_SPACE_RINGS) { @@ -4678,7 +4678,7 @@ static rct_vehicle *vehicle_create_car( y += word_9A2A60[direction].y; vehicle->track_z = mapElement->base_height * 8; - vehicle->current_station = map_element_get_station(mapElement); + vehicle->current_station = tile_element_get_station(mapElement); z = mapElement->base_height * 8; z += RideData5[ride->type].z_offset; @@ -4710,7 +4710,7 @@ static rct_vehicle *vehicle_create_car( * * rct2: 0x006DD84C */ -static train_ref vehicle_create_train(sint32 rideIndex, sint32 x, sint32 y, sint32 z, sint32 vehicleIndex, sint32 *remainingDistance, rct_map_element *mapElement) +static train_ref vehicle_create_train(sint32 rideIndex, sint32 x, sint32 y, sint32 z, sint32 vehicleIndex, sint32 *remainingDistance, rct_tile_element *mapElement) { Ride *ride = get_ride(rideIndex); @@ -4731,7 +4731,7 @@ static train_ref vehicle_create_train(sint32 rideIndex, sint32 x, sint32 y, sint return train; } -static void vehicle_create_trains(sint32 rideIndex, sint32 x, sint32 y, sint32 z, rct_map_element *mapElement) +static void vehicle_create_trains(sint32 rideIndex, sint32 x, sint32 y, sint32 z, rct_tile_element *mapElement) { Ride *ride = get_ride(rideIndex); train_ref firstTrain = { 0 }, lastTrain = { 0 }; @@ -4789,13 +4789,13 @@ static void ride_create_vehicles_find_first_block(Ride *ride, rct_xy_element *ou sint32 firstX = vehicle->track_x; sint32 firstY = vehicle->track_y; sint32 firstZ = vehicle->track_z; - rct_map_element *firstElement = map_get_track_element_at(firstX, firstY, firstZ / 8); + rct_tile_element *firstElement = map_get_track_element_at(firstX, firstY, firstZ / 8); assert(firstElement != NULL); sint32 x = firstX; sint32 y = firstY; - rct_map_element *trackElement = firstElement; + rct_tile_element *trackElement = firstElement; track_begin_end trackBeginEnd; while (track_block_get_previous(x, y, trackElement, &trackBeginEnd)) { x = trackBeginEnd.end_x; @@ -4819,17 +4819,17 @@ static void ride_create_vehicles_find_first_block(Ride *ride, rct_xy_element *ou case TRACK_ELEM_DIAG_25_DEG_UP_TO_FLAT: case TRACK_ELEM_DIAG_60_DEG_UP_TO_FLAT: if (track_element_is_lift_hill(trackElement)) { - rct_map_element *mapElement = map_get_first_element_at(trackBeginEnd.begin_x >> 5, trackBeginEnd.begin_y >> 5); + rct_tile_element *mapElement = map_get_first_element_at(trackBeginEnd.begin_x >> 5, trackBeginEnd.begin_y >> 5); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) continue; + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; if (mapElement->properties.track.type != trackType) continue; - if (map_element_get_track_sequence(mapElement) != 0) continue; + if (tile_element_get_track_sequence(mapElement) != 0) continue; if (mapElement->base_height != trackBeginEnd.begin_z / 8) continue; outXYElement->x = trackBeginEnd.begin_x; outXYElement->y = trackBeginEnd.begin_y; outXYElement->element = mapElement; return; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); } break; case TRACK_ELEM_END_STATION: @@ -4869,11 +4869,11 @@ static bool ride_create_vehicles(Ride *ride, sint32 rideIndex, rct_xy_element *e return true; } - rct_map_element *mapElement = element->element; + rct_tile_element *mapElement = element->element; sint32 x = element->x; sint32 y = element->y; sint32 z = element->element->base_height; - sint32 direction = map_element_get_direction(mapElement); + sint32 direction = tile_element_get_direction(mapElement); // if (ride->mode == RIDE_MODE_STATION_TO_STATION) { @@ -4883,12 +4883,12 @@ static bool ride_create_vehicles(Ride *ride, sint32 rideIndex, rct_xy_element *e mapElement = map_get_first_element_at(x >> 5, y >> 5); do { if (mapElement->base_height != z) continue; - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) continue; + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; break; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); z = mapElement->base_height; - direction = map_element_get_direction(mapElement); + direction = tile_element_get_direction(mapElement); } vehicle_create_trains(rideIndex, x, y, z, mapElement); @@ -4929,7 +4929,7 @@ static bool ride_create_vehicles(Ride *ride, sint32 rideIndex, rct_xy_element *e * * rct2: 0x006DDF9C */ -void loc_6DDF9C(Ride *ride, rct_map_element *mapElement) +void loc_6DDF9C(Ride *ride, rct_tile_element *mapElement) { rct_vehicle *train, *car; @@ -4944,7 +4944,7 @@ void loc_6DDF9C(Ride *ride, rct_map_element *mapElement) vehicle_update_track_motion(train, NULL); do { - mapElement->flags |= MAP_ELEMENT_FLAG_BLOCK_BRAKE_CLOSED; + mapElement->flags |= TILE_ELEMENT_FLAG_BLOCK_BRAKE_CLOSED; car = train; while (true) { car->velocity = 0; @@ -4960,7 +4960,7 @@ void loc_6DDF9C(Ride *ride, rct_map_element *mapElement) } } while (!(vehicle_update_track_motion(train, NULL) & VEHICLE_UPDATE_MOTION_TRACK_FLAG_10)); - mapElement->flags |= MAP_ELEMENT_FLAG_BLOCK_BRAKE_CLOSED; + mapElement->flags |= TILE_ELEMENT_FLAG_BLOCK_BRAKE_CLOSED; car = train; while (true) { car->update_flags &= ~VEHICLE_UPDATE_FLAG_1; @@ -5001,9 +5001,9 @@ static bool ride_initialise_cable_lift_track(Ride *ride, bool isApplying) sint32 z = ride->station_heights[stationIndex]; bool success = false; - rct_map_element *mapElement = map_get_first_element_at(location.x, location.y); + rct_tile_element *mapElement = map_get_first_element_at(location.x, location.y); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) continue; + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; if (mapElement->base_height != z) continue; if (!(TrackSequenceProperties[mapElement->properties.track.type][0] & TRACK_SEQUENCE_FLAG_ORIGIN)) { @@ -5011,7 +5011,7 @@ static bool ride_initialise_cable_lift_track(Ride *ride, bool isApplying) } success = true; break; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); if (!success) return false; @@ -5066,7 +5066,7 @@ static bool ride_initialise_cable_lift_track(Ride *ride, bool isApplying) } if (isApplying) { z = mapElement->base_height * 8; - sint32 direction = map_element_get_direction(mapElement); + sint32 direction = tile_element_get_direction(mapElement); trackType = mapElement->properties.track.type; x = it.current.x; y = it.current.y; @@ -5112,13 +5112,13 @@ static bool ride_create_cable_lift(sint32 rideIndex, bool isApplying) sint32 x = ride->cable_lift_x; sint32 y = ride->cable_lift_y; sint32 z = ride->cable_lift_z; - rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); + rct_tile_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) continue; + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; if (mapElement->base_height != z) continue; break; - } while (!map_element_is_last_for_tile(mapElement++)); - sint32 direction = map_element_get_direction(mapElement); + } while (!tile_element_is_last_for_tile(mapElement++)); + sint32 direction = tile_element_get_direction(mapElement); rct_vehicle *head = NULL; rct_vehicle *tail = NULL; @@ -5224,12 +5224,12 @@ static void ride_scroll_to_track_error(rct_xy_element *trackElement) * * rct2: 0x006B4F6B */ -static rct_map_element *loc_6B4F6B(sint32 rideIndex, sint32 x, sint32 y) +static rct_tile_element *loc_6B4F6B(sint32 rideIndex, sint32 x, sint32 y) { Ride * ride = get_ride(rideIndex); - rct_map_element *mapElement = map_get_first_element_at(x / 32, y / 32); + rct_tile_element *mapElement = map_get_first_element_at(x / 32, y / 32); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; if (RideProperties[ride->type].flags & RIDE_TYPE_FLAG_FLAT_RIDE) { @@ -5242,7 +5242,7 @@ static rct_map_element *loc_6B4F6B(sint32 rideIndex, sint32 x, sint32 y) if (mapElement->properties.track.ride_index == rideIndex) return mapElement; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return NULL; } @@ -5514,11 +5514,11 @@ sint32 ride_get_refund_price(sint32 ride_id) gGamePaused = 0; money32 refundPrice = 0; - map_element_iterator it; + tile_element_iterator it; - map_element_iterator_begin(&it); - while (map_element_iterator_next(&it)) { - if (map_element_get_type(it.element) != MAP_ELEMENT_TYPE_TRACK) + tile_element_iterator_begin(&it); + while (tile_element_iterator_next(&it)) { + if (tile_element_get_type(it.element) != TILE_ELEMENT_TYPE_TRACK) continue; if (it.element->properties.track.ride_index != ride_id) @@ -5527,7 +5527,7 @@ sint32 ride_get_refund_price(sint32 ride_id) sint32 x = it.x * 32, y = it.y * 32; sint32 z = it.element->base_height * 8; - uint8 rotation = map_element_get_direction(it.element); + uint8 rotation = tile_element_get_direction(it.element); uint8 type = it.element->properties.track.type; if (type != TRACK_ELEM_INVERTED_90_DEG_UP_TO_FLAT_QUARTER_LOOP){ @@ -5535,16 +5535,16 @@ sint32 ride_get_refund_price(sint32 ride_id) x, GAME_COMMAND_FLAG_5 | GAME_COMMAND_FLAG_APPLY | (rotation << 8), y, - type | (map_element_get_track_sequence(it.element) << 8), + type | (tile_element_get_track_sequence(it.element) << 8), GAME_COMMAND_REMOVE_TRACK, z, 0); if (removePrice == MONEY32_UNDEFINED) { - map_element_remove(it.element); + tile_element_remove(it.element); } else { refundPrice += removePrice; } - map_element_iterator_restart_for_tile(&it); + tile_element_iterator_restart_for_tile(&it); continue; } @@ -5584,7 +5584,7 @@ sint32 ride_get_refund_price(sint32 ride_id) GAME_COMMAND_SET_MAZE_TRACK, z, 0); - map_element_iterator_restart_for_tile(&it); + tile_element_iterator_restart_for_tile(&it); } gGamePaused = oldpaused; return refundPrice; @@ -5919,7 +5919,7 @@ void game_command_callback_ride_construct_placed_front(sint32 eax, sint32 ebx, s _currentTrackBeginX = next_track.x; _currentTrackBeginY = next_track.y; _currentTrackBeginZ = z; - _currentTrackPieceDirection = map_element_get_direction(next_track.element); + _currentTrackPieceDirection = tile_element_get_direction(next_track.element); _currentTrackPieceType = next_track.element->properties.track.type; _currentTrackSelectionFlags = 0; _rideConstructionArrowPulseTime = 0; @@ -5993,7 +5993,7 @@ void game_command_set_ride_appearance(sint32 *eax, sint32 *ebx, sint32 *ecx, sin LocationXYZ16 coord; coord.x = ride->overall_view.x * 32 + 16; coord.y = ride->overall_view.y * 32 + 16; - coord.z = map_element_height(coord.x, coord.y); + coord.z = tile_element_height(coord.x, coord.y); network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord); } } @@ -6137,7 +6137,7 @@ void game_command_set_ride_price(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 * LocationXYZ16 coord; coord.x = ride->overall_view.x * 32 + 16; coord.y = ride->overall_view.y * 32 + 16; - coord.z = map_element_height(coord.x, coord.y); + coord.z = tile_element_height(coord.x, coord.y); network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord); } @@ -6434,15 +6434,15 @@ bool ride_is_block_sectioned(Ride *ride) bool ride_has_any_track_elements(sint32 rideIndex) { - map_element_iterator it; + tile_element_iterator it; - map_element_iterator_begin(&it); - while (map_element_iterator_next(&it)) { - if (map_element_get_type(it.element) != MAP_ELEMENT_TYPE_TRACK) + tile_element_iterator_begin(&it); + while (tile_element_iterator_next(&it)) { + if (tile_element_get_type(it.element) != TILE_ELEMENT_TYPE_TRACK) continue; if (it.element->properties.track.ride_index != rideIndex) continue; - if (it.element->flags & MAP_ELEMENT_FLAG_GHOST) + if (it.element->flags & TILE_ELEMENT_FLAG_GHOST) continue; return true; @@ -6453,15 +6453,15 @@ bool ride_has_any_track_elements(sint32 rideIndex) void ride_all_has_any_track_elements(bool *rideIndexArray) { - map_element_iterator it; + tile_element_iterator it; memset(rideIndexArray, 0, MAX_RIDES * sizeof(bool)); - map_element_iterator_begin(&it); - while (map_element_iterator_next(&it)) { - if (map_element_get_type(it.element) != MAP_ELEMENT_TYPE_TRACK) + tile_element_iterator_begin(&it); + while (tile_element_iterator_next(&it)) { + if (tile_element_get_type(it.element) != TILE_ELEMENT_TYPE_TRACK) continue; - if (it.element->flags & MAP_ELEMENT_FLAG_GHOST) + if (it.element->flags & TILE_ELEMENT_FLAG_GHOST) continue; rideIndexArray[it.element->properties.track.ride_index] = true; @@ -6592,7 +6592,7 @@ void ride_get_entrance_or_exit_position_from_screen_position(sint32 screenX, sin sint16 mapX, mapY; sint16 entranceMinX, entranceMinY, entranceMaxX, entranceMaxY, word_F4418C, word_F4418E; sint32 interactionType, direction, stationHeight, stationDirection; - rct_map_element * mapElement; + rct_tile_element * mapElement; rct_viewport * viewport; Ride * ride; @@ -6600,7 +6600,7 @@ void ride_get_entrance_or_exit_position_from_screen_position(sint32 screenX, sin get_map_coordinates_from_pos(screenX, screenY, 0xFFFB, &mapX, &mapY, &interactionType, &mapElement, &viewport); if (interactionType != 0) { - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_TRACK) { if (mapElement->properties.track.ride_index == gRideEntranceExitPlaceRideIndex) { @@ -6612,7 +6612,7 @@ void ride_get_entrance_or_exit_position_from_screen_position(sint32 screenX, sin } else { - gRideEntranceExitPlaceStationIndex = map_element_get_station(mapElement); + gRideEntranceExitPlaceStationIndex = tile_element_get_station(mapElement); } } } @@ -6667,7 +6667,7 @@ void ride_get_entrance_or_exit_position_from_screen_position(sint32 screenX, sin mapElement = map_get_first_element_at(mapX >> 5, mapY >> 5); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; if (mapElement->base_height != stationHeight) continue; @@ -6679,18 +6679,18 @@ void ride_get_entrance_or_exit_position_from_screen_position(sint32 screenX, sin *outDirection = direction ^ 2; return; } - if (map_element_get_station(mapElement) != gRideEntranceExitPlaceStationIndex) + if (tile_element_get_station(mapElement) != gRideEntranceExitPlaceStationIndex) continue; - sint32 eax = (direction + 2 - map_element_get_direction(mapElement)) & MAP_ELEMENT_DIRECTION_MASK; - if (FlatRideTrackSequenceProperties[mapElement->properties.track.type][map_element_get_track_sequence(mapElement)] & (1 << eax)) + sint32 eax = (direction + 2 - tile_element_get_direction(mapElement)) & TILE_ELEMENT_DIRECTION_MASK; + if (FlatRideTrackSequenceProperties[mapElement->properties.track.type][tile_element_get_track_sequence(mapElement)] & (1 << eax)) { gRideEntranceExitPlaceDirection = direction ^ 2; *outDirection = direction ^ 2; return; } } - while (!map_element_is_last_for_tile(mapElement++)); + while (!tile_element_is_last_for_tile(mapElement++)); } direction = (direction + 1) & 3; } @@ -6709,7 +6709,7 @@ void ride_get_entrance_or_exit_position_from_screen_position(sint32 screenX, sin *outX = 0x8000; return; } - direction = map_element_get_direction(mapElement); + direction = tile_element_get_direction(mapElement); stationDirection = direction; while (true) @@ -6723,11 +6723,11 @@ void ride_get_entrance_or_exit_position_from_screen_position(sint32 screenX, sin do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; if (mapElement->properties.track.ride_index != gRideEntranceExitPlaceRideIndex) continue; - if (map_element_get_station(mapElement) != gRideEntranceExitPlaceStationIndex) + if (tile_element_get_station(mapElement) != gRideEntranceExitPlaceStationIndex) continue; switch (mapElement->properties.track.type) @@ -6738,7 +6738,7 @@ void ride_get_entrance_or_exit_position_from_screen_position(sint32 screenX, sin goToNextTile = true; } } - while (!goToNextTile && !map_element_is_last_for_tile(mapElement++)); + while (!goToNextTile && !tile_element_is_last_for_tile(mapElement++)); if (!goToNextTile) break; @@ -6805,7 +6805,7 @@ bool ride_select_forwards_from_back() _currentTrackBeginX = next_track.x; _currentTrackBeginY = next_track.y; _currentTrackBeginZ = z; - _currentTrackPieceDirection = map_element_get_direction(next_track.element); + _currentTrackPieceDirection = tile_element_get_direction(next_track.element); _currentTrackPieceType = next_track.element->properties.track.type; _currentTrackSelectionFlags = 0; _rideConstructionArrowPulseTime = 0; @@ -7032,7 +7032,7 @@ static sint32 ride_get_smallest_station_length(Ride *ride) static sint32 ride_get_track_length(Ride * ride) { rct_window * w; - rct_map_element * mapElement = NULL; + rct_tile_element * mapElement = NULL; track_circuit_iterator it; sint32 x = 0, y = 0, z, trackType, rideIndex, result; bool foundTrack = false; @@ -7050,7 +7050,7 @@ static sint32 ride_get_track_length(Ride * ride) mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; trackType = mapElement->properties.track.type; @@ -7062,7 +7062,7 @@ static sint32 ride_get_track_length(Ride * ride) foundTrack = true; } - while (!foundTrack && !map_element_is_last_for_tile(mapElement++)); + while (!foundTrack && !tile_element_is_last_for_tile(mapElement++)); } if (foundTrack) @@ -7404,7 +7404,7 @@ static money32 ride_set_vehicles(uint8 rideIndex, uint8 setting, uint8 value, ui LocationXYZ16 coord; coord.x = ride->overall_view.x * 32 + 16; coord.y = ride->overall_view.y * 32 + 16; - coord.z = map_element_height(coord.x, coord.y); + coord.z = tile_element_height(coord.x, coord.y); network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord); } @@ -7454,7 +7454,7 @@ void sub_6CB945(sint32 rideIndex) uint8 direction = 0xFF; bool specialTrack = false; - rct_map_element* mapElement = NULL; + rct_tile_element* mapElement = NULL; while (true) { if (direction != 0xFF) { @@ -7466,21 +7466,21 @@ void sub_6CB945(sint32 rideIndex) bool trackFound = false; do { if (mapElement->base_height != location.z) continue; - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) continue; + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; if (mapElement->properties.track.ride_index != rideIndex) continue; - if (map_element_get_track_sequence(mapElement) != 0) continue; + if (tile_element_get_track_sequence(mapElement) != 0) continue; if (!(TrackSequenceProperties[mapElement->properties.track.type][0] & TRACK_SEQUENCE_FLAG_ORIGIN)) continue; trackFound = true; break; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); if (trackFound == false) { break; } - map_element_set_station(mapElement, stationId); - direction = map_element_get_direction(mapElement); + tile_element_set_station(mapElement, stationId); + direction = tile_element_get_direction(mapElement); if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_3)) { specialTrack = true; @@ -7501,18 +7501,18 @@ void sub_6CB945(sint32 rideIndex) mapElement = map_get_first_element_at(blockLocation.x >> 5, blockLocation.y >> 5); do { if (blockLocation.z != mapElement->base_height) continue; - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) continue; + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; if (!(TrackSequenceProperties[mapElement->properties.track.type][0] & TRACK_SEQUENCE_FLAG_ORIGIN)) continue; trackFound = true; break; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); if (!trackFound) { break; } - map_element_set_station(mapElement, stationId); + tile_element_set_station(mapElement, stationId); } } } @@ -7555,27 +7555,27 @@ void sub_6CB945(sint32 rideIndex) .y = ((*locationList >> 8) & 0xFF) * 32 }; - rct_map_element *mapElement = map_get_first_element_at(location.x >> 5, location.y >> 5); + rct_tile_element *mapElement = map_get_first_element_at(location.x >> 5, location.y >> 5); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_ENTRANCE) continue; + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_ENTRANCE) continue; if (mapElement->properties.entrance.ride_index != rideIndex) continue; if (mapElement->properties.entrance.type > ENTRANCE_TYPE_RIDE_EXIT) continue; LocationXY16 nextLocation = location; - nextLocation.x += TileDirectionDelta[map_element_get_direction(mapElement)].x; - nextLocation.y += TileDirectionDelta[map_element_get_direction(mapElement)].y; + nextLocation.x += TileDirectionDelta[tile_element_get_direction(mapElement)].x; + nextLocation.y += TileDirectionDelta[tile_element_get_direction(mapElement)].y; bool shouldRemove = true; - rct_map_element *trackElement = map_get_first_element_at(nextLocation.x >> 5, nextLocation.y >> 5); + rct_tile_element *trackElement = map_get_first_element_at(nextLocation.x >> 5, nextLocation.y >> 5); do { - if (map_element_get_type(trackElement) != MAP_ELEMENT_TYPE_TRACK) continue; + if (tile_element_get_type(trackElement) != TILE_ELEMENT_TYPE_TRACK) continue; if (trackElement->properties.track.ride_index != rideIndex) continue; if (trackElement->base_height != mapElement->base_height) continue; uint8 trackType = trackElement->properties.track.type; - uint8 trackSequence = map_element_get_track_sequence(mapElement); + uint8 trackSequence = tile_element_get_track_sequence(mapElement); - uint8 direction = (map_element_get_direction(mapElement) - map_element_get_direction(trackElement) + 2) & 3; + uint8 direction = (tile_element_get_direction(mapElement) - tile_element_get_direction(trackElement) + 2) & 3; if (!(TrackSequenceProperties[trackType][trackSequence] & (1 << direction))) { continue; @@ -7583,7 +7583,7 @@ void sub_6CB945(sint32 rideIndex) uint8 stationId = 0; if (trackElement->properties.track.type != TRACK_ELEM_INVERTED_90_DEG_UP_TO_FLAT_QUARTER_LOOP) { - stationId = map_element_get_station(trackElement); + stationId = tile_element_get_station(trackElement); } if (mapElement->properties.entrance.type == ENTRANCE_TYPE_RIDE_EXIT) { @@ -7603,7 +7603,7 @@ void sub_6CB945(sint32 rideIndex) mapElement->properties.entrance.index &= 0x8F; mapElement->properties.entrance.index |= stationId << 4; shouldRemove = false; - } while (!map_element_is_last_for_tile(trackElement++)); + } while (!tile_element_is_last_for_tile(trackElement++)); if (shouldRemove == true) { footpath_queue_chain_reset(); @@ -7611,10 +7611,10 @@ void sub_6CB945(sint32 rideIndex) footpath_remove_edges_at(location.x, location.y, mapElement); footpath_update_queue_chains(); map_invalidate_tile_full(location.x, location.y); - map_element_remove(mapElement); + tile_element_remove(mapElement); mapElement--; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); } } @@ -7876,15 +7876,15 @@ money16 ride_get_price(Ride * ride) } /** - * Return the map_element of an adjacent station at x,y,z(+-2). - * Returns NULL if no suitable map_element is found. + * Return the tile_element of an adjacent station at x,y,z(+-2). + * Returns NULL if no suitable tile_element is found. */ -rct_map_element *get_station_platform(sint32 x, sint32 y, sint32 z, sint32 z_tolerance) { +rct_tile_element *get_station_platform(sint32 x, sint32 y, sint32 z, sint32 z_tolerance) { bool foundMapElement = false; - rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); + rct_tile_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); if (mapElement != NULL) { do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) continue; + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; /* Check if mapElement is a station platform. */ if (!track_element_is_station(mapElement)) continue; @@ -7898,7 +7898,7 @@ rct_map_element *get_station_platform(sint32 x, sint32 y, sint32 z, sint32 z_tol foundMapElement = true; break; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); } if (!foundMapElement) { return NULL; @@ -7919,7 +7919,7 @@ static bool check_for_adjacent_station(sint32 x, sint32 y, sint32 z, uint8 direc { adjX += TileDirectionDelta[direction].x; adjY += TileDirectionDelta[direction].y; - rct_map_element * stationElement = get_station_platform(adjX, adjY, z, 2); + rct_tile_element * stationElement = get_station_platform(adjX, adjY, z, 2); if (stationElement != NULL) { sint32 rideIndex = stationElement->properties.track.ride_index; @@ -7949,12 +7949,12 @@ bool ride_has_adjacent_station(Ride *ride) uint16 stationY = ride->station_starts[stationNum].y * 32; uint8 stationZ = ride->station_heights[stationNum]; - rct_map_element *stationElement = get_station_platform(stationX, stationY, stationZ, 0); + rct_tile_element *stationElement = get_station_platform(stationX, stationY, stationZ, 0); if (stationElement == NULL) { continue; } /* Check the first side of the station */ - sint32 direction = map_element_get_direction_with_offset(stationElement, 1); + sint32 direction = tile_element_get_direction_with_offset(stationElement, 1); found = check_for_adjacent_station(stationX, stationY, stationZ, direction); if (found) break; /* Check the other side of the station */ @@ -8245,14 +8245,14 @@ void fix_ride_entrance_and_exit_locations() uint8 entranceExitHeight = ride->station_heights[stationIndex]; bool fixEntrance = false; bool fixExit = false; - const rct_map_element * mapElement; + const rct_tile_element * mapElement; // Skip if the station has no entrance if (entranceLoc.xy != RCT_XY8_UNDEFINED) { mapElement = map_get_ride_entrance_element_at(entranceLoc.x * 32, entranceLoc.y * 32, entranceExitHeight, false); - if (mapElement == NULL || mapElement->properties.entrance.ride_index != rideIndex || map_element_get_station(mapElement) != stationIndex) + if (mapElement == NULL || mapElement->properties.entrance.ride_index != rideIndex || tile_element_get_station(mapElement) != stationIndex) { fixEntrance = true; } @@ -8262,7 +8262,7 @@ void fix_ride_entrance_and_exit_locations() { mapElement = map_get_ride_exit_element_at(exitLoc.x * 32, exitLoc.y * 32, entranceExitHeight, false); - if (mapElement == NULL || mapElement->properties.entrance.ride_index != rideIndex || map_element_get_station(mapElement) != stationIndex) + if (mapElement == NULL || mapElement->properties.entrance.ride_index != rideIndex || tile_element_get_station(mapElement) != stationIndex) { fixExit = true; } @@ -8287,7 +8287,7 @@ void fix_ride_entrance_and_exit_locations() { do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_ENTRANCE) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_ENTRANCE) { continue; } @@ -8295,7 +8295,7 @@ void fix_ride_entrance_and_exit_locations() { continue; } - if (map_element_get_station(mapElement) != stationIndex) + if (tile_element_get_station(mapElement) != stationIndex) { continue; } @@ -8335,7 +8335,7 @@ void fix_ride_entrance_and_exit_locations() log_info("Fixed disconnected exit of ride %d, station %d to x = %d, y = %d and z = %d.", rideIndex, stationIndex, x, y, mapElement->base_height); } } - while (!map_element_is_last_for_tile(mapElement++)); + while (!tile_element_is_last_for_tile(mapElement++)); } } } diff --git a/src/openrct2/ride/ride.h b/src/openrct2/ride/ride.h index 3d625555e4..679f789834 100644 --- a/src/openrct2/ride/ride.h +++ b/src/openrct2/ride/ride.h @@ -371,11 +371,11 @@ typedef struct track_begin_end { sint32 begin_y; sint32 begin_z; sint32 begin_direction; - rct_map_element *begin_element; + rct_tile_element *begin_element; sint32 end_x; sint32 end_y; sint32 end_direction; - rct_map_element *end_element; + rct_tile_element *end_element; } track_begin_end; #ifdef PLATFORM_32BIT assert_struct_size(track_begin_end, 36); @@ -1066,13 +1066,13 @@ sint32 ride_is_valid_for_open(sint32 rideIndex, sint32 goingToBeOpen, sint32 isA sint32 ride_is_valid_for_test(sint32 rideIndex, sint32 goingToBeOpen, sint32 isApplying); sint32 ride_initialise_construction_window(sint32 rideIndex); void ride_construction_invalidate_current_track(); -sint32 sub_6C683D(sint32* x, sint32* y, sint32* z, sint32 direction, sint32 type, uint16 extra_params, rct_map_element** output_element, uint16 flags); -void ride_set_map_tooltip(rct_map_element *mapElement); +sint32 sub_6C683D(sint32* x, sint32* y, sint32* z, sint32 direction, sint32 type, uint16 extra_params, rct_tile_element** output_element, uint16 flags); +void ride_set_map_tooltip(rct_tile_element *mapElement); sint32 ride_music_params_update(sint16 x, sint16 y, sint16 z, uint8 rideIndex, uint16 sampleRate, uint32 position, uint8 *tuneId); void ride_music_update_final(); void ride_prepare_breakdown(sint32 rideIndex, sint32 breakdownReason); -rct_map_element *ride_get_station_start_track_element(Ride *ride, sint32 stationIndex); -rct_map_element *ride_get_station_exit_element(Ride *ride, sint32 x, sint32 y, sint32 z); +rct_tile_element *ride_get_station_start_track_element(Ride *ride, sint32 stationIndex); +rct_tile_element *ride_get_station_exit_element(Ride *ride, sint32 x, sint32 y, sint32 z); void ride_set_status(sint32 rideIndex, sint32 status); void game_command_set_ride_status(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *edx, sint32 *esi, sint32 *edi, sint32 *ebp); void ride_set_name(sint32 rideIndex, const char *name); @@ -1137,7 +1137,7 @@ void ride_construction_set_default_next_piece(); bool track_block_get_next(rct_xy_element *input, rct_xy_element *output, sint32 *z, sint32 *direction); bool track_block_get_next_from_zero(sint16 x, sint16 y, sint16 z_start, uint8 rideIndex, uint8 direction_start, rct_xy_element *output, sint32 *z, sint32 *direction); -bool track_block_get_previous(sint32 x, sint32 y, rct_map_element *mapElement, track_begin_end *outTrackBeginEnd); +bool track_block_get_previous(sint32 x, sint32 y, rct_tile_element *mapElement, track_begin_end *outTrackBeginEnd); bool track_block_get_previous_from_zero(sint16 x, sint16 y, sint16 z, uint8 rideIndex, uint8 direction, track_begin_end *outTrackBeginEnd); void window_ride_construction_update_active_elements(); @@ -1195,7 +1195,7 @@ void game_command_callback_place_ride_entrance_or_exit(sint32 eax, sint32 ebx, s void ride_delete(uint8 rideIndex); money16 ride_get_price(Ride * ride); -rct_map_element *get_station_platform(sint32 x, sint32 y, sint32 z, sint32 z_tolerance); +rct_tile_element *get_station_platform(sint32 x, sint32 y, sint32 z, sint32 z_tolerance); bool ride_has_adjacent_station(Ride *ride); bool ride_has_ratings(const Ride * ride); diff --git a/src/openrct2/ride/ride_ratings.c b/src/openrct2/ride/ride_ratings.c index 6be14e767f..8d111fd1a0 100644 --- a/src/openrct2/ride/ride_ratings.c +++ b/src/openrct2/ride/ride_ratings.c @@ -80,7 +80,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_map_element *mapElement); +static void ride_ratings_score_close_proximity(rct_tile_element *mapElement); static void ride_ratings_add(rating_tuple * rating, sint32 excitement, sint32 intensity, sint32 nausea); @@ -193,19 +193,19 @@ static void ride_ratings_update_state_2() sint32 z = gRideRatingsCalcData.proximity_z / 8; sint32 trackType = gRideRatingsCalcData.proximity_track_type; - rct_map_element *mapElement = map_get_first_element_at(x, y); + rct_tile_element *mapElement = map_get_first_element_at(x, y); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; if (mapElement->base_height != z) continue; if ( trackType == 255 || - (map_element_get_track_sequence(mapElement) == 0 && trackType == mapElement->properties.track.type)) + (tile_element_get_track_sequence(mapElement) == 0 && trackType == mapElement->properties.track.type)) { if (trackType == TRACK_ELEM_END_STATION) { - sint32 entranceIndex = map_element_get_station(mapElement); + sint32 entranceIndex = tile_element_get_station(mapElement); gRideRatingsCalcData.station_flags &= ~RIDE_RATING_STATION_FLAG_NO_ENTRANCE; if (ride->entrances[entranceIndex].xy == RCT_XY8_UNDEFINED) { gRideRatingsCalcData.station_flags |= RIDE_RATING_STATION_FLAG_NO_ENTRANCE; @@ -239,7 +239,7 @@ static void ride_ratings_update_state_2() gRideRatingsCalcData.proximity_track_type = mapElement->properties.track.type; return; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); gRideRatingsCalcData.state = RIDE_RATINGS_STATE_FIND_NEXT_RIDE; } @@ -290,9 +290,9 @@ static void ride_ratings_update_state_5() sint32 z = gRideRatingsCalcData.proximity_z / 8; sint32 trackType = gRideRatingsCalcData.proximity_track_type; - rct_map_element *mapElement = map_get_first_element_at(x, y); + rct_tile_element *mapElement = map_get_first_element_at(x, y); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; if (mapElement->base_height != z) continue; @@ -321,7 +321,7 @@ static void ride_ratings_update_state_5() gRideRatingsCalcData.proximity_track_type = trackBeginEnd.begin_element->properties.track.type; return; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); gRideRatingsCalcData.state = RIDE_RATINGS_STATE_FIND_NEXT_RIDE; } @@ -377,37 +377,37 @@ static void proximity_score_increment(sint32 type) * * rct2: 0x006B6207 */ -static void ride_ratings_score_close_proximity_in_direction(rct_map_element *inputMapElement, sint32 direction) +static void ride_ratings_score_close_proximity_in_direction(rct_tile_element *inputMapElement, sint32 direction) { sint32 x = gRideRatingsCalcData.proximity_x + TileDirectionDelta[direction].x; sint32 y = gRideRatingsCalcData.proximity_y + TileDirectionDelta[direction].y; if (x < 0 || y < 0 || x >= (32 * 256) || y >= (32 * 256)) return; - rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); + rct_tile_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - switch (map_element_get_type(mapElement)) { - case MAP_ELEMENT_TYPE_SURFACE: + switch (tile_element_get_type(mapElement)) { + case TILE_ELEMENT_TYPE_SURFACE: if (gRideRatingsCalcData.proximity_base_height <= inputMapElement->base_height) { if (inputMapElement->clearance_height <= mapElement->base_height) { proximity_score_increment(PROXIMITY_SURFACE_SIDE_CLOSE); } } break; - case MAP_ELEMENT_TYPE_PATH: + case TILE_ELEMENT_TYPE_PATH: if (abs((sint32)inputMapElement->base_height - (sint32)mapElement->base_height) <= 2) { proximity_score_increment(PROXIMITY_PATH_SIDE_CLOSE); } break; - case MAP_ELEMENT_TYPE_TRACK: + case TILE_ELEMENT_TYPE_TRACK: if (inputMapElement->properties.track.ride_index != mapElement->properties.track.ride_index) { if (abs((sint32)inputMapElement->base_height - (sint32)mapElement->base_height) <= 2) { proximity_score_increment(PROXIMITY_FOREIGN_TRACK_SIDE_CLOSE); } } break; - case MAP_ELEMENT_TYPE_SCENERY: - case MAP_ELEMENT_TYPE_SCENERY_MULTIPLE: + case TILE_ELEMENT_TYPE_SCENERY: + case TILE_ELEMENT_TYPE_SCENERY_MULTIPLE: if (mapElement->base_height < inputMapElement->clearance_height) { if (inputMapElement->base_height > mapElement->clearance_height) { proximity_score_increment(PROXIMITY_SCENERY_SIDE_ABOVE); @@ -417,16 +417,16 @@ static void ride_ratings_score_close_proximity_in_direction(rct_map_element *inp } break; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); } -static void ride_ratings_score_close_proximity_loops_helper(rct_map_element *inputMapElement, sint32 x, sint32 y) +static void ride_ratings_score_close_proximity_loops_helper(rct_tile_element *inputMapElement, sint32 x, sint32 y) { - rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); + rct_tile_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - switch (map_element_get_type(mapElement)) { - case MAP_ELEMENT_TYPE_PATH: + switch (tile_element_get_type(mapElement)) { + case TILE_ELEMENT_TYPE_PATH: { sint32 zDiff = (sint32)mapElement->base_height - (sint32)inputMapElement->base_height; if (zDiff >= 0 && zDiff <= 16) @@ -435,7 +435,7 @@ static void ride_ratings_score_close_proximity_loops_helper(rct_map_element *inp } } break; - case MAP_ELEMENT_TYPE_TRACK: + case TILE_ELEMENT_TYPE_TRACK: { sint32 unk = (mapElement->type ^ inputMapElement->type) & 1; if (unk != 0) @@ -455,14 +455,14 @@ static void ride_ratings_score_close_proximity_loops_helper(rct_map_element *inp } } break; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); } /** * * rct2: 0x006B62DA */ -static void ride_ratings_score_close_proximity_loops(rct_map_element *inputMapElement) +static void ride_ratings_score_close_proximity_loops(rct_tile_element *inputMapElement) { sint32 trackType = inputMapElement->properties.track.type; if (trackType == TRACK_ELEM_LEFT_VERTICAL_LOOP || trackType == TRACK_ELEM_RIGHT_VERTICAL_LOOP) { @@ -470,7 +470,7 @@ static void ride_ratings_score_close_proximity_loops(rct_map_element *inputMapEl sint32 y = gRideRatingsCalcData.proximity_y; ride_ratings_score_close_proximity_loops_helper(inputMapElement, x, y); - sint32 direction = map_element_get_direction(inputMapElement); + sint32 direction = tile_element_get_direction(inputMapElement); x = gRideRatingsCalcData.proximity_x + TileDirectionDelta[direction].x; y = gRideRatingsCalcData.proximity_y + TileDirectionDelta[direction].y; ride_ratings_score_close_proximity_loops_helper(inputMapElement, x, y); @@ -481,7 +481,7 @@ static void ride_ratings_score_close_proximity_loops(rct_map_element *inputMapEl * * rct2: 0x006B5F9D */ -static void ride_ratings_score_close_proximity(rct_map_element *inputMapElement) +static void ride_ratings_score_close_proximity(rct_tile_element *inputMapElement) { if (gRideRatingsCalcData.station_flags & RIDE_RATING_STATION_FLAG_NO_ENTRANCE) { return; @@ -490,10 +490,10 @@ static void ride_ratings_score_close_proximity(rct_map_element *inputMapElement) gRideRatingsCalcData.proximity_total++; sint32 x = gRideRatingsCalcData.proximity_x; sint32 y = gRideRatingsCalcData.proximity_y; - rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); + rct_tile_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - switch (map_element_get_type(mapElement)) { - case MAP_ELEMENT_TYPE_SURFACE: + switch (tile_element_get_type(mapElement)) { + case TILE_ELEMENT_TYPE_SURFACE: gRideRatingsCalcData.proximity_base_height = mapElement->base_height; if (mapElement->base_height * 8 == gRideRatingsCalcData.proximity_z) { proximity_score_increment(PROXIMITY_SURFACE_TOUCH); @@ -517,7 +517,7 @@ static void ride_ratings_score_close_proximity(rct_map_element *inputMapElement) } } break; - case MAP_ELEMENT_TYPE_PATH: + case TILE_ELEMENT_TYPE_PATH: if (mapElement->properties.path.type & 0xF0) { if (mapElement->clearance_height == inputMapElement->base_height) { proximity_score_increment(PROXIMITY_138B5A6); @@ -537,11 +537,11 @@ static void ride_ratings_score_close_proximity(rct_map_element *inputMapElement) } } break; - case MAP_ELEMENT_TYPE_TRACK: + case TILE_ELEMENT_TYPE_TRACK: { sint32 trackType = mapElement->properties.track.type; if (trackType == TRACK_ELEM_LEFT_VERTICAL_LOOP || trackType == TRACK_ELEM_RIGHT_VERTICAL_LOOP) { - sint32 sequence = map_element_get_track_sequence(mapElement); + sint32 sequence = tile_element_get_track_sequence(mapElement); if (sequence == 3 || sequence == 6) { if (mapElement->base_height - inputMapElement->clearance_height <= 10) { proximity_score_increment(PROXIMITY_THROUGH_VERTICAL_LOOP); @@ -604,10 +604,10 @@ static void ride_ratings_score_close_proximity(rct_map_element *inputMapElement) } } } break; - } // switch map_element_get_type - } while (!map_element_is_last_for_tile(mapElement++)); + } // switch tile_element_get_type + } while (!tile_element_is_last_for_tile(mapElement++)); - uint8 direction = map_element_get_direction(inputMapElement); + uint8 direction = tile_element_get_direction(inputMapElement); ride_ratings_score_close_proximity_in_direction(inputMapElement, (direction + 1) & 3); ride_ratings_score_close_proximity_in_direction(inputMapElement, (direction - 1) & 3); ride_ratings_score_close_proximity_loops(inputMapElement); @@ -1278,7 +1278,7 @@ static sint32 ride_ratings_get_scenery_score(Ride *ride) sint32 x = location.x; sint32 y = location.y; - sint32 z = map_element_height(x * 32, y * 32) & 0xFFFF; + sint32 z = tile_element_height(x * 32, y * 32) & 0xFFFF; // Check if station is underground, returns a fixed mediocre score since you can't have scenery underground if (z > ride->station_heights[i] * 8) @@ -1291,15 +1291,15 @@ static sint32 ride_ratings_get_scenery_score(Ride *ride) for (sint32 yy = max(y - 5, 0); yy <= min(y + 5, 255); yy++) { for (sint32 xx = max(x - 5, 0); xx <= min(x + 5, 255); xx++) { // Count scenery items on this tile - rct_map_element *mapElement = map_get_first_element_at(xx, yy); + rct_tile_element *mapElement = map_get_first_element_at(xx, yy); do { if (mapElement->flags & (1 << 4)) continue; - sint32 type = map_element_get_type(mapElement); - if (type == MAP_ELEMENT_TYPE_SCENERY || type == MAP_ELEMENT_TYPE_SCENERY_MULTIPLE) + sint32 type = tile_element_get_type(mapElement); + if (type == TILE_ELEMENT_TYPE_SCENERY || type == TILE_ELEMENT_TYPE_SCENERY_MULTIPLE) numSceneryItems++; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); } } diff --git a/src/openrct2/ride/shops/Facility.cpp b/src/openrct2/ride/shops/Facility.cpp index a8de843972..61a0baf279 100644 --- a/src/openrct2/ride/shops/Facility.cpp +++ b/src/openrct2/ride/shops/Facility.cpp @@ -30,7 +30,7 @@ * rct2: 0x007630DE */ static void facility_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bool hasSupports = wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_3], NULL); diff --git a/src/openrct2/ride/shops/Shop.cpp b/src/openrct2/ride/shops/Shop.cpp index 040baa33c8..cef5fc28d0 100644 --- a/src/openrct2/ride/shops/Shop.cpp +++ b/src/openrct2/ride/shops/Shop.cpp @@ -30,7 +30,7 @@ * rct2: 0x007617A5 */ static void shop_paint_setup(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bool hasSupports = wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_3], NULL); diff --git a/src/openrct2/ride/thrill/3dCinema.cpp b/src/openrct2/ride/thrill/3dCinema.cpp index 011fc31861..064b3e1e29 100644 --- a/src/openrct2/ride/thrill/3dCinema.cpp +++ b/src/openrct2/ride/thrill/3dCinema.cpp @@ -26,7 +26,7 @@ static void paint_3d_cinema_structure(paint_session * session, uint8 rideIndex, uint8 direction, sint8 xOffset, sint8 yOffset, uint16 height) { - rct_map_element * savedMapElement = static_cast(session->CurrentlyDrawnItem); + rct_tile_element * savedMapElement = static_cast(session->CurrentlyDrawnItem); Ride * ride = get_ride(rideIndex); rct_ride_entry * rideEntry = get_ride_entry(ride->subtype); @@ -61,7 +61,7 @@ static void paint_3d_cinema_structure(paint_session * session, uint8 rideIndex, * rct2: 0x0076574C */ static void paint_3d_cinema(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = track_map_3x3[direction][trackSequence]; diff --git a/src/openrct2/ride/thrill/Enterprise.cpp b/src/openrct2/ride/thrill/Enterprise.cpp index 9ab9073751..e76ac4cb2c 100644 --- a/src/openrct2/ride/thrill/Enterprise.cpp +++ b/src/openrct2/ride/thrill/Enterprise.cpp @@ -23,11 +23,11 @@ /** rct2: 0x008A2ABC */ static void paint_enterprise_structure(paint_session * session, Ride * ride, sint8 xOffset, sint8 yOffset, uint16 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { height += 7; - rct_map_element * savedMapElement = static_cast(session->CurrentlyDrawnItem); + rct_tile_element * savedMapElement = static_cast(session->CurrentlyDrawnItem); rct_ride_entry * rideEntry = get_ride_entry(ride->subtype); rct_vehicle * vehicle = NULL; @@ -45,7 +45,7 @@ static void paint_enterprise_structure(paint_session * session, Ride * ride, sin session->CurrentlyDrawnItem = vehicle; } - uint32 imageOffset = map_element_get_direction_with_offset(mapElement, get_current_rotation()); + uint32 imageOffset = tile_element_get_direction_with_offset(mapElement, get_current_rotation()); if (vehicle != NULL) { imageOffset = (vehicle->vehicle_sprite_type << 2) + (((vehicle->sprite_direction >> 3) + get_current_rotation()) % 4); @@ -85,7 +85,7 @@ static void paint_enterprise_structure(paint_session * session, Ride * ride, sin /** rct2: 0x008A1584 */ static void paint_enterprise(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = track_map_4x4[direction][trackSequence]; diff --git a/src/openrct2/ride/thrill/GoKarts.cpp b/src/openrct2/ride/thrill/GoKarts.cpp index 75dc6fa210..57d22968de 100644 --- a/src/openrct2/ride/thrill/GoKarts.cpp +++ b/src/openrct2/ride/thrill/GoKarts.cpp @@ -132,7 +132,7 @@ static const uint32 go_karts_track_pieces_25_deg_up_to_flat[4][2] = { /** rct2: 0x0074A748 */ static void paint_go_karts_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId; if (direction == 0 || direction == 2) @@ -164,7 +164,7 @@ static void paint_go_karts_track_flat(paint_session * session, uint8 rideIndex, /** rct2: 0x0074A758 */ static void paint_go_karts_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId; paint_struct * ps; @@ -217,7 +217,7 @@ static void paint_go_karts_track_25_deg_up(paint_session * session, uint8 rideIn /** rct2: 0x0074A768 */ static void paint_go_karts_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint32 imageId; paint_struct * ps; @@ -270,7 +270,7 @@ static void paint_go_karts_track_flat_to_25_deg_up(paint_session * session, uint /** rct2: 0x */ static void paint_go_karts_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint32 imageId; paint_struct * ps; @@ -323,28 +323,28 @@ static void paint_go_karts_track_25_deg_up_to_flat(paint_session * session, uint /** rct2: 0x0074A788 */ static void paint_go_karts_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { paint_go_karts_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x0074A798 */ static void paint_go_karts_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_go_karts_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x0074A7A8 */ static void paint_go_karts_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_go_karts_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x */ static void paint_go_karts_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { LocationXY16 position = session->MapPosition; Ride * ride = get_ride(rideIndex); @@ -407,7 +407,7 @@ static void paint_go_karts_station(paint_session * session, uint8 rideIndex, uin if (mapElement->properties.track.type == TRACK_ELEM_END_STATION) { - const bool hasGreenLight = map_element_get_green_light(mapElement); + const bool hasGreenLight = tile_element_get_green_light(mapElement); switch (direction) { @@ -454,7 +454,7 @@ static void paint_go_karts_station(paint_session * session, uint8 rideIndex, uin /** rct2: 0x0074A7E8 */ static void paint_go_karts_track_left_quarter_turn_1_tile(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint32 imageId; @@ -523,7 +523,7 @@ static void paint_go_karts_track_left_quarter_turn_1_tile(paint_session * sessio /** rct2: 0x0074A7F8 */ static void paint_go_karts_track_right_quarter_turn_1_tile(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_go_karts_track_left_quarter_turn_1_tile(session, rideIndex, trackSequence, (direction + 3) % 4, height, mapElement); } diff --git a/src/openrct2/ride/thrill/LaunchedFreefall.cpp b/src/openrct2/ride/thrill/LaunchedFreefall.cpp index 2e1a8db27e..37fbfb3a9d 100644 --- a/src/openrct2/ride/thrill/LaunchedFreefall.cpp +++ b/src/openrct2/ride/thrill/LaunchedFreefall.cpp @@ -92,7 +92,7 @@ void vehicle_visual_launched_freefall(paint_session * session, sint32 x, sint32 /** rct2: 0x006FD1F8 */ static void paint_launched_freefall_base(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { trackSequence = track_map_3x3[direction][trackSequence]; @@ -164,7 +164,7 @@ static void paint_launched_freefall_base(paint_session * session, uint8 rideInde /** rct2: 0x006FD208 */ static void paint_launched_freefall_tower_section(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (trackSequence == 1) { @@ -174,8 +174,8 @@ static void paint_launched_freefall_tower_section(paint_session * session, uint8 uint32 imageId = SPR_LAUNCHED_FREEFALL_TOWER_SEGMENT | session->TrackColours[SCHEME_TRACK]; sub_98197C(session, imageId, 0, 0, 2, 2, 30, height, 8, 8, height, get_current_rotation()); - rct_map_element * nextMapElement = mapElement + 1; - if (map_element_is_last_for_tile(mapElement) || mapElement->clearance_height != nextMapElement->base_height) + rct_tile_element * nextMapElement = mapElement + 1; + if (tile_element_is_last_for_tile(mapElement) || mapElement->clearance_height != nextMapElement->base_height) { imageId = SPR_LAUNCHED_FREEFALL_TOWER_SEGMENT_TOP | session->TrackColours[SCHEME_TRACK]; sub_98199C(session, imageId, 0, 0, 2, 2, 30, height, 8, 8, height, get_current_rotation()); diff --git a/src/openrct2/ride/thrill/MagicCarpet.cpp b/src/openrct2/ride/thrill/MagicCarpet.cpp index 5d86626b0a..21b492e132 100644 --- a/src/openrct2/ride/thrill/MagicCarpet.cpp +++ b/src/openrct2/ride/thrill/MagicCarpet.cpp @@ -174,7 +174,7 @@ static void paint_magic_carpet_vehicle(paint_session * session, Ride * ride, uin /** rct2: 0x00899104 */ static void paint_magic_carpet_structure(paint_session * session, Ride * ride, uint8 direction, sint8 axisOffset, uint16 height) { - rct_map_element * savedMapElement = static_cast(session->CurrentlyDrawnItem); + rct_tile_element * savedMapElement = static_cast(session->CurrentlyDrawnItem); rct_vehicle * vehicle = get_first_vehicle(ride); uint32 swingImageId = 0; @@ -209,7 +209,7 @@ static void paint_magic_carpet_structure(paint_session * session, Ride * ride, u /** rct2: 0x00898514 */ static void paint_magic_carpet(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { uint8 relativeTrackSequence = track_map_1x4[direction][trackSequence]; diff --git a/src/openrct2/ride/thrill/MotionSimulator.cpp b/src/openrct2/ride/thrill/MotionSimulator.cpp index 92c1214191..1c878ec8e8 100644 --- a/src/openrct2/ride/thrill/MotionSimulator.cpp +++ b/src/openrct2/ride/thrill/MotionSimulator.cpp @@ -37,12 +37,12 @@ enum * rct2: 0x0076522A */ static void paint_motionsimulator_vehicle(paint_session * session, sint8 offsetX, sint8 offsetY, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { Ride * ride = get_ride(mapElement->properties.track.ride_index); rct_ride_entry * rideEntry = get_ride_entry_by_ride(ride); - rct_map_element * savedMapElement = static_cast(session->CurrentlyDrawnItem); + rct_tile_element * savedMapElement = static_cast(session->CurrentlyDrawnItem); rct_vehicle * vehicle = NULL; if (ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK) @@ -134,7 +134,7 @@ static void paint_motionsimulator_vehicle(paint_session * session, sint8 offsetX /** rct2: 0x008A85C4 */ static void paint_motionsimulator(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = track_map_2x2[direction][trackSequence]; diff --git a/src/openrct2/ride/thrill/PirateShip.cpp b/src/openrct2/ride/thrill/PirateShip.cpp index b4f89d45a9..bd6d93fb5d 100644 --- a/src/openrct2/ride/thrill/PirateShip.cpp +++ b/src/openrct2/ride/thrill/PirateShip.cpp @@ -65,7 +65,7 @@ static void paint_pirate_ship_structure(paint_session * session, Ride * ride, ui { uint32 imageId, baseImageId; - rct_map_element * savedMapElement = static_cast(session->CurrentlyDrawnItem); + rct_tile_element * savedMapElement = static_cast(session->CurrentlyDrawnItem); rct_ride_entry * rideEntry = get_ride_entry(ride->subtype); rct_vehicle * vehicle = NULL; @@ -168,7 +168,7 @@ static void paint_pirate_ship_structure(paint_session * session, Ride * ride, ui /** rct2: 0x008A85C4 */ static void paint_pirate_ship(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { uint8 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 aed78715b2..6e6092b504 100644 --- a/src/openrct2/ride/thrill/RotoDrop.cpp +++ b/src/openrct2/ride/thrill/RotoDrop.cpp @@ -92,7 +92,7 @@ void vehicle_visual_roto_drop(paint_session * session, sint32 x, sint32 imageDir /** rct2: 0x00886194 */ static void paint_roto_drop_base(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = track_map_3x3[direction][trackSequence]; @@ -169,7 +169,7 @@ static void paint_roto_drop_base(paint_session * session, uint8 rideIndex, uint8 /** rct2: 0x008861A4 */ static void paint_roto_drop_tower_section(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (trackSequence == 1) { @@ -179,8 +179,8 @@ static void paint_roto_drop_tower_section(paint_session * session, uint8 rideInd uint32 imageId = SPR_ROTO_DROP_TOWER_SEGMENT | session->TrackColours[SCHEME_TRACK]; sub_98197C(session, imageId, 0, 0, 2, 2, 30, height, 8, 8, height, get_current_rotation()); - rct_map_element * nextMapElement = mapElement + 1; - if (map_element_is_last_for_tile(mapElement) || mapElement->clearance_height != nextMapElement->base_height) + rct_tile_element * nextMapElement = mapElement + 1; + if (tile_element_is_last_for_tile(mapElement) || mapElement->clearance_height != nextMapElement->base_height) { imageId = SPR_ROTO_DROP_TOWER_SEGMENT_TOP | session->TrackColours[SCHEME_TRACK]; sub_98199C(session, imageId, 0, 0, 2, 2, 30, height, 8, 8, height, get_current_rotation()); diff --git a/src/openrct2/ride/thrill/SwingingInverterShip.cpp b/src/openrct2/ride/thrill/SwingingInverterShip.cpp index cd3a6861a2..d500e2b594 100644 --- a/src/openrct2/ride/thrill/SwingingInverterShip.cpp +++ b/src/openrct2/ride/thrill/SwingingInverterShip.cpp @@ -55,7 +55,7 @@ static const uint32 swinging_inverter_ship_frame_sprites[] = { SPR_SWINGING_INVE static void paint_swinging_inverter_ship_structure(paint_session * session, Ride * ride, uint8 direction, sint8 axisOffset, uint16 height) { - rct_map_element * savedMapElement = static_cast(session->CurrentlyDrawnItem); + rct_tile_element * savedMapElement = static_cast(session->CurrentlyDrawnItem); rct_ride_entry * rideEntry = get_ride_entry(ride->subtype); rct_vehicle * vehicle = NULL; @@ -124,7 +124,7 @@ static void paint_swinging_inverter_ship_structure(paint_session * session, Ride /** rct2: 0x00760260 */ static void paint_swinging_inverter_ship(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint8 relativeTrackSequence = track_map_1x4[direction][trackSequence]; diff --git a/src/openrct2/ride/thrill/TopSpin.cpp b/src/openrct2/ride/thrill/TopSpin.cpp index 3f58cb2744..e9931ec2d8 100644 --- a/src/openrct2/ride/thrill/TopSpin.cpp +++ b/src/openrct2/ride/thrill/TopSpin.cpp @@ -48,12 +48,12 @@ static sint8 TopSpinSeatPositionOffset[] = { * rct2: 0x0076750D */ static void top_spin_paint_vehicle(paint_session * session, sint8 al, sint8 cl, uint8 rideIndex, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { uint16 boundBoxOffsetX, boundBoxOffsetY, boundBoxOffsetZ; // As we will be drawing a vehicle we need to backup the mapElement that // is assigned to the drawings. - rct_map_element * curMapElement = static_cast(session->CurrentlyDrawnItem); + rct_tile_element * curMapElement = static_cast(session->CurrentlyDrawnItem); height += 3; @@ -248,7 +248,7 @@ static void top_spin_paint_vehicle(paint_session * session, sint8 al, sint8 cl, * rct2: 0x0076679C */ static void paint_top_spin(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = track_map_3x3[direction][trackSequence]; diff --git a/src/openrct2/ride/thrill/Twist.cpp b/src/openrct2/ride/thrill/Twist.cpp index 5b637851c5..1a97bf2604 100644 --- a/src/openrct2/ride/thrill/Twist.cpp +++ b/src/openrct2/ride/thrill/Twist.cpp @@ -25,7 +25,7 @@ static void paint_twist_structure(paint_session * session, Ride * ride, uint8 direction, sint8 xOffset, sint8 yOffset, uint16 height) { - rct_map_element * savedMapElement = static_cast(session->CurrentlyDrawnItem); + rct_tile_element * savedMapElement = static_cast(session->CurrentlyDrawnItem); rct_ride_entry * rideEntry = get_ride_entry(ride->subtype); rct_vehicle * vehicle = NULL; @@ -88,7 +88,7 @@ static void paint_twist_structure(paint_session * session, Ride * ride, uint8 di /** rct2: 0x0076D858 */ static void paint_twist(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = track_map_3x3[direction][trackSequence]; diff --git a/src/openrct2/ride/track_design_save.c b/src/openrct2/ride/track_design_save.c index 5bc6e2ae65..372986296c 100644 --- a/src/openrct2/ride/track_design_save.c +++ b/src/openrct2/ride/track_design_save.c @@ -31,7 +31,7 @@ #include "TrackDesignRepository.h" #include "../Context.h" -#define TRACK_MAX_SAVED_MAP_ELEMENTS 1500 +#define TRACK_MAX_SAVED_TILE_ELEMENTS 1500 #define TRACK_NEARBY_SCENERY_DISTANCE 1 bool gTrackDesignSaveMode = false; @@ -39,21 +39,21 @@ uint8 gTrackDesignSaveRideIndex = 255; static size_t _trackSavedMapElementsCount; #ifdef NO_RCT2 - static rct_map_element *_trackSavedMapElements[TRACK_MAX_SAVED_MAP_ELEMENTS]; + static rct_tile_element *_trackSavedMapElements[TRACK_MAX_SAVED_TILE_ELEMENTS]; #else - static rct_map_element **_trackSavedMapElements = (rct_map_element**)0x00F63674; + static rct_tile_element **_trackSavedMapElements = (rct_tile_element**)0x00F63674; #endif static size_t _trackSavedMapElementsDescCount; -static rct_td6_scenery_element _trackSavedMapElementsDesc[TRACK_MAX_SAVED_MAP_ELEMENTS]; +static rct_td6_scenery_element _trackSavedMapElementsDesc[TRACK_MAX_SAVED_TILE_ELEMENTS]; static rct_track_td6 *_trackDesign; static uint8 _trackSaveDirection; -static bool track_design_save_should_select_scenery_around(sint32 rideIndex, rct_map_element *mapElement); +static bool track_design_save_should_select_scenery_around(sint32 rideIndex, rct_tile_element *mapElement); static void track_design_save_select_nearby_scenery_for_tile(sint32 rideIndex, sint32 cx, sint32 cy); -static bool track_design_save_add_map_element(sint32 interactionType, sint32 x, sint32 y, rct_map_element *mapElement); -static void track_design_save_remove_map_element(sint32 interactionType, sint32 x, sint32 y, rct_map_element *mapElement); +static bool track_design_save_add_tile_element(sint32 interactionType, sint32 x, sint32 y, rct_tile_element *mapElement); +static void track_design_save_remove_tile_element(sint32 interactionType, sint32 x, sint32 y, rct_tile_element *mapElement); static bool track_design_save_copy_scenery_to_td6(rct_track_td6 *td6); static rct_track_td6 *track_design_save_to_td6(uint8 rideIndex); static bool track_design_save_to_td6_for_maze(uint8 rideIndex, rct_track_td6 *td6); @@ -67,7 +67,7 @@ void track_design_save_init() #ifdef NO_RCT2 memset(_trackSavedMapElements, 0, sizeof(_trackSavedMapElements)); #else - memset(_trackSavedMapElements, 0, sizeof(rct_map_element*) * TRACK_MAX_SAVED_MAP_ELEMENTS); + memset(_trackSavedMapElements, 0, sizeof(rct_tile_element*) * TRACK_MAX_SAVED_TILE_ELEMENTS); #endif memset(_trackSavedMapElementsDesc, 0, sizeof(_trackSavedMapElementsDesc)); @@ -77,15 +77,15 @@ void track_design_save_init() * * rct2: 0x006D2B07 */ -void track_design_save_select_map_element(sint32 interactionType, sint32 x, sint32 y, rct_map_element *mapElement, bool collect) +void track_design_save_select_tile_element(sint32 interactionType, sint32 x, sint32 y, rct_tile_element *mapElement, bool collect) { - if (track_design_save_contains_map_element(mapElement)) { + if (track_design_save_contains_tile_element(mapElement)) { if (!collect) { - track_design_save_remove_map_element(interactionType, x, y, mapElement); + track_design_save_remove_tile_element(interactionType, x, y, mapElement); } } else { if (collect) { - if (!track_design_save_add_map_element(interactionType, x, y, mapElement)) { + if (!track_design_save_add_tile_element(interactionType, x, y, mapElement)) { context_show_error( STR_SAVE_TRACK_SCENERY_UNABLE_TO_SELECT_ADDITIONAL_ITEM_OF_SCENERY, STR_SAVE_TRACK_SCENERY_TOO_MANY_ITEMS_SELECTED @@ -101,7 +101,7 @@ void track_design_save_select_map_element(sint32 interactionType, sint32 x, sint */ void track_design_save_select_nearby_scenery(sint32 rideIndex) { - rct_map_element *mapElement; + rct_tile_element *mapElement; for (sint32 y = 0; y < 256; y++) { for (sint32 x = 0; x < 256; x++) { @@ -111,7 +111,7 @@ void track_design_save_select_nearby_scenery(sint32 rideIndex) track_design_save_select_nearby_scenery_for_tile(rideIndex, x, y); break; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); } } gfx_invalidate_screen(); @@ -191,7 +191,7 @@ bool track_design_save(uint8 rideIndex) return true; } -bool track_design_save_contains_map_element(rct_map_element *mapElement) +bool track_design_save_contains_tile_element(rct_tile_element *mapElement) { for (size_t i = 0; i < _trackSavedMapElementsCount; i++) { if (_trackSavedMapElements[i] == mapElement) { @@ -201,19 +201,19 @@ bool track_design_save_contains_map_element(rct_map_element *mapElement) return false; } -static sint32 map_element_get_total_element_count(rct_map_element *mapElement) +static sint32 tile_element_get_total_element_count(rct_tile_element *mapElement) { sint32 elementCount; rct_scenery_entry *sceneryEntry; rct_large_scenery_tile *tile; - switch (map_element_get_type(mapElement)) { - case MAP_ELEMENT_TYPE_PATH: - case MAP_ELEMENT_TYPE_SCENERY: - case MAP_ELEMENT_TYPE_WALL: + switch (tile_element_get_type(mapElement)) { + case TILE_ELEMENT_TYPE_PATH: + case TILE_ELEMENT_TYPE_SCENERY: + case TILE_ELEMENT_TYPE_WALL: return 1; - case MAP_ELEMENT_TYPE_SCENERY_MULTIPLE: + case TILE_ELEMENT_TYPE_SCENERY_MULTIPLE: sceneryEntry = get_large_scenery_entry(mapElement->properties.scenerymultiple.type & 0x3FF); tile = sceneryEntry->large_scenery.tiles; elementCount = 0; @@ -232,15 +232,15 @@ static sint32 map_element_get_total_element_count(rct_map_element *mapElement) * * rct2: 0x006D2ED2 */ -static bool track_design_save_can_add_map_element(rct_map_element *mapElement) +static bool track_design_save_can_add_tile_element(rct_tile_element *mapElement) { - size_t newElementCount = map_element_get_total_element_count(mapElement); + size_t newElementCount = tile_element_get_total_element_count(mapElement); if (newElementCount == 0) { return false; } // Get number of spare elements left - size_t spareSavedElements = TRACK_MAX_SAVED_MAP_ELEMENTS - _trackSavedMapElementsCount; + size_t spareSavedElements = TRACK_MAX_SAVED_TILE_ELEMENTS - _trackSavedMapElementsCount; if (newElementCount > spareSavedElements) { // No more spare saved elements left return false; @@ -253,9 +253,9 @@ static bool track_design_save_can_add_map_element(rct_map_element *mapElement) * * rct2: 0x006D2F4C */ -static void track_design_save_push_map_element(sint32 x, sint32 y, rct_map_element *mapElement) +static void track_design_save_push_tile_element(sint32 x, sint32 y, rct_tile_element *mapElement) { - if (_trackSavedMapElementsCount < TRACK_MAX_SAVED_MAP_ELEMENTS) { + if (_trackSavedMapElementsCount < TRACK_MAX_SAVED_TILE_ELEMENTS) { _trackSavedMapElements[_trackSavedMapElementsCount++] = mapElement; map_invalidate_tile_full(x, y); @@ -270,7 +270,7 @@ static void track_design_save_push_map_element(sint32 x, sint32 y, rct_map_eleme * * rct2: 0x006D2FA7 */ -static void track_design_save_push_map_element_desc(rct_object_entry *entry, sint32 x, sint32 y, sint32 z, uint8 flags, uint8 primaryColour, uint8 secondaryColour) +static void track_design_save_push_tile_element_desc(rct_object_entry *entry, sint32 x, sint32 y, sint32 z, uint8 flags, uint8 primaryColour, uint8 secondaryColour) { rct_td6_scenery_element *item = &_trackSavedMapElementsDesc[_trackSavedMapElementsDescCount++]; item->scenery_object = *entry; @@ -282,7 +282,7 @@ static void track_design_save_push_map_element_desc(rct_object_entry *entry, sin item->secondary_colour = secondaryColour; } -static void track_design_save_add_scenery(sint32 x, sint32 y, rct_map_element *mapElement) +static void track_design_save_add_scenery(sint32 x, sint32 y, rct_tile_element *mapElement) { sint32 entryType = mapElement->properties.scenery.type; rct_object_entry *entry = (rct_object_entry*)&object_entry_groups[OBJECT_TYPE_SMALL_SCENERY].entries[entryType]; @@ -294,11 +294,11 @@ static void track_design_save_add_scenery(sint32 x, sint32 y, rct_map_element *m uint8 primaryColour = scenery_small_get_primary_colour(mapElement); uint8 secondaryColour = scenery_small_get_secondary_colour(mapElement); - track_design_save_push_map_element(x, y, mapElement); - track_design_save_push_map_element_desc(entry, x, y, mapElement->base_height, flags, primaryColour, secondaryColour); + track_design_save_push_tile_element(x, y, mapElement); + track_design_save_push_tile_element_desc(entry, x, y, mapElement->base_height, flags, primaryColour, secondaryColour); } -static void track_design_save_add_large_scenery(sint32 x, sint32 y, rct_map_element *mapElement) +static void track_design_save_add_large_scenery(sint32 x, sint32 y, rct_tile_element *mapElement) { rct_large_scenery_tile *sceneryTiles, *tile; sint32 x0, y0, z0, z; @@ -333,14 +333,14 @@ static void track_design_save_add_large_scenery(sint32 x, sint32 y, rct_map_elem uint8 primaryColour = mapElement->properties.scenerymultiple.colour[0] & 0x1F; uint8 secondaryColour = mapElement->properties.scenerymultiple.colour[1] & 0x1F; - track_design_save_push_map_element_desc(entry, x, y, z, flags, primaryColour, secondaryColour); + track_design_save_push_tile_element_desc(entry, x, y, z, flags, primaryColour, secondaryColour); } - track_design_save_push_map_element(x, y, mapElement); + track_design_save_push_tile_element(x, y, mapElement); } } } -static void track_design_save_add_wall(sint32 x, sint32 y, rct_map_element *mapElement) +static void track_design_save_add_wall(sint32 x, sint32 y, rct_tile_element *mapElement) { sint32 entryType = mapElement->properties.wall.type; rct_object_entry *entry = (rct_object_entry*)&object_entry_groups[OBJECT_TYPE_WALLS].entries[entryType]; @@ -352,11 +352,11 @@ static void track_design_save_add_wall(sint32 x, sint32 y, rct_map_element *mapE uint8 secondaryColour = wall_element_get_secondary_colour(mapElement); uint8 primaryColour = mapElement->properties.wall.colour_1 & 0x1F; - track_design_save_push_map_element(x, y, mapElement); - track_design_save_push_map_element_desc(entry, x, y, mapElement->base_height, flags, primaryColour, secondaryColour); + track_design_save_push_tile_element(x, y, mapElement); + track_design_save_push_tile_element_desc(entry, x, y, mapElement->base_height, flags, primaryColour, secondaryColour); } -static void track_design_save_add_footpath(sint32 x, sint32 y, rct_map_element *mapElement) +static void track_design_save_add_footpath(sint32 x, sint32 y, rct_tile_element *mapElement) { sint32 entryType = mapElement->properties.path.type >> 4; rct_object_entry *entry = (rct_object_entry*)&object_entry_groups[OBJECT_TYPE_PATHS].entries[entryType]; @@ -367,17 +367,17 @@ static void track_design_save_add_footpath(sint32 x, sint32 y, rct_map_element * flags |= (mapElement->properties.path.type & 3) << 5; flags |= (mapElement->type & 1) << 7; - track_design_save_push_map_element(x, y, mapElement); - track_design_save_push_map_element_desc(entry, x, y, mapElement->base_height, flags, 0, 0); + track_design_save_push_tile_element(x, y, mapElement); + track_design_save_push_tile_element_desc(entry, x, y, mapElement->base_height, flags, 0, 0); } /** * * rct2: 0x006D2B3C */ -static bool track_design_save_add_map_element(sint32 interactionType, sint32 x, sint32 y, rct_map_element *mapElement) +static bool track_design_save_add_tile_element(sint32 interactionType, sint32 x, sint32 y, rct_tile_element *mapElement) { - if (!track_design_save_can_add_map_element(mapElement)) { + if (!track_design_save_can_add_tile_element(mapElement)) { return false; } @@ -403,7 +403,7 @@ static bool track_design_save_add_map_element(sint32 interactionType, sint32 x, * * rct2: 0x006D2F78 */ -static void track_design_save_pop_map_element(sint32 x, sint32 y, rct_map_element *mapElement) +static void track_design_save_pop_tile_element(sint32 x, sint32 y, rct_tile_element *mapElement) { map_invalidate_tile_full(x, y); @@ -422,7 +422,7 @@ static void track_design_save_pop_map_element(sint32 x, sint32 y, rct_map_elemen memmove( &_trackSavedMapElements[removeIndex], &_trackSavedMapElements[removeIndex + 1], - remainingNumItems * sizeof(rct_map_element*) + remainingNumItems * sizeof(rct_tile_element*) ); } _trackSavedMapElementsCount--; @@ -438,7 +438,7 @@ static void track_design_save_pop_map_element(sint32 x, sint32 y, rct_map_elemen * * rct2: 0x006D2FDD */ -static void track_design_save_pop_map_element_desc(rct_object_entry *entry, sint32 x, sint32 y, sint32 z, uint8 flags, uint8 primaryColour, uint8 secondaryColour) +static void track_design_save_pop_tile_element_desc(rct_object_entry *entry, sint32 x, sint32 y, sint32 z, uint8 flags, uint8 primaryColour, uint8 secondaryColour) { size_t removeIndex = SIZE_MAX; for (size_t i = 0; i < _trackSavedMapElementsDescCount; i++) { @@ -465,7 +465,7 @@ static void track_design_save_pop_map_element_desc(rct_object_entry *entry, sint } } -static void track_design_save_remove_scenery(sint32 x, sint32 y, rct_map_element *mapElement) +static void track_design_save_remove_scenery(sint32 x, sint32 y, rct_tile_element *mapElement) { sint32 entryType = mapElement->properties.scenery.type; rct_object_entry *entry = (rct_object_entry*)&object_entry_groups[OBJECT_TYPE_SMALL_SCENERY].entries[entryType]; @@ -477,11 +477,11 @@ static void track_design_save_remove_scenery(sint32 x, sint32 y, rct_map_element uint8 primaryColour = scenery_small_get_primary_colour(mapElement); uint8 secondaryColour = scenery_small_get_secondary_colour(mapElement); - track_design_save_pop_map_element(x, y, mapElement); - track_design_save_pop_map_element_desc(entry, x, y, mapElement->base_height, flags, primaryColour, secondaryColour); + track_design_save_pop_tile_element(x, y, mapElement); + track_design_save_pop_tile_element_desc(entry, x, y, mapElement->base_height, flags, primaryColour, secondaryColour); } -static void track_design_save_remove_large_scenery(sint32 x, sint32 y, rct_map_element *mapElement) +static void track_design_save_remove_large_scenery(sint32 x, sint32 y, rct_tile_element *mapElement) { rct_large_scenery_tile *sceneryTiles, *tile; sint32 x0, y0, z0, z; @@ -516,14 +516,14 @@ static void track_design_save_remove_large_scenery(sint32 x, sint32 y, rct_map_e uint8 primaryColour = mapElement->properties.scenerymultiple.colour[0] & 0x1F; uint8 secondaryColour = mapElement->properties.scenerymultiple.colour[1] & 0x1F; - track_design_save_pop_map_element_desc(entry, x, y, z, flags, primaryColour, secondaryColour); + track_design_save_pop_tile_element_desc(entry, x, y, z, flags, primaryColour, secondaryColour); } - track_design_save_pop_map_element(x, y, mapElement); + track_design_save_pop_tile_element(x, y, mapElement); } } } -static void track_design_save_remove_wall(sint32 x, sint32 y, rct_map_element *mapElement) +static void track_design_save_remove_wall(sint32 x, sint32 y, rct_tile_element *mapElement) { sint32 entryType = mapElement->properties.wall.type; rct_object_entry *entry = (rct_object_entry*)&object_entry_groups[OBJECT_TYPE_WALLS].entries[entryType]; @@ -535,11 +535,11 @@ static void track_design_save_remove_wall(sint32 x, sint32 y, rct_map_element *m uint8 secondaryColour = wall_element_get_secondary_colour(mapElement); uint8 primaryColour = mapElement->properties.wall.colour_1 & 0x1F; - track_design_save_pop_map_element(x, y, mapElement); - track_design_save_pop_map_element_desc(entry, x, y, mapElement->base_height, flags, primaryColour, secondaryColour); + track_design_save_pop_tile_element(x, y, mapElement); + track_design_save_pop_tile_element_desc(entry, x, y, mapElement->base_height, flags, primaryColour, secondaryColour); } -static void track_design_save_remove_footpath(sint32 x, sint32 y, rct_map_element *mapElement) +static void track_design_save_remove_footpath(sint32 x, sint32 y, rct_tile_element *mapElement) { sint32 entryType = mapElement->properties.path.type >> 4; rct_object_entry *entry = (rct_object_entry*)&object_entry_groups[OBJECT_TYPE_PATHS].entries[entryType]; @@ -550,15 +550,15 @@ static void track_design_save_remove_footpath(sint32 x, sint32 y, rct_map_elemen flags |= (mapElement->properties.path.type & 3) << 5; flags |= (mapElement->type & 1) << 7; - track_design_save_pop_map_element(x, y, mapElement); - track_design_save_pop_map_element_desc(entry, x, y, mapElement->base_height, flags, 0, 0); + track_design_save_pop_tile_element(x, y, mapElement); + track_design_save_pop_tile_element_desc(entry, x, y, mapElement->base_height, flags, 0, 0); } /** * * rct2: 0x006D2B3C */ -static void track_design_save_remove_map_element(sint32 interactionType, sint32 x, sint32 y, rct_map_element *mapElement) +static void track_design_save_remove_tile_element(sint32 interactionType, sint32 x, sint32 y, rct_tile_element *mapElement) { switch (interactionType) { case VIEWPORT_INTERACTION_ITEM_SCENERY: @@ -576,18 +576,18 @@ static void track_design_save_remove_map_element(sint32 interactionType, sint32 } } -static bool track_design_save_should_select_scenery_around(sint32 rideIndex, rct_map_element *mapElement) +static bool track_design_save_should_select_scenery_around(sint32 rideIndex, rct_tile_element *mapElement) { - switch (map_element_get_type(mapElement)) { - case MAP_ELEMENT_TYPE_PATH: + switch (tile_element_get_type(mapElement)) { + case TILE_ELEMENT_TYPE_PATH: if ((mapElement->type & 1) && mapElement->properties.path.addition_status == rideIndex) return true; break; - case MAP_ELEMENT_TYPE_TRACK: + case TILE_ELEMENT_TYPE_TRACK: if (mapElement->properties.track.ride_index == rideIndex) return true; break; - case MAP_ELEMENT_TYPE_ENTRANCE: + case TILE_ELEMENT_TYPE_ENTRANCE: if (mapElement->properties.entrance.type != ENTRANCE_TYPE_RIDE_ENTRANCE) break; if (mapElement->properties.entrance.type != ENTRANCE_TYPE_RIDE_EXIT) @@ -601,37 +601,37 @@ static bool track_design_save_should_select_scenery_around(sint32 rideIndex, rct static void track_design_save_select_nearby_scenery_for_tile(sint32 rideIndex, sint32 cx, sint32 cy) { - rct_map_element *mapElement; + rct_tile_element *mapElement; for (sint32 y = cy - TRACK_NEARBY_SCENERY_DISTANCE; y <= cy + TRACK_NEARBY_SCENERY_DISTANCE; y++) { for (sint32 x = cx - TRACK_NEARBY_SCENERY_DISTANCE; x <= cx + TRACK_NEARBY_SCENERY_DISTANCE; x++) { mapElement = map_get_first_element_at(x, y); do { sint32 interactionType = VIEWPORT_INTERACTION_ITEM_NONE; - switch (map_element_get_type(mapElement)) { - case MAP_ELEMENT_TYPE_PATH: + switch (tile_element_get_type(mapElement)) { + case TILE_ELEMENT_TYPE_PATH: if (!(mapElement->type & 1)) interactionType = VIEWPORT_INTERACTION_ITEM_FOOTPATH; else if (mapElement->properties.path.addition_status == rideIndex) interactionType = VIEWPORT_INTERACTION_ITEM_FOOTPATH; break; - case MAP_ELEMENT_TYPE_SCENERY: + case TILE_ELEMENT_TYPE_SCENERY: interactionType = VIEWPORT_INTERACTION_ITEM_SCENERY; break; - case MAP_ELEMENT_TYPE_WALL: + case TILE_ELEMENT_TYPE_WALL: interactionType = VIEWPORT_INTERACTION_ITEM_WALL; break; - case MAP_ELEMENT_TYPE_SCENERY_MULTIPLE: + case TILE_ELEMENT_TYPE_SCENERY_MULTIPLE: interactionType = VIEWPORT_INTERACTION_ITEM_LARGE_SCENERY; break; } if (interactionType != VIEWPORT_INTERACTION_ITEM_NONE) { - if (!track_design_save_contains_map_element(mapElement)) { - track_design_save_add_map_element(interactionType, x * 32, y * 32, mapElement); + if (!track_design_save_contains_tile_element(mapElement)) { + track_design_save_add_tile_element(interactionType, x * 32, y * 32, mapElement); } } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); } } } @@ -805,7 +805,7 @@ static rct_track_td6 *track_design_save_to_td6(uint8 rideIndex) */ static bool track_design_save_to_td6_for_maze(uint8 rideIndex, rct_track_td6 *td6) { - rct_map_element *mapElement = NULL; + rct_tile_element *mapElement = NULL; bool mapFound = false; sint16 startX = 0; sint16 startY = 0; @@ -813,13 +813,13 @@ static bool track_design_save_to_td6_for_maze(uint8 rideIndex, rct_track_td6 *td for (startX = 0; startX < 8192; startX += 32) { mapElement = map_get_first_element_at(startX >> 5, startY >> 5); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; if (mapElement->properties.track.ride_index == rideIndex){ mapFound = true; break; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); if (mapFound) { break; } @@ -847,7 +847,7 @@ static bool track_design_save_to_td6_for_maze(uint8 rideIndex, rct_track_td6 *td for (; x < 8192; x += 32) { mapElement = map_get_first_element_at(x / 32, y / 32); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) continue; + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; if (mapElement->properties.track.ride_index != rideIndex) continue; maze->maze_entry = mapElement->properties.track.maze_entry; @@ -861,7 +861,7 @@ static bool track_design_save_to_td6_for_maze(uint8 rideIndex, rct_track_td6 *td SafeFree(td6->maze_elements); return false; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); } x = 0; @@ -881,13 +881,13 @@ static bool track_design_save_to_td6_for_maze(uint8 rideIndex, rct_track_td6 *td mapElement = map_get_first_element_at(location.x, location.y); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_ENTRANCE) continue; + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_ENTRANCE) continue; if (mapElement->properties.entrance.type != ENTRANCE_TYPE_RIDE_ENTRANCE) continue; if (mapElement->properties.entrance.ride_index == rideIndex) break; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); // Add something that stops this from walking off the end - uint8 entrance_direction = map_element_get_direction(mapElement); + uint8 entrance_direction = tile_element_get_direction(mapElement); maze->direction = entrance_direction; maze->type = 8; maze->x = (sint8)((x - startX) / 32); @@ -906,13 +906,13 @@ static bool track_design_save_to_td6_for_maze(uint8 rideIndex, rct_track_td6 *td y = location.y * 32; mapElement = map_get_first_element_at(location.x, location.y); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_ENTRANCE) continue; + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_ENTRANCE) continue; if (mapElement->properties.entrance.type != ENTRANCE_TYPE_RIDE_EXIT) continue; if (mapElement->properties.entrance.ride_index == rideIndex) break; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); // Add something that stops this from walking off the end - uint8 exit_direction = map_element_get_direction(mapElement); + uint8 exit_direction = tile_element_get_direction(mapElement); maze->direction = exit_direction; maze->type = 0x80; maze->x = (sint8)((x - startX) / 32); @@ -963,7 +963,7 @@ static bool track_design_save_to_td6_for_tracked_ride(uint8 rideIndex, rct_track // Find the start of the track. // It has to do this as a backwards loop in case this is an incomplete track. if (track_block_get_previous(trackElement.x, trackElement.y, trackElement.element, &trackBeginEnd)) { - rct_map_element* initial_map = trackElement.element; + rct_tile_element* initial_map = trackElement.element; do { rct_xy_element lastGood = { .element = trackBeginEnd.begin_element, @@ -980,7 +980,7 @@ static bool track_design_save_to_td6_for_tracked_ride(uint8 rideIndex, rct_track z = trackElement.element->base_height * 8; uint8 track_type = trackElement.element->properties.track.type; - uint8 direction = map_element_get_direction(trackElement.element); + uint8 direction = tile_element_get_direction(trackElement.element); _trackSaveDirection = direction; if (sub_6C683D(&trackElement.x, &trackElement.y, &z, direction, track_type, 0, &trackElement.element, 0)) { @@ -992,7 +992,7 @@ static bool track_design_save_to_td6_for_tracked_ride(uint8 rideIndex, rct_track // Used in the following loop to know when we have // completed all of the elements and are back at the // start. - rct_map_element *initialMap = trackElement.element; + rct_tile_element *initialMap = trackElement.element; sint16 start_x = trackElement.x; sint16 start_y = trackElement.y; @@ -1011,7 +1011,7 @@ static bool track_design_save_to_td6_for_tracked_ride(uint8 rideIndex, rct_track uint8 bh; if (track_element_has_speed_setting(track->type)) { - bh = map_element_get_brake_booster_speed(trackElement.element) >> 1; + bh = tile_element_get_brake_booster_speed(trackElement.element) >> 1; } else { @@ -1037,7 +1037,7 @@ static bool track_design_save_to_td6_for_tracked_ride(uint8 rideIndex, rct_track } z = trackElement.element->base_height * 8; - direction = map_element_get_direction(trackElement.element); + direction = tile_element_get_direction(trackElement.element); track_type = trackElement.element->properties.track.type; if (sub_6C683D(&trackElement.x, &trackElement.y, &z, direction, track_type, 0, &trackElement.element, 0)) @@ -1073,16 +1073,16 @@ static bool track_design_save_to_td6_for_tracked_ride(uint8 rideIndex, rct_track sint16 x = location.x * 32; sint16 y = location.y * 32; - rct_map_element *map_element = map_get_first_element_at(x >> 5, y >> 5); + rct_tile_element *tile_element = map_get_first_element_at(x >> 5, y >> 5); do { - if (map_element_get_type(map_element) != MAP_ELEMENT_TYPE_ENTRANCE) continue; - if (map_element->base_height == z) break; - } while (!map_element_is_last_for_tile(map_element++)); + if (tile_element_get_type(tile_element) != TILE_ELEMENT_TYPE_ENTRANCE) continue; + if (tile_element->base_height == z) break; + } while (!tile_element_is_last_for_tile(tile_element++)); // Add something that stops this from walking off the end - uint8 entrance_direction = map_element_get_direction(map_element); + uint8 entrance_direction = tile_element_get_direction(tile_element); entrance_direction -= _trackSaveDirection; - entrance_direction &= MAP_ELEMENT_DIRECTION_MASK; + entrance_direction &= TILE_ELEMENT_DIRECTION_MASK; entrance->direction = entrance_direction; x -= gTrackPreviewOrigin.x; diff --git a/src/openrct2/ride/track_paint.c b/src/openrct2/ride/track_paint.c index dfaf310f89..a483d3804b 100644 --- a/src/openrct2/ride/track_paint.c +++ b/src/openrct2/ride/track_paint.c @@ -27,7 +27,7 @@ #include "ride_data.h" #include "TrackData.h" #include "track_paint.h" -#include "../paint/map_element/map_element.h" +#include "../paint/tile_element/tile_element.h" /* rct2: 0x007667AC */ static LocationXY16 loc_7667AC[] = { @@ -203,7 +203,7 @@ enum bool gUseOriginalRidePaint = false; -bool track_paint_util_has_fence(enum edge_t edge, LocationXY16 position, rct_map_element * mapElement, Ride * ride, uint8 rotation) +bool track_paint_util_has_fence(enum edge_t edge, LocationXY16 position, rct_tile_element * mapElement, Ride * ride, uint8 rotation) { LocationXY16 offset = { 0, 0 }; switch (edge) { @@ -225,7 +225,7 @@ bool track_paint_util_has_fence(enum edge_t edge, LocationXY16 position, rct_map ((position.x / 32) + offset.x) | (((position.y / 32) + offset.y) * (1 << 8)); - sint32 entranceId = map_element_get_station(mapElement); + sint32 entranceId = tile_element_get_station(mapElement); return (ride->entrances[entranceId].xy != entranceLoc && ride->exits[entranceId].xy != entranceLoc); } @@ -247,7 +247,7 @@ void track_paint_util_paint_floor(paint_session * session, uint8 edges, uint32 c sub_98197C(session, imageId | colourFlags, 0, 0, 32, 32, 1, height, 0, 0, height, rotation); } -void track_paint_util_paint_fences(paint_session * session, uint8 edges, LocationXY16 position, rct_map_element * mapElement, Ride * ride, uint32 colourFlags, uint16 height, const uint32 fenceSprites[4], uint8 rotation) +void track_paint_util_paint_fences(paint_session * session, uint8 edges, LocationXY16 position, rct_tile_element * mapElement, Ride * ride, uint32 colourFlags, uint16 height, const uint32 fenceSprites[4], uint8 rotation) { uint32 imageId; @@ -281,29 +281,29 @@ bool track_paint_util_should_paint_supports(LocationXY16 position) return false; } -void track_paint_util_draw_station_impl(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, uint16 coverHeight, rct_map_element * mapElement, sint32 fenceOffsetA, sint32 fenceOffsetB); +void track_paint_util_draw_station_impl(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, uint16 coverHeight, rct_tile_element * mapElement, sint32 fenceOffsetA, sint32 fenceOffsetB); -void track_paint_util_draw_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element * mapElement) +void track_paint_util_draw_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element * mapElement) { track_paint_util_draw_station_impl(session, rideIndex, trackSequence, direction, height, height, mapElement, 5, 7); } -void track_paint_util_draw_station_2(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element * mapElement, sint32 fenceOffsetA, sint32 fenceOffsetB) +void track_paint_util_draw_station_2(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element * mapElement, sint32 fenceOffsetA, sint32 fenceOffsetB) { track_paint_util_draw_station_impl(session, rideIndex, trackSequence, direction, height, height, mapElement, fenceOffsetA, fenceOffsetB); } -void track_paint_util_draw_station_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, uint16 coverHeight, rct_map_element * mapElement) +void track_paint_util_draw_station_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, uint16 coverHeight, rct_tile_element * mapElement) { track_paint_util_draw_station_impl(session, rideIndex, trackSequence, direction, height, coverHeight, mapElement, 5, 7); } -void track_paint_util_draw_station_impl(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, uint16 coverHeight, rct_map_element * mapElement, sint32 fenceOffsetA, sint32 fenceOffsetB) +void track_paint_util_draw_station_impl(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, uint16 coverHeight, rct_tile_element * mapElement, sint32 fenceOffsetA, sint32 fenceOffsetB) { LocationXY16 position = session->MapPosition; Ride * ride = get_ride(rideIndex); const rct_ride_entrance_definition * entranceStyle = &RideEntranceDefinitions[ride->entrance_style]; - const bool hasGreenLight = map_element_get_green_light(mapElement); + const bool hasGreenLight = tile_element_get_green_light(mapElement); bool hasFence; uint32 imageId; @@ -432,12 +432,12 @@ void track_paint_util_draw_station_impl(paint_session * session, uint8 rideIndex } } -void track_paint_util_draw_station_inverted(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, uint8 stationVariant) +void track_paint_util_draw_station_inverted(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, uint8 stationVariant) { LocationXY16 position = session->MapPosition; Ride * ride = get_ride(rideIndex); const rct_ride_entrance_definition * entranceStyle = &RideEntranceDefinitions[ride->entrance_style]; - const bool hasGreenLight = map_element_get_green_light(mapElement); + const bool hasGreenLight = tile_element_get_green_light(mapElement); bool hasFence; uint32 imageId; @@ -641,7 +641,7 @@ bool track_paint_util_draw_station_covers_2(paint_session * session, enum edge_t return true; } -void track_paint_util_draw_station_platform(paint_session * session, Ride *ride, uint8 direction, sint32 height, sint32 zOffset, rct_map_element * mapElement) +void track_paint_util_draw_station_platform(paint_session * session, Ride *ride, uint8 direction, sint32 height, sint32 zOffset, rct_tile_element * mapElement) { LocationXY16 position = session->MapPosition; const rct_ride_entrance_definition * entranceStyle = &RideEntranceDefinitions[ride->entrance_style]; @@ -678,7 +678,7 @@ void track_paint_util_draw_station_platform(paint_session * session, Ride *ride, } } -void track_paint_util_draw_pier(paint_session * session, Ride * ride, const rct_ride_entrance_definition * entranceStyle, LocationXY16 position, uint8 direction, sint32 height, rct_map_element * mapElement, uint8 rotation) +void track_paint_util_draw_pier(paint_session * session, Ride * ride, const rct_ride_entrance_definition * entranceStyle, LocationXY16 position, uint8 direction, sint32 height, rct_tile_element * mapElement, uint8 rotation) { bool hasFence; uint32 imageId; @@ -1620,7 +1620,7 @@ void track_paint_util_spinning_tunnel_paint(paint_session * session, sint8 thick } } -void track_paint_util_onride_photo_small_paint(paint_session * session, uint8 direction, sint32 height, rct_map_element *mapElement) +void track_paint_util_onride_photo_small_paint(paint_session * session, uint8 direction, sint32 height, rct_tile_element *mapElement) { static const uint32 imageIds[4][3] = { @@ -1630,7 +1630,7 @@ void track_paint_util_onride_photo_small_paint(paint_session * session, uint8 di { SPR_ON_RIDE_PHOTO_SIGN_SMALL_SE_NW, SPR_ON_RIDE_PHOTO_CAMERA_SMALL_E, SPR_ON_RIDE_PHOTO_CAMERA_FLASH_SMALL_E }, }; - bool takingPhoto = map_element_is_taking_photo(mapElement); + bool takingPhoto = tile_element_is_taking_photo(mapElement); uint32 imageId = imageIds[direction][0] | session->TrackColours[SCHEME_MISC]; uint32 flashImageId = imageIds[direction][takingPhoto ? 2 : 1] | session->TrackColours[SCHEME_MISC]; switch (direction) { @@ -1657,7 +1657,7 @@ void track_paint_util_onride_photo_small_paint(paint_session * session, uint8 di } } -void track_paint_util_onride_photo_paint(paint_session * session, uint8 direction, sint32 height, rct_map_element *mapElement) +void track_paint_util_onride_photo_paint(paint_session * session, uint8 direction, sint32 height, rct_tile_element *mapElement) { static const uint32 imageIds[4][3] = { @@ -1667,7 +1667,7 @@ void track_paint_util_onride_photo_paint(paint_session * session, uint8 directio { SPR_ON_RIDE_PHOTO_SIGN_SE_NW, SPR_ON_RIDE_PHOTO_CAMERA_E, SPR_ON_RIDE_PHOTO_CAMERA_FLASH_E }, }; - bool takingPhoto = map_element_is_taking_photo(mapElement); + bool takingPhoto = tile_element_is_taking_photo(mapElement); uint32 imageId = imageIds[direction][0] | session->TrackColours[SCHEME_MISC]; uint32 flashImageId = imageIds[direction][takingPhoto ? 2 : 1] | session->TrackColours[SCHEME_MISC]; switch (direction) { @@ -1733,7 +1733,7 @@ void track_paint_util_left_corkscrew_up_supports(paint_session * session, uint8 * * rct2: 0x006C4794 */ -void track_paint(paint_session * session, uint8 direction, sint32 height, rct_map_element *mapElement) +void track_paint(paint_session * session, uint8 direction, sint32 height, rct_tile_element *mapElement) { sint32 rideIndex = mapElement->properties.track.ride_index; Ride *ride = get_ride(rideIndex); @@ -1753,7 +1753,7 @@ void track_paint(paint_session * session, uint8 direction, sint32 height, rct_ma if (!gTrackDesignSaveMode || rideIndex == gTrackDesignSaveRideIndex) { sint32 trackType = mapElement->properties.track.type; - sint32 trackSequence = map_element_get_track_sequence(mapElement); + sint32 trackSequence = tile_element_get_track_sequence(mapElement); sint32 trackColourScheme = track_element_get_colour_scheme(mapElement); if ((gCurrentViewportFlags & VIEWPORT_FLAG_TRACK_HEIGHTS) && dpi->zoom_level == 0) { @@ -1772,13 +1772,13 @@ void track_paint(paint_session * session, uint8 direction, sint32 height, rct_ma session->TrackColours[SCHEME_SUPPORTS] = SPRITE_ID_PALETTE_COLOUR_1(ride->track_colour_supports[trackColourScheme]); session->TrackColours[SCHEME_MISC] = IMAGE_TYPE_REMAP; session->TrackColours[SCHEME_3] = 0x20C00000; - if (mapElement->type & MAP_ELEMENT_TYPE_FLAG_HIGHLIGHT) { + if (mapElement->type & TILE_ELEMENT_TYPE_FLAG_HIGHLIGHT) { session->TrackColours[SCHEME_TRACK] = 0x21600000; session->TrackColours[SCHEME_SUPPORTS] = 0x21600000; session->TrackColours[SCHEME_MISC] = 0x21600000; session->TrackColours[SCHEME_3] = 0x21600000; } - if (mapElement->flags & MAP_ELEMENT_FLAG_GHOST) { + if (mapElement->flags & TILE_ELEMENT_FLAG_GHOST) { uint32 ghost_id = construction_markers[gConfigGeneral.construction_marker_colour]; session->InteractionType = VIEWPORT_INTERACTION_ITEM_NONE; session->TrackColours[SCHEME_TRACK] = ghost_id; diff --git a/src/openrct2/ride/track_paint.h b/src/openrct2/ride/track_paint.h index 0a7db2b2c9..cd92bb7c1b 100644 --- a/src/openrct2/ride/track_paint.h +++ b/src/openrct2/ride/track_paint.h @@ -20,7 +20,7 @@ #include "../rct2/addresses.h" #include "ride_data.h" #include "../common.h" -#include "../paint/map_element/map_element.h" +#include "../paint/tile_element/tile_element.h" #include "../paint/paint.h" #include "../world/map.h" @@ -267,18 +267,18 @@ extern bool gUseOriginalRidePaint; extern const size_t mini_golf_peep_animation_lengths[]; -bool track_paint_util_has_fence(enum edge_t edge, LocationXY16 position, rct_map_element * mapElement, Ride * ride, uint8 rotation); +bool track_paint_util_has_fence(enum edge_t edge, LocationXY16 position, rct_tile_element * mapElement, Ride * ride, uint8 rotation); void track_paint_util_paint_floor(paint_session * session, uint8 edges, uint32 colourFlags, uint16 height, const uint32 floorSprites[4], uint8 rotation); -void track_paint_util_paint_fences(paint_session * session, uint8 edges, LocationXY16 position, rct_map_element * mapElement, Ride * ride, uint32 colourFlags, uint16 height, const uint32 fenceSprites[4], uint8 rotation); +void track_paint_util_paint_fences(paint_session * session, uint8 edges, LocationXY16 position, rct_tile_element * mapElement, Ride * ride, uint32 colourFlags, uint16 height, const uint32 fenceSprites[4], uint8 rotation); bool track_paint_util_draw_station_covers(paint_session * session, enum edge_t edge, bool hasFence, const rct_ride_entrance_definition * entranceStyle, uint8 direction, uint16 height); bool track_paint_util_draw_station_covers_2(paint_session * session, enum edge_t edge, bool hasFence, const rct_ride_entrance_definition * entranceStyle, uint8 direction, uint16 height, uint8 stationVariant); -void track_paint_util_draw_station_platform(paint_session * session, Ride *ride, uint8 direction, sint32 height, sint32 zOffset, rct_map_element * mapElement); -void track_paint_util_draw_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element * mapElement); -void track_paint_util_draw_station_2(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_map_element * mapElement, sint32 fenceOffsetA, sint32 fenceOffsetB); -void track_paint_util_draw_station_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, uint16 coverHeight, rct_map_element * mapElement); -void track_paint_util_draw_station_inverted(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element * mapElement, uint8 stationVariant); +void track_paint_util_draw_station_platform(paint_session * session, Ride *ride, uint8 direction, sint32 height, sint32 zOffset, rct_tile_element * mapElement); +void track_paint_util_draw_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element * mapElement); +void track_paint_util_draw_station_2(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, rct_tile_element * mapElement, sint32 fenceOffsetA, sint32 fenceOffsetB); +void track_paint_util_draw_station_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, uint16 height, uint16 coverHeight, rct_tile_element * mapElement); +void track_paint_util_draw_station_inverted(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element * mapElement, uint8 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 direction, sint32 height, rct_map_element * mapElement, uint8 rotation); +void track_paint_util_draw_pier(paint_session * session, Ride * ride, const rct_ride_entrance_definition * entranceStyle, LocationXY16 position, uint8 direction, sint32 height, rct_tile_element * mapElement, uint8 rotation); void track_paint_util_draw_station_metal_supports(paint_session * session, uint8 direction, uint16 height, uint32 colour); void track_paint_util_draw_station_metal_supports_2(paint_session * session, uint8 direction, uint16 height, uint32 colour, uint8 type); @@ -300,8 +300,8 @@ void track_paint_util_left_quarter_turn_3_tiles_paint_with_height_offset(paint_s void track_paint_util_left_quarter_turn_3_tiles_tunnel(paint_session * session, sint16 height, uint8 tunnelType, uint8 direction, uint8 trackSequence); void track_paint_util_left_quarter_turn_1_tile_paint(paint_session * session, sint8 thickness, sint16 height, sint16 boundBoxZOffset, sint32 direction, uint32 colourFlags, const uint32 * sprites, uint8 rotation); void track_paint_util_spinning_tunnel_paint(paint_session * session, sint8 thickness, sint16 height, uint8 direction, uint8 rotation); -void track_paint_util_onride_photo_small_paint(paint_session * session, uint8 direction, sint32 height, rct_map_element *mapElement); -void track_paint_util_onride_photo_paint(paint_session * session, uint8 direction, sint32 height, rct_map_element *mapElement); +void track_paint_util_onride_photo_small_paint(paint_session * session, uint8 direction, sint32 height, rct_tile_element *mapElement); +void track_paint_util_onride_photo_paint(paint_session * session, uint8 direction, sint32 height, rct_tile_element *mapElement); void track_paint_util_right_helix_up_small_quarter_tiles_paint(paint_session * session, const sint8 thickness[2], sint16 height, sint32 direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][3][2], const LocationXY16 offsets[4][3][2], const LocationXY16 boundsLengths[4][3][2], const LocationXYZ16 boundsOffsets[4][3][2], uint8 rotation); void track_paint_util_right_helix_up_large_quarter_tiles_paint(paint_session * session, const sint8 thickness[2], sint16 height, sint32 direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][5][2], const LocationXY16 offsets[4][5][2], const LocationXY16 boundsLengths[4][5][2], const LocationXYZ16 boundsOffsets[4][5][2], uint8 rotation); void track_paint_util_eighth_to_diag_tiles_paint(paint_session * session, const sint8 thickness[4][4], sint16 height, sint32 direction, uint8 trackSequence, uint32 colourFlags, const uint32 sprites[4][4], const LocationXY16 offsets[4][4], const LocationXY16 boundsLengths[4][4], const LocationXYZ16 boundsOffsets[4][4], uint8 rotation); @@ -314,7 +314,7 @@ void track_paint_util_right_vertical_loop_segments(paint_session * session, uint void track_paint_util_left_corkscrew_up_supports(paint_session * session, uint8 direction, uint16 height); -typedef void (*TRACK_PAINT_FUNCTION)(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_map_element* mapElement); +typedef void (*TRACK_PAINT_FUNCTION)(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, rct_tile_element* mapElement); typedef TRACK_PAINT_FUNCTION (*TRACK_PAINT_FUNCTION_GETTER)(sint32 trackType, sint32 direction); TRACK_PAINT_FUNCTION get_track_paint_function_stand_up_rc(sint32 trackType, sint32 direction); diff --git a/src/openrct2/ride/transport/Chairlift.cpp b/src/openrct2/ride/transport/Chairlift.cpp index da6e3ff6d0..8d116795d5 100644 --- a/src/openrct2/ride/transport/Chairlift.cpp +++ b/src/openrct2/ride/transport/Chairlift.cpp @@ -114,10 +114,10 @@ static void chairlift_paint_util_draw_supports(paint_session * session, sint32 s } } -static rct_map_element * chairlift_paint_util_map_get_track_element_at_from_ride_fuzzy(sint32 x, sint32 y, sint32 z, +static rct_tile_element * chairlift_paint_util_map_get_track_element_at_from_ride_fuzzy(sint32 x, sint32 y, sint32 z, sint32 rideIndex) { - rct_map_element * mapElement = map_get_first_element_at(x >> 5, y >> 5); + rct_tile_element * mapElement = map_get_first_element_at(x >> 5, y >> 5); if (mapElement == NULL) { return NULL; @@ -125,7 +125,7 @@ static rct_map_element * chairlift_paint_util_map_get_track_element_at_from_ride do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; if (mapElement->properties.track.ride_index != rideIndex) continue; @@ -133,12 +133,12 @@ static rct_map_element * chairlift_paint_util_map_get_track_element_at_from_ride continue; return mapElement; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return NULL; }; -static bool chairlift_paint_util_is_first_track(uint8 rideIndex, const rct_map_element * mapElement, LocationXY16 pos, +static bool chairlift_paint_util_is_first_track(uint8 rideIndex, const rct_tile_element * mapElement, LocationXY16 pos, uint8 trackType) { if (mapElement->properties.track.type != TRACK_ELEM_BEGIN_STATION) @@ -146,19 +146,19 @@ static bool chairlift_paint_util_is_first_track(uint8 rideIndex, const rct_map_e return false; } - LocationXY16 delta = TileDirectionDelta[map_element_get_direction(mapElement)]; + LocationXY16 delta = TileDirectionDelta[tile_element_get_direction(mapElement)]; LocationXY16 newPos = { static_cast(pos.x - delta.x), static_cast(pos.y - delta.y), }; - rct_map_element * nextTrack = + rct_tile_element * nextTrack = chairlift_paint_util_map_get_track_element_at_from_ride_fuzzy(newPos.x, newPos.y, mapElement->base_height, rideIndex); return nextTrack == NULL; } -static bool chairlift_paint_util_is_last_track(uint8 rideIndex, const rct_map_element * mapElement, LocationXY16 pos, +static bool chairlift_paint_util_is_last_track(uint8 rideIndex, const rct_tile_element * mapElement, LocationXY16 pos, uint8 trackType) { if (mapElement->properties.track.type != TRACK_ELEM_END_STATION) @@ -166,20 +166,20 @@ static bool chairlift_paint_util_is_last_track(uint8 rideIndex, const rct_map_el return false; } - LocationXY16 delta = TileDirectionDelta[map_element_get_direction(mapElement)]; + LocationXY16 delta = TileDirectionDelta[tile_element_get_direction(mapElement)]; LocationXY16 newPos = { static_cast(pos.x + delta.x), static_cast(pos.y + delta.y), }; - rct_map_element * nextTrack = + rct_tile_element * nextTrack = chairlift_paint_util_map_get_track_element_at_from_ride_fuzzy(newPos.x, newPos.y, mapElement->base_height, rideIndex); return nextTrack == NULL; } static void chairlift_paint_station_ne_sw(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { const LocationXY16 pos = session->MapPosition; uint8 trackType = mapElement->properties.track.type; @@ -270,7 +270,7 @@ static void chairlift_paint_station_ne_sw(paint_session * session, uint8 rideInd } static void chairlift_paint_station_se_nw(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { const LocationXY16 pos = session->MapPosition; uint8 trackType = mapElement->properties.track.type; @@ -363,7 +363,7 @@ static void chairlift_paint_station_se_nw(paint_session * session, uint8 rideInd /** rct2: 0x00744068 */ static void chairlift_paint_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (direction % 2) { @@ -376,7 +376,7 @@ static void chairlift_paint_station(paint_session * session, uint8 rideIndex, ui } static void chairlift_paint_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { uint32 imageId; if (direction & 1) @@ -398,7 +398,7 @@ static void chairlift_paint_flat(paint_session * session, uint8 rideIndex, uint8 /** rct2: 0x00743FD8 */ static void chairlift_paint_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId; @@ -435,7 +435,7 @@ static void chairlift_paint_25_deg_up(paint_session * session, uint8 rideIndex, /** rct2: 0x00743FD8 */ static void chairlift_paint_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId; @@ -489,7 +489,7 @@ static void chairlift_paint_flat_to_25_deg_up(paint_session * session, uint8 rid /** rct2: 0x00743FF8 */ static void chairlift_paint_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId; @@ -543,28 +543,28 @@ static void chairlift_paint_25_deg_up_to_flat(paint_session * session, uint8 rid /** rct2: 0x00744008 */ static void chairlift_paint_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { chairlift_paint_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x00744018 */ static void chairlift_paint_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { chairlift_paint_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x00744028 */ static void chairlift_paint_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { chairlift_paint_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x00744038 */ static void chairlift_paint_left_quarter_turn_1_tile(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint32 imageId; @@ -630,7 +630,7 @@ static void chairlift_paint_left_quarter_turn_1_tile(paint_session * session, ui /** rct2: 0x00744048 */ static void chairlift_paint_right_quarter_turn_1_tile(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { chairlift_paint_left_quarter_turn_1_tile(session, rideIndex, trackSequence, (direction + 3) % 4, height, mapElement); } diff --git a/src/openrct2/ride/transport/Lift.cpp b/src/openrct2/ride/transport/Lift.cpp index 48a710407d..39e29d3f42 100644 --- a/src/openrct2/ride/transport/Lift.cpp +++ b/src/openrct2/ride/transport/Lift.cpp @@ -54,7 +54,7 @@ static void paint_lift_cage(paint_session * session, sint8 index, uint32 colourF /** rct2: 0x0076C6CC */ static void paint_lift_base(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = track_map_3x3[direction][trackSequence]; @@ -123,7 +123,7 @@ static void paint_lift_base(paint_session * session, uint8 rideIndex, uint8 trac /** rct2: 0x0076C6DC */ static void paint_lift_tower_section(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (trackSequence == 1) { diff --git a/src/openrct2/ride/transport/MiniatureRailway.cpp b/src/openrct2/ride/transport/MiniatureRailway.cpp index d655077f6c..fb6e44ccbe 100644 --- a/src/openrct2/ride/transport/MiniatureRailway.cpp +++ b/src/openrct2/ride/transport/MiniatureRailway.cpp @@ -549,7 +549,7 @@ static const uint32 miniature_railway_track_pieces_diag_25_deg_up[4] = { /** rct2: 0x008AD0C0 */ static void paint_miniature_railway_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bool isSupported = @@ -578,7 +578,7 @@ static void paint_miniature_railway_track_flat(paint_session * session, uint8 ri /** rct2: 0x008AD170, 0x008AD180, 0x008AD190 */ static void paint_miniature_railway_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId; @@ -601,7 +601,7 @@ static void paint_miniature_railway_station(paint_session * session, uint8 rideI /** rct2: 0x008AD0D0 */ static void paint_miniature_railway_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint32 imageId = miniature_railway_track_pieces_25_deg_up[direction] | session->TrackColours[SCHEME_TRACK]; @@ -632,7 +632,7 @@ static void paint_miniature_railway_track_25_deg_up(paint_session * session, uin /** rct2: 0x008AD0E0 */ static void paint_miniature_railway_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint32 imageId = miniature_railway_track_pieces_flat_to_25_deg_up[direction] | session->TrackColours[SCHEME_TRACK]; @@ -663,7 +663,7 @@ static void paint_miniature_railway_track_flat_to_25_deg_up(paint_session * sess /** rct2: 0x008AD0F0 */ static void paint_miniature_railway_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint32 imageId = miniature_railway_track_pieces_25_deg_up_to_flat[direction] | session->TrackColours[SCHEME_TRACK]; @@ -694,21 +694,21 @@ static void paint_miniature_railway_track_25_deg_up_to_flat(paint_session * sess /** rct2: 0x008AD100 */ static void paint_miniature_railway_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_miniature_railway_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x008AD110 */ static void paint_miniature_railway_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_miniature_railway_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x008AD120 */ static void paint_miniature_railway_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_miniature_railway_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } @@ -820,7 +820,7 @@ static const sint8 miniature_railway_right_quarter_turn_5_tiles_sprite_map[] = { /** rct2: 0x008AD140 */ static void paint_miniature_railway_track_right_quarter_turn_5_tiles(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { if (right_quarter_turn_5_supports_type[direction][trackSequence] != -1) @@ -908,7 +908,7 @@ static void paint_miniature_railway_track_right_quarter_turn_5_tiles(paint_sessi /** rct2: 0x008AD130 */ static void paint_miniature_railway_track_left_quarter_turn_5_tiles(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; paint_miniature_railway_track_right_quarter_turn_5_tiles(session, rideIndex, trackSequence, (direction + 1) % 4, height, @@ -928,7 +928,7 @@ static const uint32 miniature_railway_s_bend_left_tiles_track_floor[2][4] = { { /** rct2: 0x8AD150 */ static void paint_miniature_railway_track_s_bend_left(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (direction == 2 || direction == 3) { @@ -1022,7 +1022,7 @@ static const uint32 miniature_railway_s_bend_right_tiles_track_floor[2][4] = { { /** rct2: 0x008AD160 */ static void paint_miniature_railway_track_s_bend_right(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (direction == 2 || direction == 3) { @@ -1148,7 +1148,7 @@ const LocationXYZ16 miniature_railway_right_quarter_turn_3_tile_bound_offsets[4] /** rct2: 0x008AD1B0 */ static void paint_miniature_railway_track_right_quarter_turn_3_tiles(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bool isSupported = false; if (trackSequence != 1 && trackSequence != 2) @@ -1207,7 +1207,7 @@ static void paint_miniature_railway_track_right_quarter_turn_3_tiles(paint_sessi /** rct2: 0x008AD1A0 */ static void paint_miniature_railway_track_left_quarter_turn_3_tiles(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; paint_miniature_railway_track_right_quarter_turn_3_tiles(session, rideIndex, trackSequence, (direction + 1) % 4, height, @@ -1289,7 +1289,7 @@ static const LocationXY16 miniature_railway_track_floor_pieces_left_eight_to_dia /** rct2: 0x008AD1C0 */ static void paint_miniature_railway_track_left_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { const uint8 supportType[4][5] = { { 0, 0, 3, 5, 1 }, { 1, 1, 4, 2, 0 }, { 0, 0, 5, 3, 1 }, { 1, 1, 2, 4, 0 } }; @@ -1427,7 +1427,7 @@ static const LocationXY16 miniature_railway_track_floor_pieces_right_eight_to_di /** rct2: 0x008AD1D0 */ static void paint_miniature_railway_track_right_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { const uint8 supportType[4][5] = { { 0, 0, 2, 4, 1 }, { 1, 1, 3, 5, 0 }, { 0, 0, 4, 2, 1 }, { 1, 1, 5, 3, 0 } }; @@ -1497,7 +1497,7 @@ static void paint_miniature_railway_track_right_eighth_to_diag(paint_session * s /** rct2: 0x008AD1E0 */ static void paint_miniature_railway_track_left_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; paint_miniature_railway_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) % 4, height, @@ -1507,7 +1507,7 @@ static void paint_miniature_railway_track_left_eighth_to_orthogonal(paint_sessio /** rct2: 0x008AD1F0 */ static void paint_miniature_railway_track_right_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; paint_miniature_railway_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) % 4, height, @@ -1556,7 +1556,7 @@ static const floor_desc floors[] = { /** rct2: 0x008AD200 */ static void miniature_railway_track_diag_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bool isSupported = false; sint16 supportType = monorail_diag_support_types[direction][trackSequence]; @@ -1625,7 +1625,7 @@ static bool wooden_supports_paint_setup(paint_session * session, sint32 woodType /** rct2: 0x008AD230 */ static void miniature_railway_track_diag_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { // TODO: The supports are inconsistent for different rotations @@ -1697,7 +1697,7 @@ static void miniature_railway_track_diag_25_deg_up(paint_session * session, uint /** rct2: 0x008AD210 */ static void miniature_railway_track_diag_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bool hasSupports = false; @@ -1745,7 +1745,7 @@ static void miniature_railway_track_diag_flat_to_25_deg_up(paint_session * sessi /** rct2: 0x008AD220 */ static void miniature_railway_track_diag_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { const sint8 supportOffsets[][4] = { { 0, +8, +8, +8 }, @@ -1817,7 +1817,7 @@ static void miniature_railway_track_diag_25_deg_up_to_flat(paint_session * sessi /** rct2: 0x008AD260 */ static void miniature_railway_track_diag_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { const sint8 supportOffsets[][4] = { { 0, +16, +16, 0 }, @@ -1888,7 +1888,7 @@ static void miniature_railway_track_diag_25_deg_down(paint_session * session, ui /** rct2: 0x008AD240 */ static void miniature_railway_track_diag_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { const sint8 supportOffsets[][4] = { { 0, +16, +16, 0 }, @@ -1957,7 +1957,7 @@ static void miniature_railway_track_diag_flat_to_25_deg_down(paint_session * ses } static void miniature_railway_track_diag_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bool hasSupports = false; uint32 floorImage = 0; diff --git a/src/openrct2/ride/transport/Monorail.cpp b/src/openrct2/ride/transport/Monorail.cpp index e89b272940..83e8fe60a8 100644 --- a/src/openrct2/ride/transport/Monorail.cpp +++ b/src/openrct2/ride/transport/Monorail.cpp @@ -426,7 +426,7 @@ static const uint32 monorail_track_pieces_diag_25_deg_up[4] = { /** rct2: 0x008AE1AC */ static void paint_monorail_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { LocationXY16 position = session->MapPosition; @@ -462,7 +462,7 @@ static void paint_monorail_track_flat(paint_session * session, uint8 rideIndex, /** rct2: 0x008AE25C, 0x008AE26C, 0x008AE27C */ static void paint_monorail_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId; @@ -515,7 +515,7 @@ static void paint_monorail_station(paint_session * session, uint8 rideIndex, uin /** rct2: 0x008AE1BC */ static void paint_monorail_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { LocationXY16 position = session->MapPosition; @@ -558,7 +558,7 @@ static void paint_monorail_track_25_deg_up(paint_session * session, uint8 rideIn /** rct2: 0x008AE1CC */ static void paint_monorail_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { LocationXY16 position = session->MapPosition; @@ -601,7 +601,7 @@ static void paint_monorail_track_flat_to_25_deg_up(paint_session * session, uint /** rct2: 0x008AE1DC */ static void paint_monorail_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { LocationXY16 position = session->MapPosition; @@ -644,28 +644,28 @@ static void paint_monorail_track_25_deg_up_to_flat(paint_session * session, uint /** rct2: 0x008AE1EC */ static void paint_monorail_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { paint_monorail_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x008AE1FC */ static void paint_monorail_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_monorail_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x008AE20C */ static void paint_monorail_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_monorail_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } /** rct2: 0x008AE22C */ static void paint_monorail_track_right_quarter_turn_5_tiles(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { track_paint_util_right_quarter_turn_5_tiles_paint( session, 3, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -727,7 +727,7 @@ static void paint_monorail_track_right_quarter_turn_5_tiles(paint_session * sess /** rct2: 0x008AE21C */ static void paint_monorail_track_left_quarter_turn_5_tiles(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; paint_monorail_track_right_quarter_turn_5_tiles(session, rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); @@ -735,7 +735,7 @@ static void paint_monorail_track_left_quarter_turn_5_tiles(paint_session * sessi /** rct2: 0x */ static void paint_monorail_track_s_bend_left(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (direction == 2 || direction == 3) { @@ -832,7 +832,7 @@ static void paint_monorail_track_s_bend_left(paint_session * session, uint8 ride /** rct2: 0x008AE24C */ static void paint_monorail_track_s_bend_right(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (direction == 2 || direction == 3) { @@ -929,7 +929,7 @@ static void paint_monorail_track_s_bend_right(paint_session * session, uint8 rid /** rct2: 0x008AE29C */ static void paint_monorail_track_right_quarter_turn_3_tiles(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { track_paint_util_right_quarter_turn_3_tiles_paint( session, 3, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK], @@ -965,7 +965,7 @@ static void paint_monorail_track_right_quarter_turn_3_tiles(paint_session * sess /** rct2: 0x008AE28C */ static void paint_monorail_track_left_quarter_turn_3_tiles(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; paint_monorail_track_right_quarter_turn_3_tiles(session, rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); @@ -975,7 +975,7 @@ static const sint8 paint_monorail_eighth_to_diag_index[] = { 0, 1, 2, -1, 3 }; /** rct2: 0x008AE31C */ static void paint_monorail_track_left_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { sint8 index = paint_monorail_eighth_to_diag_index[trackSequence]; if (index >= 0) @@ -1038,7 +1038,7 @@ static void paint_monorail_track_left_eighth_to_diag(paint_session * session, ui /** rct2: 0x008AE32C */ static void paint_monorail_track_right_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { sint8 index = paint_monorail_eighth_to_diag_index[trackSequence]; if (index >= 0) @@ -1101,7 +1101,7 @@ static void paint_monorail_track_right_eighth_to_diag(paint_session * session, u /** rct2: 0x008AE33C */ static void paint_monorail_track_left_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { const uint8 map[] = { 4, 2, 3, 1, 0 }; trackSequence = map[trackSequence]; @@ -1110,7 +1110,7 @@ static void paint_monorail_track_left_eighth_to_orthogonal(paint_session * sessi /** rct2: 0x008AE34C */ static void paint_monorail_track_right_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { const uint8 map[] = { 4, 2, 3, 1, 0 }; trackSequence = map[trackSequence]; @@ -1134,7 +1134,7 @@ static const sint32 monorail_diag_blocked_segments[] = { SEGMENT_C4 | SEGMENT_CC /** rct2: 0x008AE2AC */ static void paint_monorail_track_diag_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (monorail_diag_image_segment[direction][trackSequence]) { @@ -1155,7 +1155,7 @@ static void paint_monorail_track_diag_flat(paint_session * session, uint8 rideIn /** rct2: 0x008AE2DC */ static void paint_monorail_track_diag_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { if (monorail_diag_image_segment[direction][trackSequence]) { @@ -1176,7 +1176,7 @@ static void paint_monorail_track_diag_25_deg_up(paint_session * session, uint8 r /** rct2: 0x008AE2BC */ static void paint_monorail_track_diag_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (monorail_diag_image_segment[direction][trackSequence]) { @@ -1197,7 +1197,7 @@ static void paint_monorail_track_diag_flat_to_25_deg_up(paint_session * session, /** rct2: 0x008AE2CC */ static void paint_monorail_track_diag_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (monorail_diag_image_segment[direction][trackSequence]) { @@ -1218,7 +1218,7 @@ static void paint_monorail_track_diag_25_deg_up_to_flat(paint_session * session, /** rct2: 0x008AE30C */ static void paint_monorail_track_diag_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (monorail_diag_image_segment[direction][trackSequence]) { @@ -1239,7 +1239,7 @@ static void paint_monorail_track_diag_25_deg_down(paint_session * session, uint8 /** rct2: 0x008AE2EC */ static void paint_monorail_track_diag_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (monorail_diag_image_segment[direction][trackSequence]) { @@ -1261,7 +1261,7 @@ static void paint_monorail_track_diag_flat_to_25_deg_down(paint_session * sessio /** rct2: 0x008AE2FC */ static void paint_monorail_track_diag_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { if (monorail_diag_image_segment[direction][trackSequence]) { diff --git a/src/openrct2/ride/transport/SuspendedMonorail.cpp b/src/openrct2/ride/transport/SuspendedMonorail.cpp index 049888e2ac..9d74d4dc31 100644 --- a/src/openrct2/ride/transport/SuspendedMonorail.cpp +++ b/src/openrct2/ride/transport/SuspendedMonorail.cpp @@ -16,7 +16,7 @@ #include "../../drawing/drawing.h" #include "../../interface/viewport.h" -#include "../../paint/map_element/map_element.h" +#include "../../paint/tile_element/tile_element.h" #include "../../paint/paint.h" #include "../../paint/supports.h" #include "../../sprites.h" @@ -28,7 +28,7 @@ /** rct2: 0x008636F4 */ static void suspended_monorail_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -57,7 +57,7 @@ static void suspended_monorail_track_flat(paint_session * session, uint8 rideInd /** rct2: 0x008637A4, 0x008637B4, 0x008637C4 */ static void suspended_monorail_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][3] = { { SPR_STATION_BASE_C_SW_NE, 25853, SPR_STATION_INVERTED_BAR_F_SW_NE }, @@ -82,7 +82,7 @@ static void suspended_monorail_track_station(paint_session * session, uint8 ride /** rct2: 0x00863704 */ static void suspended_monorail_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -142,7 +142,7 @@ static void suspended_monorail_track_25_deg_up(paint_session * session, uint8 ri /** rct2: 0x00863714 */ static void suspended_monorail_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -202,7 +202,7 @@ static void suspended_monorail_track_flat_to_25_deg_up(paint_session * session, /** rct2: 0x00863724 */ static void suspended_monorail_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (direction) { @@ -262,28 +262,28 @@ static void suspended_monorail_track_25_deg_up_to_flat(paint_session * session, /** rct2: 0x00863734 */ static void suspended_monorail_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { suspended_monorail_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00863744 */ static void suspended_monorail_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { suspended_monorail_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00863754 */ static void suspended_monorail_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { suspended_monorail_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } /** rct2: 0x00863764 */ static void suspended_monorail_track_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -438,7 +438,7 @@ static void suspended_monorail_track_left_quarter_turn_5(paint_session * session /** rct2: 0x00863774 */ static void suspended_monorail_track_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; suspended_monorail_track_left_quarter_turn_5(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -446,7 +446,7 @@ static void suspended_monorail_track_right_quarter_turn_5(paint_session * sessio /** rct2: 0x00863784 */ static void suspended_monorail_track_s_bend_left(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -596,7 +596,7 @@ static void suspended_monorail_track_s_bend_left(paint_session * session, uint8 /** rct2: 0x00863794 */ static void suspended_monorail_track_s_bend_right(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -746,7 +746,7 @@ static void suspended_monorail_track_s_bend_right(paint_session * session, uint8 /** rct2: 0x008637D4 */ static void suspended_monorail_track_left_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -850,7 +850,7 @@ static void suspended_monorail_track_left_quarter_turn_3(paint_session * session /** rct2: 0x008637E4 */ static void suspended_monorail_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; suspended_monorail_track_left_quarter_turn_3(session, rideIndex, trackSequence, (direction - 1) & 3, height, mapElement); @@ -858,7 +858,7 @@ static void suspended_monorail_track_right_quarter_turn_3(paint_session * sessio /** rct2: 0x00863864 */ static void suspended_monorail_track_left_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1001,7 +1001,7 @@ static void suspended_monorail_track_left_eighth_to_diag(paint_session * session /** rct2: 0x00863874 */ static void suspended_monorail_track_right_eighth_to_diag(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1144,7 +1144,7 @@ static void suspended_monorail_track_right_eighth_to_diag(paint_session * sessio /** rct2: 0x00863884 */ static void suspended_monorail_track_left_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; suspended_monorail_track_right_eighth_to_diag(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); @@ -1152,7 +1152,7 @@ static void suspended_monorail_track_left_eighth_to_orthogonal(paint_session * s /** rct2: 0x00863894 */ static void suspended_monorail_track_right_eighth_to_orthogonal(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence]; suspended_monorail_track_left_eighth_to_diag(session, rideIndex, trackSequence, (direction + 3) & 3, height, mapElement); @@ -1160,7 +1160,7 @@ static void suspended_monorail_track_right_eighth_to_orthogonal(paint_session * /** rct2: 0x008637F4 */ static void suspended_monorail_track_diag_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1238,7 +1238,7 @@ static void suspended_monorail_track_diag_flat(paint_session * session, uint8 ri /** rct2: 0x00863824 */ static void suspended_monorail_track_diag_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1316,7 +1316,7 @@ static void suspended_monorail_track_diag_25_deg_up(paint_session * session, uin /** rct2: 0x00863804 */ static void suspended_monorail_track_diag_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1394,7 +1394,7 @@ static void suspended_monorail_track_diag_flat_to_25_deg_up(paint_session * sess /** rct2: 0x00863814 */ static void suspended_monorail_track_diag_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1472,7 +1472,7 @@ static void suspended_monorail_track_diag_25_deg_up_to_flat(paint_session * sess /** rct2: 0x00863854 */ static void suspended_monorail_track_diag_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1550,7 +1550,7 @@ static void suspended_monorail_track_diag_25_deg_down(paint_session * session, u /** rct2: 0x00863834 */ static void suspended_monorail_track_diag_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { @@ -1625,7 +1625,7 @@ static void suspended_monorail_track_diag_flat_to_25_deg_down(paint_session * se /** rct2: 0x00863844 */ static void suspended_monorail_track_diag_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { switch (trackSequence) { diff --git a/src/openrct2/ride/water/BoatRide.cpp b/src/openrct2/ride/water/BoatRide.cpp index cc4607a0f1..0764520fce 100644 --- a/src/openrct2/ride/water/BoatRide.cpp +++ b/src/openrct2/ride/water/BoatRide.cpp @@ -38,7 +38,7 @@ enum /** rct2: 0x008B0E40 */ static void paint_boat_ride_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId; @@ -66,7 +66,7 @@ static void paint_boat_ride_track_flat(paint_session * session, uint8 rideIndex, /** rct2: 0x008B0E50 */ static void paint_boat_ride_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { LocationXY16 position = session->MapPosition; Ride * ride = get_ride(rideIndex); @@ -91,7 +91,7 @@ static void paint_boat_ride_station(paint_session * session, uint8 rideIndex, ui /** rct2: 0x008B0E80 */ static void paint_boat_ride_track_left_quarter_turn_1_tile(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint32 imageId; switch (direction) @@ -133,7 +133,7 @@ static void paint_boat_ride_track_left_quarter_turn_1_tile(paint_session * sessi /** rct2: 0x008B0E90 */ static void paint_boat_ride_track_right_quarter_turn_1_tile(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_boat_ride_track_left_quarter_turn_1_tile(session, rideIndex, trackSequence, (direction + 3) % 4, height, mapElement); } diff --git a/src/openrct2/ride/water/DingySlide.cpp b/src/openrct2/ride/water/DingySlide.cpp index 57f0f6af62..87181ca526 100644 --- a/src/openrct2/ride/water/DingySlide.cpp +++ b/src/openrct2/ride/water/DingySlide.cpp @@ -357,7 +357,7 @@ enum }; static void dinghy_slide_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[2][4][2] = { { @@ -394,7 +394,7 @@ static void dinghy_slide_track_flat(paint_session * session, uint8 rideIndex, ui } static void dinghy_slide_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_DINGHY_SLIDE_STATION_SW_NE, SPR_STATION_BASE_B_SW_NE }, @@ -422,7 +422,7 @@ static void dinghy_slide_track_station(paint_session * session, uint8 rideIndex, } static void dinghy_slide_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[2][4][2] = { { @@ -466,7 +466,7 @@ static void dinghy_slide_track_25_deg_up(paint_session * session, uint8 rideInde } static void dinghy_slide_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_DINGHY_SLIDE_60_DEG_SW_NE, SPR_DINGHY_SLIDE_60_DEG_FRONT_SW_NE }, @@ -501,7 +501,7 @@ static void dinghy_slide_track_60_deg_up(paint_session * session, uint8 rideInde } static void dinghy_slide_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[2][4][2] = { { @@ -545,7 +545,7 @@ static void dinghy_slide_track_flat_to_25_deg_up(paint_session * session, uint8 } static void dinghy_slide_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_DINGHY_SLIDE_25_DEG_TO_60_DEG_SW_NE, SPR_DINGHY_SLIDE_25_DEG_TO_60_DEG_FRONT_SW_NE }, @@ -580,7 +580,7 @@ static void dinghy_slide_track_25_deg_up_to_60_deg_up(paint_session * session, u } static void dinghy_slide_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_DINGHY_SLIDE_60_DEG_TO_25_DEG_SW_NE, SPR_DINGHY_SLIDE_60_DEG_TO_25_DEG_FRONT_SW_NE }, @@ -615,7 +615,7 @@ static void dinghy_slide_track_60_deg_up_to_25_deg_up(paint_session * session, u } static void dinghy_slide_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[2][4][2] = { { @@ -659,37 +659,37 @@ static void dinghy_slide_track_25_deg_up_to_flat(paint_session * session, uint8 } static void dinghy_slide_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { dinghy_slide_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } static void dinghy_slide_track_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { dinghy_slide_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } static void dinghy_slide_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { dinghy_slide_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } static void dinghy_slide_track_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { dinghy_slide_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } static void dinghy_slide_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { dinghy_slide_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } static void dinghy_slide_track_right_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const sprite_bb imageIds[4][5] = { { @@ -814,20 +814,20 @@ static void dinghy_slide_track_right_quarter_turn_5(paint_session * session, uin } static void dinghy_slide_track_left_quarter_turn_5(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; dinghy_slide_track_right_quarter_turn_5(session, rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); } static void dinghy_slide_track_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { dinghy_slide_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } static void dinghy_slide_track_s_bend_left(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 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 }, @@ -917,7 +917,7 @@ static void dinghy_slide_track_s_bend_left(paint_session * session, uint8 rideIn } static void dinghy_slide_track_s_bend_right(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 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 }, @@ -1007,7 +1007,7 @@ static void dinghy_slide_track_s_bend_right(paint_session * session, uint8 rideI } static void dinghy_slide_track_right_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const sprite_bb imageIds[4][3] = { { @@ -1087,14 +1087,14 @@ static void dinghy_slide_track_right_quarter_turn_3(paint_session * session, uin } static void dinghy_slide_track_left_quarter_turn_3(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; dinghy_slide_track_right_quarter_turn_3(session, rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); } static void dinghy_slide_track_flat_covered(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_DINGHY_SLIDE_FLAT_COVERED_SW_NE, SPR_DINGHY_SLIDE_FLAT_COVERED_FRONT_SW_NE }, @@ -1122,7 +1122,7 @@ static void dinghy_slide_track_flat_covered(paint_session * session, uint8 rideI } static void dinghy_slide_track_25_deg_up_covered(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_DINGHY_SLIDE_25_DEG_COVERED_SW_NE, SPR_DINGHY_SLIDE_25_DEG_COVERED_FRONT_SW_NE }, @@ -1157,7 +1157,7 @@ static void dinghy_slide_track_25_deg_up_covered(paint_session * session, uint8 } static void dinghy_slide_track_60_deg_up_covered(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_DINGHY_SLIDE_60_DEG_COVERED_SW_NE, SPR_DINGHY_SLIDE_60_DEG_COVERED_FRONT_SW_NE }, @@ -1192,7 +1192,7 @@ static void dinghy_slide_track_60_deg_up_covered(paint_session * session, uint8 } static void dinghy_slide_track_flat_to_25_deg_up_covered(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_DINGHY_SLIDE_FLAT_TO_25_DEG_COVERED_SW_NE, SPR_DINGHY_SLIDE_FLAT_TO_25_DEG_COVERED_FRONT_SW_NE }, @@ -1227,7 +1227,7 @@ static void dinghy_slide_track_flat_to_25_deg_up_covered(paint_session * session } static void dinghy_slide_track_25_deg_up_to_60_deg_up_covered(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 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 }, @@ -1262,7 +1262,7 @@ static void dinghy_slide_track_25_deg_up_to_60_deg_up_covered(paint_session * se } static void dinghy_slide_track_60_deg_up_to_25_deg_up_covered(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 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 }, @@ -1297,7 +1297,7 @@ static void dinghy_slide_track_60_deg_up_to_25_deg_up_covered(paint_session * se } static void dinghy_slide_track_25_deg_up_to_flat_covered(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_DINGHY_SLIDE_25_DEG_TO_FLAT_COVERED_SW_NE, SPR_DINGHY_SLIDE_25_DEG_TO_FLAT_COVERED_FRONT_SW_NE }, @@ -1332,38 +1332,38 @@ static void dinghy_slide_track_25_deg_up_to_flat_covered(paint_session * session } static void dinghy_slide_track_25_deg_down_covered(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { dinghy_slide_track_25_deg_up_covered(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } static void dinghy_slide_track_60_deg_down_covered(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { dinghy_slide_track_60_deg_up_covered(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } static void dinghy_slide_track_flat_to_25_deg_down_covered(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { dinghy_slide_track_25_deg_up_to_flat_covered(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } static void dinghy_slide_track_25_deg_down_to_60_deg_down_covered(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { dinghy_slide_track_60_deg_up_to_25_deg_up_covered(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } static void dinghy_slide_track_25_deg_down_to_flat_covered(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { dinghy_slide_track_flat_to_25_deg_up_covered(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } static void dinghy_slide_track_right_quarter_turn_5_covered(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const sprite_bb imageIds[4][5] = { { @@ -1488,14 +1488,14 @@ static void dinghy_slide_track_right_quarter_turn_5_covered(paint_session * sess } static void dinghy_slide_track_left_quarter_turn_5_covered(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence]; dinghy_slide_track_right_quarter_turn_5_covered(session, rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); } static void dinghy_slide_track_s_bend_left_covered(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 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 }, @@ -1585,7 +1585,7 @@ static void dinghy_slide_track_s_bend_left_covered(paint_session * session, uint } static void dinghy_slide_track_s_bend_right_covered(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 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 }, @@ -1675,7 +1675,7 @@ static void dinghy_slide_track_s_bend_right_covered(paint_session * session, uin } static void dinghy_slide_track_right_quarter_turn_3_covered(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const sprite_bb imageIds[4][3] = { { @@ -1755,14 +1755,14 @@ static void dinghy_slide_track_right_quarter_turn_3_covered(paint_session * sess } static void dinghy_slide_track_left_quarter_turn_3_covered(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence]; dinghy_slide_track_right_quarter_turn_3_covered(session, rideIndex, trackSequence, (direction + 1) % 4, height, mapElement); } static void dinghy_slide_track_60_deg_down_to_25_deg_down_covered(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { dinghy_slide_track_25_deg_up_to_60_deg_up_covered(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); diff --git a/src/openrct2/ride/water/LogFlume.cpp b/src/openrct2/ride/water/LogFlume.cpp index 331ac91f2e..e8bc30b9a1 100644 --- a/src/openrct2/ride/water/LogFlume.cpp +++ b/src/openrct2/ride/water/LogFlume.cpp @@ -169,7 +169,7 @@ static const uint32 LogFlumeTrackFlatImageIds[4][2] = { }; static void paint_log_flume_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId = LogFlumeTrackFlatImageIds[direction][0] | session->TrackColours[SCHEME_TRACK]; uint32 frontImageId = LogFlumeTrackFlatImageIds[direction][1] | session->TrackColours[SCHEME_TRACK]; @@ -189,7 +189,7 @@ static void paint_log_flume_track_flat(paint_session * session, uint8 rideIndex, } static void paint_log_flume_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId = LogFlumeTrackFlatImageIds[direction][0] | session->TrackColours[SCHEME_TRACK]; sub_98197C_rotated(session, direction, imageId, 0, 0, 32, 20, 1, height, 0, 6, height + 3); @@ -225,7 +225,7 @@ static void paint_log_flume_track_station(paint_session * session, uint8 rideInd } static void paint_log_flume_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_LOG_FLUME_25_DEG_UP_SW_NE, SPR_LOG_FLUME_25_DEG_UP_FRONT_SW_NE }, @@ -259,7 +259,7 @@ static void paint_log_flume_track_25_deg_up(paint_session * session, uint8 rideI } static void paint_log_flume_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_LOG_FLUME_FLAT_TO_25_DEG_UP_SW_NE, SPR_LOG_FLUME_FLAT_TO_25_DEG_UP_FRONT_SW_NE }, @@ -293,7 +293,7 @@ static void paint_log_flume_track_flat_to_25_deg_up(paint_session * session, uin } static void paint_log_flume_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_LOG_FLUME_25_DEG_UP_TO_FLAT_SW_NE, SPR_LOG_FLUME_25_DEG_UP_TO_FLAT_FRONT_SW_NE }, @@ -327,7 +327,7 @@ static void paint_log_flume_track_25_deg_up_to_flat(paint_session * session, uin } static void paint_log_flume_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 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(paint_session * session, uint8 rid } static void paint_log_flume_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_LOG_FLUME_FLAT_TO_25_DEG_DOWN_SW_NE, SPR_LOG_FLUME_25_DEG_UP_TO_FLAT_FRONT_NE_SW }, @@ -395,7 +395,7 @@ static void paint_log_flume_track_flat_to_25_deg_down(paint_session * session, u } static void paint_log_flume_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 imageIds[4][2] = { { SPR_LOG_FLUME_25_DEG_DOWN_TO_FLAT_SW_NE, SPR_LOG_FLUME_FLAT_TO_25_DEG_UP_FRONT_NE_SW }, @@ -429,7 +429,7 @@ static void paint_log_flume_track_25_deg_down_to_flat(paint_session * session, u } static void paint_log_flume_track_s_bend_left(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 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 }, @@ -519,7 +519,7 @@ static void paint_log_flume_track_s_bend_left(paint_session * session, uint8 rid } static void paint_log_flume_track_s_bend_right(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 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 }, @@ -609,7 +609,7 @@ static void paint_log_flume_track_s_bend_right(paint_session * session, uint8 ri } static void paint_log_flume_track_left_quarter_turn_3_tiles(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 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 }, @@ -676,7 +676,7 @@ static void paint_log_flume_track_left_quarter_turn_3_tiles(paint_session * sess } static void paint_log_flume_track_right_quarter_turn_3_tiles(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 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 }, @@ -743,7 +743,7 @@ static void paint_log_flume_track_right_quarter_turn_3_tiles(paint_session * ses } static void paint_log_flume_track_on_ride_photo(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId = SPR_STATION_BASE_D | IMAGE_TYPE_REMAP; sub_98196C(session, imageId, 0, 0, 32, 32, 1, height, get_current_rotation()); @@ -773,7 +773,7 @@ static void paint_log_flume_track_on_ride_photo(paint_session * session, uint8 r } static void paint_log_flume_track_reverser(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 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 7310ac45b0..f4ea16a897 100644 --- a/src/openrct2/ride/water/RiverRapids.cpp +++ b/src/openrct2/ride/water/RiverRapids.cpp @@ -272,7 +272,7 @@ void vehicle_visual_river_rapids(paint_session * session, sint32 x, sint32 image /** rct2: 0x00757650 */ static void paint_river_rapids_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId; @@ -314,7 +314,7 @@ static void paint_river_rapids_track_flat(paint_session * session, uint8 rideInd /** rct2: 0x007576C0 */ static void paint_river_rapids_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { Ride * ride = get_ride(rideIndex); @@ -501,35 +501,35 @@ static void paint_river_rapids_track_25_deg_to_flat_b(paint_session * session, u /** rct2: 0x00757660 */ static void paint_river_rapids_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { paint_river_rapids_track_25_deg(session, direction, height, river_rapids_track_pieces_25_deg_up); } /** rct2: 0x00757670 */ static void paint_river_rapids_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_river_rapids_track_25_deg_to_flat_b(session, direction, height, river_rapids_track_pieces_flat_to_25_deg_up); } /** rct2: 0x00757680 */ static void paint_river_rapids_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_river_rapids_track_25_deg_to_flat_a(session, direction, height, river_rapids_track_pieces_25_deg_up_to_flat); } /** rct2: 0x00757690 */ static void paint_river_rapids_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { paint_river_rapids_track_25_deg(session, (direction + 2) % 4, height, river_rapids_track_pieces_25_deg_down); } /** rct2: 0x007576A0 */ static void paint_river_rapids_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_river_rapids_track_25_deg_to_flat_a(session, (direction + 2) % 4, height, river_rapids_track_pieces_flat_to_25_deg_down); @@ -537,7 +537,7 @@ static void paint_river_rapids_track_flat_to_25_deg_down(paint_session * session /** rct2: 0x007576B0 */ static void paint_river_rapids_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_river_rapids_track_25_deg_to_flat_b(session, (direction + 2) % 4, height, river_rapids_track_pieces_25_deg_down_to_flat); @@ -545,7 +545,7 @@ static void paint_river_rapids_track_25_deg_down_to_flat(paint_session * session /** rct2: 0x007576F0 */ static void paint_river_rapids_track_left_quarter_turn_1_tile(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint32 imageId; switch (direction) @@ -600,7 +600,7 @@ static void paint_river_rapids_track_left_quarter_turn_1_tile(paint_session * se /** rct2: 0x00757700 */ static void paint_river_rapids_track_right_quarter_turn_1_tile(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint32 imageId; @@ -656,7 +656,7 @@ static void paint_river_rapids_track_right_quarter_turn_1_tile(paint_session * s /** rct2: 0x00757710 */ static void paint_river_rapids_track_waterfall(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId; @@ -718,7 +718,7 @@ static void paint_river_rapids_track_waterfall(paint_session * session, uint8 ri /** rct2: 0x00757720 */ static void paint_river_rapids_track_rapids(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId; @@ -758,7 +758,7 @@ static void paint_river_rapids_track_rapids(paint_session * session, uint8 rideI /** rct2: 0x00757740 */ static void paint_river_rapids_track_on_ride_photo(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_river_rapids_track_flat(session, rideIndex, trackSequence, direction, height, mapElement); track_paint_util_onride_photo_paint(session, direction, height + 13, mapElement); @@ -767,7 +767,7 @@ static void paint_river_rapids_track_on_ride_photo(paint_session * session, uint /** rct2: 0x */ static void paint_river_rapids_track_whirlpool(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId; diff --git a/src/openrct2/ride/water/SplashBoats.cpp b/src/openrct2/ride/water/SplashBoats.cpp index 2c3aa7fb57..20c76d8fd6 100644 --- a/src/openrct2/ride/water/SplashBoats.cpp +++ b/src/openrct2/ride/water/SplashBoats.cpp @@ -481,7 +481,7 @@ static const sprite_bb RiverRaftsRightQuarterTurn5_Side[4][5] = { }; static void paint_splash_boats_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId = SplashBoats25DegUpImageId[direction] | session->TrackColours[SCHEME_TRACK]; uint32 frontImageId = SplashBoats25DegUpFrontImageId[direction] | session->TrackColours[SCHEME_TRACK]; @@ -505,7 +505,7 @@ static void paint_splash_boats_track_25_deg_up(paint_session * session, uint8 ri } static void paint_splash_boats_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId = SplashBoats60DegUpImageId[direction] | session->TrackColours[SCHEME_TRACK]; uint32 frontImageId = SplashBoats60DegUpFrontImageId[direction] | session->TrackColours[SCHEME_TRACK]; @@ -529,7 +529,7 @@ static void paint_splash_boats_track_60_deg_up(paint_session * session, uint8 ri } static void paint_splash_boats_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint32 imageId = SplashBoatsFlatTo25DegUpImageId[direction] | session->TrackColours[SCHEME_TRACK]; uint32 frontImageId = SplashBoatsFlatTo25DegUpFrontImageId[direction] | session->TrackColours[SCHEME_TRACK]; @@ -553,7 +553,7 @@ static void paint_splash_boats_track_flat_to_25_deg_up(paint_session * session, } static void paint_splash_boats_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint32 imageId = SplashBoats25DegUpToFlatImageId[direction] | session->TrackColours[SCHEME_TRACK]; uint32 frontImageId = SplashBoats25DegUpToFlatFrontImageId[direction] | session->TrackColours[SCHEME_TRACK]; @@ -577,7 +577,7 @@ static void paint_splash_boats_track_25_deg_up_to_flat(paint_session * session, } static void paint_splash_boats_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint32 imageId = SplashBoats25DegUpTo60DegUpImageId[direction] | session->TrackColours[SCHEME_TRACK]; uint32 frontImageId = SplashBoats25DegUpTo60DegUpFrontImageId[direction] | session->TrackColours[SCHEME_TRACK]; @@ -601,7 +601,7 @@ static void paint_splash_boats_track_25_deg_up_to_60_deg_up(paint_session * sess } static void paint_splash_boats_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint32 imageId = SplashBoats60DegUpTo25DegUpImageId[direction] | session->TrackColours[SCHEME_TRACK]; uint32 frontImageId = SplashBoats60DegUpTo25DegUpFrontImageId[direction] | session->TrackColours[SCHEME_TRACK]; @@ -625,7 +625,7 @@ static void paint_splash_boats_track_60_deg_up_to_25_deg_up(paint_session * sess } static void paint_splash_boats_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId = SplashBoats25DegDownImageId[direction] | session->TrackColours[SCHEME_TRACK]; uint32 frontImageId = SplashBoats25DegDownFrontImageId[direction] | session->TrackColours[SCHEME_TRACK]; @@ -650,13 +650,13 @@ static void paint_splash_boats_track_25_deg_down(paint_session * session, uint8 } static void paint_splash_boats_track_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { paint_splash_boats_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } static void paint_splash_boats_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint32 imageId = SplashBoatsFlatTo25DegDownImageId[direction] | session->TrackColours[SCHEME_TRACK]; uint32 frontImageId = SplashBoatsFlatTo25DegDownFrontImageId[direction] | session->TrackColours[SCHEME_TRACK]; @@ -681,19 +681,19 @@ static void paint_splash_boats_track_flat_to_25_deg_down(paint_session * session } static void paint_splash_boats_track_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_splash_boats_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } static void paint_splash_boats_track_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { paint_splash_boats_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } static void paint_splash_boats_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { uint32 imageId = SplashBoats25DegDownToFlatImageId[direction] | session->TrackColours[SCHEME_TRACK]; uint32 frontImageId = SplashBoats25DegDownToFlatFrontImageId[direction] | session->TrackColours[SCHEME_TRACK]; @@ -730,7 +730,7 @@ static void paint_splash_boats_track_25_deg_down_to_flat(paint_session * session /** Start of elements originally from River Rafts */ /** rct2: 0x0089B170 */ static void paint_splash_boats_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { uint32 imageId; @@ -772,7 +772,7 @@ static void paint_splash_boats_track_flat(paint_session * session, uint8 rideInd /** rct2: 0x0089B1A0 */ static void paint_splash_boats_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { Ride * ride = get_ride(rideIndex); @@ -807,7 +807,7 @@ static void paint_splash_boats_station(paint_session * session, uint8 rideIndex, /** rct2: 0x0089B1D0 */ static void paint_splash_boats_track_left_quarter_turn_5_tiles(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { track_paint_util_right_quarter_turn_5_tiles_paint_2(session, height, direction, get_current_rotation(), trackSequence, session->TrackColours[SCHEME_TRACK], RiverRaftsLeftQuarterTurn5_Top); @@ -884,7 +884,7 @@ static void paint_splash_boats_track_left_quarter_turn_5_tiles(paint_session * s /** rct2: 0x0089B1D0 */ static void paint_splash_boats_track_right_quarter_turn_5_tiles(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { track_paint_util_right_quarter_turn_5_tiles_paint_2(session, height, direction, get_current_rotation(), trackSequence, session->TrackColours[SCHEME_TRACK], RiverRaftsRightQuarterTurn5_Top); @@ -961,7 +961,7 @@ static void paint_splash_boats_track_right_quarter_turn_5_tiles(paint_session * /** rct2: 0x0089B180 */ static void paint_splash_boats_track_s_bend_left(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { static const uint32 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 }, @@ -1050,7 +1050,7 @@ static void paint_splash_boats_track_s_bend_left(paint_session * session, uint8 /** rct2: 0x0089B190 */ static void paint_splash_boats_track_s_bend_right(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { static const uint32 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 }, diff --git a/src/openrct2/ride/water/SubmarineRide.cpp b/src/openrct2/ride/water/SubmarineRide.cpp index 7391944b52..d767091051 100644 --- a/src/openrct2/ride/water/SubmarineRide.cpp +++ b/src/openrct2/ride/water/SubmarineRide.cpp @@ -82,7 +82,7 @@ void vehicle_visual_submarine(paint_session * session, sint32 x, sint32 imageDir #endif static void submarine_ride_paint_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { LocationXY16 position = session->MapPosition; Ride * ride = get_ride(rideIndex); @@ -114,7 +114,7 @@ static void submarine_ride_paint_track_station(paint_session * session, uint8 ri } static void submarine_ride_paint_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { LocationXY16 position = session->MapPosition; sint32 heightLower = height - 16; @@ -145,7 +145,7 @@ static void submarine_ride_paint_track_flat(paint_session * session, uint8 rideI } static void submarine_ride_paint_track_left_quarter_turn_3_tiles(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { 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(paint_session * static const uint8 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 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = submarine_ride_right_quarter_turn_3_tiles_to_left_turn_map[trackSequence]; submarine_ride_paint_track_left_quarter_turn_3_tiles(session, rideIndex, trackSequence, (direction + 3) % 4, height, @@ -183,7 +183,7 @@ static void submarine_ride_paint_track_right_quarter_turn_3_tiles(paint_session } static void submarine_ride_paint_track_left_quarter_turn_1_tile(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { track_paint_util_left_quarter_turn_1_tile_paint(session, 1, height - 16, 0, direction, session->TrackColours[SCHEME_TRACK], trackSpritesSubmarineRideMiniHelicoptersQuarterTurn1Tile, @@ -196,7 +196,7 @@ static void submarine_ride_paint_track_left_quarter_turn_1_tile(paint_session * } static void submarine_ride_paint_track_right_quarter_turn_1_tile(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { submarine_ride_paint_track_left_quarter_turn_1_tile(session, rideIndex, trackSequence, (direction + 3) % 4, height, mapElement); diff --git a/src/openrct2/ride/water/WaterCoaster.cpp b/src/openrct2/ride/water/WaterCoaster.cpp index dac20d3855..f654ec673b 100644 --- a/src/openrct2/ride/water/WaterCoaster.cpp +++ b/src/openrct2/ride/water/WaterCoaster.cpp @@ -20,7 +20,7 @@ #include "../track_paint.h" static void water_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, sint32 height, - rct_map_element * mapElement) + rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_flat(session, rideIndex, trackSequence, direction, height, mapElement, @@ -28,7 +28,7 @@ static void water_rc_track_flat(paint_session * session, uint8 rideIndex, uint8 } static void water_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, @@ -36,7 +36,7 @@ static void water_rc_track_25_deg_up(paint_session * session, uint8 rideIndex, u } static void water_rc_track_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_flat_to_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, @@ -44,7 +44,7 @@ static void water_rc_track_flat_to_25_deg_up(paint_session * session, uint8 ride } static void water_rc_track_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_25_deg_up_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, @@ -52,25 +52,25 @@ static void water_rc_track_25_deg_up_to_flat(paint_session * session, uint8 ride } static void water_rc_track_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { water_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } static void water_rc_track_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { water_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } static void water_rc_track_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { water_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, mapElement); } static void water_rc_track_diag_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_flat(session, rideIndex, trackSequence, direction, height, mapElement, @@ -78,7 +78,7 @@ static void water_rc_track_diag_flat(paint_session * session, uint8 rideIndex, u } static void water_rc_track_diag_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, @@ -86,7 +86,7 @@ static void water_rc_track_diag_25_deg_up(paint_session * session, uint8 rideInd } static void water_rc_track_diag_flat_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_flat_to_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, @@ -94,7 +94,7 @@ static void water_rc_track_diag_flat_to_25_deg_up(paint_session * session, uint8 } static void water_rc_track_diag_25_deg_up_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_25_deg_up_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, @@ -102,7 +102,7 @@ static void water_rc_track_diag_25_deg_up_to_flat(paint_session * session, uint8 } static void water_rc_track_diag_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, @@ -110,7 +110,7 @@ static void water_rc_track_diag_25_deg_down(paint_session * session, uint8 rideI } static void water_rc_track_diag_flat_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_flat_to_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, @@ -118,7 +118,7 @@ static void water_rc_track_diag_flat_to_25_deg_down(paint_session * session, uin } static void water_rc_track_diag_25_deg_down_to_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { bool isChained = track_element_is_lift_hill(mapElement); junior_rc_paint_track_diag_25_deg_down_to_flat(session, rideIndex, trackSequence, direction, height, mapElement, @@ -126,45 +126,45 @@ static void water_rc_track_diag_25_deg_down_to_flat(paint_session * session, uin } static void water_rc_track_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { junior_rc_paint_station(session, rideIndex, trackSequence, direction, height, mapElement, RIDE_TYPE_WATER_COASTER); } static void water_rc_track_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { junior_rc_paint_track_60_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, JUNIOR_RC_CHAIN_NONE); } static void water_rc_track_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { junior_rc_paint_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, JUNIOR_RC_CHAIN_NONE); } static void water_rc_track_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { junior_rc_paint_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, JUNIOR_RC_CHAIN_NONE); } static void water_rc_track_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { water_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } static void water_rc_track_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { water_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } static void water_rc_track_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { water_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, mapElement); } @@ -172,14 +172,14 @@ static void water_rc_track_60_deg_down_to_25_deg_down(paint_session * session, u // 5 tile turns static void water_rc_track_left_quarter_turn_5_tiles_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { junior_rc_paint_track_left_quarter_turn_5_tiles_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, JUNIOR_RC_CHAIN_NONE); } static void water_rc_track_right_quarter_turn_5_tiles_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { junior_rc_paint_track_right_quarter_turn_5_tiles_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, JUNIOR_RC_CHAIN_NONE); @@ -188,7 +188,7 @@ static void water_rc_track_right_quarter_turn_5_tiles_25_deg_up(paint_session * static const uint8 water_rc_left_quarter_turn_5_tiles_to_right_turn_map[] = { 6, 4, 5, 3, 1, 2, 0 }; static void water_rc_track_left_quarter_turn_5_tiles_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { 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], @@ -196,7 +196,7 @@ static void water_rc_track_left_quarter_turn_5_tiles_25_deg_down(paint_session * } static void water_rc_track_right_quarter_turn_5_tiles_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { 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], @@ -206,14 +206,14 @@ static void water_rc_track_right_quarter_turn_5_tiles_25_deg_down(paint_session // 3 tile turns static void water_rc_track_right_quarter_turn_3_tiles_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, JUNIOR_RC_CHAIN_NONE); } static void water_rc_track_right_quarter_turn_3_tiles_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, JUNIOR_RC_CHAIN_NONE); @@ -222,7 +222,7 @@ static void water_rc_track_right_quarter_turn_3_tiles_25_deg_down(paint_session static const uint8 water_rc_left_quarter_turn_3_tiles_to_right_turn_map[] = { 3, 1, 2, 0 }; static void water_rc_track_left_quarter_turn_3_tiles_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = water_rc_left_quarter_turn_3_tiles_to_right_turn_map[trackSequence]; water_rc_track_right_quarter_turn_3_tiles_25_deg_down(session, rideIndex, trackSequence, (direction + 1) % 4, height, @@ -230,7 +230,7 @@ static void water_rc_track_left_quarter_turn_3_tiles_25_deg_up(paint_session * s } static void water_rc_track_left_quarter_turn_3_tiles_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { trackSequence = water_rc_left_quarter_turn_3_tiles_to_right_turn_map[trackSequence]; water_rc_track_right_quarter_turn_3_tiles_25_deg_up(session, rideIndex, trackSequence, (direction + 1) % 4, height, @@ -238,42 +238,42 @@ static void water_rc_track_left_quarter_turn_3_tiles_25_deg_down(paint_session * } static void water_rc_track_diag_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { junior_rc_paint_track_diag_60_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, JUNIOR_RC_CHAIN_NONE); } static void water_rc_track_diag_25_deg_up_to_60_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { junior_rc_paint_track_diag_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, JUNIOR_RC_CHAIN_NONE); } static void water_rc_track_diag_60_deg_up_to_25_deg_up(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { junior_rc_paint_track_diag_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, direction, height, mapElement, JUNIOR_RC_CHAIN_NONE); } static void water_rc_track_diag_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction, - sint32 height, rct_map_element * mapElement) + sint32 height, rct_tile_element * mapElement) { junior_rc_paint_track_diag_60_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, JUNIOR_RC_CHAIN_NONE); } static void water_rc_track_diag_25_deg_down_to_60_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { junior_rc_paint_track_diag_25_deg_down_to_60_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, JUNIOR_RC_CHAIN_NONE); } static void water_rc_track_diag_60_deg_down_to_25_deg_down(paint_session * session, uint8 rideIndex, uint8 trackSequence, - uint8 direction, sint32 height, rct_map_element * mapElement) + uint8 direction, sint32 height, rct_tile_element * mapElement) { junior_rc_paint_track_diag_60_deg_down_to_25_deg_down(session, rideIndex, trackSequence, direction, height, mapElement, JUNIOR_RC_CHAIN_NONE); diff --git a/src/openrct2/scenario/scenario.c b/src/openrct2/scenario/scenario.c index 9111a8c928..5645bbfc06 100644 --- a/src/openrct2/scenario/scenario.c +++ b/src/openrct2/scenario/scenario.c @@ -434,7 +434,7 @@ static sint32 scenario_create_ducks() if (!map_is_location_in_park(x, y)) return 0; - centreWaterZ = (map_element_height(x, y) >> 16) & 0xFFFF; + centreWaterZ = (tile_element_height(x, y) >> 16) & 0xFFFF; if (centreWaterZ == 0) return 0; @@ -444,7 +444,7 @@ static sint32 scenario_create_ducks() c = 0; for (i = 0; i < 7; i++) { for (j = 0; j < 7; j++) { - waterZ = (map_element_height(x2, y2) >> 16) & 0xFFFF; + waterZ = (tile_element_height(x2, y2) >> 16) & 0xFFFF; if (waterZ == centreWaterZ) c++; @@ -605,11 +605,11 @@ static bool scenario_prepare_rides_for_save() } bool markTrackAsIndestructible; - map_element_iterator it; - map_element_iterator_begin(&it); + tile_element_iterator it; + tile_element_iterator_begin(&it); do { - if (map_element_get_type(it.element) == MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(it.element) == TILE_ELEMENT_TYPE_TRACK) { markTrackAsIndestructible = false; @@ -626,15 +626,15 @@ static bool scenario_prepare_rides_for_save() if (markTrackAsIndestructible) { - it.element->flags |= MAP_ELEMENT_FLAG_INDESTRUCTIBLE_TRACK_PIECE; + it.element->flags |= TILE_ELEMENT_FLAG_INDESTRUCTIBLE_TRACK_PIECE; } else { - it.element->flags &= ~MAP_ELEMENT_FLAG_INDESTRUCTIBLE_TRACK_PIECE; + it.element->flags &= ~TILE_ELEMENT_FLAG_INDESTRUCTIBLE_TRACK_PIECE; } } } - while (map_element_iterator_next(&it)); + while (tile_element_iterator_next(&it)); return true; } @@ -732,14 +732,14 @@ static sint32 scenario_write_available_objects(FILE *file) void scenario_fix_ghosts(rct_s6_data *s6) { // Remove all ghost elements - rct_map_element *destinationElement = s6->map_elements; + rct_tile_element *destinationElement = s6->tile_elements; for (sint32 y = 0; y < 256; y++) { for (sint32 x = 0; x < 256; x++) { - rct_map_element *originalElement = map_get_first_element_at(x, y); + rct_tile_element *originalElement = map_get_first_element_at(x, y); do { - if (originalElement->flags & MAP_ELEMENT_FLAG_GHOST) { - sint32 bannerIndex = map_element_get_banner_index(originalElement); + if (originalElement->flags & TILE_ELEMENT_FLAG_GHOST) { + sint32 bannerIndex = tile_element_get_banner_index(originalElement); if (bannerIndex != -1) { rct_banner *banner = &s6->banners[bannerIndex]; if (banner->type != BANNER_NULL) { @@ -751,10 +751,10 @@ void scenario_fix_ghosts(rct_s6_data *s6) } else { *destinationElement++ = *originalElement; } - } while (!map_element_is_last_for_tile(originalElement++)); + } while (!tile_element_is_last_for_tile(originalElement++)); // Set last element flag in case the original last element was never added - (destinationElement - 1)->flags |= MAP_ELEMENT_FLAG_LAST_TILE; + (destinationElement - 1)->flags |= TILE_ELEMENT_FLAG_LAST_TILE; } } } diff --git a/src/openrct2/scenario/scenario.h b/src/openrct2/scenario/scenario.h index dd7bd34291..4db340847b 100644 --- a/src/openrct2/scenario/scenario.h +++ b/src/openrct2/scenario/scenario.h @@ -109,10 +109,10 @@ typedef struct rct_s6_data { uint32 scenario_srand_1; // SC6[5] - rct_map_element map_elements[RCT2_MAX_MAP_ELEMENTS]; + rct_tile_element tile_elements[RCT2_MAX_TILE_ELEMENTS]; // SC6[6] - uint32 next_free_map_element_pointer_index; + uint32 next_free_tile_element_pointer_index; rct_sprite sprites[RCT2_MAX_SPRITES]; uint16 sprite_lists_head[6]; uint16 sprite_lists_count[6]; diff --git a/src/openrct2/title/TitleSequencePlayer.cpp b/src/openrct2/title/TitleSequencePlayer.cpp index 95084451fc..bebf8b0cca 100644 --- a/src/openrct2/title/TitleSequencePlayer.cpp +++ b/src/openrct2/title/TitleSequencePlayer.cpp @@ -501,7 +501,7 @@ private: rct_window * w = window_get_main(); if (w != nullptr) { - sint32 z = map_element_height(x, y); + sint32 z = tile_element_height(x, y); // Prevent scroll adjustment due to window placement when in-game auto oldScreenFlags = gScreenFlags; diff --git a/src/openrct2/windows/EditorObjectSelection.cpp b/src/openrct2/windows/EditorObjectSelection.cpp index ac0b026b12..f7b9d035c7 100644 --- a/src/openrct2/windows/EditorObjectSelection.cpp +++ b/src/openrct2/windows/EditorObjectSelection.cpp @@ -515,18 +515,18 @@ static void setup_in_use_selection_flags() } } - map_element_iterator iter; - map_element_iterator_begin(&iter); + tile_element_iterator iter; + tile_element_iterator_begin(&iter); do { uint16 type; rct_banner* banner; - switch (map_element_get_type(iter.element)) { + switch (tile_element_get_type(iter.element)) { default: - case MAP_ELEMENT_TYPE_SURFACE: - case MAP_ELEMENT_TYPE_TRACK: + case TILE_ELEMENT_TYPE_SURFACE: + case TILE_ELEMENT_TYPE_TRACK: break; - case MAP_ELEMENT_TYPE_PATH: + case TILE_ELEMENT_TYPE_PATH: type = iter.element->properties.path.type; type >>= 4; assert(type < object_entry_group_counts[OBJECT_TYPE_PATHS]); @@ -537,12 +537,12 @@ static void setup_in_use_selection_flags() Editor::SelectedObjects[OBJECT_TYPE_PATH_BITS][path_additions] |= 1; } break; - case MAP_ELEMENT_TYPE_SCENERY: + case TILE_ELEMENT_TYPE_SCENERY: type = iter.element->properties.scenery.type; assert(type < object_entry_group_counts[OBJECT_TYPE_SMALL_SCENERY]); Editor::SelectedObjects[OBJECT_TYPE_SMALL_SCENERY][type] |= (1 << 0); break; - case MAP_ELEMENT_TYPE_ENTRANCE: + case TILE_ELEMENT_TYPE_ENTRANCE: if (iter.element->properties.entrance.type != ENTRANCE_TYPE_PARK_ENTRANCE) break; @@ -552,24 +552,24 @@ static void setup_in_use_selection_flags() assert(type < object_entry_group_counts[OBJECT_TYPE_PATHS]); Editor::SelectedObjects[OBJECT_TYPE_PATHS][type] |= (1 << 0); break; - case MAP_ELEMENT_TYPE_WALL: + case TILE_ELEMENT_TYPE_WALL: type = iter.element->properties.wall.type; assert(type < object_entry_group_counts[OBJECT_TYPE_WALLS]); Editor::SelectedObjects[OBJECT_TYPE_WALLS][type] |= (1 << 0); break; - case MAP_ELEMENT_TYPE_SCENERY_MULTIPLE: + case TILE_ELEMENT_TYPE_SCENERY_MULTIPLE: type = iter.element->properties.scenerymultiple.type & 0x3FF; assert(type < object_entry_group_counts[OBJECT_TYPE_LARGE_SCENERY]); Editor::SelectedObjects[OBJECT_TYPE_LARGE_SCENERY][type] |= (1 << 0); break; - case MAP_ELEMENT_TYPE_BANNER: + case TILE_ELEMENT_TYPE_BANNER: banner = &gBanners[iter.element->properties.banner.index]; type = banner->type; assert(type < object_entry_group_counts[OBJECT_TYPE_BANNERS]); Editor::SelectedObjects[OBJECT_TYPE_BANNERS][type] |= (1 << 0); break; } - } while (map_element_iterator_next(&iter)); + } while (tile_element_iterator_next(&iter)); for (uint8 ride_index = 0; ride_index < 0xFF; ride_index++) { Ride* ride = get_ride(ride_index); diff --git a/src/openrct2/windows/Ride.cpp b/src/openrct2/windows/Ride.cpp index d199117b61..ffe7bbb432 100644 --- a/src/openrct2/windows/Ride.cpp +++ b/src/openrct2/windows/Ride.cpp @@ -1440,15 +1440,15 @@ static void window_ride_disable_tabs(rct_window *w) static void window_ride_update_overall_view(uint8 ride_index) { // Calculate x, y, z bounds of the entire ride using its track elements - map_element_iterator it; + tile_element_iterator it; - map_element_iterator_begin(&it); + tile_element_iterator_begin(&it); sint32 minx = INT_MAX, miny = INT_MAX, minz = INT_MAX; sint32 maxx = INT_MIN, maxy = INT_MIN, maxz = INT_MIN; - while (map_element_iterator_next(&it)) { - if (map_element_get_type(it.element) != MAP_ELEMENT_TYPE_TRACK) + while (tile_element_iterator_next(&it)) { + if (tile_element_get_type(it.element) != TILE_ELEMENT_TYPE_TRACK) continue; if (it.element->properties.track.ride_index != ride_index) @@ -1610,15 +1610,15 @@ rct_window *window_ride_open_station(sint32 rideIndex, sint32 stationIndex) return w; } -rct_window *window_ride_open_track(rct_map_element *mapElement) +rct_window *window_ride_open_track(rct_tile_element *mapElement) { sint32 rideIndex = mapElement->properties.track.ride_index; if ( - (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_ENTRANCE) || + (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_ENTRANCE) || (TrackSequenceProperties[mapElement->properties.track.type][0] & TRACK_SEQUENCE_FLAG_ORIGIN) ) { // Open ride window in station view - return window_ride_open_station(rideIndex, map_element_get_station(mapElement)); + return window_ride_open_station(rideIndex, tile_element_get_station(mapElement)); } else { // Open ride window in overview mode. return window_ride_main_open(rideIndex); @@ -4096,7 +4096,7 @@ static sint32 window_ride_has_track_colour(Ride *ride, sint32 trackColour) static void window_ride_set_track_colour_scheme(rct_window *w, sint32 x, sint32 y) { - rct_map_element *mapElement; + rct_tile_element *mapElement; uint8 newColourScheme; sint32 interactionType, z, direction; @@ -4115,7 +4115,7 @@ static void window_ride_set_track_colour_scheme(rct_window *w, sint32 x, sint32 return; z = mapElement->base_height * 8; - direction = map_element_get_direction(mapElement); + direction = tile_element_get_direction(mapElement); sub_6C683D(&x, &y, &z, direction, mapElement->properties.track.type, newColourScheme, nullptr, 4); } @@ -5154,7 +5154,7 @@ static void window_ride_measurements_update(rct_window *w) */ static void window_ride_measurements_tooldown(rct_window *w, rct_widgetindex widgetIndex, sint32 x, sint32 y) { - rct_map_element *mapElement; + rct_tile_element *mapElement; sint16 mapX, mapY; sint32 interactionType; @@ -5168,8 +5168,8 @@ static void window_ride_measurements_tooldown(rct_window *w, rct_widgetindex wid case VIEWPORT_INTERACTION_ITEM_LARGE_SCENERY: case VIEWPORT_INTERACTION_ITEM_WALL: case VIEWPORT_INTERACTION_ITEM_FOOTPATH: - _collectTrackDesignScenery = !track_design_save_contains_map_element(mapElement); - track_design_save_select_map_element(interactionType, mapX, mapY, mapElement, _collectTrackDesignScenery); + _collectTrackDesignScenery = !track_design_save_contains_tile_element(mapElement); + track_design_save_select_tile_element(interactionType, mapX, mapY, mapElement, _collectTrackDesignScenery); break; } } @@ -5181,7 +5181,7 @@ static void window_ride_measurements_tooldrag(rct_window *w, rct_widgetindex wid _lastSceneryX = x; _lastSceneryY = y; - rct_map_element *mapElement; + rct_tile_element *mapElement; sint16 mapX, mapY; sint32 interactionType; @@ -5191,7 +5191,7 @@ static void window_ride_measurements_tooldrag(rct_window *w, rct_widgetindex wid case VIEWPORT_INTERACTION_ITEM_LARGE_SCENERY: case VIEWPORT_INTERACTION_ITEM_WALL: case VIEWPORT_INTERACTION_ITEM_FOOTPATH: - track_design_save_select_map_element(interactionType, mapX, mapY, mapElement, _collectTrackDesignScenery); + track_design_save_select_tile_element(interactionType, mapX, mapY, mapElement, _collectTrackDesignScenery); break; } } diff --git a/src/openrct2/windows/RideConstruction.cpp b/src/openrct2/windows/RideConstruction.cpp index 27bb714918..5223819ccc 100644 --- a/src/openrct2/windows/RideConstruction.cpp +++ b/src/openrct2/windows/RideConstruction.cpp @@ -1739,7 +1739,7 @@ static void window_ride_construction_construct(rct_window *w) _currentTrackBeginX = next_track.x; _currentTrackBeginY = next_track.y; _currentTrackBeginZ = z; - _currentTrackPieceDirection = map_element_get_direction(next_track.element); + _currentTrackPieceDirection = tile_element_get_direction(next_track.element); _currentTrackPieceType = next_track.element->properties.track.type; _currentTrackSelectionFlags = 0; _rideConstructionArrowPulseTime = 0; @@ -1766,7 +1766,7 @@ static void window_ride_construction_construct(rct_window *w) static void window_ride_construction_mouseup_demolish(rct_window* w) { sint32 x, y, z, direction, type; - rct_map_element *mapElement; + rct_tile_element *mapElement; rct_xy_element inputElement, outputElement; track_begin_end trackBeginEnd; //bool gotoStartPlacementMode; @@ -1816,7 +1816,7 @@ static void window_ride_construction_mouseup_demolish(rct_window* w) else if (track_block_get_next(&inputElement, &outputElement, &z, &direction)) { x = outputElement.x; y = outputElement.y; - direction = map_element_get_direction(outputElement.element); + direction = tile_element_get_direction(outputElement.element); type = outputElement.element->properties.track.type; gGotoStartPlacementMode = false; } else { @@ -2052,7 +2052,7 @@ static bool ride_get_place_position_from_screen_position(sint32 screenX, sint32 { sint16 mapX, mapY, mapZ; sint32 interactionType, direction; - rct_map_element *mapElement; + rct_tile_element *mapElement; rct_viewport *viewport; if (!_trackPlaceCtrlState) { @@ -2296,9 +2296,9 @@ static void window_ride_construction_draw_track_piece( sub_6CBCE2(dpi, rideIndex, trackType, trackDirection, d, 4096, 4096, 1024); } -static rct_map_element _tempTrackMapElement; -static rct_map_element _tempSideTrackMapElement = { 0x80, 0x8F, 128, 128, 0, 0, 0, 0 }; -static rct_map_element *_backupMapElementArrays[5]; +static rct_tile_element _tempTrackMapElement; +static rct_tile_element _tempSideTrackMapElement = { 0x80, 0x8F, 128, 128, 0, 0, 0, 0 }; +static rct_tile_element *_backupMapElementArrays[5]; /** * @@ -2396,12 +2396,12 @@ static void sub_6CBCE2( map_set_tile_elements(tileX + 0, tileY - 1, &_tempSideTrackMapElement); // Set the temporary track element - _tempTrackMapElement.type = trackDirection | MAP_ELEMENT_TYPE_TRACK | ((edx & 0x10000) ? 0x80 : 0); - _tempTrackMapElement.flags = (bl & 0x0F) | MAP_ELEMENT_FLAG_LAST_TILE; + _tempTrackMapElement.type = trackDirection | TILE_ELEMENT_TYPE_TRACK | ((edx & 0x10000) ? 0x80 : 0); + _tempTrackMapElement.flags = (bl & 0x0F) | TILE_ELEMENT_FLAG_LAST_TILE; _tempTrackMapElement.base_height = baseZ; _tempTrackMapElement.clearance_height = clearanceZ; _tempTrackMapElement.properties.track.type = trackType; - map_element_set_track_sequence(&_tempTrackMapElement, trackBlock->index); + tile_element_set_track_sequence(&_tempTrackMapElement, trackBlock->index); _tempTrackMapElement.properties.track.colour = 0; _tempTrackMapElement.properties.track.ride_index = rideIndex; if (edx & 0x20000) @@ -2441,7 +2441,7 @@ static void sub_6CBCE2( void window_ride_construction_update_active_elements() { rct_window *w; - rct_map_element *mapElement; + rct_tile_element *mapElement; window_ride_construction_update_enabled_track_pieces(); w = window_find_by_class(WC_RIDE_CONSTRUCTION); @@ -2458,7 +2458,7 @@ void window_ride_construction_update_active_elements() if (!sub_6C683D(&x, &y, &z, _currentTrackPieceDirection & 3, _currentTrackPieceType, 0, &mapElement, 0)) { _selectedTrackType = mapElement->properties.track.type; if (track_element_has_speed_setting(mapElement->properties.track.type)) - _currentBrakeSpeed2 = map_element_get_brake_booster_speed(mapElement); + _currentBrakeSpeed2 = tile_element_get_brake_booster_speed(mapElement); _currentSeatRotationAngle = track_element_get_seat_rotation(mapElement); } } @@ -3619,7 +3619,7 @@ static void loc_6C7502(sint32 al) */ static void ride_construction_set_brakes_speed(sint32 brakesSpeed) { - rct_map_element *mapElement; + rct_tile_element *mapElement; sint32 x, y, z; x = _currentTrackBeginX; diff --git a/src/openrct2/windows/TileInspector.cpp b/src/openrct2/windows/TileInspector.cpp index 0c384225d9..9418a32bd9 100644 --- a/src/openrct2/windows/TileInspector.cpp +++ b/src/openrct2/windows/TileInspector.cpp @@ -455,7 +455,7 @@ static sint32 windowTileInspectorToolMapX = 0; static sint32 windowTileInspectorToolMapY = 0; static bool windowTileInspectorApplyToAll = false; static bool windowTileInspectorElementCopied = false; -static rct_map_element tileInspectorCopiedElement; +static rct_tile_element tileInspectorCopiedElement; static void window_tile_inspector_mouseup(rct_window *w, rct_widgetindex widgetIndex); static void window_tile_inspector_resize(rct_window *w); @@ -568,7 +568,7 @@ void window_tile_inspector_clear_clipboard() windowTileInspectorElementCopied = false; } -static rct_map_element* window_tile_inspector_get_selected_element(rct_window *w) +static rct_tile_element* window_tile_inspector_get_selected_element(rct_window *w) { openrct2_assert(w->selected_list_item >= 0 && w->selected_list_item < windowTileInspectorElementCount, "Selected list item out of range"); @@ -586,8 +586,8 @@ static void window_tile_inspector_select_element_from_list(rct_window *w, sint32 w->selected_list_item = index; // Get type of selected map element to select the correct page - rct_map_element *const mapElement = window_tile_inspector_get_selected_element(w); - page = (Math::Min(map_element_get_type(mapElement), MAP_ELEMENT_TYPE_CORRUPT) >> 2) + 1; + rct_tile_element *const mapElement = window_tile_inspector_get_selected_element(w); + page = (Math::Min(tile_element_get_type(mapElement), TILE_ELEMENT_TYPE_CORRUPT) >> 2) + 1; } window_tile_inspector_set_page(w, (tile_inspector_page)page); @@ -599,11 +599,11 @@ static void window_tile_inspector_select_element_from_list(rct_window *w, sint32 static void window_tile_inspector_load_tile(rct_window* w) { - rct_map_element *element = map_get_first_element_at(windowTileInspectorTileX, windowTileInspectorTileY); + rct_tile_element *element = map_get_first_element_at(windowTileInspectorTileX, windowTileInspectorTileY); sint32 numItems = 0; do { numItems++; - } while (!map_element_is_last_for_tile(element++)); + } while (!tile_element_is_last_for_tile(element++)); windowTileInspectorElementCount = numItems; @@ -967,7 +967,7 @@ static void window_tile_inspector_mouseup(rct_window *w, rct_widgetindex widgetI } // Get the selected map element - rct_map_element *const mapElement = window_tile_inspector_get_selected_element(w); + rct_tile_element *const mapElement = window_tile_inspector_get_selected_element(w); // Page widgets switch (w->page) { @@ -1198,7 +1198,7 @@ static void window_tile_inspector_mousedown(rct_window *w, rct_widgetindex widge ); // Set current value as checked - rct_map_element *const mapElement = window_tile_inspector_get_selected_element(w); + rct_tile_element *const mapElement = window_tile_inspector_get_selected_element(w); dropdown_set_checked((mapElement->type & 0xC0) >> 6, true); break; } @@ -1225,11 +1225,11 @@ static void window_tile_inspector_dropdown(rct_window *w, rct_widgetindex widget } // Get selected element - rct_map_element *const mapElement = window_tile_inspector_get_selected_element(w); + rct_tile_element *const mapElement = window_tile_inspector_get_selected_element(w); switch (w->page) { case TILE_INSPECTOR_PAGE_WALL: - openrct2_assert(map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_WALL, "Element is not a wall"); + openrct2_assert(tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_WALL, "Element is not a wall"); switch (widgetIndex) { case WIDX_WALL_DROPDOWN_SLOPE_BUTTON: @@ -1352,7 +1352,7 @@ void window_tile_inspector_auto_set_buttons(rct_window *w) // Page widgets switch (w->page) { case TILE_INSPECTOR_PAGE_WALL: { - const rct_map_element *const mapElement = window_tile_inspector_get_selected_element(w); + const rct_tile_element *const mapElement = window_tile_inspector_get_selected_element(w); const uint8 wallType = mapElement->properties.wall.type; const rct_wall_scenery_entry wallEntry = get_wall_entry(wallType)->wall; const bool canBeSloped = !(wallEntry.flags & WALL_SCENERY_CANT_BUILD_ON_SLOPE); @@ -1412,7 +1412,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 sint32 propertiesAnchor = w->widgets[WIDX_GROUPBOX_PROPERTIES].top; - rct_map_element *const mapElement = window_tile_inspector_get_selected_element(w); + rct_tile_element *const mapElement = window_tile_inspector_get_selected_element(w); switch (w->page) { case TILE_INSPECTOR_PAGE_SURFACE: @@ -1510,10 +1510,10 @@ static void window_tile_inspector_invalidate(rct_window *w) w->widgets[WIDX_SCENERY_CHECK_QUARTER_W].top = GBBT(propertiesAnchor, 1) - 5 + 7 * 1; w->widgets[WIDX_SCENERY_CHECK_QUARTER_W].bottom = w->widgets[WIDX_SCENERY_CHECK_QUARTER_W].top + 13; // This gets the relative rotation, by subtracting the camera's rotation, and wrapping it between 0-3 inclusive - bool N = (mapElement->type & MAP_ELEMENT_QUADRANT_MASK) == ((0 - get_current_rotation()) & 3) << 6; - bool E = (mapElement->type & MAP_ELEMENT_QUADRANT_MASK) == ((1 - get_current_rotation()) & 3) << 6; - bool S = (mapElement->type & MAP_ELEMENT_QUADRANT_MASK) == ((2 - get_current_rotation()) & 3) << 6; - bool W = (mapElement->type & MAP_ELEMENT_QUADRANT_MASK) == ((3 - get_current_rotation()) & 3) << 6; + bool N = (mapElement->type & TILE_ELEMENT_QUADRANT_MASK) == ((0 - get_current_rotation()) & 3) << 6; + bool E = (mapElement->type & TILE_ELEMENT_QUADRANT_MASK) == ((1 - get_current_rotation()) & 3) << 6; + bool S = (mapElement->type & TILE_ELEMENT_QUADRANT_MASK) == ((2 - get_current_rotation()) & 3) << 6; + bool W = (mapElement->type & TILE_ELEMENT_QUADRANT_MASK) == ((3 - get_current_rotation()) & 3) << 6; widget_set_checkbox_value(w, WIDX_SCENERY_CHECK_QUARTER_N, N); widget_set_checkbox_value(w, WIDX_SCENERY_CHECK_QUARTER_E, E); widget_set_checkbox_value(w, WIDX_SCENERY_CHECK_QUARTER_S, S); @@ -1638,19 +1638,19 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) sint32 y = w->y + w->widgets[WIDX_GROUPBOX_DETAILS].top + 14; // Get map element - rct_map_element *const mapElement = window_tile_inspector_get_selected_element(w); + rct_tile_element *const mapElement = window_tile_inspector_get_selected_element(w); switch (w->page) { case TILE_INSPECTOR_PAGE_SURFACE: { // Details // Terrain texture name - rct_string_id terrainNameId = TerrainTypeStringIds[map_element_get_terrain(mapElement)]; + rct_string_id terrainNameId = TerrainTypeStringIds[tile_element_get_terrain(mapElement)]; gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_SURFACE_TERAIN, &terrainNameId, COLOUR_DARK_GREEN, x, y); // Edge texture name - sint32 idx = map_element_get_terrain_edge(mapElement); + sint32 idx = tile_element_get_terrain_edge(mapElement); openrct2_assert((uint32)idx < Util::CountOf(TerrainEdgeTypeStringIds), "Tried accessing invalid entry %d in terrainEdgeTypeStringIds", idx); - rct_string_id terrainEdgeNameId = TerrainEdgeTypeStringIds[map_element_get_terrain_edge(mapElement)]; + rct_string_id terrainEdgeNameId = TerrainEdgeTypeStringIds[tile_element_get_terrain_edge(mapElement)]; gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_SURFACE_EDGE, &terrainEdgeNameId, COLOUR_DARK_GREEN, x, y + 11); // Land ownership @@ -1730,7 +1730,7 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_TRACK_RIDE_NAME, gCommonFormatArgs, COLOUR_DARK_GREEN, x, y + 22); // Track sint16 trackType = mapElement->properties.track.type; - sint16 sequenceNumber = map_element_get_track_sequence(mapElement); + sint16 sequenceNumber = tile_element_get_track_sequence(mapElement); gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_TRACK_PIECE_ID, &trackType, COLOUR_DARK_GREEN, x, y + 33); gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_TRACK_SEQUENCE, &sequenceNumber, COLOUR_DARK_GREEN, x, y + 44); @@ -1754,7 +1754,7 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) // Quadrant value if (!(get_small_scenery_entry(mapElement->properties.scenery.type)->small_scenery.flags & SMALL_SCENERY_FLAG_FULL_TILE)) { - sint16 quadrant = (mapElement->type & MAP_ELEMENT_QUADRANT_MASK) >> 6; + sint16 quadrant = (mapElement->type & TILE_ELEMENT_QUADRANT_MASK) >> 6; static rct_string_id quadrant_string_idx[] = { STR_TILE_INSPECTOR_SCENERY_QUADRANT_SW, STR_TILE_INSPECTOR_SCENERY_QUADRANT_NW, @@ -1882,7 +1882,7 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_LARGE_SCENERY_PIECE_ID, &pieceID, COLOUR_DARK_GREEN, x, y + 11); // Banner info - rct_scenery_entry *largeSceneryEntry = get_large_scenery_entry(mapElement->properties.scenerymultiple.type & MAP_ELEMENT_LARGE_TYPE_MASK); + rct_scenery_entry *largeSceneryEntry = get_large_scenery_entry(mapElement->properties.scenerymultiple.type & TILE_ELEMENT_LARGE_TYPE_MASK); if (largeSceneryEntry->large_scenery.scrolling_mode != 0xFF) { const sint32 bannerIndex = (mapElement->type & 0xC0) | ((mapElement->properties.scenerymultiple.colour[0] & 0xE0) >> 2) | @@ -1962,11 +1962,11 @@ static void window_tile_inspector_scrollpaint(rct_window *w, rct_drawpixelinfo * if (!windowTileInspectorTileSelected) return; - rct_map_element *mapElement = map_get_first_element_at(windowTileInspectorTileX, windowTileInspectorTileY); + rct_tile_element *mapElement = map_get_first_element_at(windowTileInspectorTileX, windowTileInspectorTileY); gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; do { - sint32 type = map_element_get_type(mapElement); + sint32 type = tile_element_get_type(mapElement); const char * typeName = ""; sint32 baseHeight = mapElement->base_height; sint32 clearanceHeight = mapElement->clearance_height; @@ -1981,16 +1981,16 @@ static void window_tile_inspector_scrollpaint(rct_window *w, rct_drawpixelinfo * gfx_fill_rect(dpi, 0, y, listWidth, y + LIST_ITEM_HEIGHT - 1, ColourMapA[w->colours[1]].lighter | 0x1000000); switch (type) { - case MAP_ELEMENT_TYPE_SURFACE: + case TILE_ELEMENT_TYPE_SURFACE: typeName = "Surface"; break; - case MAP_ELEMENT_TYPE_PATH: + case TILE_ELEMENT_TYPE_PATH: typeName = footpath_element_is_queue(mapElement) ? "Queue" : "Footpath"; break; - case MAP_ELEMENT_TYPE_TRACK: + case TILE_ELEMENT_TYPE_TRACK: typeName = "Track"; break; - case MAP_ELEMENT_TYPE_SCENERY: + case TILE_ELEMENT_TYPE_SCENERY: snprintf( buffer, sizeof(buffer), "Scenery (%s)", @@ -1998,10 +1998,10 @@ static void window_tile_inspector_scrollpaint(rct_window *w, rct_drawpixelinfo * ); typeName = buffer; break; - case MAP_ELEMENT_TYPE_ENTRANCE: + case TILE_ELEMENT_TYPE_ENTRANCE: typeName = "Entrance"; break; - case MAP_ELEMENT_TYPE_WALL: + case TILE_ELEMENT_TYPE_WALL: snprintf( buffer, sizeof(buffer), "Wall (%s)", @@ -2009,10 +2009,10 @@ static void window_tile_inspector_scrollpaint(rct_window *w, rct_drawpixelinfo * ); typeName = buffer; break; - case MAP_ELEMENT_TYPE_SCENERY_MULTIPLE: + case TILE_ELEMENT_TYPE_SCENERY_MULTIPLE: typeName = "Scenery multiple"; break; - case MAP_ELEMENT_TYPE_BANNER: + case TILE_ELEMENT_TYPE_BANNER: snprintf( buffer, sizeof(buffer), "Banner (%d)", @@ -2020,7 +2020,7 @@ static void window_tile_inspector_scrollpaint(rct_window *w, rct_drawpixelinfo * ); typeName = buffer; break; - case MAP_ELEMENT_TYPE_CORRUPT: + case TILE_ELEMENT_TYPE_CORRUPT: // fall-through default: snprintf(buffer, sizeof(buffer), "Unknown (type %d)", type); @@ -2029,9 +2029,9 @@ static void window_tile_inspector_scrollpaint(rct_window *w, rct_drawpixelinfo * // Undo relative scroll offset, but keep the 3 pixel padding sint32 x = -w->widgets[WIDX_LIST].left; - const bool ghost = (mapElement->flags & MAP_ELEMENT_FLAG_GHOST) != 0; - const bool broken = (mapElement->flags & MAP_ELEMENT_FLAG_BROKEN) != 0; - const bool last = (mapElement->flags & MAP_ELEMENT_FLAG_LAST_TILE) != 0; + const bool ghost = (mapElement->flags & TILE_ELEMENT_FLAG_GHOST) != 0; + const bool broken = (mapElement->flags & TILE_ELEMENT_FLAG_BROKEN) != 0; + const bool last = (mapElement->flags & TILE_ELEMENT_FLAG_LAST_TILE) != 0; gfx_clip_string(buffer, w->widgets[WIDX_COLUMN_TYPE].right - w->widgets[WIDX_COLUMN_TYPE].left - COL_X_TYPE); gfx_draw_string(dpi, (char *)typeName, COLOUR_DARK_GREEN, x + COL_X_TYPE + 3, y); // 3px padding gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &baseHeight, COLOUR_DARK_GREEN, x + COL_X_BH, y); @@ -2042,5 +2042,5 @@ static void window_tile_inspector_scrollpaint(rct_window *w, rct_drawpixelinfo * y -= LIST_ITEM_HEIGHT; i++; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); } diff --git a/src/openrct2/windows/TopToolbar.cpp b/src/openrct2/windows/TopToolbar.cpp index 8d7562b7a3..b487d880e4 100644 --- a/src/openrct2/windows/TopToolbar.cpp +++ b/src/openrct2/windows/TopToolbar.cpp @@ -926,7 +926,7 @@ static void repaint_scenery_tool_down(sint16 x, sint16 y, rct_widgetindex widget sint16 grid_x, grid_y; sint32 type; // edx - rct_map_element* map_element; + rct_tile_element* tile_element; uint16 flags = VIEWPORT_INTERACTION_MASK_SCENERY & VIEWPORT_INTERACTION_MASK_WALL & @@ -936,12 +936,12 @@ static void repaint_scenery_tool_down(sint16 x, sint16 y, rct_widgetindex widget // not used rct_viewport* viewport; - get_map_coordinates_from_pos(x, y, flags, &grid_x, &grid_y, &type, &map_element, &viewport); + get_map_coordinates_from_pos(x, y, flags, &grid_x, &grid_y, &type, &tile_element, &viewport); switch (type){ case VIEWPORT_INTERACTION_ITEM_SCENERY: { - rct_scenery_entry* scenery_entry = get_small_scenery_entry(map_element->properties.scenery.type); + rct_scenery_entry* scenery_entry = get_small_scenery_entry(tile_element->properties.scenery.type); // If can't repaint if (!(scenery_entry->small_scenery.flags & @@ -952,9 +952,9 @@ static void repaint_scenery_tool_down(sint16 x, sint16 y, rct_widgetindex widget gGameCommandErrorTitle = STR_CANT_REPAINT_THIS; game_do_command( grid_x, - 1 | (map_element->type << 8), + 1 | (tile_element->type << 8), grid_y, - map_element->base_height | (map_element->properties.scenery.type << 8), + tile_element->base_height | (tile_element->properties.scenery.type << 8), GAME_COMMAND_SET_SCENERY_COLOUR, 0, gWindowSceneryPrimaryColour | (gWindowScenerySecondaryColour << 8)); @@ -962,7 +962,7 @@ static void repaint_scenery_tool_down(sint16 x, sint16 y, rct_widgetindex widget } case VIEWPORT_INTERACTION_ITEM_WALL: { - rct_scenery_entry* scenery_entry = get_wall_entry(map_element->properties.wall.type); + rct_scenery_entry* scenery_entry = get_wall_entry(tile_element->properties.wall.type); // If can't repaint if (!(scenery_entry->wall.flags & @@ -975,7 +975,7 @@ static void repaint_scenery_tool_down(sint16 x, sint16 y, rct_widgetindex widget grid_x, 1 | (gWindowSceneryPrimaryColour << 8), grid_y, - (map_element->type & MAP_ELEMENT_DIRECTION_MASK) | (map_element->base_height << 8), + (tile_element->type & TILE_ELEMENT_DIRECTION_MASK) | (tile_element->base_height << 8), GAME_COMMAND_SET_WALL_COLOUR, 0, gWindowScenerySecondaryColour | (gWindowSceneryTertiaryColour << 8)); @@ -983,7 +983,7 @@ static void repaint_scenery_tool_down(sint16 x, sint16 y, rct_widgetindex widget } case VIEWPORT_INTERACTION_ITEM_LARGE_SCENERY: { - rct_scenery_entry* scenery_entry = get_large_scenery_entry(map_element->properties.scenerymultiple.type & MAP_ELEMENT_LARGE_TYPE_MASK); + rct_scenery_entry* scenery_entry = get_large_scenery_entry(tile_element->properties.scenerymultiple.type & TILE_ELEMENT_LARGE_TYPE_MASK); // If can't repaint if (!(scenery_entry->large_scenery.flags & @@ -993,9 +993,9 @@ static void repaint_scenery_tool_down(sint16 x, sint16 y, rct_widgetindex widget gGameCommandErrorTitle = STR_CANT_REPAINT_THIS; game_do_command( grid_x, - 1 | ((map_element->type & MAP_ELEMENT_DIRECTION_MASK) << 8), + 1 | ((tile_element->type & TILE_ELEMENT_DIRECTION_MASK) << 8), grid_y, - map_element->base_height | ((map_element->properties.scenerymultiple.type >> 10) << 8), + tile_element->base_height | ((tile_element->properties.scenerymultiple.type >> 10) << 8), GAME_COMMAND_SET_LARGE_SCENERY_COLOUR, 0, gWindowSceneryPrimaryColour | (gWindowScenerySecondaryColour << 8)); @@ -1003,7 +1003,7 @@ static void repaint_scenery_tool_down(sint16 x, sint16 y, rct_widgetindex widget } case VIEWPORT_INTERACTION_ITEM_BANNER: { - rct_banner* banner = &gBanners[map_element->properties.banner.index]; + rct_banner* banner = &gBanners[tile_element->properties.banner.index]; rct_scenery_entry* scenery_entry = get_banner_entry(banner->type); // If can't repaint @@ -1016,7 +1016,7 @@ static void repaint_scenery_tool_down(sint16 x, sint16 y, rct_widgetindex widget grid_x, 1, grid_y, - map_element->base_height | ((map_element->properties.banner.position & 0x3) << 8), + tile_element->base_height | ((tile_element->properties.banner.position & 0x3) << 8), GAME_COMMAND_SET_BANNER_COLOUR, 0, gWindowSceneryPrimaryColour | (gWindowScenerySecondaryColour << 8)); @@ -1038,7 +1038,7 @@ static void scenery_eyedropper_tool_down(sint16 x, sint16 y, rct_widgetindex wid sint16 gridX, gridY; sint32 type; - rct_map_element* mapElement; + rct_tile_element* mapElement; rct_viewport * viewport; get_map_coordinates_from_pos(x, y, flags, &gridX, &gridY, &type, &mapElement, &viewport); @@ -1050,7 +1050,7 @@ static void scenery_eyedropper_tool_down(sint16 x, sint16 y, rct_widgetindex wid if (sceneryEntry != nullptr) { sint32 sceneryId = get_scenery_id_from_entry_index(OBJECT_TYPE_SMALL_SCENERY, entryIndex); if (sceneryId != -1 && window_scenery_set_selected_item(sceneryId)) { - gWindowSceneryRotation = (get_current_rotation() + map_element_get_direction(mapElement)) & 3; + gWindowSceneryRotation = (get_current_rotation() + tile_element_get_direction(mapElement)) & 3; gWindowSceneryPrimaryColour = mapElement->properties.scenery.colour_1 & 0x1F; gWindowScenerySecondaryColour = mapElement->properties.scenery.colour_2 & 0x1F; gWindowSceneryEyedropperEnabled = false; @@ -1075,12 +1075,12 @@ static void scenery_eyedropper_tool_down(sint16 x, sint16 y, rct_widgetindex wid } case VIEWPORT_INTERACTION_ITEM_LARGE_SCENERY: { - sint32 entryIndex = mapElement->properties.scenerymultiple.type & MAP_ELEMENT_LARGE_TYPE_MASK; + sint32 entryIndex = mapElement->properties.scenerymultiple.type & TILE_ELEMENT_LARGE_TYPE_MASK; rct_scenery_entry * sceneryEntry = get_large_scenery_entry(entryIndex); if (sceneryEntry != nullptr) { sint32 sceneryId = get_scenery_id_from_entry_index(OBJECT_TYPE_LARGE_SCENERY, entryIndex); if (sceneryId != -1 && window_scenery_set_selected_item(sceneryId)) { - gWindowSceneryRotation = (get_current_rotation() + map_element_get_direction(mapElement)) & 3; + gWindowSceneryRotation = (get_current_rotation() + tile_element_get_direction(mapElement)) & 3; gWindowSceneryPrimaryColour = mapElement->properties.scenerymultiple.colour[0] & 0x1F; gWindowScenerySecondaryColour = mapElement->properties.scenerymultiple.colour[1] & 0x1F; gWindowSceneryEyedropperEnabled = false; @@ -1156,7 +1156,7 @@ static void sub_6E1F34(sint16 x, sint16 y, uint16 selected_scenery, sint16* grid if (!gSceneryCtrlPressed) { if (input_test_place_object_modifier(PLACE_OBJECT_MODIFIER_COPY_Z)) { // CTRL pressed - rct_map_element* map_element; + rct_tile_element* tile_element; uint16 flags = VIEWPORT_INTERACTION_MASK_TERRAIN & VIEWPORT_INTERACTION_MASK_RIDE & @@ -1165,11 +1165,11 @@ static void sub_6E1F34(sint16 x, sint16 y, uint16 selected_scenery, sint16* grid VIEWPORT_INTERACTION_MASK_WALL & VIEWPORT_INTERACTION_MASK_LARGE_SCENERY; sint32 interaction_type; - get_map_coordinates_from_pos(x, y, flags, nullptr, nullptr, &interaction_type, &map_element, nullptr); + get_map_coordinates_from_pos(x, y, flags, nullptr, nullptr, &interaction_type, &tile_element, nullptr); if (interaction_type != VIEWPORT_INTERACTION_ITEM_NONE) { gSceneryCtrlPressed = true; - gSceneryCtrlPressZ = map_element->base_height * 8; + gSceneryCtrlPressZ = tile_element->base_height * 8; } } } @@ -1223,14 +1223,14 @@ static void sub_6E1F34(sint16 x, sint16 y, uint16 selected_scenery, sint16* grid // If SHIFT pressed if (gSceneryShiftPressed) { - rct_map_element* map_element = map_get_surface_element_at(*grid_x / 32, *grid_y / 32); + rct_tile_element* tile_element = map_get_surface_element_at(*grid_x / 32, *grid_y / 32); - if (map_element == nullptr) { + if (tile_element == nullptr) { *grid_x = LOCATION_NULL; return; } - sint16 z = (map_element->base_height * 8) & 0xFFF0; + sint16 z = (tile_element->base_height * 8) & 0xFFF0; z += gSceneryShiftPressZOffset; z = Math::Max(z, 16); @@ -1278,9 +1278,9 @@ static void sub_6E1F34(sint16 x, sint16 y, uint16 selected_scenery, sint16* grid VIEWPORT_INTERACTION_MASK_TERRAIN & VIEWPORT_INTERACTION_MASK_WATER; sint32 interaction_type = 0; - rct_map_element* map_element; + rct_tile_element* tile_element; - get_map_coordinates_from_pos(x, y, flags, grid_x, grid_y, &interaction_type, &map_element, nullptr); + get_map_coordinates_from_pos(x, y, flags, grid_x, grid_y, &interaction_type, &tile_element, nullptr); if (interaction_type == VIEWPORT_INTERACTION_ITEM_NONE) { *grid_x = LOCATION_NULL; @@ -1288,21 +1288,21 @@ static void sub_6E1F34(sint16 x, sint16 y, uint16 selected_scenery, sint16* grid } gSceneryPlaceZ = 0; - uint16 water_height = map_element->properties.surface.terrain & MAP_ELEMENT_WATER_HEIGHT_MASK; + uint16 water_height = tile_element->properties.surface.terrain & TILE_ELEMENT_WATER_HEIGHT_MASK; if (water_height != 0) { gSceneryPlaceZ = water_height * 16; } // If SHIFT pressed if (gSceneryShiftPressed) { - map_element = map_get_surface_element_at(*grid_x / 32, *grid_y / 32); + tile_element = map_get_surface_element_at(*grid_x / 32, *grid_y / 32); - if (map_element == nullptr) { + if (tile_element == nullptr) { *grid_x = LOCATION_NULL; return; } - sint16 z = (map_element->base_height * 8) & 0xFFF0; + sint16 z = (tile_element->base_height * 8) & 0xFFF0; z += gSceneryShiftPressZOffset; z = Math::Max(z, 16); @@ -1351,18 +1351,18 @@ static void sub_6E1F34(sint16 x, sint16 y, uint16 selected_scenery, sint16* grid VIEWPORT_INTERACTION_MASK_FOOTPATH & VIEWPORT_INTERACTION_MASK_FOOTPATH_ITEM; sint32 interaction_type = 0; - rct_map_element* map_element; + rct_tile_element* tile_element; - get_map_coordinates_from_pos(x, y, flags, grid_x, grid_y, &interaction_type, &map_element, nullptr); + get_map_coordinates_from_pos(x, y, flags, grid_x, grid_y, &interaction_type, &tile_element, nullptr); if (interaction_type == VIEWPORT_INTERACTION_ITEM_NONE) { *grid_x = LOCATION_NULL; return; } - *parameter_1 = 0 | ((map_element->properties.path.type & 0x7) << 8); - *parameter_2 = map_element->base_height | ((map_element->properties.path.type >> 4) << 8); - if (map_element->type & 1) { + *parameter_1 = 0 | ((tile_element->properties.path.type & 0x7) << 8); + *parameter_2 = tile_element->base_height | ((tile_element->properties.path.type >> 4) << 8); + if (tile_element->type & 1) { *parameter_2 |= LOCATION_NULL; } *parameter_3 = (selected_scenery & 0xFF) + 1; @@ -1383,14 +1383,14 @@ static void sub_6E1F34(sint16 x, sint16 y, uint16 selected_scenery, sint16* grid // If SHIFT pressed if (gSceneryShiftPressed) { - rct_map_element* map_element = map_get_surface_element_at(*grid_x / 32, *grid_y / 32); + rct_tile_element* tile_element = map_get_surface_element_at(*grid_x / 32, *grid_y / 32); - if (map_element == nullptr) { + if (tile_element == nullptr) { *grid_x = LOCATION_NULL; return; } - sint16 z = (map_element->base_height * 8) & 0xFFF0; + sint16 z = (tile_element->base_height * 8) & 0xFFF0; z += gSceneryShiftPressZOffset; z = Math::Max(z, 16); @@ -1436,14 +1436,14 @@ static void sub_6E1F34(sint16 x, sint16 y, uint16 selected_scenery, sint16* grid // If SHIFT pressed if (gSceneryShiftPressed) { - rct_map_element* map_element = map_get_surface_element_at(*grid_x / 32, *grid_y / 32); + rct_tile_element* tile_element = map_get_surface_element_at(*grid_x / 32, *grid_y / 32); - if (map_element == nullptr) { + if (tile_element == nullptr) { *grid_x = LOCATION_NULL; return; } - sint16 z = (map_element->base_height * 8) & 0xFFF0; + sint16 z = (tile_element->base_height * 8) & 0xFFF0; z += gSceneryShiftPressZOffset; z = Math::Max(z, 16); @@ -1487,9 +1487,9 @@ static void sub_6E1F34(sint16 x, sint16 y, uint16 selected_scenery, sint16* grid VIEWPORT_INTERACTION_MASK_FOOTPATH & VIEWPORT_INTERACTION_MASK_FOOTPATH_ITEM; sint32 interaction_type = 0; - rct_map_element* map_element; + rct_tile_element* tile_element; - get_map_coordinates_from_pos(x, y, flags, grid_x, grid_y, &interaction_type, &map_element, nullptr); + get_map_coordinates_from_pos(x, y, flags, grid_x, grid_y, &interaction_type, &tile_element, nullptr); if (interaction_type == VIEWPORT_INTERACTION_ITEM_NONE) { *grid_x = LOCATION_NULL; @@ -1500,10 +1500,10 @@ static void sub_6E1F34(sint16 x, sint16 y, uint16 selected_scenery, sint16* grid rotation -= get_current_rotation(); rotation &= 0x3; - sint16 z = map_element->base_height; + sint16 z = tile_element->base_height; - if (map_element->properties.path.type & (1 << 2)) { - if (rotation != ((map_element->properties.path.type & 3) ^ 2)) { + if (tile_element->properties.path.type & (1 << 2)) { + if (rotation != ((tile_element->properties.path.type & 3) ^ 2)) { z += 2; } } @@ -2195,7 +2195,7 @@ static money32 try_place_ghost_scenery(LocationXY16 map_tile, uint32 parameter_1 uint8 scenery_type = (selected_tab & 0xFF00) >> 8; money32 cost = 0; - rct_map_element* mapElement; + rct_tile_element* mapElement; switch (scenery_type){ case 0: diff --git a/src/openrct2/world/Banner.cpp b/src/openrct2/world/Banner.cpp index afbf13af0d..244333de52 100644 --- a/src/openrct2/world/Banner.cpp +++ b/src/openrct2/world/Banner.cpp @@ -37,7 +37,7 @@ rct_banner gBanners[MAX_BANNERS]; */ static sint32 banner_get_ride_index_at(sint32 x, sint32 y, sint32 z) { - rct_map_element *mapElement; + rct_tile_element *mapElement; Ride *ride; sint32 rideIndex, resultRideIndex; @@ -45,7 +45,7 @@ static sint32 banner_get_ride_index_at(sint32 x, sint32 y, sint32 z) mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; rideIndex = mapElement->properties.track.ride_index; @@ -57,7 +57,7 @@ static sint32 banner_get_ride_index_at(sint32 x, sint32 y, sint32 z) continue; resultRideIndex = rideIndex; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return resultRideIndex; } @@ -83,7 +83,7 @@ static money32 BannerRemove(sint16 x, sint16 y, uint8 baseHeight, uint8 directio // Slight modification to the code so that it now checks height as well // This was causing a bug with banners on two paths stacked. - rct_map_element* mapElement = map_get_banner_element_at(x / 32, y / 32, baseHeight, direction); + rct_tile_element* mapElement = map_get_banner_element_at(x / 32, y / 32, baseHeight, direction); if (mapElement == nullptr) { return MONEY32_UNDEFINED; @@ -104,13 +104,13 @@ static money32 BannerRemove(sint16 x, sint16 y, uint8 baseHeight, uint8 directio LocationXYZ16 coord; coord.x = x + 16; coord.y = y + 16; - coord.z = map_element_height(coord.x, coord.y); + coord.z = tile_element_height(coord.x, coord.y); network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord); } - map_element_remove_banner_entry(mapElement); + tile_element_remove_banner_entry(mapElement); map_invalidate_tile_zoom1(x, y, z, z + 32); - map_element_remove(mapElement); + tile_element_remove(mapElement); } if (gParkFlags & PARK_FLAGS_NO_MONEY) @@ -136,12 +136,12 @@ static money32 BannerSetColour(sint16 x, sint16 y, uint8 baseHeight, uint8 direc if (flags & GAME_COMMAND_FLAG_APPLY) { - rct_map_element* mapElement = map_get_first_element_at(x / 32, y / 32); + rct_tile_element* mapElement = map_get_first_element_at(x / 32, y / 32); bool found = false; do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_BANNER) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_BANNER) continue; if (mapElement->properties.banner.position != direction) @@ -149,7 +149,7 @@ static money32 BannerSetColour(sint16 x, sint16 y, uint8 baseHeight, uint8 direc found = true; break; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); if (found == false) { @@ -190,12 +190,12 @@ static money32 BannerPlace(sint16 x, sint16 y, uint8 pathBaseHeight, uint8 direc return MONEY32_UNDEFINED; } - rct_map_element* mapElement = map_get_first_element_at(x / 32, y / 32); + rct_tile_element* mapElement = map_get_first_element_at(x / 32, y / 32); bool pathFound = false; do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_PATH) continue; if (mapElement->base_height != pathBaseHeight * 2 && mapElement->base_height != (pathBaseHeight - 1) * 2) @@ -206,7 +206,7 @@ static money32 BannerPlace(sint16 x, sint16 y, uint8 pathBaseHeight, uint8 direc pathFound = true; break; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); if (pathFound == false) { @@ -240,17 +240,17 @@ static money32 BannerPlace(sint16 x, sint16 y, uint8 pathBaseHeight, uint8 direc LocationXYZ16 coord; coord.x = x + 16; coord.y = y + 16; - coord.z = map_element_height(coord.x, coord.y); + coord.z = tile_element_height(coord.x, coord.y); network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord); } - rct_map_element* newMapElement = map_element_insert(x / 32, y / 32, baseHeight, 0); + rct_tile_element* newMapElement = tile_element_insert(x / 32, y / 32, baseHeight, 0); assert(newMapElement != nullptr); gBanners[*bannerIndex].type = type; gBanners[*bannerIndex].colour = colour; gBanners[*bannerIndex].x = x / 32; gBanners[*bannerIndex].y = y / 32; - newMapElement->type = MAP_ELEMENT_TYPE_BANNER; + newMapElement->type = TILE_ELEMENT_TYPE_BANNER; newMapElement->clearance_height = newMapElement->base_height + 2; newMapElement->properties.banner.position = direction; newMapElement->properties.banner.flags = 0xFF; @@ -258,7 +258,7 @@ static money32 BannerPlace(sint16 x, sint16 y, uint8 pathBaseHeight, uint8 direc newMapElement->properties.banner.index = *bannerIndex; if (flags & GAME_COMMAND_FLAG_GHOST) { - newMapElement->flags |= MAP_ELEMENT_FLAG_GHOST; + newMapElement->flags |= TILE_ELEMENT_FLAG_GHOST; } map_invalidate_tile_full(x, y); map_animation_create(MAP_ANIMATION_TYPE_BANNER, x, y, newMapElement->base_height); @@ -353,7 +353,7 @@ static money32 BannerSetStyle(uint8 bannerIndex, uint8 colour, uint8 textColour, rct_banner* banner = &gBanners[bannerIndex]; - rct_map_element* mapElement = banner_get_map_element(bannerIndex); + rct_tile_element* mapElement = banner_get_tile_element(bannerIndex); if (mapElement == nullptr) { @@ -467,17 +467,17 @@ extern "C" return bannerIndex; } - rct_map_element *banner_get_map_element(sint32 bannerIndex) + rct_tile_element *banner_get_tile_element(sint32 bannerIndex) { rct_banner *banner = &gBanners[bannerIndex]; - rct_map_element *mapElement = map_get_first_element_at(banner->x, banner->y); + rct_tile_element *mapElement = map_get_first_element_at(banner->x, banner->y); do { - if (map_element_get_banner_index(mapElement) == bannerIndex) + if (tile_element_get_banner_index(mapElement) == bannerIndex) { return mapElement; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return nullptr; } @@ -540,7 +540,7 @@ extern "C" { for (sint32 bannerIndex = 0; bannerIndex < MAX_BANNERS; bannerIndex++) { - rct_map_element *mapElement = banner_get_map_element(bannerIndex); + rct_tile_element *mapElement = banner_get_tile_element(bannerIndex); if (mapElement == nullptr) gBanners[bannerIndex].type = BANNER_NULL; } diff --git a/src/openrct2/world/Duck.cpp b/src/openrct2/world/Duck.cpp index f486f5f6fb..1cb1fc87f8 100644 --- a/src/openrct2/world/Duck.cpp +++ b/src/openrct2/world/Duck.cpp @@ -125,7 +125,7 @@ void rct_duck::UpdateFlyToWater() sint32 newY = y + DuckMoveOffset[direction].y; sint32 manhattanDistanceN = abs(target_x - newX) + abs(target_y - newY); - rct_map_element * mapElement = map_get_surface_element_at(target_x >> 5, target_y >> 5); + rct_tile_element * mapElement = map_get_surface_element_at(target_x >> 5, target_y >> 5); sint32 waterHeight = map_get_water_height(mapElement); if (waterHeight == 0) { @@ -203,7 +203,7 @@ void rct_duck::UpdateSwim() else { Invalidate(); - sint32 landZ = map_element_height(x, y); + sint32 landZ = tile_element_height(x, y); sint32 waterZ = (landZ >> 16) & 0xFFFF; landZ &= 0xFFFF; @@ -225,7 +225,7 @@ void rct_duck::UpdateSwim() sint32 direction = sprite_direction >> 3; sint32 newX = x + DuckMoveOffset[direction].x; sint32 newY = y + DuckMoveOffset[direction].y; - landZ = map_element_height(newX, newY); + landZ = tile_element_height(newX, newY); waterZ = (landZ >> 16) & 0xFFFF; landZ &= 0xFFFF; diff --git a/src/openrct2/world/Entrance.cpp b/src/openrct2/world/Entrance.cpp index 20316df88d..5491ed4148 100644 --- a/src/openrct2/world/Entrance.cpp +++ b/src/openrct2/world/Entrance.cpp @@ -37,7 +37,7 @@ uint8 gRideEntranceExitGhostStationIndex; static void ParkEntranceRemoveSegment(sint32 x, sint32 y, sint32 z) { - rct_map_element *mapElement; + rct_tile_element *mapElement; mapElement = map_get_park_entrance_element_at(x, y, z, true); if (mapElement == nullptr) @@ -46,7 +46,7 @@ static void ParkEntranceRemoveSegment(sint32 x, sint32 y, sint32 z) } map_invalidate_tile(x, y, mapElement->base_height * 8, mapElement->clearance_height * 8); - map_element_remove(mapElement); + tile_element_remove(mapElement); update_park_fences(x, y); } @@ -278,20 +278,20 @@ static money32 RideEntranceExitPlace(sint16 x, LocationXYZ16 coord; coord.x = x + 16; coord.y = y + 16; - coord.z = map_element_height(coord.x, coord.y); + coord.z = tile_element_height(coord.x, coord.y); network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord); - rct_map_element* mapElement = map_element_insert(x / 32, y / 32, z / 8, 0xF); + rct_tile_element* mapElement = tile_element_insert(x / 32, y / 32, z / 8, 0xF); assert(mapElement != nullptr); mapElement->clearance_height = clear_z; mapElement->properties.entrance.type = isExit; mapElement->properties.entrance.index = stationNum << 4; mapElement->properties.entrance.ride_index = rideIndex; - mapElement->type = MAP_ELEMENT_TYPE_ENTRANCE | direction; + mapElement->type = TILE_ELEMENT_TYPE_ENTRANCE | direction; if (flags & GAME_COMMAND_FLAG_GHOST) { - mapElement->flags |= MAP_ELEMENT_FLAG_GHOST; + mapElement->flags |= TILE_ELEMENT_FLAG_GHOST; } if (isExit) @@ -372,7 +372,7 @@ static money32 RideEntranceExitRemove(sint16 x, sint16 y, uint8 rideIndex, uint8 invalidate_test_results(rideIndex); bool found = false; - rct_map_element* mapElement = map_get_first_element_at(x / 32, y / 32); + rct_tile_element* mapElement = map_get_first_element_at(x / 32, y / 32); if (mapElement == nullptr) { log_warning("Invalid coordinates for entrance/exit removal x = %d, y = %d", x, y); @@ -381,19 +381,19 @@ static money32 RideEntranceExitRemove(sint16 x, sint16 y, uint8 rideIndex, uint8 do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_ENTRANCE) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_ENTRANCE) continue; if (mapElement->base_height != ride->station_heights[stationNum]) continue; - if (flags & GAME_COMMAND_FLAG_5 && !(mapElement->flags & MAP_ELEMENT_FLAG_GHOST)) + if (flags & GAME_COMMAND_FLAG_5 && !(mapElement->flags & TILE_ELEMENT_FLAG_GHOST)) continue; found = true; break; } - while (!map_element_is_last_for_tile(mapElement++)); + while (!tile_element_is_last_for_tile(mapElement++)); if (!found) { @@ -403,7 +403,7 @@ static money32 RideEntranceExitRemove(sint16 x, sint16 y, uint8 rideIndex, uint8 LocationXYZ16 coord; coord.x = x + 16; coord.y = y + 16; - coord.z = map_element_height(coord.x, coord.y); + coord.z = tile_element_height(coord.x, coord.y); network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord); footpath_queue_chain_reset(); @@ -412,7 +412,7 @@ static money32 RideEntranceExitRemove(sint16 x, sint16 y, uint8 rideIndex, uint8 bool isExit = mapElement->properties.entrance.type == ENTRANCE_TYPE_RIDE_EXIT; - map_element_remove(mapElement); + tile_element_remove(mapElement); if (isExit) { @@ -620,9 +620,9 @@ extern "C" * Replaces the outer hedge walls for an entrance placement removal. * rct2: 0x00666D6F */ - void maze_entrance_hedge_replacement(sint32 x, sint32 y, rct_map_element *mapElement) + void maze_entrance_hedge_replacement(sint32 x, sint32 y, rct_tile_element *mapElement) { - sint32 direction = map_element_get_direction(mapElement); + sint32 direction = tile_element_get_direction(mapElement); x += TileDirectionDelta[direction].x; y += TileDirectionDelta[direction].y; sint32 z = mapElement->base_height; @@ -630,7 +630,7 @@ extern "C" mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - if (mapElement->type != MAP_ELEMENT_TYPE_TRACK) continue; + if (mapElement->type != TILE_ELEMENT_TYPE_TRACK) continue; if (mapElement->properties.track.ride_index != rideIndex) continue; if (mapElement->base_height != z) continue; if (mapElement->properties.track.type != TRACK_ELEM_MAZE) continue; @@ -644,16 +644,16 @@ extern "C" map_invalidate_tile(x, y, mapElement->base_height * 8, mapElement->clearance_height * 8); return; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); } /** * Removes the hedge walls for an entrance placement. * rct2: 0x00666CBE */ - void maze_entrance_hedge_removal(sint32 x, sint32 y, rct_map_element *mapElement) + void maze_entrance_hedge_removal(sint32 x, sint32 y, rct_tile_element *mapElement) { - sint32 direction = map_element_get_direction(mapElement); + sint32 direction = tile_element_get_direction(mapElement); x += TileDirectionDelta[direction].x; y += TileDirectionDelta[direction].y; sint32 z = mapElement->base_height; @@ -661,7 +661,7 @@ extern "C" mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - if (mapElement->type != MAP_ELEMENT_TYPE_TRACK) continue; + if (mapElement->type != TILE_ELEMENT_TYPE_TRACK) continue; if (mapElement->properties.track.ride_index != rideIndex) continue; if (mapElement->base_height != z) continue; if (mapElement->properties.track.type != TRACK_ELEM_MAZE) continue; @@ -681,12 +681,12 @@ extern "C" map_invalidate_tile(x, y, mapElement->base_height * 8, mapElement->clearance_height * 8); return; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); } void fix_park_entrance_locations(void) { - // Fix gParkEntrance locations for which the map_element no longer exists + // Fix gParkEntrance locations for which the tile_element no longer exists for (uint8 entranceNum = 0; entranceNum < MAX_PARK_ENTRANCES; ++entranceNum) { if (gParkEntrances[entranceNum].x == LOCATION_NULL) diff --git a/src/openrct2/world/Fountain.cpp b/src/openrct2/world/Fountain.cpp index 311e7a2411..ef057b2481 100644 --- a/src/openrct2/world/Fountain.cpp +++ b/src/openrct2/world/Fountain.cpp @@ -99,7 +99,7 @@ static void jumping_fountain_create_next(const rct_jumping_fountain * jumpingFou extern "C" { - void jumping_fountain_begin(sint32 type, sint32 x, sint32 y, const rct_map_element * mapElement) + void jumping_fountain_begin(sint32 type, sint32 x, sint32 y, const rct_tile_element * mapElement) { sint32 randomIndex; sint32 z = mapElement->base_height * 8; @@ -300,10 +300,10 @@ static bool is_jumping_fountain(sint32 type, sint32 x, sint32 y, sint32 z) PATH_BIT_FLAG_JUMPING_FOUNTAIN_SNOW : PATH_BIT_FLAG_JUMPING_FOUNTAIN_WATER; - rct_map_element * mapElement = map_get_first_element_at(x >> 5, y >> 5); + rct_tile_element * mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_PATH) continue; + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_PATH) continue; if (mapElement->base_height != z) continue; if (footpath_element_path_scenery_is_ghost(mapElement)) continue; if (!footpath_element_has_path_scenery(mapElement)) continue; @@ -315,7 +315,7 @@ static bool is_jumping_fountain(sint32 type, sint32 x, sint32 y, sint32 z) return true; } } - while (!map_element_is_last_for_tile(mapElement++)); + while (!tile_element_is_last_for_tile(mapElement++)); return false; } diff --git a/src/openrct2/world/Fountain.h b/src/openrct2/world/Fountain.h index a0af6543bc..1aa930cad5 100644 --- a/src/openrct2/world/Fountain.h +++ b/src/openrct2/world/Fountain.h @@ -31,7 +31,7 @@ enum extern "C" { #endif - void jumping_fountain_begin(sint32 type, sint32 x, sint32 y, const rct_map_element * mapElement); + void jumping_fountain_begin(sint32 type, sint32 x, sint32 y, const rct_tile_element * mapElement); void jumping_fountain_create(sint32 type, sint32 x, sint32 y, sint32 z, sint32 direction, sint32 flags, sint32 iteration); void jumping_fountain_update(rct_jumping_fountain * jumpingFountain); #ifdef __cplusplus diff --git a/src/openrct2/world/SmallScenery.cpp b/src/openrct2/world/SmallScenery.cpp index 49dff398be..2b2b76354a 100644 --- a/src/openrct2/world/SmallScenery.cpp +++ b/src/openrct2/world/SmallScenery.cpp @@ -75,9 +75,9 @@ static money32 SmallSceneryRemove(sint16 x, sint16 y, uint8 baseHeight, uint8 qu } bool sceneryFound = false; - rct_map_element* mapElement = map_get_first_element_at(x / 32, y / 32); + rct_tile_element* mapElement = map_get_first_element_at(x / 32, y / 32); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_SCENERY) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_SCENERY) continue; if ((mapElement->type >> 6) != quadrant) continue; @@ -86,12 +86,12 @@ static money32 SmallSceneryRemove(sint16 x, sint16 y, uint8 baseHeight, uint8 qu if (mapElement->properties.scenery.type != sceneryType) continue; if ((flags & GAME_COMMAND_FLAG_GHOST) && - !(mapElement->flags & MAP_ELEMENT_FLAG_GHOST)) + !(mapElement->flags & TILE_ELEMENT_FLAG_GHOST)) continue; sceneryFound = true; break; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); if (sceneryFound == false) { @@ -106,12 +106,12 @@ static money32 SmallSceneryRemove(sint16 x, sint16 y, uint8 baseHeight, uint8 qu LocationXYZ16 coord; coord.x = x + 16; coord.y = y + 16; - coord.z = map_element_height(coord.x, coord.y); + coord.z = tile_element_height(coord.x, coord.y); network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord); } map_invalidate_tile_full(x, y); - map_element_remove(mapElement); + tile_element_remove(mapElement); } return (gParkFlags & PARK_FLAGS_NO_MONEY) ? 0 : cost; } @@ -132,14 +132,14 @@ static money32 SmallScenerySetColour(sint16 x, sint16 y, uint8 baseHeight, uint8 } } - rct_map_element *mapElement = map_get_small_scenery_element_at(x, y, baseHeight, sceneryType, quadrant); + rct_tile_element *mapElement = map_get_small_scenery_element_at(x, y, baseHeight, sceneryType, quadrant); if (mapElement == nullptr) { return 0; } - if ((flags & GAME_COMMAND_FLAG_GHOST) && !(mapElement->flags & MAP_ELEMENT_FLAG_GHOST)) + if ((flags & GAME_COMMAND_FLAG_GHOST) && !(mapElement->flags & TILE_ELEMENT_FLAG_GHOST)) { return 0; } @@ -174,7 +174,7 @@ static money32 SmallSceneryPlace(sint16 x, { supportsRequired = true; } - sint32 baseHeight = map_element_height(x, y); + sint32 baseHeight = tile_element_height(x, y); // If on water if (baseHeight & 0xFFFF0000) { @@ -236,7 +236,7 @@ static money32 SmallSceneryPlace(sint16 x, x2 += ScenerySubTileOffsets[quadrant & 3].x - 1; y2 += ScenerySubTileOffsets[quadrant & 3].y - 1; } - baseHeight = map_element_height(x2, y2); + baseHeight = tile_element_height(x2, y2); // If on water if (baseHeight & 0xFFFF0000) { @@ -269,7 +269,7 @@ static money32 SmallSceneryPlace(sint16 x, } } - rct_map_element* surfaceElement = map_get_surface_element_at(x / 32, y / 32); + rct_tile_element* surfaceElement = map_get_surface_element_at(x / 32, y / 32); if (surfaceElement != nullptr && !gCheatsDisableClearanceChecks && map_get_water_height(surfaceElement) > 0) { @@ -401,15 +401,15 @@ static money32 SmallSceneryPlace(sint16 x, LocationXYZ16 coord; coord.x = x + 16; coord.y = y + 16; - coord.z = map_element_height(coord.x, coord.y); + coord.z = tile_element_height(coord.x, coord.y); network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord); } - rct_map_element* newElement = map_element_insert(x / 32, y / 32, zLow, collisionQuadrants); + rct_tile_element* newElement = tile_element_insert(x / 32, y / 32, zLow, collisionQuadrants); assert(newElement != nullptr); gSceneryMapElement = newElement; uint8 type = quadrant << 6; - type |= MAP_ELEMENT_TYPE_SCENERY; + type |= TILE_ELEMENT_TYPE_SCENERY; type |= rotation; newElement->type = type; newElement->properties.scenery.type = sceneryType; @@ -425,7 +425,7 @@ static money32 SmallSceneryPlace(sint16 x, if (flags & GAME_COMMAND_FLAG_GHOST) { - newElement->flags |= MAP_ELEMENT_FLAG_GHOST; + newElement->flags |= TILE_ELEMENT_FLAG_GHOST; } map_invalidate_tile_full(x, y); @@ -477,15 +477,15 @@ extern "C" * * rct2: 0x006E0D6E, 0x006B8D88 */ - sint32 map_place_scenery_clear_func(rct_map_element** map_element, sint32 x, sint32 y, uint8 flags, money32* price) + sint32 map_place_scenery_clear_func(rct_tile_element** tile_element, sint32 x, sint32 y, uint8 flags, money32* price) { - if (map_element_get_type(*map_element) != MAP_ELEMENT_TYPE_SCENERY) + if (tile_element_get_type(*tile_element) != TILE_ELEMENT_TYPE_SCENERY) return 1; if (!(flags & GAME_COMMAND_FLAG_PATH_SCENERY)) return 1; - rct_scenery_entry* scenery = get_small_scenery_entry((*map_element)->properties.scenery.type); + rct_scenery_entry* scenery = get_small_scenery_entry((*tile_element)->properties.scenery.type); if (gParkFlags & PARK_FLAGS_FORBID_TREE_REMOVAL) { @@ -502,11 +502,11 @@ extern "C" if (!(flags & GAME_COMMAND_FLAG_APPLY)) return 0; - map_invalidate_tile(x, y, (*map_element)->base_height * 8, (*map_element)->clearance_height * 8); + map_invalidate_tile(x, y, (*tile_element)->base_height * 8, (*tile_element)->clearance_height * 8); - map_element_remove(*map_element); + tile_element_remove(*tile_element); - (*map_element)--; + (*tile_element)--; return 0; } @@ -514,12 +514,12 @@ extern "C" * * rct2: 0x006C5A4F, 0x006CDE57, 0x006A6733, 0x0066637E */ - sint32 map_place_non_scenery_clear_func(rct_map_element** map_element, sint32 x, sint32 y, uint8 flags, money32* price) + sint32 map_place_non_scenery_clear_func(rct_tile_element** tile_element, sint32 x, sint32 y, uint8 flags, money32* price) { - if (map_element_get_type(*map_element) != MAP_ELEMENT_TYPE_SCENERY) + if (tile_element_get_type(*tile_element) != TILE_ELEMENT_TYPE_SCENERY) return 1; - rct_scenery_entry* scenery = get_small_scenery_entry((*map_element)->properties.scenery.type); + rct_scenery_entry* scenery = get_small_scenery_entry((*tile_element)->properties.scenery.type); if (gParkFlags & PARK_FLAGS_FORBID_TREE_REMOVAL) { @@ -536,11 +536,11 @@ extern "C" if (!(flags & GAME_COMMAND_FLAG_APPLY)) return 0; - map_invalidate_tile(x, y, (*map_element)->base_height * 8, (*map_element)->clearance_height * 8); + map_invalidate_tile(x, y, (*tile_element)->base_height * 8, (*tile_element)->clearance_height * 8); - map_element_remove(*map_element); + tile_element_remove(*tile_element); - (*map_element)--; + (*tile_element)--; return 0; } diff --git a/src/openrct2/world/Wall.cpp b/src/openrct2/world/Wall.cpp index cbaffe728e..2e2f1c3130 100644 --- a/src/openrct2/world/Wall.cpp +++ b/src/openrct2/world/Wall.cpp @@ -63,12 +63,12 @@ static bool WallCheckObstructionWithTrack(rct_scenery_entry * wall, sint32 z0, sint32 z1, sint32 edge, - rct_map_element * trackElement, + rct_tile_element * trackElement, bool * wallAcrossTrack) { sint32 trackType = trackElement->properties.track.type; - sint32 sequence = map_element_get_track_sequence(trackElement); - sint32 direction = (edge - map_element_get_direction(trackElement)) & MAP_ELEMENT_DIRECTION_MASK; + sint32 sequence = tile_element_get_track_sequence(trackElement); + sint32 direction = (edge - tile_element_get_direction(trackElement)) & TILE_ELEMENT_DIRECTION_MASK; Ride * ride = get_ride(trackElement->properties.track.ride_index); if (TrackIsAllowedWallEdges(ride->type, trackType, sequence, direction)) @@ -111,7 +111,7 @@ static bool WallCheckObstructionWithTrack(rct_scenery_entry * wall, { if (!(TrackCoordinates[trackType].rotation_begin & 4)) { - direction = map_element_get_direction_with_offset(trackElement, 2); + direction = tile_element_get_direction_with_offset(trackElement, 2); if (direction == edge) { const rct_preview_track * trackBlock = &TrackBlocks[trackType][sequence]; @@ -143,7 +143,7 @@ static bool WallCheckObstructionWithTrack(rct_scenery_entry * wall, return false; } - direction = map_element_get_direction(trackElement); + direction = tile_element_get_direction(trackElement); if (direction != edge) { return false; @@ -184,16 +184,16 @@ static bool WallCheckObstruction(rct_scenery_entry * wall, return false; } - rct_map_element * mapElement = map_get_first_element_at(x / 32, y / 32); + rct_tile_element * mapElement = map_get_first_element_at(x / 32, y / 32); do { - sint32 elementType = map_element_get_type(mapElement); - if (elementType == MAP_ELEMENT_TYPE_SURFACE) continue; + sint32 elementType = tile_element_get_type(mapElement); + if (elementType == TILE_ELEMENT_TYPE_SURFACE) continue; if (z0 >= mapElement->clearance_height) continue; if (z1 <= mapElement->base_height) continue; - if (elementType == MAP_ELEMENT_TYPE_WALL) + if (elementType == TILE_ELEMENT_TYPE_WALL) { - sint32 direction = map_element_get_direction(mapElement); + sint32 direction = tile_element_get_direction(mapElement); if (edge == direction) { map_obstruction_set_error_text(mapElement); @@ -204,23 +204,23 @@ static bool WallCheckObstruction(rct_scenery_entry * wall, if ((mapElement->flags & 0x0F) == 0) continue; switch (elementType) { - case MAP_ELEMENT_TYPE_ENTRANCE: + case TILE_ELEMENT_TYPE_ENTRANCE: map_obstruction_set_error_text(mapElement); return false; - case MAP_ELEMENT_TYPE_PATH: + case TILE_ELEMENT_TYPE_PATH: if (mapElement->properties.path.edges & (1 << edge)) { map_obstruction_set_error_text(mapElement); return false; } break; - case MAP_ELEMENT_TYPE_SCENERY_MULTIPLE: + case TILE_ELEMENT_TYPE_SCENERY_MULTIPLE: entryType = mapElement->properties.scenerymultiple.type & 0x3FF; sequence = mapElement->properties.scenerymultiple.type >> 10; entry = get_large_scenery_entry(entryType); tile = &entry->large_scenery.tiles[sequence]; { - sint32 direction = ((edge - map_element_get_direction(mapElement)) & MAP_ELEMENT_DIRECTION_MASK) + 8; + sint32 direction = ((edge - tile_element_get_direction(mapElement)) & TILE_ELEMENT_DIRECTION_MASK) + 8; if (!(tile->var_7 & (1 << direction))) { map_obstruction_set_error_text(mapElement); @@ -228,7 +228,7 @@ static bool WallCheckObstruction(rct_scenery_entry * wall, } } break; - case MAP_ELEMENT_TYPE_SCENERY: + case TILE_ELEMENT_TYPE_SCENERY: entryType = mapElement->properties.scenery.type; entry = get_small_scenery_entry(entryType); if (entry->small_scenery.flags & SMALL_SCENERY_FLAG_ALLOW_WALLS) @@ -237,7 +237,7 @@ static bool WallCheckObstruction(rct_scenery_entry * wall, return false; } break; - case MAP_ELEMENT_TYPE_TRACK: + case TILE_ELEMENT_TYPE_TRACK: if (!WallCheckObstructionWithTrack(wall, x, y, z0, z1, edge, mapElement, wallAcrossTrack)) { return false; @@ -245,7 +245,7 @@ static bool WallCheckObstruction(rct_scenery_entry * wall, break; } } - while (!map_element_is_last_for_tile(mapElement++)); + while (!tile_element_is_last_for_tile(mapElement++)); return true; } @@ -320,7 +320,7 @@ static money32 WallPlace(uint8 wallType, if (position.z == 0) { - gCommandPosition.z = map_element_height(position.x, position.y) & 0xFFFF; + gCommandPosition.z = tile_element_height(position.x, position.y) & 0xFFFF; } if (game_is_paused() && !gCheatsBuildInPauseMode) @@ -350,14 +350,14 @@ static money32 WallPlace(uint8 wallType, uint8 edgeSlope = 0; if (position.z == 0) { - rct_map_element * surfaceElement = map_get_surface_element_at(position.x / 32, position.y / 32); + rct_tile_element * surfaceElement = map_get_surface_element_at(position.x / 32, position.y / 32); if (surfaceElement == nullptr) { return MONEY32_UNDEFINED; } position.z = surfaceElement->base_height * 8; - uint8 slope = surfaceElement->properties.surface.slope & MAP_ELEMENT_SLOPE_MASK; + uint8 slope = surfaceElement->properties.surface.slope & TILE_ELEMENT_SLOPE_MASK; edgeSlope = EdgeSlopes[slope][edge & 3]; if (edgeSlope & EDGE_SLOPE_ELEVATED) { @@ -366,7 +366,7 @@ static money32 WallPlace(uint8 wallType, } } - rct_map_element * surfaceElement = map_get_surface_element_at(position.x / 32, position.y / 32); + rct_tile_element * surfaceElement = map_get_surface_element_at(position.x / 32, position.y / 32); if (surfaceElement == nullptr) { return MONEY32_UNDEFINED; @@ -525,18 +525,18 @@ static money32 WallPlace(uint8 wallType, LocationXYZ16 coord; coord.x = position.x + 16; coord.y = position.y + 16; - coord.z = map_element_height(coord.x, coord.y); + coord.z = tile_element_height(coord.x, coord.y); network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord); } - rct_map_element * mapElement = map_element_insert(position.x / 32, position.y / 32, position.z / 8, 0); + rct_tile_element * mapElement = tile_element_insert(position.x / 32, position.y / 32, position.z / 8, 0); assert(mapElement != nullptr); map_animation_create(MAP_ANIMATION_TYPE_WALL, position.x, position.y, position.z / 8); mapElement->clearance_height = clearanceHeight; - mapElement->type = edgeSlope | edge | MAP_ELEMENT_TYPE_WALL; + mapElement->type = edgeSlope | edge | TILE_ELEMENT_TYPE_WALL; mapElement->properties.wall.colour_1 = primaryColour; wall_element_set_secondary_colour(mapElement, secondaryColour); @@ -559,7 +559,7 @@ static money32 WallPlace(uint8 wallType, if (flags & GAME_COMMAND_FLAG_GHOST) { - mapElement->flags |= MAP_ELEMENT_FLAG_GHOST; + mapElement->flags |= TILE_ELEMENT_FLAG_GHOST; } gSceneryMapElement = mapElement; @@ -576,18 +576,18 @@ static money32 WallPlace(uint8 wallType, } } -static rct_map_element * GetFirstWallElementAt(sint32 x, sint32 y, uint8 baseZ, uint8 direction, bool isGhost) +static rct_tile_element * GetFirstWallElementAt(sint32 x, sint32 y, uint8 baseZ, uint8 direction, bool isGhost) { - rct_map_element * mapElement = map_get_first_element_at(x / 32, y / 32); + rct_tile_element * mapElement = map_get_first_element_at(x / 32, y / 32); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_WALL) continue; + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_WALL) continue; if (mapElement->base_height != baseZ) continue; - if ((map_element_get_direction(mapElement)) != direction) continue; - if (map_element_is_ghost(mapElement) != isGhost) continue; + if ((tile_element_get_direction(mapElement)) != direction) continue; + if (tile_element_is_ghost(mapElement) != isGhost) continue; return mapElement; } - while (!map_element_is_last_for_tile(mapElement++)); + while (!tile_element_is_last_for_tile(mapElement++)); return nullptr; } @@ -616,7 +616,7 @@ static money32 WallRemove(sint16 x, sint16 y, uint8 baseHeight, uint8 direction, return MONEY32_UNDEFINED; } - rct_map_element * wallElement = GetFirstWallElementAt(x, y, baseHeight, direction, isGhost); + rct_tile_element * wallElement = GetFirstWallElementAt(x, y, baseHeight, direction, isGhost); if (!(flags & GAME_COMMAND_FLAG_APPLY) || (wallElement == nullptr)) { return 0; @@ -627,13 +627,13 @@ static money32 WallRemove(sint16 x, sint16 y, uint8 baseHeight, uint8 direction, LocationXYZ16 coord; coord.x = x + 16; coord.y = y + 16; - coord.z = map_element_height(coord.x, coord.y); + coord.z = tile_element_height(coord.x, coord.y); network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord); } - map_element_remove_banner_entry(wallElement); + tile_element_remove_banner_entry(wallElement); map_invalidate_tile_zoom1(x, y, wallElement->base_height * 8, (wallElement->base_height * 8) + 72); - map_element_remove(wallElement); + tile_element_remove(wallElement); return 0; } @@ -661,13 +661,13 @@ static money32 WallSetColour(sint16 x, return MONEY32_UNDEFINED; } - rct_map_element * wallElement = map_get_wall_element_at(x, y, baseHeight, direction); + rct_tile_element * wallElement = map_get_wall_element_at(x, y, baseHeight, direction); if (wallElement == nullptr) { return 0; } - if ((flags & GAME_COMMAND_FLAG_GHOST) && !(wallElement->flags & MAP_ELEMENT_FLAG_GHOST)) + if ((flags & GAME_COMMAND_FLAG_GHOST) && !(wallElement->flags & TILE_ELEMENT_FLAG_GHOST)) { return 0; } @@ -690,25 +690,25 @@ static money32 WallSetColour(sint16 x, extern "C" { - uint8 wall_element_get_animation_frame(rct_map_element * wallElement) + uint8 wall_element_get_animation_frame(rct_tile_element * wallElement) { return (wallElement->properties.wall.animation >> 3) & 0xF; } - void wall_element_set_animation_frame(rct_map_element * wallElement, uint8 frameNum) + void wall_element_set_animation_frame(rct_tile_element * wallElement, uint8 frameNum) { wallElement->properties.wall.animation &= WALL_ANIMATION_FLAG_ALL_FLAGS; wallElement->properties.wall.animation |= (frameNum & 0xF) << 3; } - uint8 wall_element_get_secondary_colour(rct_map_element * wallElement) + uint8 wall_element_get_secondary_colour(rct_tile_element * wallElement) { uint8 secondaryColour = (wallElement->properties.wall.colour_1 & 0xE0) >> 5; secondaryColour |= (wallElement->flags & 0x60) >> 2; return secondaryColour; } - void wall_element_set_secondary_colour(rct_map_element * wallElement, uint8 secondaryColour) + void wall_element_set_secondary_colour(rct_tile_element * wallElement, uint8 secondaryColour) { wallElement->properties.wall.colour_1 &= 0x1F; wallElement->properties.wall.colour_1 |= (secondaryColour & 0x7) << 5; @@ -722,7 +722,7 @@ extern "C" */ void wall_remove_at(sint32 x, sint32 y, sint32 z0, sint32 z1) { - rct_map_element * mapElement; + rct_tile_element * mapElement; z0 /= 8; z1 /= 8; @@ -730,19 +730,19 @@ extern "C" mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_WALL) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_WALL) continue; if (z0 >= mapElement->clearance_height) continue; if (z1 <= mapElement->base_height) continue; - map_element_remove_banner_entry(mapElement); + tile_element_remove_banner_entry(mapElement); map_invalidate_tile_zoom1(x, y, mapElement->base_height * 8, mapElement->base_height * 8 + 72); - map_element_remove(mapElement); + tile_element_remove(mapElement); goto repeat; } - while (!map_element_is_last_for_tile(mapElement++)); + while (!tile_element_is_last_for_tile(mapElement++)); } /** @@ -760,26 +760,26 @@ extern "C" */ void wall_remove_intersecting_walls(sint32 x, sint32 y, sint32 z0, sint32 z1, sint32 direction) { - rct_map_element * mapElement; + rct_tile_element * mapElement; mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_WALL) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_WALL) continue; if (mapElement->clearance_height <= z0 || mapElement->base_height >= z1) continue; - if (direction != map_element_get_direction(mapElement)) + if (direction != tile_element_get_direction(mapElement)) continue; - map_element_remove_banner_entry(mapElement); + tile_element_remove_banner_entry(mapElement); map_invalidate_tile_zoom1(x, y, mapElement->base_height * 8, mapElement->base_height * 8 + 72); - map_element_remove(mapElement); + tile_element_remove(mapElement); mapElement--; } - while (!map_element_is_last_for_tile(mapElement++)); + while (!tile_element_is_last_for_tile(mapElement++)); } /** diff --git a/src/openrct2/world/banner.h b/src/openrct2/world/banner.h index e78a500b48..be07b6951c 100644 --- a/src/openrct2/world/banner.h +++ b/src/openrct2/world/banner.h @@ -51,7 +51,7 @@ extern rct_banner gBanners[MAX_BANNERS]; void banner_init(); sint32 create_new_banner(uint8 flags); -rct_map_element *banner_get_map_element(sint32 bannerIndex); +rct_tile_element *banner_get_tile_element(sint32 bannerIndex); sint32 banner_get_closest_ride_index(sint32 x, sint32 y, sint32 z); void banner_reset_broken_index(); void game_command_callback_place_banner(sint32 eax, sint32 ebx, sint32 ecx, sint32 edx, sint32 esi, sint32 edi, sint32 ebp); diff --git a/src/openrct2/world/entrance.h b/src/openrct2/world/entrance.h index 9ef19c103a..d405bfa108 100644 --- a/src/openrct2/world/entrance.h +++ b/src/openrct2/world/entrance.h @@ -37,7 +37,7 @@ void game_command_remove_park_entrance(sint32 *eax, sint32 *ebx, sint32 *ecx, si typedef struct LocationXYZ16 LocationXYZ16; typedef struct LocationXYZD16 LocationXYZD16; -typedef struct rct_map_element rct_map_element; +typedef struct rct_tile_element rct_tile_element; extern bool gParkEntranceGhostExists; extern LocationXYZ16 gParkEntranceGhostPosition; @@ -55,8 +55,8 @@ money32 park_entrance_place_ghost(sint32 x, sint32 y, sint32 z, sint32 direction money32 place_park_entrance(sint16 x, sint16 y, sint16 z, uint8 direction); void reset_park_entrance(); -void maze_entrance_hedge_replacement(sint32 x, sint32 y, rct_map_element *mapElement); -void maze_entrance_hedge_removal(sint32 x, sint32 y, rct_map_element *mapElement); +void maze_entrance_hedge_replacement(sint32 x, sint32 y, rct_tile_element *mapElement); +void maze_entrance_hedge_removal(sint32 x, sint32 y, rct_tile_element *mapElement); void fix_park_entrance_locations(); diff --git a/src/openrct2/world/footpath.c b/src/openrct2/world/footpath.c index 15e16118f2..410e6fa934 100644 --- a/src/openrct2/world/footpath.c +++ b/src/openrct2/world/footpath.c @@ -26,7 +26,7 @@ #include "../util/util.h" void footpath_interrupt_peeps(sint32 x, sint32 y, sint32 z); -void footpath_update_queue_entrance_banner(sint32 x, sint32 y, rct_map_element *mapElement); +void footpath_update_queue_entrance_banner(sint32 x, sint32 y, rct_tile_element *mapElement); uint8 gFootpathProvisionalFlags; LocationXYZ16 gFootpathProvisionalPosition; @@ -80,14 +80,14 @@ static const uint8 connected_path_count[] = { 4, // 0b1111 }; -sint32 entrance_get_directions(rct_map_element *mapElement) +sint32 entrance_get_directions(rct_tile_element *mapElement) { uint8 entranceType = mapElement->properties.entrance.type; uint8 sequence = mapElement->properties.entrance.index & 0x0F; return EntranceDirections[(entranceType * 8) + sequence]; } -static bool entrance_has_direction(rct_map_element *mapElement, sint32 direction) +static bool entrance_has_direction(rct_tile_element *mapElement, sint32 direction) { return entrance_get_directions(mapElement) & (1 << direction); } @@ -118,38 +118,38 @@ static void automatically_set_peep_spawn(sint32 x, sint32 y, sint32 z) peepSpawn->z = z; } -static rct_map_element *map_get_footpath_element(sint32 x, sint32 y, sint32 z) +static rct_tile_element *map_get_footpath_element(sint32 x, sint32 y, sint32 z) { - rct_map_element *mapElement; + rct_tile_element *mapElement; mapElement = map_get_first_element_at(x, y); do { - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_PATH && mapElement->base_height == z) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_PATH && mapElement->base_height == z) return mapElement; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return NULL; } -static rct_map_element *map_get_footpath_element_slope(sint32 x, sint32 y, sint32 z, sint32 slope) +static rct_tile_element *map_get_footpath_element_slope(sint32 x, sint32 y, sint32 z, sint32 slope) { - rct_map_element *mapElement; + rct_tile_element *mapElement; mapElement = map_get_first_element_at(x, y); do { if ( - map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_PATH && + tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_PATH && mapElement->base_height == z && (mapElement->properties.path.type & 7) == slope ) { return mapElement; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return NULL; } -static void loc_6A6620(sint32 flags, sint32 x, sint32 y, rct_map_element *mapElement) +static void loc_6A6620(sint32 flags, sint32 x, sint32 y, rct_tile_element *mapElement) { if ((mapElement->properties.path.type & 4) && !(flags & GAME_COMMAND_FLAG_GHOST)) { sint32 direction = mapElement->properties.path.type & 3; @@ -173,7 +173,7 @@ static const uint8 byte_98D7EC[] = { static money32 footpath_element_insert(sint32 type, sint32 x, sint32 y, sint32 z, sint32 slope, sint32 flags, uint8 pathItemType) { - rct_map_element * mapElement, * entranceElement; + rct_tile_element * mapElement, * entranceElement; sint32 bl, zHigh; bool entrancePath = false, entranceIsSamePath = false; @@ -231,17 +231,17 @@ static money32 footpath_element_insert(sint32 type, sint32 x, sint32 y, sint32 z } else { - mapElement = map_element_insert(x / 32, y / 32, z, 0x0F); + mapElement = tile_element_insert(x / 32, y / 32, z, 0x0F); assert(mapElement != NULL); - mapElement->type = MAP_ELEMENT_TYPE_PATH; + mapElement->type = TILE_ELEMENT_TYPE_PATH; mapElement->clearance_height = z + 4 + ((slope & 4) ? 2 : 0); mapElement->properties.path.type = (type << 4) | (slope & 7); mapElement->type |= type >> 7; mapElement->properties.path.additions = pathItemType; mapElement->properties.path.addition_status = 255; - mapElement->flags &= ~MAP_ELEMENT_FLAG_BROKEN; + mapElement->flags &= ~TILE_ELEMENT_FLAG_BROKEN; if (flags & GAME_COMMAND_FLAG_GHOST) - mapElement->flags |= MAP_ELEMENT_FLAG_GHOST; + mapElement->flags |= TILE_ELEMENT_FLAG_GHOST; footpath_queue_chain_reset(); @@ -262,7 +262,7 @@ static money32 footpath_element_insert(sint32 type, sint32 x, sint32 y, sint32 z return gParkFlags & PARK_FLAGS_NO_MONEY ? 0 : gFootpathPrice; } -static money32 footpath_element_update(sint32 x, sint32 y, rct_map_element *mapElement, sint32 type, sint32 flags, uint8 pathItemType) +static money32 footpath_element_update(sint32 x, sint32 y, rct_tile_element *mapElement, sint32 type, sint32 flags, uint8 pathItemType) { if ((mapElement->properties.path.type >> 4) != (type & 0x0F) || (mapElement->type & 1) != (type >> 7)) { gFootpathPrice += MONEY(6, 00); @@ -270,7 +270,7 @@ static money32 footpath_element_update(sint32 x, sint32 y, rct_map_element *mapE if ( !(flags & GAME_COMMAND_FLAG_GHOST) && footpath_element_get_path_scenery(mapElement) == pathItemType && - !(mapElement->flags & MAP_ELEMENT_FLAG_BROKEN) + !(mapElement->flags & TILE_ELEMENT_FLAG_BROKEN) ) { if (flags & GAME_COMMAND_FLAG_4) return MONEY32_UNDEFINED; @@ -332,7 +332,7 @@ static money32 footpath_element_update(sint32 x, sint32 y, rct_map_element *mapE } footpath_element_set_path_scenery(mapElement, pathItemType); - mapElement->flags &= ~MAP_ELEMENT_FLAG_BROKEN; + mapElement->flags &= ~TILE_ELEMENT_FLAG_BROKEN; if (pathItemType != 0) { rct_scenery_entry* scenery_entry = get_footpath_item_entry(pathItemType - 1); if (scenery_entry->path_bit.flags & PATH_BIT_FLAG_IS_BIN) { @@ -355,7 +355,7 @@ static money32 footpath_element_update(sint32 x, sint32 y, rct_map_element *mapE mapElement->properties.path.type = (mapElement->properties.path.type & 0x0F) | (type << 4); mapElement->type = (mapElement->type & 0xFE) | (type >> 7); footpath_element_set_path_scenery(mapElement, pathItemType); - mapElement->flags &= ~MAP_ELEMENT_FLAG_BROKEN; + mapElement->flags &= ~TILE_ELEMENT_FLAG_BROKEN; loc_6A6620(flags, x, y, mapElement); } @@ -365,7 +365,7 @@ static money32 footpath_element_update(sint32 x, sint32 y, rct_map_element *mapE static money32 footpath_place_real(sint32 type, sint32 x, sint32 y, sint32 z, sint32 slope, sint32 flags, uint8 pathItemType, bool clearDirection, sint32 direction) { - rct_map_element *mapElement; + rct_tile_element *mapElement; gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LANDSCAPING; gCommandPosition.x = x + 16; @@ -413,7 +413,7 @@ static money32 footpath_place_real(sint32 type, sint32 x, sint32 y, sint32 z, si LocationXYZ16 coord; coord.x = x + 16; coord.y = y + 16; - coord.z = map_element_height(coord.x, coord.y); + coord.z = tile_element_height(coord.x, coord.y); network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord); if (clearDirection && !gCheatsDisableClearanceChecks) @@ -442,10 +442,10 @@ static money32 footpath_place_real(sint32 type, sint32 x, sint32 y, sint32 z, si * * rct2: 0x006BA23E */ -static void remove_banners_at_element(sint32 x, sint32 y, rct_map_element* mapElement){ - while (!map_element_is_last_for_tile(mapElement++)){ - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_PATH)return; - else if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_BANNER)continue; +static void remove_banners_at_element(sint32 x, sint32 y, rct_tile_element* mapElement){ + while (!tile_element_is_last_for_tile(mapElement++)){ + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_PATH)return; + else if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_BANNER)continue; game_do_command(x, 1, y, mapElement->base_height | mapElement->properties.banner.position << 8, GAME_COMMAND_REMOVE_BANNER, 0, 0); mapElement--; @@ -454,8 +454,8 @@ static void remove_banners_at_element(sint32 x, sint32 y, rct_map_element* mapEl money32 footpath_remove_real(sint32 x, sint32 y, sint32 z, sint32 flags) { - rct_map_element *mapElement; - rct_map_element *footpathElement = NULL; + rct_tile_element *mapElement; + rct_tile_element *footpathElement = NULL; gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LANDSCAPING; gCommandPosition.x = x + 16; @@ -481,15 +481,15 @@ money32 footpath_remove_real(sint32 x, sint32 y, sint32 z, sint32 flags) LocationXYZ16 coord; coord.x = x + 16; coord.y = y + 16; - coord.z = map_element_height(coord.x, coord.y); + coord.z = tile_element_height(coord.x, coord.y); network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord); } // If the ghost flag is present we have to make sure to only delete ghost footpaths as they may be // at the same origin. - if ((flags & GAME_COMMAND_FLAG_GHOST) && map_element_is_ghost(mapElement) == false) { - while (!map_element_is_last_for_tile(mapElement++)) { - if (mapElement->type != MAP_ELEMENT_TYPE_PATH && !map_element_is_ghost(mapElement)) { + if ((flags & GAME_COMMAND_FLAG_GHOST) && tile_element_is_ghost(mapElement) == false) { + while (!tile_element_is_last_for_tile(mapElement++)) { + if (mapElement->type != TILE_ELEMENT_TYPE_PATH && !tile_element_is_ghost(mapElement)) { continue; } footpathElement = mapElement; @@ -504,7 +504,7 @@ money32 footpath_remove_real(sint32 x, sint32 y, sint32 z, sint32 flags) remove_banners_at_element(x, y, footpathElement); footpath_remove_edges_at(x, y, footpathElement); map_invalidate_tile_full(x, y); - map_element_remove(footpathElement); + tile_element_remove(footpathElement); footpath_update_queue_chains(); } } @@ -513,7 +513,7 @@ money32 footpath_remove_real(sint32 x, sint32 y, sint32 z, sint32 flags) bool isNotOwnedByPark = (flags & GAME_COMMAND_FLAG_5); bool moneyDisabled = (gParkFlags & PARK_FLAGS_NO_MONEY); - bool isGhost = (footpathElement == NULL) || (map_element_is_ghost(footpathElement)); + bool isGhost = (footpathElement == NULL) || (tile_element_is_ghost(footpathElement)); if (isNotOwnedByPark || moneyDisabled || isGhost) { cost = 0; @@ -543,7 +543,7 @@ void game_command_place_footpath(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 * static money32 footpath_place_from_track(sint32 type, sint32 x, sint32 y, sint32 z, sint32 slope, sint32 edges, sint32 flags) { - rct_map_element * mapElement, * entranceElement; + rct_tile_element * mapElement, * entranceElement; bool entrancePath = false, entranceIsSamePath = false; gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LANDSCAPING; @@ -624,7 +624,7 @@ static money32 footpath_place_from_track(sint32 type, sint32 x, sint32 y, sint32 LocationXYZ16 coord; coord.x = x + 16; coord.y = y + 16; - coord.z = map_element_height(coord.x, coord.y); + coord.z = tile_element_height(coord.x, coord.y); network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord); } @@ -639,18 +639,18 @@ static money32 footpath_place_from_track(sint32 type, sint32 x, sint32 y, sint32 } else { - mapElement = map_element_insert(x / 32, y / 32, z, 0x0F); + mapElement = tile_element_insert(x / 32, y / 32, z, 0x0F); assert(mapElement != NULL); - mapElement->type = MAP_ELEMENT_TYPE_PATH; + mapElement->type = TILE_ELEMENT_TYPE_PATH; mapElement->clearance_height = z + 4 + ((slope & 4) ? 2 : 0); mapElement->properties.path.type = (type << 4) | (slope & 7); mapElement->type |= type >> 7; mapElement->properties.path.additions = 0; mapElement->properties.path.addition_status = 255; mapElement->properties.path.edges = edges & 0xF; - mapElement->flags &= ~MAP_ELEMENT_FLAG_BROKEN; + mapElement->flags &= ~TILE_ELEMENT_FLAG_BROKEN; if (flags & (1 << 6)) - mapElement->flags |= MAP_ELEMENT_FLAG_GHOST; + mapElement->flags |= TILE_ELEMENT_FLAG_GHOST; map_invalidate_tile_full(x, y); } @@ -782,10 +782,10 @@ void footpath_provisional_update() * direction: ecx * mapElement: edx */ -void footpath_get_coordinates_from_pos(sint32 screenX, sint32 screenY, sint32 *x, sint32 *y, sint32 *direction, rct_map_element **mapElement) +void footpath_get_coordinates_from_pos(sint32 screenX, sint32 screenY, sint32 *x, sint32 *y, sint32 *direction, rct_tile_element **mapElement) { sint32 z = 0, interactionType; - rct_map_element *myMapElement; + rct_tile_element *myMapElement; rct_viewport *viewport; LocationXY16 position = { 0 }; @@ -815,7 +815,7 @@ void footpath_get_coordinates_from_pos(sint32 screenX, sint32 screenY, sint32 *x for (sint32 i = 0; i < 5; i++) { if (interactionType != VIEWPORT_INTERACTION_ITEM_FOOTPATH) { - z = map_element_height(position.x, position.y); + z = tile_element_height(position.x, position.y); } position = viewport_coord_to_map_coord(start_vp_pos.x, start_vp_pos.y, z); position.x = clamp(minPosition.x, position.x, maxPosition.x); @@ -855,7 +855,7 @@ void footpath_get_coordinates_from_pos(sint32 screenX, sint32 screenY, sint32 *x * direction: cl * mapElement: edx */ -void footpath_bridge_get_info_from_pos(sint32 screenX, sint32 screenY, sint32 *x, sint32 *y, sint32 *direction, rct_map_element **mapElement) +void footpath_bridge_get_info_from_pos(sint32 screenX, sint32 screenY, sint32 *x, sint32 *y, sint32 *direction, rct_tile_element **mapElement) { // First check if we point at an entrance or exit. In that case, we would want the path coming from the entrance/exit. sint32 interactionType; @@ -868,7 +868,7 @@ void footpath_bridge_get_info_from_pos(sint32 screenX, sint32 screenY, sint32 *x if (interactionType == VIEWPORT_INTERACTION_ITEM_RIDE && viewport->flags & (VIEWPORT_FLAG_UNDERGROUND_INSIDE | VIEWPORT_FLAG_HIDE_BASE | VIEWPORT_FLAG_HIDE_VERTICAL) - && map_element_get_type(*mapElement) == MAP_ELEMENT_TYPE_ENTRANCE + && tile_element_get_type(*mapElement) == TILE_ELEMENT_TYPE_ENTRANCE ) { sint32 directions = entrance_get_directions(*mapElement); if (directions & 0x0F) { @@ -883,10 +883,10 @@ void footpath_bridge_get_info_from_pos(sint32 screenX, sint32 screenY, sint32 *x get_map_coordinates_from_pos(screenX, screenY, VIEWPORT_INTERACTION_MASK_RIDE & VIEWPORT_INTERACTION_MASK_FOOTPATH & VIEWPORT_INTERACTION_MASK_TERRAIN, &map_pos.x, &map_pos.y, &interactionType, mapElement, &viewport); *x = map_pos.x; *y = map_pos.y; - if (interactionType == VIEWPORT_INTERACTION_ITEM_RIDE && map_element_get_type(*mapElement) == MAP_ELEMENT_TYPE_ENTRANCE) { + if (interactionType == VIEWPORT_INTERACTION_ITEM_RIDE && tile_element_get_type(*mapElement) == TILE_ELEMENT_TYPE_ENTRANCE) { sint32 directions = entrance_get_directions(*mapElement); if (directions & 0x0F) { - sint32 bx = map_element_get_direction_with_offset(*mapElement, bitscanforward(directions)); + sint32 bx = tile_element_get_direction_with_offset(*mapElement, bitscanforward(directions)); if (direction != NULL) *direction = bx; return; } @@ -950,25 +950,25 @@ void footpath_interrupt_peeps(sint32 x, sint32 y, sint32 z) */ bool fence_in_the_way(sint32 x, sint32 y, sint32 z0, sint32 z1, sint32 direction) { - rct_map_element *mapElement; + rct_tile_element *mapElement; mapElement = map_get_first_element_at(x >> 5, y >> 5); if (mapElement == NULL) return false; do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_WALL) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_WALL) continue; - if (mapElement->flags & MAP_ELEMENT_FLAG_GHOST) + if (mapElement->flags & TILE_ELEMENT_FLAG_GHOST) continue; if (z0 >= mapElement->clearance_height) continue; if (z1 <= mapElement->base_height) continue; - if ((map_element_get_direction(mapElement)) != direction) + if ((tile_element_get_direction(mapElement)) != direction) continue; return true; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return false; } @@ -982,11 +982,11 @@ static bool map_is_edge(sint32 x, sint32 y) ); } -static rct_map_element *footpath_connect_corners_get_neighbour(sint32 x, sint32 y, sint32 z, sint32 requireEdges) +static rct_tile_element *footpath_connect_corners_get_neighbour(sint32 x, sint32 y, sint32 z, sint32 requireEdges) { - rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); + rct_tile_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_PATH) continue; if (footpath_element_is_queue(mapElement)) continue; @@ -996,7 +996,7 @@ static rct_map_element *footpath_connect_corners_get_neighbour(sint32 x, sint32 continue; return mapElement; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return NULL; } @@ -1008,9 +1008,9 @@ static rct_map_element *footpath_connect_corners_get_neighbour(sint32 x, sint32 * * rct2: 0x006A70EB */ -static void footpath_connect_corners(sint32 initialX, sint32 initialY, rct_map_element *initialMapElement) +static void footpath_connect_corners(sint32 initialX, sint32 initialY, rct_tile_element *initialMapElement) { - rct_map_element *mapElement[4]; + rct_tile_element *mapElement[4]; if (footpath_element_is_queue(initialMapElement)) return; @@ -1134,14 +1134,14 @@ static void neighbour_list_sort(rct_neighbour_list *neighbourList) qsort(neighbourList->items, neighbourList->count, sizeof(rct_neighbour), rct_neighbour_compare); } -static rct_map_element *footpath_get_element(sint32 x, sint32 y, sint32 z0, sint32 z1, sint32 direction) +static rct_tile_element *footpath_get_element(sint32 x, sint32 y, sint32 z0, sint32 z1, sint32 direction) { - rct_map_element *mapElement; + rct_tile_element *mapElement; sint32 slope; mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_PATH) continue; if (z1 == mapElement->base_height) { @@ -1162,11 +1162,11 @@ static rct_map_element *footpath_get_element(sint32 x, sint32 y, sint32 z0, sint return mapElement; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return NULL; } -static bool sub_footpath_disconnect_queue_from_path(sint32 x, sint32 y, rct_map_element *mapElement, sint32 action, sint32 direction) { +static bool sub_footpath_disconnect_queue_from_path(sint32 x, sint32 y, rct_tile_element *mapElement, sint32 action, sint32 direction) { if (((mapElement->properties.path.edges & (1 << direction)) == 0) ^ (action < 0)) return false; if ((action < 0) && fence_in_the_way(x, y, mapElement->base_height, mapElement->clearance_height, direction)) @@ -1175,7 +1175,7 @@ static bool sub_footpath_disconnect_queue_from_path(sint32 x, sint32 y, rct_map_ sint32 x1 = x + TileDirectionDelta[direction].x; sint32 y1 = y + TileDirectionDelta[direction].y; sint32 z = mapElement->base_height; - rct_map_element *otherMapElement = footpath_get_element(x1, y1, z - 2, z, direction); + rct_tile_element *otherMapElement = footpath_get_element(x1, y1, z - 2, z, direction); if (otherMapElement != NULL && !footpath_element_is_queue(otherMapElement)) { mapElement->properties.path.type &= 0xFC; if (action > 0) { @@ -1193,7 +1193,7 @@ static bool sub_footpath_disconnect_queue_from_path(sint32 x, sint32 y, rct_map_ return false; } -static bool footpath_disconnect_queue_from_path(sint32 x, sint32 y, rct_map_element *mapElement, sint32 action) { +static bool footpath_disconnect_queue_from_path(sint32 x, sint32 y, rct_tile_element *mapElement, sint32 action) { if (!footpath_element_is_queue(mapElement)) return false; if (footpath_element_is_sloped(mapElement)) return false; @@ -1215,7 +1215,7 @@ static bool footpath_disconnect_queue_from_path(sint32 x, sint32 y, rct_map_elem return false; } -static bool footpath_is_queue_connected_to_path(sint32 x, sint32 y, rct_map_element *mapElement, sint32 direction) +static bool footpath_is_queue_connected_to_path(sint32 x, sint32 y, rct_tile_element *mapElement, sint32 direction) { if (!footpath_element_is_queue(mapElement)) return false; if (!(mapElement->properties.path.edges & (1 << direction))) return false; @@ -1234,7 +1234,7 @@ static bool footpath_is_queue_connected_to_path(sint32 x, sint32 y, rct_map_elem * rct2: 0x006A6D7E */ static void loc_6A6D7E( - sint32 initialX, sint32 initialY, sint32 z, sint32 direction, rct_map_element *initialMapElement, + sint32 initialX, sint32 initialY, sint32 z, sint32 direction, rct_tile_element *initialMapElement, sint32 flags, bool query, rct_neighbour_list *neighbourList ) { sint32 x = initialX + TileDirectionDelta[direction].x; @@ -1244,10 +1244,10 @@ static void loc_6A6D7E( neighbour_list_push(neighbourList, 7, direction, 255, 255); } } else { - rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); + rct_tile_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - switch (map_element_get_type(mapElement)) { - case MAP_ELEMENT_TYPE_PATH: + switch (tile_element_get_type(mapElement)) { + case TILE_ELEMENT_TYPE_PATH: if (z == mapElement->base_height) { if (footpath_element_is_sloped(mapElement) && footpath_element_get_slope_direction(mapElement) != direction) { return; @@ -1262,7 +1262,7 @@ static void loc_6A6D7E( goto loc_6A6F1F; } break; - case MAP_ELEMENT_TYPE_TRACK: + case TILE_ELEMENT_TYPE_TRACK: if (z == mapElement->base_height) { Ride *ride = get_ride(mapElement->properties.track.ride_index); if (!ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_FLAT_RIDE)) { @@ -1270,11 +1270,11 @@ static void loc_6A6D7E( } const uint8 trackType = mapElement->properties.track.type; - const uint8 trackSequence = map_element_get_track_sequence(mapElement); + const uint8 trackSequence = tile_element_get_track_sequence(mapElement); if (!(FlatRideTrackSequenceProperties[trackType][trackSequence] & TRACK_SEQUENCE_FLAG_CONNECTS_TO_PATH)) { return; } - uint16 dx = (direction - map_element_get_direction(mapElement)) ^ 2; + uint16 dx = (direction - tile_element_get_direction(mapElement)) ^ 2; if (!(FlatRideTrackSequenceProperties[trackType][trackSequence] & (1 << dx))) { return; } @@ -1284,9 +1284,9 @@ static void loc_6A6D7E( goto loc_6A6FD2; } break; - case MAP_ELEMENT_TYPE_ENTRANCE: + case TILE_ELEMENT_TYPE_ENTRANCE: if (z == mapElement->base_height) { - if (entrance_has_direction(mapElement, ((direction - map_element_get_direction(mapElement)) & MAP_ELEMENT_DIRECTION_MASK) ^ 2)) { + if (entrance_has_direction(mapElement, ((direction - tile_element_get_direction(mapElement)) & TILE_ELEMENT_DIRECTION_MASK) ^ 2)) { if (query) { neighbour_list_push(neighbourList, 8, direction, mapElement->properties.entrance.ride_index, mapElement->properties.entrance.index); } else { @@ -1299,7 +1299,7 @@ static void loc_6A6D7E( } break; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return; loc_6A6F1F: @@ -1311,7 +1311,7 @@ static void loc_6A6D7E( if (connected_path_count[mapElement->properties.path.edges & 0x0F] < 2) { neighbour_list_push(neighbourList, 4, direction, mapElement->properties.path.ride_index, mapElement->properties.entrance.index); } else { - if (map_element_get_type(initialMapElement) == MAP_ELEMENT_TYPE_PATH && + if (tile_element_get_type(initialMapElement) == TILE_ELEMENT_TYPE_PATH && footpath_element_is_queue(initialMapElement)) { if (footpath_disconnect_queue_from_path(x, y, mapElement, 0)) { neighbour_list_push(neighbourList, 3, direction, mapElement->properties.path.ride_index, mapElement->properties.entrance.index); @@ -1335,7 +1335,7 @@ static void loc_6A6D7E( } loc_6A6FD2: - if (map_element_get_type(initialMapElement) == MAP_ELEMENT_TYPE_PATH) { + if (tile_element_get_type(initialMapElement) == TILE_ELEMENT_TYPE_PATH) { if (!query) { initialMapElement->properties.path.edges |= (1 << direction); map_invalidate_element(initialX, initialY, initialMapElement); @@ -1344,36 +1344,36 @@ loc_6A6FD2: } static void loc_6A6C85( - sint32 x, sint32 y, sint32 direction, rct_map_element *mapElement, + sint32 x, sint32 y, sint32 direction, rct_tile_element *mapElement, sint32 flags, bool query, rct_neighbour_list *neighbourList ) { if (query && fence_in_the_way(x, y, mapElement->base_height, mapElement->clearance_height, direction)) return; - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_ENTRANCE) { + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_ENTRANCE) { if (!entrance_has_direction(mapElement, (direction - mapElement->type) & 3)) { return; } } - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_TRACK) { + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_TRACK) { Ride *ride = get_ride(mapElement->properties.track.ride_index); if (!ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_FLAT_RIDE)) { return; } const uint8 trackType = mapElement->properties.track.type; - const uint8 trackSequence = map_element_get_track_sequence(mapElement); + const uint8 trackSequence = tile_element_get_track_sequence(mapElement); if (!(FlatRideTrackSequenceProperties[trackType][trackSequence] & TRACK_SEQUENCE_FLAG_CONNECTS_TO_PATH)) { return; } - uint16 dx = (direction - map_element_get_direction(mapElement)) & MAP_ELEMENT_DIRECTION_MASK; + uint16 dx = (direction - tile_element_get_direction(mapElement)) & TILE_ELEMENT_DIRECTION_MASK; if (!(FlatRideTrackSequenceProperties[trackType][trackSequence] & (1 << dx))) { return; } } sint32 z = mapElement->base_height; - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_PATH) { + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_PATH) { if (footpath_element_is_sloped(mapElement)) { if ((footpath_element_get_slope_direction(mapElement) - direction) & 1) { return; @@ -1391,7 +1391,7 @@ static void loc_6A6C85( * * rct2: 0x006A6C66 */ -void footpath_connect_edges(sint32 x, sint32 y, rct_map_element *mapElement, sint32 flags) +void footpath_connect_edges(sint32 x, sint32 y, rct_tile_element *mapElement, sint32 flags) { rct_neighbour_list neighbourList; rct_neighbour neighbour; @@ -1407,7 +1407,7 @@ void footpath_connect_edges(sint32 x, sint32 y, rct_map_element *mapElement, sin neighbour_list_sort(&neighbourList); - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_PATH && footpath_element_is_queue(mapElement)) { + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_PATH && footpath_element_is_queue(mapElement)) { sint32 rideIndex = -1; uint8 entranceIndex = 255; for (sint32 i = 0; i < neighbourList.count; i++) { @@ -1432,7 +1432,7 @@ void footpath_connect_edges(sint32 x, sint32 y, rct_map_element *mapElement, sin loc_6A6C85(x, y, neighbour.direction, mapElement, flags, false, NULL); } - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_PATH) { + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_PATH) { footpath_connect_corners(x, y, mapElement); } } @@ -1441,16 +1441,16 @@ void footpath_connect_edges(sint32 x, sint32 y, rct_map_element *mapElement, sin * * rct2: 0x006A742F */ -void footpath_chain_ride_queue(sint32 rideIndex, sint32 entranceIndex, sint32 x, sint32 y, rct_map_element *mapElement, sint32 direction) +void footpath_chain_ride_queue(sint32 rideIndex, sint32 entranceIndex, sint32 x, sint32 y, rct_tile_element *mapElement, sint32 direction) { - rct_map_element *lastPathElement, *lastQueuePathElement; + rct_tile_element *lastPathElement, *lastQueuePathElement; sint32 lastPathX = x, lastPathY = y, lastPathDirection = direction; lastPathElement = NULL; lastQueuePathElement = NULL; sint32 z = mapElement->base_height; for (;;) { - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_PATH) { + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_PATH) { lastPathElement = mapElement; lastPathX = x; lastPathY = y; @@ -1468,7 +1468,7 @@ void footpath_chain_ride_queue(sint32 rideIndex, sint32 entranceIndex, sint32 x, do { if (lastQueuePathElement == mapElement) continue; - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_PATH) continue; if (mapElement->base_height == z) { if (footpath_element_is_sloped(mapElement)) { @@ -1487,7 +1487,7 @@ void footpath_chain_ride_queue(sint32 rideIndex, sint32 entranceIndex, sint32 x, z -= 2; goto foundNextPath; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); break; foundNextPath: @@ -1586,15 +1586,15 @@ void footpath_update_queue_chains() uint8 y = ride->entrances[i].y; uint8 z = ride->station_heights[i]; - rct_map_element *mapElement = map_get_first_element_at(x, y); + rct_tile_element *mapElement = map_get_first_element_at(x, y); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_ENTRANCE) continue; + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_ENTRANCE) continue; if (mapElement->base_height != z) continue; if (mapElement->properties.entrance.type != ENTRANCE_TYPE_RIDE_ENTRANCE) continue; - uint8 direction = map_element_get_direction_with_offset(mapElement, 2); + uint8 direction = tile_element_get_direction_with_offset(mapElement, 2); footpath_chain_ride_queue(rideIndex, i, x << 5, y << 5, mapElement, direction); - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); } } } @@ -1603,9 +1603,9 @@ void footpath_update_queue_chains() * * rct2: 0x0069ADBD */ -static void footpath_fix_ownership(sint32 x, sint32 y, rct_map_element *pathElement) +static void footpath_fix_ownership(sint32 x, sint32 y, rct_tile_element *pathElement) { - const rct_map_element * surfaceElement = map_get_surface_element_at(x >> 5, y >> 5); + const rct_tile_element * surfaceElement = map_get_surface_element_at(x >> 5, y >> 5); uint16 ownership; // Unlikely to be NULL unless deliberate. @@ -1656,7 +1656,7 @@ static sint32 footpath_is_connected_to_map_edge_recurse( sint32 x, sint32 y, sint32 z, sint32 direction, sint32 flags, sint32 level, sint32 distanceFromJunction, sint32 junctionTolerance ) { - rct_map_element *mapElement; + rct_tile_element *mapElement; sint32 edges, slopeDirection; x += TileDirectionDelta[direction].x; @@ -1672,7 +1672,7 @@ static sint32 footpath_is_connected_to_map_edge_recurse( mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_PATH) continue; if ( @@ -1697,23 +1697,23 @@ static sint32 footpath_is_connected_to_map_edge_recurse( edges = mapElement->properties.path.edges & 0x0F; direction ^= 2; if (!(flags & (1 << 7))) { - if (mapElement[1].type == MAP_ELEMENT_TYPE_BANNER) { + if (mapElement[1].type == TILE_ELEMENT_TYPE_BANNER) { for (sint32 i = 1; i < 4; i++) { - if (map_element_is_last_for_tile(&mapElement[i - 1])) break; - if (mapElement[i].type != MAP_ELEMENT_TYPE_BANNER) break; + if (tile_element_is_last_for_tile(&mapElement[i - 1])) break; + if (mapElement[i].type != TILE_ELEMENT_TYPE_BANNER) break; edges &= mapElement[i].properties.banner.flags; } } - if (mapElement[2].type == MAP_ELEMENT_TYPE_BANNER && mapElement[1].type != MAP_ELEMENT_TYPE_PATH) { + if (mapElement[2].type == TILE_ELEMENT_TYPE_BANNER && mapElement[1].type != TILE_ELEMENT_TYPE_PATH) { for (sint32 i = 1; i < 6; i++) { - if (map_element_is_last_for_tile(&mapElement[i - 1])) break; - if (mapElement[i].type != MAP_ELEMENT_TYPE_BANNER) break; + if (tile_element_is_last_for_tile(&mapElement[i - 1])) break; + if (mapElement[i].type != TILE_ELEMENT_TYPE_BANNER) break; edges &= mapElement[i].properties.banner.flags; } } } goto searchFromFootpath; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return level == 1 ? FOOTPATH_SEARCH_NOT_FOUND : FOOTPATH_SEARCH_INCOMPLETE; searchFromFootpath: @@ -1767,52 +1767,52 @@ sint32 footpath_is_connected_to_map_edge(sint32 x, sint32 y, sint32 z, sint32 di return footpath_is_connected_to_map_edge_recurse(x, y, z, direction, flags, 0, 0, 16); } -bool footpath_element_is_sloped(rct_map_element *mapElement) +bool footpath_element_is_sloped(rct_tile_element *mapElement) { return mapElement->properties.path.type & 4; } -uint8 footpath_element_get_slope_direction(rct_map_element *mapElement) +uint8 footpath_element_get_slope_direction(rct_tile_element *mapElement) { return mapElement->properties.path.type & 3; } -bool footpath_element_is_queue(rct_map_element *mapElement) +bool footpath_element_is_queue(rct_tile_element *mapElement) { return mapElement->type & 1; } -bool footpath_element_is_wide(rct_map_element *mapElement) +bool footpath_element_is_wide(rct_tile_element *mapElement) { return mapElement->type & 2; } -bool footpath_element_has_path_scenery(rct_map_element *mapElement) +bool footpath_element_has_path_scenery(rct_tile_element *mapElement) { return (mapElement->properties.path.additions & 0xF) > 0; } -uint8 footpath_element_get_path_scenery(rct_map_element *mapElement) +uint8 footpath_element_get_path_scenery(rct_tile_element *mapElement) { return mapElement->properties.path.additions & 0xF; } -void footpath_element_set_path_scenery(rct_map_element *mapElement, uint8 pathSceneryType) +void footpath_element_set_path_scenery(rct_tile_element *mapElement, uint8 pathSceneryType) { mapElement->properties.path.additions = (mapElement->properties.path.additions & 0xF0) | pathSceneryType; } -uint8 footpath_element_get_path_scenery_index(rct_map_element *mapElement) +uint8 footpath_element_get_path_scenery_index(rct_tile_element *mapElement) { return footpath_element_get_path_scenery(mapElement) - 1; } -bool footpath_element_path_scenery_is_ghost(rct_map_element *mapElement) +bool footpath_element_path_scenery_is_ghost(rct_tile_element *mapElement) { return (mapElement->properties.path.additions & 0x80) == 0x80; } -void footpath_scenery_set_is_ghost(rct_map_element *mapElement, bool isGhost) +void footpath_scenery_set_is_ghost(rct_tile_element *mapElement, bool isGhost) { // Remove ghost flag mapElement->properties.path.additions &= ~0x80; @@ -1821,7 +1821,7 @@ void footpath_scenery_set_is_ghost(rct_map_element *mapElement, bool isGhost) mapElement->properties.path.additions |= 0x80; } -uint8 footpath_element_get_type(rct_map_element *mapElement) +uint8 footpath_element_get_type(rct_tile_element *mapElement) { return mapElement->properties.path.type >> 4; } @@ -1834,12 +1834,12 @@ uint8 footpath_element_get_type(rct_map_element *mapElement) */ static void footpath_clear_wide(sint32 x, sint32 y) { - rct_map_element *mapElement = map_get_first_element_at(x / 32, y / 32); + rct_tile_element *mapElement = map_get_first_element_at(x / 32, y / 32); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_PATH) continue; mapElement->type &= ~0x2; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); } /** @@ -1848,11 +1848,11 @@ static void footpath_clear_wide(sint32 x, sint32 y) * returns footpath element if it can be made wide * returns NULL if it can not be made wide */ -static rct_map_element* footpath_can_be_wide(sint32 x, sint32 y, uint8 height) +static rct_tile_element* footpath_can_be_wide(sint32 x, sint32 y, uint8 height) { - rct_map_element *mapElement = map_get_first_element_at(x / 32, y / 32); + rct_tile_element *mapElement = map_get_first_element_at(x / 32, y / 32); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_PATH) continue; if (height != mapElement->base_height) continue; @@ -1861,7 +1861,7 @@ static rct_map_element* footpath_can_be_wide(sint32 x, sint32 y, uint8 height) if (footpath_element_is_sloped(mapElement)) continue; return mapElement; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return NULL; } @@ -1901,9 +1901,9 @@ void footpath_update_path_wide_flags(sint32 x, sint32 y) //footpath_clear_wide(x, y); //y -= 0x20; - rct_map_element *mapElement = map_get_first_element_at(x / 32, y / 32); + rct_tile_element *mapElement = map_get_first_element_at(x / 32, y / 32); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_PATH) continue; if (footpath_element_is_queue(mapElement)) @@ -1919,7 +1919,7 @@ void footpath_update_path_wide_flags(sint32 x, sint32 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_map_element *pathList[8]; + rct_tile_element *pathList[8]; x -= 0x20; y -= 0x20; @@ -2054,18 +2054,18 @@ void footpath_update_path_wide_flags(sint32 x, sint32 y) if ((e != 0xAF) && (e != 0x5F) && (e != 0xEF)) mapElement->type |= 2; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); } /** * * rct2: 0x006A7642 */ -void footpath_update_queue_entrance_banner(sint32 x, sint32 y, rct_map_element *mapElement) +void footpath_update_queue_entrance_banner(sint32 x, sint32 y, rct_tile_element *mapElement) { - sint32 elementType = map_element_get_type(mapElement); + sint32 elementType = tile_element_get_type(mapElement); switch (elementType) { - case MAP_ELEMENT_TYPE_PATH: + case TILE_ELEMENT_TYPE_PATH: if (footpath_element_is_queue(mapElement)) { footpath_queue_chain_push(mapElement->properties.path.ride_index); for (sint32 direction = 0; direction < 4; direction++) { @@ -2076,10 +2076,10 @@ void footpath_update_queue_entrance_banner(sint32 x, sint32 y, rct_map_element * mapElement->properties.path.ride_index = 255; } break; - case MAP_ELEMENT_TYPE_ENTRANCE: + case TILE_ELEMENT_TYPE_ENTRANCE: if (mapElement->properties.entrance.type == ENTRANCE_TYPE_RIDE_ENTRANCE) { footpath_queue_chain_push(mapElement->properties.entrance.ride_index); - footpath_chain_ride_queue(255, 0, x, y, mapElement, map_element_get_direction_with_offset(mapElement, 2)); + footpath_chain_ride_queue(255, 0, x, y, mapElement, tile_element_get_direction_with_offset(mapElement, 2)); } break; } @@ -2089,7 +2089,7 @@ void footpath_update_queue_entrance_banner(sint32 x, sint32 y, rct_map_element * * * rct2: 0x006A6B7F */ -static void footpath_remove_edges_towards_here(sint32 x, sint32 y, sint32 z, sint32 direction, rct_map_element *mapElement, bool isQueue) +static void footpath_remove_edges_towards_here(sint32 x, sint32 y, sint32 z, sint32 direction, rct_tile_element *mapElement, bool isQueue) { sint32 d; @@ -2113,7 +2113,7 @@ static void footpath_remove_edges_towards_here(sint32 x, sint32 y, sint32 z, sin mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_PATH) continue; if (mapElement->base_height != z) continue; @@ -2125,7 +2125,7 @@ static void footpath_remove_edges_towards_here(sint32 x, sint32 y, sint32 z, sin mapElement->properties.path.edges &= ~(1 << d); map_invalidate_tile(x, y, mapElement->base_height * 8, mapElement->clearance_height * 8); break; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); } /** @@ -2134,12 +2134,12 @@ static void footpath_remove_edges_towards_here(sint32 x, sint32 y, sint32 z, sin */ static void footpath_remove_edges_towards(sint32 x, sint32 y, sint32 z0, sint32 z1, sint32 direction, bool isQueue) { - rct_map_element *mapElement; + rct_tile_element *mapElement; sint32 slope; mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_PATH) continue; if (z1 == mapElement->base_height) { @@ -2162,7 +2162,7 @@ static void footpath_remove_edges_towards(sint32 x, sint32 y, sint32 z0, sint32 footpath_remove_edges_towards_here(x, y, z1, direction, mapElement, isQueue); break; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); } /** @@ -2171,9 +2171,9 @@ static void footpath_remove_edges_towards(sint32 x, sint32 y, sint32 z0, sint32 * @param x x-coordinate in units (not tiles) * @param y y-coordinate in units (not tiles) */ -void footpath_remove_edges_at(sint32 x, sint32 y, rct_map_element *mapElement) +void footpath_remove_edges_at(sint32 x, sint32 y, rct_tile_element *mapElement) { - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_TRACK) { + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_TRACK) { sint32 rideIndex = mapElement->properties.track.ride_index; Ride *ride = get_ride(rideIndex); if (!ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_FLAT_RIDE)) @@ -2184,7 +2184,7 @@ void footpath_remove_edges_at(sint32 x, sint32 y, rct_map_element *mapElement) for (sint32 direction = 0; direction < 4; direction++) { sint32 z1 = mapElement->base_height; - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_PATH) { + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_PATH) { if (footpath_element_is_sloped(mapElement)) { sint32 slope = footpath_element_get_slope_direction(mapElement); if ((slope - direction) & 1) @@ -2198,7 +2198,7 @@ void footpath_remove_edges_at(sint32 x, sint32 y, rct_map_element *mapElement) z0, z1, direction, footpath_element_is_queue(mapElement)); } - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_PATH) mapElement->properties.path.edges = 0; } diff --git a/src/openrct2/world/footpath.h b/src/openrct2/world/footpath.h index 8cce286cc6..d9e0136a2c 100644 --- a/src/openrct2/world/footpath.h +++ b/src/openrct2/world/footpath.h @@ -93,29 +93,29 @@ void footpath_remove(sint32 x, sint32 y, sint32 z, sint32 flags); money32 footpath_provisional_set(sint32 type, sint32 x, sint32 y, sint32 z, sint32 slope); void footpath_provisional_remove(); void footpath_provisional_update(); -void footpath_get_coordinates_from_pos(sint32 screenX, sint32 screenY, sint32 *x, sint32 *y, sint32 *direction, rct_map_element **mapElement); -void footpath_bridge_get_info_from_pos(sint32 screenX, sint32 screenY, sint32 *x, sint32 *y, sint32 *direction, rct_map_element **mapElement); +void footpath_get_coordinates_from_pos(sint32 screenX, sint32 screenY, sint32 *x, sint32 *y, sint32 *direction, rct_tile_element **mapElement); +void footpath_bridge_get_info_from_pos(sint32 screenX, sint32 screenY, sint32 *x, sint32 *y, sint32 *direction, rct_tile_element **mapElement); void footpath_remove_litter(sint32 x, sint32 y, sint32 z); -void footpath_connect_edges(sint32 x, sint32 y, rct_map_element *mapElement, sint32 flags); +void footpath_connect_edges(sint32 x, sint32 y, rct_tile_element *mapElement, sint32 flags); void footpath_update_queue_chains(); bool fence_in_the_way(sint32 x, sint32 y, sint32 z0, sint32 z1, sint32 direction); -void footpath_chain_ride_queue(sint32 rideIndex, sint32 entranceIndex, sint32 x, sint32 y, rct_map_element *mapElement, sint32 direction); +void footpath_chain_ride_queue(sint32 rideIndex, sint32 entranceIndex, sint32 x, sint32 y, rct_tile_element *mapElement, sint32 direction); void footpath_update_path_wide_flags(sint32 x, sint32 y); sint32 footpath_is_connected_to_map_edge(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 flags); -bool footpath_element_is_sloped(rct_map_element *mapElement); -uint8 footpath_element_get_slope_direction(rct_map_element *mapElement); -bool footpath_element_is_queue(rct_map_element *mapElement); -bool footpath_element_is_wide(rct_map_element *mapElement); -uint8 footpath_element_get_type(rct_map_element *mapElement); -bool footpath_element_has_path_scenery(rct_map_element *mapElement); -uint8 footpath_element_get_path_scenery(rct_map_element *mapElement); -void footpath_element_set_path_scenery(rct_map_element *mapElement, uint8 pathSceneryType); -uint8 footpath_element_get_path_scenery_index(rct_map_element *mapElement); -bool footpath_element_path_scenery_is_ghost(rct_map_element *mapElement); -void footpath_scenery_set_is_ghost(rct_map_element *mapElement, bool isGhost); -void footpath_remove_edges_at(sint32 x, sint32 y, rct_map_element *mapElement); -sint32 entrance_get_directions(rct_map_element *mapElement); +bool footpath_element_is_sloped(rct_tile_element *mapElement); +uint8 footpath_element_get_slope_direction(rct_tile_element *mapElement); +bool footpath_element_is_queue(rct_tile_element *mapElement); +bool footpath_element_is_wide(rct_tile_element *mapElement); +uint8 footpath_element_get_type(rct_tile_element *mapElement); +bool footpath_element_has_path_scenery(rct_tile_element *mapElement); +uint8 footpath_element_get_path_scenery(rct_tile_element *mapElement); +void footpath_element_set_path_scenery(rct_tile_element *mapElement, uint8 pathSceneryType); +uint8 footpath_element_get_path_scenery_index(rct_tile_element *mapElement); +bool footpath_element_path_scenery_is_ghost(rct_tile_element *mapElement); +void footpath_scenery_set_is_ghost(rct_tile_element *mapElement, bool isGhost); +void footpath_remove_edges_at(sint32 x, sint32 y, rct_tile_element *mapElement); +sint32 entrance_get_directions(rct_tile_element *mapElement); rct_footpath_entry *get_footpath_entry(sint32 entryIndex); diff --git a/src/openrct2/world/map.c b/src/openrct2/world/map.c index 0fecfc7609..6fc71d8dfe 100644 --- a/src/openrct2/world/map.c +++ b/src/openrct2/world/map.c @@ -94,16 +94,16 @@ sint16 gMapSizeMaxXY; sint16 gMapBaseZ; #if defined(NO_RCT2) -rct_map_element gMapElements[MAX_TILE_MAP_ELEMENT_POINTERS * 3]; -rct_map_element *gMapElementTilePointers[MAX_TILE_MAP_ELEMENT_POINTERS]; +rct_tile_element gMapElements[MAX_TILE_TILE_ELEMENT_POINTERS * 3]; +rct_tile_element *gMapElementTilePointers[MAX_TILE_TILE_ELEMENT_POINTERS]; #else -rct_map_element *gMapElements = RCT2_ADDRESS(RCT2_ADDRESS_MAP_ELEMENTS, rct_map_element); -rct_map_element **gMapElementTilePointers = RCT2_ADDRESS(RCT2_ADDRESS_TILE_MAP_ELEMENT_POINTERS, rct_map_element*); +rct_tile_element *gMapElements = RCT2_ADDRESS(RCT2_ADDRESS_TILE_ELEMENTS, rct_tile_element); +rct_tile_element **gMapElementTilePointers = RCT2_ADDRESS(RCT2_ADDRESS_TILE_TILE_ELEMENT_POINTERS, rct_tile_element*); #endif LocationXY16 gMapSelectionTiles[300]; rct2_peep_spawn gPeepSpawns[MAX_PEEP_SPAWNS]; -rct_map_element *gNextFreeMapElement; +rct_tile_element *gNextFreeMapElement; uint32 gNextFreeMapElementPointerIndex; bool gLandMountainMode; @@ -119,8 +119,8 @@ LocationXYZ16 gCommandPosition; bool gMapLandRightsUpdateSuccess; -static void map_update_grass_length(sint32 x, sint32 y, rct_map_element *mapElement); -static void map_set_grass_length(sint32 x, sint32 y, rct_map_element *mapElement, sint32 length); +static void map_update_grass_length(sint32 x, sint32 y, rct_tile_element *mapElement); +static void map_set_grass_length(sint32 x, sint32 y, rct_tile_element *mapElement, sint32 length); static void clear_elements_at(sint32 x, sint32 y); static void translate_3d_to_2d(sint32 rotation, sint32 *x, sint32 *y); @@ -129,18 +129,18 @@ void rotate_map_coordinates(sint16 *x, sint16 *y, sint32 rotation) sint32 temp; switch (rotation) { - case MAP_ELEMENT_DIRECTION_WEST: + case TILE_ELEMENT_DIRECTION_WEST: break; - case MAP_ELEMENT_DIRECTION_NORTH: + case TILE_ELEMENT_DIRECTION_NORTH: temp = *x; *x = *y; *y = -temp; break; - case MAP_ELEMENT_DIRECTION_EAST: + case TILE_ELEMENT_DIRECTION_EAST: *x = -*x; *y = -*y; break; - case MAP_ELEMENT_DIRECTION_SOUTH: + case TILE_ELEMENT_DIRECTION_SOUTH: temp = *y; *y = *x; *x = -temp; @@ -173,21 +173,21 @@ LocationXY16 coordinate_3d_to_2d(const LocationXYZ16* coordinate_3d, sint32 rota return coordinate_2d; } -void map_element_iterator_begin(map_element_iterator *it) +void tile_element_iterator_begin(tile_element_iterator *it) { it->x = 0; it->y = 0; it->element = map_get_first_element_at(0, 0); } -sint32 map_element_iterator_next(map_element_iterator *it) +sint32 tile_element_iterator_next(tile_element_iterator *it) { if (it->element == NULL) { it->element = map_get_first_element_at(it->x, it->y); return 1; } - if (!map_element_is_last_for_tile(it->element)) { + if (!tile_element_is_last_for_tile(it->element)) { it->element++; return 1; } @@ -208,12 +208,12 @@ sint32 map_element_iterator_next(map_element_iterator *it) return 0; } -void map_element_iterator_restart_for_tile(map_element_iterator *it) +void tile_element_iterator_restart_for_tile(tile_element_iterator *it) { it->element = NULL; } -rct_map_element *map_get_first_element_at(sint32 x, sint32 y) +rct_tile_element *map_get_first_element_at(sint32 x, sint32 y) { if (x < 0 || y < 0 || x > (MAXIMUM_MAP_SIZE_TECHNICAL - 1) || y > (MAXIMUM_MAP_SIZE_TECHNICAL - 1)) { log_error("Trying to access element outside of range"); @@ -222,9 +222,9 @@ rct_map_element *map_get_first_element_at(sint32 x, sint32 y) return gMapElementTilePointers[x + y * MAXIMUM_MAP_SIZE_TECHNICAL]; } -rct_map_element *map_get_nth_element_at(sint32 x, sint32 y, sint32 n) +rct_tile_element *map_get_nth_element_at(sint32 x, sint32 y, sint32 n) { - rct_map_element * mapElement = map_get_first_element_at(x, y); + rct_tile_element * mapElement = map_get_first_element_at(x, y); if (mapElement == NULL) { return NULL; } @@ -235,7 +235,7 @@ rct_map_element *map_get_nth_element_at(sint32 x, sint32 y, sint32 n) if (n == 0) { return mapElement; } - if (map_element_is_last_for_tile(mapElement)) { + if (tile_element_is_last_for_tile(mapElement)) { break; } mapElement++; @@ -245,7 +245,7 @@ rct_map_element *map_get_nth_element_at(sint32 x, sint32 y, sint32 n) return NULL; } -void map_set_tile_elements(sint32 x, sint32 y, rct_map_element *elements) +void map_set_tile_elements(sint32 x, sint32 y, rct_tile_element *elements) { if (x < 0 || y < 0 || x > (MAXIMUM_MAP_SIZE_TECHNICAL - 1) || y > (MAXIMUM_MAP_SIZE_TECHNICAL - 1)) { log_error("Trying to access element outside of range"); @@ -254,37 +254,37 @@ void map_set_tile_elements(sint32 x, sint32 y, rct_map_element *elements) gMapElementTilePointers[x + y * MAXIMUM_MAP_SIZE_TECHNICAL] = elements; } -sint32 map_element_is_last_for_tile(const rct_map_element *element) +sint32 tile_element_is_last_for_tile(const rct_tile_element *element) { - return element->flags & MAP_ELEMENT_FLAG_LAST_TILE; + return element->flags & TILE_ELEMENT_FLAG_LAST_TILE; } -bool map_element_is_ghost(const rct_map_element *element) +bool tile_element_is_ghost(const rct_tile_element *element) { - return element->flags & MAP_ELEMENT_FLAG_GHOST; + return element->flags & TILE_ELEMENT_FLAG_GHOST; } -uint8 map_element_get_scenery_quadrant(const rct_map_element *element) +uint8 tile_element_get_scenery_quadrant(const rct_tile_element *element) { - return (element->type & MAP_ELEMENT_QUADRANT_MASK) >> 6; + return (element->type & TILE_ELEMENT_QUADRANT_MASK) >> 6; } -sint32 map_element_get_type(const rct_map_element *element) +sint32 tile_element_get_type(const rct_tile_element *element) { - return element->type & MAP_ELEMENT_TYPE_MASK; + return element->type & TILE_ELEMENT_TYPE_MASK; } -sint32 map_element_get_direction(const rct_map_element *element) +sint32 tile_element_get_direction(const rct_tile_element *element) { - return element->type & MAP_ELEMENT_DIRECTION_MASK; + return element->type & TILE_ELEMENT_DIRECTION_MASK; } -sint32 map_element_get_direction_with_offset(const rct_map_element *element, uint8 offset) +sint32 tile_element_get_direction_with_offset(const rct_tile_element *element, uint8 offset) { - return ((element->type & MAP_ELEMENT_DIRECTION_MASK) + offset) & MAP_ELEMENT_DIRECTION_MASK; + return ((element->type & TILE_ELEMENT_DIRECTION_MASK) + offset) & TILE_ELEMENT_DIRECTION_MASK; } -sint32 map_element_get_terrain(const rct_map_element *element) +sint32 tile_element_get_terrain(const rct_tile_element *element) { sint32 terrain = (element->properties.surface.terrain >> 5) & 7; if (element->type & 1) @@ -292,7 +292,7 @@ sint32 map_element_get_terrain(const rct_map_element *element) return terrain; } -sint32 map_element_get_terrain_edge(const rct_map_element *element) +sint32 tile_element_get_terrain_edge(const rct_tile_element *element) { sint32 terrain_edge = (element->properties.surface.slope >> 5) & 7; if (element->type & 128) @@ -300,7 +300,7 @@ sint32 map_element_get_terrain_edge(const rct_map_element *element) return terrain_edge; } -void map_element_set_terrain(rct_map_element *element, sint32 terrain) +void tile_element_set_terrain(rct_tile_element *element, sint32 terrain) { // Bit 3 for terrain is stored in element.type bit 0 if (terrain & 8) @@ -313,7 +313,7 @@ void map_element_set_terrain(rct_map_element *element, sint32 terrain) element->properties.surface.terrain |= (terrain & 7) << 5; } -void map_element_set_terrain_edge(rct_map_element *element, sint32 terrain) +void tile_element_set_terrain_edge(rct_tile_element *element, sint32 terrain) { // Bit 3 for terrain is stored in element.type bit 7 if (terrain & 8) @@ -326,16 +326,16 @@ void map_element_set_terrain_edge(rct_map_element *element, sint32 terrain) element->properties.surface.slope |= (terrain & 7) << 5; } -rct_map_element *map_get_surface_element_at(sint32 x, sint32 y) +rct_tile_element *map_get_surface_element_at(sint32 x, sint32 y) { - rct_map_element *mapElement = map_get_first_element_at(x, y); + rct_tile_element *mapElement = map_get_first_element_at(x, y); if (mapElement == NULL) return NULL; // Find the first surface element - while (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_SURFACE) { - if (map_element_is_last_for_tile(mapElement)) + while (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_SURFACE) { + if (tile_element_is_last_for_tile(mapElement)) return NULL; mapElement++; @@ -344,36 +344,36 @@ rct_map_element *map_get_surface_element_at(sint32 x, sint32 y) return mapElement; } -rct_map_element* map_get_path_element_at(sint32 x, sint32 y, sint32 z){ - rct_map_element *mapElement = map_get_first_element_at(x, y); +rct_tile_element* map_get_path_element_at(sint32 x, sint32 y, sint32 z){ + rct_tile_element *mapElement = map_get_first_element_at(x, y); if (mapElement == NULL) return NULL; // Find the path element at known z do { - if (mapElement->flags & MAP_ELEMENT_FLAG_GHOST) + if (mapElement->flags & TILE_ELEMENT_FLAG_GHOST) continue; - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_PATH) continue; if (mapElement->base_height != z) continue; return mapElement; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return NULL; } -rct_map_element* map_get_banner_element_at(sint32 x, sint32 y, sint32 z, uint8 position) { - rct_map_element *mapElement = map_get_first_element_at(x, y); +rct_tile_element* map_get_banner_element_at(sint32 x, sint32 y, sint32 z, uint8 position) { + rct_tile_element *mapElement = map_get_first_element_at(x, y); if (mapElement == NULL) return NULL; // Find the banner element at known z and position do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_BANNER) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_BANNER) continue; if (mapElement->base_height != z) continue; @@ -381,7 +381,7 @@ rct_map_element* map_get_banner_element_at(sint32 x, sint32 y, sint32 z, uint8 p continue; return mapElement; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return NULL; } @@ -395,19 +395,19 @@ void map_init(sint32 size) gNumMapAnimations = 0; gNextFreeMapElementPointerIndex = 0; - for (sint32 i = 0; i < MAX_TILE_MAP_ELEMENT_POINTERS; i++) { - rct_map_element *map_element = &gMapElements[i]; - map_element->type = (MAP_ELEMENT_TYPE_SURFACE << 2); - map_element->flags = MAP_ELEMENT_FLAG_LAST_TILE; - map_element->base_height = 14; - map_element->clearance_height = 14; - map_element->properties.surface.slope = 0; - map_element->properties.surface.grass_length = GRASS_LENGTH_CLEAR_0; - map_element->properties.surface.ownership = 0; - map_element->properties.surface.terrain = 0; + for (sint32 i = 0; i < MAX_TILE_TILE_ELEMENT_POINTERS; i++) { + rct_tile_element *tile_element = &gMapElements[i]; + tile_element->type = (TILE_ELEMENT_TYPE_SURFACE << 2); + tile_element->flags = TILE_ELEMENT_FLAG_LAST_TILE; + tile_element->base_height = 14; + tile_element->clearance_height = 14; + tile_element->properties.surface.slope = 0; + tile_element->properties.surface.grass_length = GRASS_LENGTH_CLEAR_0; + tile_element->properties.surface.ownership = 0; + tile_element->properties.surface.terrain = 0; - map_element_set_terrain(map_element, TERRAIN_GRASS); - map_element_set_terrain_edge(map_element, TERRAIN_EDGE_ROCK); + tile_element_set_terrain(tile_element, TERRAIN_GRASS); + tile_element_set_terrain_edge(tile_element, TERRAIN_EDGE_ROCK); } gGrassSceneryTileLoopPosition = 0; @@ -439,7 +439,7 @@ void map_count_remaining_land_rights() for (sint32 x = 0; x < MAXIMUM_MAP_SIZE_TECHNICAL; x++) { for (sint32 y = 0; y < MAXIMUM_MAP_SIZE_TECHNICAL; y++) { - rct_map_element *element = map_get_surface_element_at(x, y); + rct_tile_element *element = map_get_surface_element_at(x, y); // Surface elements are sometimes hacked out to save some space for other map elements if (element == NULL) { continue; @@ -457,7 +457,7 @@ void map_count_remaining_land_rights() } /** - * This is meant to strip MAP_ELEMENT_FLAG_GHOST flag from all elements when + * This is meant to strip TILE_ELEMENT_FLAG_GHOST flag from all elements when * importing a park. * * This can only exist in hacked parks, as we remove ghost elements while saving. @@ -467,10 +467,10 @@ void map_count_remaining_land_rights() */ void map_strip_ghost_flag_from_elements() { - rct_map_element *mapElement = gMapElements; + rct_tile_element *mapElement = gMapElements; do { - mapElement->flags &= ~MAP_ELEMENT_FLAG_GHOST; - } while (++mapElement < gMapElements + MAX_MAP_ELEMENTS); + mapElement->flags &= ~TILE_ELEMENT_FLAG_GHOST; + } while (++mapElement < gMapElements + MAX_TILE_ELEMENTS); } /** @@ -481,16 +481,16 @@ void map_update_tile_pointers() { sint32 i, x, y; - for (i = 0; i < MAX_TILE_MAP_ELEMENT_POINTERS; i++) { - gMapElementTilePointers[i] = TILE_UNDEFINED_MAP_ELEMENT; + for (i = 0; i < MAX_TILE_TILE_ELEMENT_POINTERS; i++) { + gMapElementTilePointers[i] = TILE_UNDEFINED_TILE_ELEMENT; } - rct_map_element *mapElement = gMapElements; - rct_map_element **tile = gMapElementTilePointers; + rct_tile_element *mapElement = gMapElements; + rct_tile_element **tile = gMapElementTilePointers; for (y = 0; y < MAXIMUM_MAP_SIZE_TECHNICAL; y++) { for (x = 0; x < MAXIMUM_MAP_SIZE_TECHNICAL; x++) { *tile++ = mapElement; - while (!map_element_is_last_for_tile(mapElement++)); + while (!tile_element_is_last_for_tile(mapElement++)); } } @@ -505,9 +505,9 @@ void map_update_tile_pointers() * dx: return remember to & with 0xFFFF if you don't want water affecting results * rct2: 0x00662783 */ -sint32 map_element_height(sint32 x, sint32 y) +sint32 tile_element_height(sint32 x, sint32 y) { - rct_map_element *mapElement; + rct_tile_element *mapElement; // Off the map if ((unsigned)x >= 8192 || (unsigned)y >= 8192) @@ -528,7 +528,7 @@ sint32 map_element_height(sint32 x, sint32 y) (map_get_water_height(mapElement) << 20) | (mapElement->base_height << 3); - uint32 slope = (mapElement->properties.surface.slope & MAP_ELEMENT_SLOPE_MASK); + uint32 slope = (mapElement->properties.surface.slope & TILE_ELEMENT_SLOPE_MASK); uint8 extra_height = (slope & 0x10) >> 4; // 0x10 is the 5th bit - sets slope to double height // Remove the extra height bit slope &= 0xF; @@ -651,7 +651,7 @@ sint32 map_element_height(sint32 x, sint32 y) void sub_68B089() { sint32 i; - rct_map_element *mapElementFirst, *mapElement; + rct_tile_element *mapElementFirst, *mapElement; if (gTrackDesignSaveMode) return; @@ -659,9 +659,9 @@ void sub_68B089() i = gNextFreeMapElementPointerIndex; do { i++; - if (i >= MAX_TILE_MAP_ELEMENT_POINTERS) + if (i >= MAX_TILE_TILE_ELEMENT_POINTERS) i = 0; - } while (gMapElementTilePointers[i] == TILE_UNDEFINED_MAP_ELEMENT); + } while (gMapElementTilePointers[i] == TILE_UNDEFINED_TILE_ELEMENT); gNextFreeMapElementPointerIndex = i; mapElementFirst = mapElement = gMapElementTilePointers[i]; @@ -682,7 +682,7 @@ void sub_68B089() mapElementFirst->base_height = 255; mapElementFirst++; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); mapElement = gNextFreeMapElement; do { @@ -699,13 +699,13 @@ void sub_68B089() */ sint32 map_coord_is_connected(sint32 x, sint32 y, sint32 z, uint8 faceDirection) { - rct_map_element *mapElement = map_get_first_element_at(x, y); + rct_tile_element *mapElement = map_get_first_element_at(x, y); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_PATH) continue; - rct_map_element_path_properties props = mapElement->properties.path; + rct_tile_element_path_properties props = mapElement->properties.path; uint8 pathType = props.type >> 2; uint8 pathDirection = props.type & 3; @@ -720,7 +720,7 @@ sint32 map_coord_is_connected(sint32 x, sint32 y, sint32 z, uint8 faceDirection) if (z == mapElement->base_height) return 1; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return 0; } @@ -806,7 +806,7 @@ bool map_is_location_owned(sint32 x, sint32 y, sint32 z) { // This check is to avoid throwing lots of messages in logs. if (map_is_location_valid(x, y)) { - rct_map_element *mapElement = map_get_surface_element_at(x / 32, y / 32); + rct_tile_element *mapElement = map_get_surface_element_at(x / 32, y / 32); if (mapElement != NULL) { if (mapElement->properties.surface.ownership & OWNERSHIP_OWNED) return true; @@ -830,7 +830,7 @@ bool map_is_location_owned(sint32 x, sint32 y, sint32 z) bool map_is_location_in_park(sint32 x, sint32 y) { if (map_is_location_valid(x, y)) { - rct_map_element *mapElement = map_get_surface_element_at(x / 32, y / 32); + rct_tile_element *mapElement = map_get_surface_element_at(x / 32, y / 32); if (mapElement == NULL) return false; if (mapElement->properties.surface.ownership & OWNERSHIP_OWNED) @@ -844,7 +844,7 @@ bool map_is_location_in_park(sint32 x, sint32 y) bool map_is_location_owned_or_has_rights(sint32 x, sint32 y) { if (map_is_location_valid(x, y)) { - rct_map_element *mapElement = map_get_surface_element_at(x / 32, y / 32); + rct_tile_element *mapElement = map_get_surface_element_at(x / 32, y / 32); if (mapElement == NULL) { return false; } @@ -862,10 +862,10 @@ void game_command_remove_large_scenery(sint32* eax, sint32* ebx, sint32* ecx, si { uint8 base_height = *edx; uint8 tileIndex = *edx >> 8; - uint8 map_element_direction = *ebx >> 8; + uint8 tile_element_direction = *ebx >> 8; sint32 x = *eax; sint32 y = *ecx; - sint32 z = map_element_height(x, y); + sint32 z = tile_element_height(x, y); uint8 flags = *ebx & 0xFF; gCommandPosition.x = x + 16; gCommandPosition.y = y + 16; @@ -879,33 +879,33 @@ void game_command_remove_large_scenery(sint32* eax, sint32* ebx, sint32* ecx, si } bool element_found = false; - rct_map_element* map_element = map_get_first_element_at(x / 32, y / 32); - if (map_element == NULL) + rct_tile_element* tile_element = map_get_first_element_at(x / 32, y / 32); + if (tile_element == NULL) { log_warning("Invalid game command for scenery removal, x = %d, y = %d", x, y); *ebx = MONEY32_UNDEFINED; return; } do { - if (map_element_get_type(map_element) != MAP_ELEMENT_TYPE_SCENERY_MULTIPLE) + if (tile_element_get_type(tile_element) != TILE_ELEMENT_TYPE_SCENERY_MULTIPLE) continue; - if (map_element->base_height != base_height) + if (tile_element->base_height != base_height) continue; - if ((map_element->properties.scenerymultiple.type >> 10) != tileIndex) + if ((tile_element->properties.scenerymultiple.type >> 10) != tileIndex) continue; - if ((map_element_get_direction(map_element)) != map_element_direction) + if ((tile_element_get_direction(tile_element)) != tile_element_direction) continue; // If we are removing ghost elements - if((flags & GAME_COMMAND_FLAG_GHOST) && !(map_element->flags & MAP_ELEMENT_FLAG_GHOST)) + if((flags & GAME_COMMAND_FLAG_GHOST) && !(tile_element->flags & TILE_ELEMENT_FLAG_GHOST)) continue; element_found = true; break; - } while (!map_element_is_last_for_tile(map_element++)); + } while (!tile_element_is_last_for_tile(tile_element++)); if (element_found == false){ *ebx = 0; @@ -913,17 +913,17 @@ void game_command_remove_large_scenery(sint32* eax, sint32* ebx, sint32* ecx, si } if (flags & GAME_COMMAND_FLAG_APPLY) { - map_element_remove_banner_entry(map_element); + tile_element_remove_banner_entry(tile_element); } - rct_scenery_entry* scenery_entry = get_large_scenery_entry(map_element->properties.scenerymultiple.type & 0x3FF); + rct_scenery_entry* scenery_entry = get_large_scenery_entry(tile_element->properties.scenerymultiple.type & 0x3FF); LocationXYZ16 firstTile = { .x = scenery_entry->large_scenery.tiles[tileIndex].x_offset, .y = scenery_entry->large_scenery.tiles[tileIndex].y_offset, .z = (base_height * 8) - scenery_entry->large_scenery.tiles[tileIndex].z_offset }; - rotate_map_coordinates(&firstTile.x, &firstTile.y, map_element_direction); + rotate_map_coordinates(&firstTile.x, &firstTile.y, tile_element_direction); firstTile.x = x - firstTile.x; firstTile.y = y - firstTile.y; @@ -937,7 +937,7 @@ void game_command_remove_large_scenery(sint32* eax, sint32* ebx, sint32* ecx, si .z = scenery_entry->large_scenery.tiles[i].z_offset }; - rotate_map_coordinates(¤tTile.x, ¤tTile.y, map_element_direction); + rotate_map_coordinates(¤tTile.x, ¤tTile.y, tile_element_direction); currentTile.x += firstTile.x; currentTile.y += firstTile.y; @@ -953,21 +953,21 @@ void game_command_remove_large_scenery(sint32* eax, sint32* ebx, sint32* ecx, si // If not applying then no need to delete the actual element if (!(flags & GAME_COMMAND_FLAG_APPLY)) { if (flags & (1 << 7)) { - if (map_element->flags & (1 << 6)) + if (tile_element->flags & (1 << 6)) calculate_cost = false; - map_element->flags |= (1 << 6); + tile_element->flags |= (1 << 6); } continue; } - rct_map_element* sceneryElement = map_get_first_element_at(currentTile.x / 32, currentTile.y / 32); + rct_tile_element* sceneryElement = map_get_first_element_at(currentTile.x / 32, currentTile.y / 32); element_found = false; do { - if (map_element_get_type(sceneryElement) != MAP_ELEMENT_TYPE_SCENERY_MULTIPLE) + if (tile_element_get_type(sceneryElement) != TILE_ELEMENT_TYPE_SCENERY_MULTIPLE) continue; - if (map_element_get_direction(sceneryElement) != map_element_direction) + if (tile_element_get_direction(sceneryElement) != tile_element_direction) continue; if ((sceneryElement->properties.scenerymultiple.type >> 10) != i) @@ -977,14 +977,14 @@ void game_command_remove_large_scenery(sint32* eax, sint32* ebx, sint32* ecx, si continue; // If we are removing ghost elements - if ((flags & GAME_COMMAND_FLAG_GHOST) && !(sceneryElement->flags & MAP_ELEMENT_FLAG_GHOST)) + if ((flags & GAME_COMMAND_FLAG_GHOST) && !(sceneryElement->flags & TILE_ELEMENT_FLAG_GHOST)) continue; map_invalidate_tile_full(currentTile.x, currentTile.y); - map_element_remove(sceneryElement); + tile_element_remove(sceneryElement); element_found = true; break; - } while (!map_element_is_last_for_tile(sceneryElement++)); + } while (!tile_element_is_last_for_tile(sceneryElement++)); if (element_found == false){ log_error("Tile not found when trying to remove element!"); @@ -995,7 +995,7 @@ void game_command_remove_large_scenery(sint32* eax, sint32* ebx, sint32* ecx, si LocationXYZ16 coord; coord.x = x + 16; coord.y = y + 16; - coord.z = map_element_height(coord.x, coord.y); + coord.z = tile_element_height(coord.x, coord.y); network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord); } @@ -1016,30 +1016,30 @@ void game_command_set_large_scenery_colour(sint32* eax, sint32* ebx, sint32* ecx gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LANDSCAPING; sint32 x = *eax; sint32 y = *ecx; - uint8 map_element_direction = *ebx >> 8; + uint8 tile_element_direction = *ebx >> 8; uint8 flags = *ebx & 0xFF; uint8 base_height = *edx; uint8 tileIndex = *edx >> 8; uint8 colour1 = *ebp; uint8 colour2 = *ebp >> 8; - sint32 z = map_element_height(x, y); + sint32 z = tile_element_height(x, y); gCommandPosition.x = x + 16; gCommandPosition.y = y + 16; gCommandPosition.z = z; - rct_map_element *map_element = map_get_large_scenery_segment(x, y, base_height, map_element_direction, tileIndex); + rct_tile_element *tile_element = map_get_large_scenery_segment(x, y, base_height, tile_element_direction, tileIndex); - if(map_element == NULL){ + if(tile_element == NULL){ *ebx = 0; return; } - if((flags & GAME_COMMAND_FLAG_GHOST) && !(map_element->flags & MAP_ELEMENT_FLAG_GHOST)){ + if((flags & GAME_COMMAND_FLAG_GHOST) && !(tile_element->flags & TILE_ELEMENT_FLAG_GHOST)){ *ebx = 0; return; } - rct_scenery_entry *scenery_entry = get_large_scenery_entry(map_element->properties.scenerymultiple.type & 0x3FF); + rct_scenery_entry *scenery_entry = get_large_scenery_entry(tile_element->properties.scenerymultiple.type & 0x3FF); // Work out the base tile coordinates (Tile with index 0) LocationXYZ16 baseTile = { @@ -1047,7 +1047,7 @@ void game_command_set_large_scenery_colour(sint32* eax, sint32* ebx, sint32* ecx .y = scenery_entry->large_scenery.tiles[tileIndex].y_offset, .z = (base_height * 8) - scenery_entry->large_scenery.tiles[tileIndex].z_offset }; - rotate_map_coordinates(&baseTile.x, &baseTile.y, map_element_direction); + rotate_map_coordinates(&baseTile.x, &baseTile.y, tile_element_direction); baseTile.x = x - baseTile.x; baseTile.y = y - baseTile.y; @@ -1060,7 +1060,7 @@ void game_command_set_large_scenery_colour(sint32* eax, sint32* ebx, sint32* ecx .y = scenery_entry->large_scenery.tiles[i].y_offset, .z = scenery_entry->large_scenery.tiles[i].z_offset }; - rotate_map_coordinates(¤tTile.x, ¤tTile.y, map_element_direction); + rotate_map_coordinates(¤tTile.x, ¤tTile.y, tile_element_direction); currentTile.x += baseTile.x; currentTile.y += baseTile.y; currentTile.z += baseTile.z; @@ -1073,11 +1073,11 @@ void game_command_set_large_scenery_colour(sint32* eax, sint32* ebx, sint32* ecx } if(flags & GAME_COMMAND_FLAG_APPLY){ - rct_map_element* mapElement = map_get_large_scenery_segment( + rct_tile_element* mapElement = map_get_large_scenery_segment( currentTile.x, currentTile.y, base_height, - map_element_direction, + tile_element_direction, i); mapElement->properties.scenerymultiple.colour[0] &= 0xE0; @@ -1103,16 +1103,16 @@ static money32 map_clear_scenery_from_tile(sint32 x, sint32 y, sint32 clear, sin { sint32 type; money32 cost, totalCost; - rct_map_element *mapElement; + rct_tile_element *mapElement; totalCost = 0; restart_from_beginning: mapElement = map_get_first_element_at(x, y); do { - type = map_element_get_type(mapElement); + type = tile_element_get_type(mapElement); switch (type) { - case MAP_ELEMENT_TYPE_PATH: + case TILE_ELEMENT_TYPE_PATH: if (clear & (1 << 2)) { sint32 eax = x * 32; sint32 ebx = flags; @@ -1128,7 +1128,7 @@ restart_from_beginning: if (flags & 1) goto restart_from_beginning; } break; - case MAP_ELEMENT_TYPE_SCENERY: + case TILE_ELEMENT_TYPE_SCENERY: if (clear & (1 << 0)) { sint32 eax = x * 32; sint32 ebx = (mapElement->type << 8) | flags; @@ -1145,12 +1145,12 @@ restart_from_beginning: goto restart_from_beginning; } break; - case MAP_ELEMENT_TYPE_WALL: + case TILE_ELEMENT_TYPE_WALL: if (clear & (1 << 0)) { sint32 eax = x * 32; sint32 ebx = flags; sint32 ecx = y * 32; - sint32 edx = (mapElement->base_height << 8) | (map_element_get_direction(mapElement)); + sint32 edx = (mapElement->base_height << 8) | (tile_element_get_direction(mapElement)); sint32 edi = 0, ebp = 0; cost = game_do_command(eax, ebx, ecx, edx, GAME_COMMAND_REMOVE_WALL, edi, ebp); @@ -1162,10 +1162,10 @@ restart_from_beginning: goto restart_from_beginning; } break; - case MAP_ELEMENT_TYPE_SCENERY_MULTIPLE: + case TILE_ELEMENT_TYPE_SCENERY_MULTIPLE: if (clear & (1 << 1)) { sint32 eax = x * 32; - sint32 ebx = flags | ((map_element_get_direction(mapElement)) << 8); + sint32 ebx = flags | ((tile_element_get_direction(mapElement)) << 8); sint32 ecx = y * 32; sint32 edx = mapElement->base_height | ((mapElement->properties.scenerymultiple.type >> 10) << 8); sint32 edi = 0, ebp = 0; @@ -1180,7 +1180,7 @@ restart_from_beginning: } break; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return totalCost; } @@ -1190,16 +1190,16 @@ restart_from_beginning: * when using the clear scenery tool with large scenery. */ static void map_reset_clear_large_scenery_flag(){ - rct_map_element* mapElement; + rct_tile_element* mapElement; // TODO: Improve efficiency of this for (sint32 y = 0; y < MAXIMUM_MAP_SIZE_TECHNICAL; y++) { for (sint32 x = 0; x < MAXIMUM_MAP_SIZE_TECHNICAL; x++) { mapElement = map_get_first_element_at(x, y); do { - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_SCENERY_MULTIPLE) { + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_SCENERY_MULTIPLE) { mapElement->flags &= ~(1 << 6); } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); } } } @@ -1214,7 +1214,7 @@ money32 map_clear_scenery(sint32 x0, sint32 y0, sint32 x1, sint32 y1, sint32 cle x = (x0 + x1) / 2 + 16; y = (y0 + y1) / 2 + 16; - z = map_element_height(x, y); + z = tile_element_height(x, y); gCommandPosition.x = x; gCommandPosition.y = y; gCommandPosition.z = z; @@ -1244,7 +1244,7 @@ money32 map_clear_scenery(sint32 x0, sint32 y0, sint32 x1, sint32 y1, sint32 cle LocationXYZ16 coord; coord.x = ((x0 + x1) / 2) + 16; coord.y = ((y0 + y1) / 2) + 16; - coord.z = map_element_height(coord.x, coord.y); + coord.z = tile_element_height(coord.x, coord.y); network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord); } @@ -1289,7 +1289,7 @@ static money32 map_change_surface_style(sint32 x0, sint32 y0, sint32 x1, sint32 xMid = (x0 + x1) / 2 + 16; yMid = (y0 + y1) / 2 + 16; - sint32 heightMid = map_element_height(xMid, yMid); + sint32 heightMid = tile_element_height(xMid, yMid); gCommandPosition.x = xMid; gCommandPosition.y = yMid; @@ -1319,11 +1319,11 @@ static money32 map_change_surface_style(sint32 x0, sint32 y0, sint32 x1, sint32 if (!map_is_location_in_park(x, y)) continue; } - rct_map_element* mapElement = map_get_surface_element_at(x / 32, y / 32); + rct_tile_element* mapElement = map_get_surface_element_at(x / 32, y / 32); if (surfaceStyle != 0xFF){ uint8 cur_terrain = ( - map_element_get_direction(mapElement) << 3) | + tile_element_get_direction(mapElement) << 3) | (mapElement->properties.surface.terrain >> 5); if (surfaceStyle != cur_terrain) { @@ -1335,17 +1335,17 @@ static money32 map_change_surface_style(sint32 x0, sint32 y0, sint32 x1, sint32 } surfaceCost += TerrainPricing[style]; if (flags & 1){ - mapElement->properties.surface.terrain &= MAP_ELEMENT_WATER_HEIGHT_MASK; - mapElement->type &= MAP_ELEMENT_QUADRANT_MASK | MAP_ELEMENT_TYPE_MASK; + mapElement->properties.surface.terrain &= TILE_ELEMENT_WATER_HEIGHT_MASK; + mapElement->type &= TILE_ELEMENT_QUADRANT_MASK | TILE_ELEMENT_TYPE_MASK; //Save the new terrain mapElement->properties.surface.terrain |= surfaceStyle << 5; //Save the new direction mask - mapElement->type |= (surfaceStyle >> 3) & MAP_ELEMENT_DIRECTION_MASK; + mapElement->type |= (surfaceStyle >> 3) & TILE_ELEMENT_DIRECTION_MASK; map_invalidate_tile_full(x, y); - footpath_remove_litter(x, y, map_element_height(x, y)); + footpath_remove_litter(x, y, tile_element_height(x, y)); } } } @@ -1359,7 +1359,7 @@ static money32 map_change_surface_style(sint32 x0, sint32 y0, sint32 x1, sint32 edgeCost += 100; if (flags & 1){ - mapElement->properties.surface.slope &= MAP_ELEMENT_SLOPE_MASK; + mapElement->properties.surface.slope &= TILE_ELEMENT_SLOPE_MASK; mapElement->type &= 0x7F; //Save edge style @@ -1374,9 +1374,9 @@ static money32 map_change_surface_style(sint32 x0, sint32 y0, sint32 x1, sint32 if (flags & 1) { - if (!(mapElement->properties.surface.terrain & MAP_ELEMENT_SURFACE_TERRAIN_MASK)) + if (!(mapElement->properties.surface.terrain & TILE_ELEMENT_SURFACE_TERRAIN_MASK)) { - if (!(map_element_get_direction(mapElement))) + if (!(tile_element_get_direction(mapElement))) { if ((mapElement->properties.surface.grass_length & 7) != GRASS_LENGTH_CLEAR_0) { mapElement->properties.surface.grass_length = GRASS_LENGTH_CLEAR_0; @@ -1392,7 +1392,7 @@ static money32 map_change_surface_style(sint32 x0, sint32 y0, sint32 x1, sint32 LocationXYZ16 coord; coord.x = ((x0 + x1) / 2) + 16; coord.y = ((y0 + y1) / 2) + 16; - coord.z = map_element_height(coord.x, coord.y); + coord.z = tile_element_height(coord.x, coord.y); network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord); } @@ -1417,7 +1417,7 @@ void game_command_change_surface_style(sint32* eax, sint32* ebx, sint32* ecx, si } //0x00981A1E -static const uint8 map_element_raise_styles[5][32] = { +static const uint8 tile_element_raise_styles[5][32] = { { 0x01, 0x1B, 0x03, 0x1B, 0x05, 0x21, 0x07, 0x21, 0x09, 0x1B, 0x0B, 0x1B, 0x0D, 0x21, 0x20, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x23, 0x18, 0x19, 0x1A, 0x3B, 0x1C, 0x29, 0x24, 0x1F }, { 0x02, 0x03, 0x17, 0x17, 0x06, 0x07, 0x17, 0x17, 0x0A, 0x0B, 0x22, 0x22, 0x0E, 0x20, 0x22, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x37, 0x18, 0x19, 0x1A, 0x23, 0x1C, 0x28, 0x26, 0x1F }, { 0x04, 0x05, 0x06, 0x07, 0x1E, 0x24, 0x1E, 0x24, 0x0C, 0x0D, 0x0E, 0x20, 0x1E, 0x24, 0x1E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x26, 0x18, 0x19, 0x1A, 0x21, 0x1C, 0x2C, 0x3E, 0x1F }, @@ -1426,7 +1426,7 @@ static const uint8 map_element_raise_styles[5][32] = { }; //0x00981ABE -static const uint8 map_element_lower_styles[5][32] = { +static const uint8 tile_element_lower_styles[5][32] = { { 0x2E, 0x00, 0x2E, 0x02, 0x3E, 0x04, 0x3E, 0x06, 0x2E, 0x08, 0x2E, 0x0A, 0x3E, 0x0C, 0x3E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x06, 0x18, 0x19, 0x1A, 0x0B, 0x1C, 0x0C, 0x3E, 0x1F }, { 0x2D, 0x2D, 0x00, 0x01, 0x2D, 0x2D, 0x04, 0x05, 0x3D, 0x3D, 0x08, 0x09, 0x3D, 0x3D, 0x0C, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x07, 0x18, 0x19, 0x1A, 0x09, 0x1C, 0x3D, 0x0C, 0x1F }, { 0x2B, 0x3B, 0x2B, 0x3B, 0x00, 0x01, 0x02, 0x03, 0x2B, 0x3B, 0x2B, 0x3B, 0x08, 0x09, 0x0A, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x03, 0x18, 0x19, 0x1A, 0x3B, 0x1C, 0x09, 0x0E, 0x1F }, @@ -1438,11 +1438,11 @@ static const uint8 map_element_lower_styles[5][32] = { * * rct2: 0x00663CB9 */ -static sint32 map_set_land_height_clear_func(rct_map_element** map_element, sint32 x, sint32 y, uint8 flags, money32* price) { - if (map_element_get_type(*map_element) == MAP_ELEMENT_TYPE_SURFACE) +static sint32 map_set_land_height_clear_func(rct_tile_element** tile_element, sint32 x, sint32 y, uint8 flags, money32* price) { + if (tile_element_get_type(*tile_element) == TILE_ELEMENT_TYPE_SURFACE) return 0; - if (map_element_get_type(*map_element) == MAP_ELEMENT_TYPE_SCENERY) + if (tile_element_get_type(*tile_element) == TILE_ELEMENT_TYPE_SCENERY) return 0; return 1; @@ -1487,16 +1487,16 @@ static sint32 map_get_corner_height(sint32 z, sint32 slope, sint32 direction) return z; } -static sint32 map_element_get_corner_height(rct_map_element *mapElement, sint32 direction) +static sint32 tile_element_get_corner_height(rct_tile_element *mapElement, sint32 direction) { sint32 z = mapElement->base_height; - sint32 slope = mapElement->properties.surface.slope & MAP_ELEMENT_SLOPE_MASK; + sint32 slope = mapElement->properties.surface.slope & TILE_ELEMENT_SLOPE_MASK; return map_get_corner_height(z, slope, direction); } static money32 map_set_land_height(sint32 flags, sint32 x, sint32 y, sint32 height, sint32 style, sint32 selectionType) { - rct_map_element *mapElement; + rct_tile_element *mapElement; if (game_is_paused() && !gCheatsBuildInPauseMode) { gGameCommandErrorText = STR_CONSTRUCTION_NOT_POSSIBLE_WHILE_GAME_IS_PAUSED; @@ -1543,7 +1543,7 @@ static money32 map_set_land_height(sint32 flags, sint32 x, sint32 y, sint32 heig money32 cost = MONEY(0, 0); if(flags & GAME_COMMAND_FLAG_APPLY) { - footpath_remove_litter(x, y, map_element_height(x, y)); + footpath_remove_litter(x, y, tile_element_height(x, y)); if(!gCheatsDisableClearanceChecks) wall_remove_at(x, y, height * 8 - 16, height * 8 + 32); } @@ -1552,7 +1552,7 @@ static money32 map_set_land_height(sint32 flags, sint32 x, sint32 y, sint32 heig //Check for obstructing scenery mapElement = map_get_first_element_at(x / 32, y / 32); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_SCENERY) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_SCENERY) continue; if (height > mapElement->clearance_height) continue; @@ -1566,8 +1566,8 @@ static money32 map_set_land_height(sint32 flags, sint32 x, sint32 y, sint32 heig } cost += MONEY(sceneryEntry->small_scenery.removal_price, 0); if (flags & GAME_COMMAND_FLAG_APPLY) - map_element_remove(mapElement--); - } while (!map_element_is_last_for_tile(mapElement++)); + tile_element_remove(mapElement--); + } while (!tile_element_is_last_for_tile(mapElement++)); } //Check for ride support limits @@ -1575,7 +1575,7 @@ static money32 map_set_land_height(sint32 flags, sint32 x, sint32 y, sint32 heig { mapElement = map_get_first_element_at(x / 32, y / 32); do{ - if(map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) + if(tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; sint32 rideIndex = mapElement->properties.track.ride_index; sint32 maxHeight = get_ride_entry_by_ride(get_ride(rideIndex))->max_height; @@ -1587,12 +1587,12 @@ static money32 map_set_land_height(sint32 flags, sint32 x, sint32 y, sint32 heig gGameCommandErrorText = STR_SUPPORTS_CANT_BE_EXTENDED; return MONEY32_UNDEFINED; } - }while(!map_element_is_last_for_tile(mapElement++)); + }while(!tile_element_is_last_for_tile(mapElement++)); } uint8 zCorner = height; //z position of highest corner of tile - rct_map_element *surfaceElement = map_get_surface_element_at(x / 32, y / 32); - if(surfaceElement->type & MAP_ELEMENT_TYPE_FLAG_HIGHLIGHT) + rct_tile_element *surfaceElement = map_get_surface_element_at(x / 32, y / 32); + if(surfaceElement->type & TILE_ELEMENT_TYPE_FLAG_HIGHLIGHT) { sint32 waterHeight = map_get_water_height(surfaceElement); if(waterHeight != 0) @@ -1633,11 +1633,11 @@ static money32 map_set_land_height(sint32 flags, sint32 x, sint32 y, sint32 heig if (!gCheatsDisableClearanceChecks) { mapElement = map_get_first_element_at(x / 32, y / 32); do { - sint32 elementType = map_element_get_type(mapElement); + sint32 elementType = tile_element_get_type(mapElement); - if (elementType == MAP_ELEMENT_TYPE_WALL) + if (elementType == TILE_ELEMENT_TYPE_WALL) continue; - if (elementType == MAP_ELEMENT_TYPE_SCENERY) + if (elementType == TILE_ELEMENT_TYPE_SCENERY) continue; if (mapElement->flags & 0x10) continue; @@ -1657,12 +1657,12 @@ static money32 map_set_land_height(sint32 flags, sint32 x, sint32 y, sint32 heig map_obstruction_set_error_text(mapElement); return MONEY32_UNDEFINED; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); } for (sint32 i = 0; i < 4; i += 1) { - sint32 cornerHeight = map_element_get_corner_height(surfaceElement, i); - cornerHeight -= map_get_corner_height(height, style & MAP_ELEMENT_SLOPE_MASK, i); + sint32 cornerHeight = tile_element_get_corner_height(surfaceElement, i); + cornerHeight -= map_get_corner_height(height, style & TILE_ELEMENT_SLOPE_MASK, i); cost += MONEY(abs(cornerHeight) * 5 / 2, 0); } @@ -1672,18 +1672,18 @@ static money32 map_set_land_height(sint32 flags, sint32 x, sint32 y, sint32 heig LocationXYZ16 coord; coord.x = x + 16; coord.y = y + 16; - coord.z = map_element_height(coord.x, coord.y); + coord.z = tile_element_height(coord.x, coord.y); network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord); } surfaceElement = map_get_surface_element_at(x / 32, y / 32); surfaceElement->base_height = height; surfaceElement->clearance_height = height; - surfaceElement->properties.surface.slope &= MAP_ELEMENT_SLOPE_EDGE_STYLE_MASK; + surfaceElement->properties.surface.slope &= TILE_ELEMENT_SLOPE_EDGE_STYLE_MASK; surfaceElement->properties.surface.slope |= style; - sint32 slope = surfaceElement->properties.surface.terrain & MAP_ELEMENT_SLOPE_MASK; + sint32 slope = surfaceElement->properties.surface.terrain & TILE_ELEMENT_SLOPE_MASK; if(slope != 0 && slope <= height / 2) - surfaceElement->properties.surface.terrain &= MAP_ELEMENT_SURFACE_TERRAIN_MASK; + surfaceElement->properties.surface.terrain &= TILE_ELEMENT_SURFACE_TERRAIN_MASK; map_invalidate_tile_full(x, y); } if(gParkFlags & PARK_FLAGS_NO_MONEY) @@ -1726,7 +1726,7 @@ static money32 map_set_land_ownership(uint8 flags, sint16 x1, sint16 y1, sint16 x += 16; y += 16; - sint16 z = map_element_height(x, y) & 0xFFFF; + sint16 z = tile_element_height(x, y) & 0xFFFF; audio_play_sound_at_location(SOUND_PLACE_ITEM, x, y, z); return 0; } @@ -1763,9 +1763,9 @@ static uint8 map_get_lowest_land_height(sint32 xMin, sint32 xMax, sint32 yMin, s uint8 min_height = 0xFF; for (sint32 yi = yMin; yi <= yMax; yi += 32) { for (sint32 xi = xMin; xi <= xMax; xi += 32) { - rct_map_element *map_element = map_get_surface_element_at(xi / 32, yi / 32); - if (map_element != NULL && min_height > map_element->base_height) { - min_height = map_element->base_height; + rct_tile_element *tile_element = map_get_surface_element_at(xi / 32, yi / 32); + if (tile_element != NULL && min_height > tile_element->base_height) { + min_height = tile_element->base_height; } } } @@ -1782,12 +1782,12 @@ static uint8 map_get_highest_land_height(sint32 xMin, sint32 xMax, sint32 yMin, uint8 max_height = 0; for (sint32 yi = yMin; yi <= yMax; yi += 32) { for (sint32 xi = xMin; xi <= xMax; xi += 32) { - rct_map_element *map_element = map_get_surface_element_at(xi / 32, yi / 32); - if (map_element != NULL) { - uint8 base_height = map_element->base_height; - if (map_element->properties.surface.slope & 0xF) + rct_tile_element *tile_element = map_get_surface_element_at(xi / 32, yi / 32); + if (tile_element != NULL) { + uint8 base_height = tile_element->base_height; + if (tile_element->properties.surface.slope & 0xF) base_height += 2; - if (map_element->properties.surface.slope & 0x10) + if (tile_element->properties.surface.slope & 0x10) base_height += 2; if (max_height < base_height) max_height = base_height; @@ -1801,7 +1801,7 @@ static money32 raise_land(sint32 flags, sint32 x, sint32 y, sint32 z, sint32 ax, { money32 cost = 0; - if (selectionType < 0 || selectionType >= countof(map_element_raise_styles)) + if (selectionType < 0 || selectionType >= countof(tile_element_raise_styles)) { log_warning("Invalid selection type %d for raising land", selectionType); return MONEY32_UNDEFINED; @@ -1815,11 +1815,11 @@ static money32 raise_land(sint32 flags, sint32 x, sint32 y, sint32 z, sint32 ax, for (sint32 yi = ay; yi <= by; yi += 32) { for (sint32 xi = ax; xi <= bx; xi += 32) { - rct_map_element *map_element = map_get_surface_element_at(xi / 32, yi / 32); - if (map_element != NULL) { - uint8 height = map_element->base_height; + rct_tile_element *tile_element = map_get_surface_element_at(xi / 32, yi / 32); + if (tile_element != NULL) { + uint8 height = tile_element->base_height; if (height <= min_height){ - uint8 newStyle = map_element_raise_styles[selectionType][map_element->properties.surface.slope & MAP_ELEMENT_SLOPE_MASK]; + uint8 newStyle = tile_element_raise_styles[selectionType][tile_element->properties.surface.slope & TILE_ELEMENT_SLOPE_MASK]; if (newStyle & 0x20) { // needs to be raised height += 2; newStyle &= ~0x20; @@ -1862,16 +1862,16 @@ static money32 lower_land(sint32 flags, sint32 x, sint32 y, sint32 z, sint32 ax, for (sint32 yi = ay; yi <= by; yi += 32) { for (sint32 xi = ax; xi <= bx; xi += 32) { - rct_map_element *map_element = map_get_surface_element_at(xi / 32, yi / 32); - if (map_element != NULL) { - uint8 height = map_element->base_height; - if (map_element->properties.surface.slope & 0xF) + rct_tile_element *tile_element = map_get_surface_element_at(xi / 32, yi / 32); + if (tile_element != NULL) { + uint8 height = tile_element->base_height; + if (tile_element->properties.surface.slope & 0xF) height += 2; - if (map_element->properties.surface.slope & 0x10) + if (tile_element->properties.surface.slope & 0x10) height += 2; if (height >= max_height) { - height = map_element->base_height; - uint8 newStyle = map_element_lower_styles[selectionType][map_element->properties.surface.slope & MAP_ELEMENT_SLOPE_MASK]; + height = tile_element->base_height; + uint8 newStyle = tile_element_lower_styles[selectionType][tile_element->properties.surface.slope & TILE_ELEMENT_SLOPE_MASK]; if (newStyle & 0x20) { // needs to be lowered height -= 2; newStyle &= ~0x20; @@ -1896,9 +1896,9 @@ static money32 lower_land(sint32 flags, sint32 x, sint32 y, sint32 z, sint32 ax, return cost; } -sint32 map_get_water_height(const rct_map_element * mapElement) +sint32 map_get_water_height(const rct_tile_element * mapElement) { - return mapElement->properties.surface.terrain & MAP_ELEMENT_WATER_HEIGHT_MASK; + return mapElement->properties.surface.terrain & TILE_ELEMENT_WATER_HEIGHT_MASK; } money32 raise_water(sint16 x0, sint16 y0, sint16 x1, sint16 y1, uint8 flags) @@ -1915,11 +1915,11 @@ money32 raise_water(sint16 x0, sint16 y0, sint16 x1, sint16 y1, uint8 flags) for (sint32 yi = y0; yi <= y1; yi += 32) { for (sint32 xi = x0; xi <= x1; xi += 32) { - rct_map_element* map_element = map_get_surface_element_at(xi / 32, yi / 32); - if (map_element != NULL) { - uint8 height = map_element->base_height; - if (map_get_water_height(map_element) > 0) - height = map_get_water_height(map_element) * 2; + rct_tile_element* tile_element = map_get_surface_element_at(xi / 32, yi / 32); + if (tile_element != NULL) { + uint8 height = tile_element->base_height; + if (map_get_water_height(tile_element) > 0) + height = map_get_water_height(tile_element) * 2; if (max_height > height) max_height = height; } @@ -1928,17 +1928,17 @@ money32 raise_water(sint16 x0, sint16 y0, sint16 x1, sint16 y1, uint8 flags) for (sint32 yi = y0; yi <= y1; yi += 32) { for (sint32 xi = x0; xi <= x1; xi += 32) { - rct_map_element* map_element = map_get_surface_element_at(xi / 32, yi / 32); - if (map_element != NULL) { - if (map_element->base_height <= max_height){ - uint8 height = map_get_water_height(map_element); + rct_tile_element* tile_element = map_get_surface_element_at(xi / 32, yi / 32); + if (tile_element != NULL) { + if (tile_element->base_height <= max_height){ + uint8 height = map_get_water_height(tile_element); if (height != 0) { height *= 2; if (height > max_height) continue; height += 2; } else { - height = map_element->base_height + 2; + height = tile_element->base_height + 2; } money32 tileCost = game_do_command(xi, flags, yi, (max_height << 8) + height, GAME_COMMAND_SET_WATER_HEIGHT, 0, 0); @@ -1955,7 +1955,7 @@ money32 raise_water(sint16 x0, sint16 y0, sint16 x1, sint16 y1, uint8 flags) if (flags & GAME_COMMAND_FLAG_APPLY) { sint32 x = ((x0 + x1) / 2) + 16; sint32 y = ((y0 + y1) / 2) + 16; - sint32 z = map_element_height(x, y); + sint32 z = tile_element_height(x, y); sint16 water_height_z = z >> 16; sint16 base_height_z = z; z = water_height_z; @@ -1996,9 +1996,9 @@ money32 lower_water(sint16 x0, sint16 y0, sint16 x1, sint16 y1, uint8 flags) for (sint32 yi = y0; yi <= y1; yi += 32){ for (sint32 xi = x0; xi <= x1; xi += 32){ - rct_map_element* map_element = map_get_surface_element_at(xi / 32, yi / 32); - if (map_element != NULL) { - uint8 height = map_get_water_height(map_element); + rct_tile_element* tile_element = map_get_surface_element_at(xi / 32, yi / 32); + if (tile_element != NULL) { + uint8 height = map_get_water_height(tile_element); if (height != 0) { height *= 2; if (height > min_height) @@ -2010,9 +2010,9 @@ money32 lower_water(sint16 x0, sint16 y0, sint16 x1, sint16 y1, uint8 flags) for (sint32 yi = y0; yi <= y1; yi += 32) { for (sint32 xi = x0; xi <= x1; xi += 32) { - rct_map_element* map_element = map_get_surface_element_at(xi / 32, yi / 32); - if (map_element != NULL) { - uint8 height = map_get_water_height(map_element); + rct_tile_element* tile_element = map_get_surface_element_at(xi / 32, yi / 32); + if (tile_element != NULL) { + uint8 height = map_get_water_height(tile_element); if (height != 0) { height *= 2; if (height < min_height) @@ -2031,7 +2031,7 @@ money32 lower_water(sint16 x0, sint16 y0, sint16 x1, sint16 y1, uint8 flags) if (flags & GAME_COMMAND_FLAG_APPLY) { sint32 x = ((x0 + x1) / 2) + 16; sint32 y = ((y0 + y1) / 2) + 16; - sint32 z = map_element_height(x, y); + sint32 z = tile_element_height(x, y); sint16 water_height_z = z >> 16; sint16 base_height_z = z; z = water_height_z; @@ -2068,7 +2068,7 @@ void game_command_raise_land(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, *ebx, *eax, *ecx, - map_element_height(*eax, *ecx), + tile_element_height(*eax, *ecx), (sint16)(*edx & 0xFFFF), (sint16)(*ebp & 0xFFFF), *edx >> 16, @@ -2087,7 +2087,7 @@ void game_command_lower_land(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, *ebx, *eax, *ecx, - map_element_height(*eax, *ecx), + tile_element_height(*eax, *ecx), (sint16)(*edx & 0xFFFF), (sint16)(*ebp & 0xFFFF), *edx >> 16, @@ -2096,19 +2096,19 @@ void game_command_lower_land(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, ); } -static money32 smooth_land_tile(sint32 direction, uint8 flags, sint32 x, sint32 y, rct_map_element * mapElement, bool raiseLand) +static money32 smooth_land_tile(sint32 direction, uint8 flags, sint32 x, sint32 y, rct_tile_element * mapElement, bool raiseLand) { sint32 targetBaseZ = mapElement->base_height; - sint32 slope = mapElement->properties.surface.slope & MAP_ELEMENT_SLOPE_MASK; + sint32 slope = mapElement->properties.surface.slope & TILE_ELEMENT_SLOPE_MASK; if (raiseLand) { - slope = map_element_raise_styles[direction][slope]; + slope = tile_element_raise_styles[direction][slope]; if (slope & 0x20) { targetBaseZ += 2; slope &= ~0x20; } } else { - slope = map_element_lower_styles[direction][slope]; + slope = tile_element_lower_styles[direction][slope]; if (slope & 0x20) { targetBaseZ -= 2; slope &= ~0x20; @@ -2121,7 +2121,7 @@ static money32 smooth_land_row_by_edge(sint32 flags, sint32 x, sint32 y, sint32 { uint8 shouldContinue = 0xF; sint32 landChangePerTile = raiseLand ? -2 : 2; - rct_map_element *mapElement, *nextMapElement; + rct_tile_element *mapElement, *nextMapElement; money32 totalCost = 0; money32 result; @@ -2134,16 +2134,16 @@ static money32 smooth_land_row_by_edge(sint32 flags, sint32 x, sint32 y, sint32 if (mapElement == NULL || nextMapElement == NULL) { return 0; } - if (map_element_get_corner_height(mapElement, checkDirection1) != expectedLandHeight1 + (raiseLand ? -2 : 2)) { + if (tile_element_get_corner_height(mapElement, checkDirection1) != expectedLandHeight1 + (raiseLand ? -2 : 2)) { shouldContinue &= ~0x1; } - if (map_element_get_corner_height(mapElement, checkDirection2) != expectedLandHeight2 + (raiseLand ? -2 : 2)) { + if (tile_element_get_corner_height(mapElement, checkDirection2) != expectedLandHeight2 + (raiseLand ? -2 : 2)) { shouldContinue &= ~0x2; } - if (map_element_get_corner_height(mapElement, checkDirection1) != map_element_get_corner_height(nextMapElement, direction1)) { + if (tile_element_get_corner_height(mapElement, checkDirection1) != tile_element_get_corner_height(nextMapElement, direction1)) { shouldContinue &= ~0x1; } - if (map_element_get_corner_height(mapElement, checkDirection2) != map_element_get_corner_height(nextMapElement, direction2)) { + if (tile_element_get_corner_height(mapElement, checkDirection2) != tile_element_get_corner_height(nextMapElement, direction2)) { shouldContinue &= ~0x2; } while ((shouldContinue & 0x3) != 0) @@ -2163,16 +2163,16 @@ static money32 smooth_land_row_by_edge(sint32 flags, sint32 x, sint32 y, sint32 if (nextMapElement == NULL) { shouldContinue &= ~0x3; } - if (map_element_get_corner_height(mapElement, direction1) + landChangePerTile != map_element_get_corner_height(mapElement, checkDirection1)) { + if (tile_element_get_corner_height(mapElement, direction1) + landChangePerTile != tile_element_get_corner_height(mapElement, checkDirection1)) { shouldContinue &= ~0x1; } - if (map_element_get_corner_height(mapElement, direction2) + landChangePerTile != map_element_get_corner_height(mapElement, checkDirection2)) { + if (tile_element_get_corner_height(mapElement, direction2) + landChangePerTile != tile_element_get_corner_height(mapElement, checkDirection2)) { shouldContinue &= ~0x2; } - if ((shouldContinue & 0x1) && map_element_get_corner_height(mapElement, checkDirection1) != map_element_get_corner_height(nextMapElement, direction1)) { + if ((shouldContinue & 0x1) && tile_element_get_corner_height(mapElement, checkDirection1) != tile_element_get_corner_height(nextMapElement, direction1)) { shouldContinue &= ~0x1; } - if ((shouldContinue & 0x2) && map_element_get_corner_height(mapElement, checkDirection2) != map_element_get_corner_height(nextMapElement, direction2)) { + if ((shouldContinue & 0x2) && tile_element_get_corner_height(mapElement, checkDirection2) != tile_element_get_corner_height(nextMapElement, direction2)) { shouldContinue &= ~0x2; } } @@ -2180,11 +2180,11 @@ static money32 smooth_land_row_by_edge(sint32 flags, sint32 x, sint32 y, sint32 // change land of current tile sint32 targetBaseZ = mapElement->base_height; - sint32 slope = mapElement->properties.surface.slope & MAP_ELEMENT_SLOPE_MASK; + sint32 slope = mapElement->properties.surface.slope & TILE_ELEMENT_SLOPE_MASK; sint32 oldSlope = slope; if (raiseLand) { if (shouldContinue & 0x4) { - slope = map_element_raise_styles[direction1][slope]; + slope = tile_element_raise_styles[direction1][slope]; if (slope & 0x20) { targetBaseZ += 2; slope &= ~0x20; @@ -2194,7 +2194,7 @@ static money32 smooth_land_row_by_edge(sint32 flags, sint32 x, sint32 y, sint32 map_get_corner_height(mapElement->base_height, oldSlope, direction2) == map_get_corner_height(targetBaseZ, slope, direction2)) { - slope = map_element_raise_styles[direction2][slope]; + slope = tile_element_raise_styles[direction2][slope]; if (slope & 0x20) { targetBaseZ += 2; slope &= ~0x20; @@ -2204,7 +2204,7 @@ static money32 smooth_land_row_by_edge(sint32 flags, sint32 x, sint32 y, sint32 else { if (shouldContinue & 0x4) { - slope = map_element_lower_styles[direction1][slope]; + slope = tile_element_lower_styles[direction1][slope]; if (slope & 0x20) { targetBaseZ -= 2; slope &= ~0x20; @@ -2214,7 +2214,7 @@ static money32 smooth_land_row_by_edge(sint32 flags, sint32 x, sint32 y, sint32 map_get_corner_height(mapElement->base_height, oldSlope, direction2) == map_get_corner_height(targetBaseZ, slope, direction2)) { - slope = map_element_lower_styles[direction2][slope]; + slope = tile_element_lower_styles[direction2][slope]; if (slope & 0x20) { targetBaseZ -= 2; slope &= ~0x20; @@ -2232,7 +2232,7 @@ static money32 smooth_land_row_by_edge(sint32 flags, sint32 x, sint32 y, sint32 static money32 smooth_land_row_by_corner(sint32 flags, sint32 x, sint32 y, sint32 expectedLandHeight, sint32 stepX, sint32 stepY, sint32 direction, sint32 checkDirection, bool raiseLand) { bool shouldContinue = true; - rct_map_element *mapElement, *nextMapElement; + rct_tile_element *mapElement, *nextMapElement; money32 totalCost = 0; money32 result; sint32 landChangePerTile; @@ -2254,10 +2254,10 @@ static money32 smooth_land_row_by_corner(sint32 flags, sint32 x, sint32 y, sint3 if (mapElement == NULL || nextMapElement == NULL) { return 0; } - if (map_element_get_corner_height(mapElement, checkDirection) != expectedLandHeight + (raiseLand ? -2 : 2)) { + if (tile_element_get_corner_height(mapElement, checkDirection) != expectedLandHeight + (raiseLand ? -2 : 2)) { return 0; } - if (map_element_get_corner_height(mapElement, checkDirection) != map_element_get_corner_height(nextMapElement, direction)) { + if (tile_element_get_corner_height(mapElement, checkDirection) != tile_element_get_corner_height(nextMapElement, direction)) { return 0; } while (shouldContinue) @@ -2276,10 +2276,10 @@ static money32 smooth_land_row_by_corner(sint32 flags, sint32 x, sint32 y, sint3 if (nextMapElement == NULL) { shouldContinue = false; } - if (map_element_get_corner_height(mapElement, direction) + landChangePerTile != map_element_get_corner_height(mapElement, checkDirection)) { + if (tile_element_get_corner_height(mapElement, direction) + landChangePerTile != tile_element_get_corner_height(mapElement, checkDirection)) { shouldContinue = false; } - if (shouldContinue && map_element_get_corner_height(mapElement, checkDirection) != map_element_get_corner_height(nextMapElement, direction)) { + if (shouldContinue && tile_element_get_corner_height(mapElement, checkDirection) != tile_element_get_corner_height(nextMapElement, direction)) { shouldContinue = false; } } @@ -2308,7 +2308,7 @@ static money32 smooth_land(sint32 flags, sint32 centreX, sint32 centreY, sint32 bool raiseLand = command < 0x7FFF; sint32 commandType = raiseLand ? GAME_COMMAND_RAISE_LAND : GAME_COMMAND_LOWER_LAND; - sint32 centreZ = map_element_height(centreX, centreY); + sint32 centreZ = tile_element_height(centreX, centreY); sint32 mapLeftRight = mapLeft | (mapRight << 16); sint32 mapTopBottom = mapTop | (mapBottom << 16); bool fullTile = ((command & 0x7FFF) == MAP_SELECT_TYPE_FULL); @@ -2321,7 +2321,7 @@ static money32 smooth_land(sint32 flags, sint32 centreX, sint32 centreY, sint32 money32 totalCost = 0; money32 result; - rct_map_element *mapElement = map_get_surface_element_at(mapLeft >> 5, mapTop >> 5); + rct_tile_element *mapElement = map_get_surface_element_at(mapLeft >> 5, mapTop >> 5); if (mapElement == NULL) { log_warning("Invalid coordinates for land smoothing, x = %d, y = %d", mapLeft, mapTop); @@ -2332,7 +2332,7 @@ static money32 smooth_land(sint32 flags, sint32 centreX, sint32 centreY, sint32 LocationXYZ16 coord; coord.x = centreX + 16; coord.y = centreY + 16; - coord.z = map_element_height(coord.x, coord.y); + coord.z = tile_element_height(coord.x, coord.y); network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord); } @@ -2360,16 +2360,16 @@ static money32 smooth_land(sint32 flags, sint32 centreX, sint32 centreY, sint32 { // One corner tile selected newBaseZ = mapElement->base_height; - newSlope = mapElement->properties.surface.slope & MAP_ELEMENT_SLOPE_MASK; + newSlope = mapElement->properties.surface.slope & TILE_ELEMENT_SLOPE_MASK; if (commandType == GAME_COMMAND_RAISE_LAND) { - newSlope = map_element_raise_styles[command & 0xFF][newSlope]; + newSlope = tile_element_raise_styles[command & 0xFF][newSlope]; if (newSlope & 0x20) { newBaseZ += 2; newSlope &= ~0x20; } } else { - newSlope = map_element_lower_styles[command & 0xFF][newSlope]; + newSlope = tile_element_lower_styles[command & 0xFF][newSlope]; if (newSlope & 0x20) { newBaseZ -= 2; newSlope &= ~0x20; @@ -2380,16 +2380,16 @@ static money32 smooth_land(sint32 flags, sint32 centreX, sint32 centreY, sint32 // Then do the smoothing if (fullTile) { // Smooth the corners - sint32 z = clamp(minHeight, map_element_get_corner_height(mapElement, 2), maxHeight); + sint32 z = clamp(minHeight, tile_element_get_corner_height(mapElement, 2), maxHeight); totalCost += smooth_land_row_by_corner(flags, mapLeft, mapTop, z, -32, -32, 0, 2, raiseLand); mapElement = map_get_surface_element_at(mapLeft >> 5, mapBottom >> 5); - z = clamp(minHeight, map_element_get_corner_height(mapElement, 3), maxHeight); + z = clamp(minHeight, tile_element_get_corner_height(mapElement, 3), maxHeight); totalCost += smooth_land_row_by_corner(flags, mapLeft, mapBottom, z, -32, 32, 1, 3, raiseLand); mapElement = map_get_surface_element_at(mapRight >> 5, mapBottom >> 5); - z = clamp(minHeight, map_element_get_corner_height(mapElement, 0), maxHeight); + z = clamp(minHeight, tile_element_get_corner_height(mapElement, 0), maxHeight); totalCost += smooth_land_row_by_corner(flags, mapRight, mapBottom, z, 32, 32, 2, 0, raiseLand); mapElement = map_get_surface_element_at(mapRight >> 5, mapTop >> 5); - z = clamp(minHeight, map_element_get_corner_height(mapElement, 1), maxHeight); + z = clamp(minHeight, tile_element_get_corner_height(mapElement, 1), maxHeight); totalCost += smooth_land_row_by_corner(flags, mapRight, mapTop, z, 32, -32, 3, 1, raiseLand); // Smooth the edges @@ -2398,32 +2398,32 @@ static money32 smooth_land(sint32 flags, sint32 centreX, sint32 centreY, sint32 for (y = mapTop; y <= mapBottom; y += 32) { mapElement = map_get_surface_element_at(x >> 5, y >> 5); - z = clamp(minHeight, map_element_get_corner_height(mapElement, 3), maxHeight); - z2 = clamp(minHeight, map_element_get_corner_height(mapElement, 2), maxHeight); + z = clamp(minHeight, tile_element_get_corner_height(mapElement, 3), maxHeight); + z2 = clamp(minHeight, tile_element_get_corner_height(mapElement, 2), maxHeight); totalCost += smooth_land_row_by_edge(flags, x, y, z, z2, -32, 0, 0, 1, 3, 2, raiseLand); } x = mapRight; for (y = mapTop; y <= mapBottom; y += 32) { mapElement = map_get_surface_element_at(x >> 5, y >> 5); - z = clamp(minHeight, map_element_get_corner_height(mapElement, 1), maxHeight); - z2 = clamp(minHeight, map_element_get_corner_height(mapElement, 0), maxHeight); + z = clamp(minHeight, tile_element_get_corner_height(mapElement, 1), maxHeight); + z2 = clamp(minHeight, tile_element_get_corner_height(mapElement, 0), maxHeight); totalCost += smooth_land_row_by_edge(flags, x, y, z, z2, 32, 0, 2, 3, 1, 0, raiseLand); } y = mapTop; for (x = mapLeft; x <= mapRight; x += 32) { mapElement = map_get_surface_element_at(x >> 5, y >> 5); - z = clamp(minHeight, map_element_get_corner_height(mapElement, 1), maxHeight); - z2 = clamp(minHeight, map_element_get_corner_height(mapElement, 2), maxHeight); + z = clamp(minHeight, tile_element_get_corner_height(mapElement, 1), maxHeight); + z2 = clamp(minHeight, tile_element_get_corner_height(mapElement, 2), maxHeight); totalCost += smooth_land_row_by_edge(flags, x, y, z, z2, 0, -32, 0, 3, 1, 2, raiseLand); } y = mapBottom; for (x = mapLeft; x <= mapRight; x += 32) { mapElement = map_get_surface_element_at(x >> 5, y >> 5); - z = clamp(minHeight, map_element_get_corner_height(mapElement, 0), maxHeight); - z2 = clamp(minHeight, map_element_get_corner_height(mapElement, 3), maxHeight); + z = clamp(minHeight, tile_element_get_corner_height(mapElement, 0), maxHeight); + z2 = clamp(minHeight, tile_element_get_corner_height(mapElement, 3), maxHeight); totalCost += smooth_land_row_by_edge(flags, x, y, z, z2, 0, 32, 1, 2, 0, 3, raiseLand); } } @@ -2591,18 +2591,18 @@ void game_command_set_water_height(sint32* eax, sint32* ebx, sint32* ecx, sint32 } if(*ebx & GAME_COMMAND_FLAG_APPLY){ - sint32 element_height = map_element_height(x, y); + sint32 element_height = tile_element_height(x, y); footpath_remove_litter(x, y, element_height); if(!gCheatsDisableClearanceChecks) wall_remove_at_z(x, y, element_height); } - rct_map_element* map_element = map_get_surface_element_at(x / 32, y / 32); - sint32 zHigh = map_element->base_height; + rct_tile_element* tile_element = map_get_surface_element_at(x / 32, y / 32); + sint32 zHigh = tile_element->base_height; sint32 zLow = base_height; - if (map_get_water_height(map_element) > 0) + if (map_get_water_height(tile_element) > 0) { - zHigh = map_get_water_height(map_element) * 2; + zHigh = map_get_water_height(tile_element) * 2; } if(zLow > zHigh){ sint32 temp = zHigh; @@ -2611,17 +2611,17 @@ void game_command_set_water_height(sint32* eax, sint32* ebx, sint32* ecx, sint32 } if (gCheatsDisableClearanceChecks || map_can_construct_at(x, y, zLow, zHigh, 0xFF)) { - if(map_element->type & 0x40){ + if(tile_element->type & 0x40){ gGameCommandErrorText = 0; *ebx = MONEY32_UNDEFINED; return; } if(*ebx & GAME_COMMAND_FLAG_APPLY){ - sint32 new_terrain = map_element->properties.surface.terrain & 0xE0; - if(base_height > map_element->base_height){ + sint32 new_terrain = tile_element->properties.surface.terrain & 0xE0; + if(base_height > tile_element->base_height){ new_terrain |= (base_height / 2); } - map_element->properties.surface.terrain = new_terrain; + tile_element->properties.surface.terrain = new_terrain; map_invalidate_tile_full(x, y); } *ebx = 250; @@ -2653,7 +2653,7 @@ void game_command_place_large_scenery(sint32* eax, sint32* ebx, sint32* ecx, sin uint8 flags = *ebx; uint8 rotation = *ebx >> 8; uint8 entry_index = *edi; - sint32 base_height = map_element_height(x, y); + sint32 base_height = tile_element_height(x, y); gCommandPosition.x = x + 16; gCommandPosition.y = y + 16; gCommandPosition.z = base_height; @@ -2725,13 +2725,13 @@ void game_command_place_large_scenery(sint32* eax, sint32* ebx, sint32* ecx, sin continue; } - rct_map_element* map_element = map_get_surface_element_at(curTile.x / 32, curTile.y / 32); - if(map_element != NULL){ - sint32 height = map_element->base_height * 8; + rct_tile_element* tile_element = map_get_surface_element_at(curTile.x / 32, curTile.y / 32); + if(tile_element != NULL){ + sint32 height = tile_element->base_height * 8; - if(map_element->properties.scenerymultiple.type & 0xF){ + if(tile_element->properties.scenerymultiple.type & 0xF){ height += 16; - if(map_element->properties.scenerymultiple.type & 0x10){ + if(tile_element->properties.scenerymultiple.type & 0x10){ height += 16; } } @@ -2822,36 +2822,36 @@ void game_command_place_large_scenery(sint32* eax, sint32* ebx, sint32* ecx, sin LocationXYZ16 coord; coord.x = x + 16; coord.y = y + 16; - coord.z = map_element_height(coord.x, coord.y); + coord.z = tile_element_height(coord.x, coord.y); network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord); } - rct_map_element *new_map_element = map_element_insert(curTile.x / 32, curTile.y / 32, zLow, F43887); - assert(new_map_element != NULL); + rct_tile_element *new_tile_element = tile_element_insert(curTile.x / 32, curTile.y / 32, zLow, F43887); + assert(new_tile_element != NULL); map_animation_create(MAP_ANIMATION_TYPE_LARGE_SCENERY, curTile.x, curTile.y, zLow); - new_map_element->clearance_height = zHigh; - new_map_element->type = MAP_ELEMENT_TYPE_SCENERY_MULTIPLE | rotation; + new_tile_element->clearance_height = zHigh; + new_tile_element->type = TILE_ELEMENT_TYPE_SCENERY_MULTIPLE | rotation; - new_map_element->properties.scenerymultiple.type = + new_tile_element->properties.scenerymultiple.type = (tile_num << 10) | entry_index; - new_map_element->properties.scenerymultiple.colour[0] = colour1; - new_map_element->properties.scenerymultiple.colour[1] = colour2; + new_tile_element->properties.scenerymultiple.colour[0] = colour1; + new_tile_element->properties.scenerymultiple.colour[1] = colour2; if (banner_id != 0xFF) { - new_map_element->type |= banner_id & 0xC0; - new_map_element->properties.scenerymultiple.colour[0] |= (banner_id & 0x38) << 2; - new_map_element->properties.scenerymultiple.colour[1] |= (banner_id & 7) << 5; + new_tile_element->type |= banner_id & 0xC0; + new_tile_element->properties.scenerymultiple.colour[0] |= (banner_id & 0x38) << 2; + new_tile_element->properties.scenerymultiple.colour[1] |= (banner_id & 7) << 5; } if (flags & GAME_COMMAND_FLAG_GHOST) { - new_map_element->flags |= MAP_ELEMENT_FLAG_GHOST; + new_tile_element->flags |= TILE_ELEMENT_FLAG_GHOST; } if (tile_num == 0) { - gSceneryMapElement = new_map_element; + gSceneryMapElement = new_tile_element; } map_invalidate_tile_full(curTile.x, curTile.y); } @@ -2866,34 +2866,34 @@ void game_command_place_large_scenery(sint32* eax, sint32* ebx, sint32* ecx, sin } } -sint32 map_element_get_station(const rct_map_element * mapElement) +sint32 tile_element_get_station(const rct_tile_element * mapElement) { return (mapElement->properties.track.sequence & MAP_ELEM_TRACK_SEQUENCE_STATION_INDEX_MASK) >> 4; } -void map_element_set_station(rct_map_element * mapElement, uint32 stationIndex) +void tile_element_set_station(rct_tile_element * mapElement, uint32 stationIndex) { mapElement->properties.track.sequence &= ~MAP_ELEM_TRACK_SEQUENCE_STATION_INDEX_MASK; mapElement->properties.track.sequence |= (stationIndex << 4); } -sint32 map_element_get_track_sequence(const rct_map_element * mapElement) +sint32 tile_element_get_track_sequence(const rct_tile_element * mapElement) { return mapElement->properties.track.sequence & MAP_ELEM_TRACK_SEQUENCE_SEQUENCE_MASK; } -void map_element_set_track_sequence(rct_map_element * mapElement, sint32 trackSequence) +void tile_element_set_track_sequence(rct_tile_element * mapElement, sint32 trackSequence) { mapElement->properties.track.sequence &= ~MAP_ELEM_TRACK_SEQUENCE_SEQUENCE_MASK; mapElement->properties.track.sequence |= (trackSequence & MAP_ELEM_TRACK_SEQUENCE_SEQUENCE_MASK); } -bool map_element_get_green_light(const rct_map_element * mapElement) +bool tile_element_get_green_light(const rct_tile_element * mapElement) { return (mapElement->properties.track.sequence & MAP_ELEM_TRACK_SEQUENCE_GREEN_LIGHT) != 0; } -void map_element_set_green_light(rct_map_element * mapElement, bool greenLight) +void tile_element_set_green_light(rct_tile_element * mapElement, bool greenLight) { mapElement->properties.track.sequence &= ~MAP_ELEM_TRACK_SEQUENCE_GREEN_LIGHT; if (greenLight) @@ -2902,28 +2902,28 @@ void map_element_set_green_light(rct_map_element * mapElement, bool greenLight) } } -sint32 map_element_get_brake_booster_speed(const rct_map_element *mapElement) +sint32 tile_element_get_brake_booster_speed(const rct_tile_element *mapElement) { return (mapElement->properties.track.sequence >> 4) << 1; } -void map_element_set_brake_booster_speed(rct_map_element *mapElement, sint32 speed) +void tile_element_set_brake_booster_speed(rct_tile_element *mapElement, sint32 speed) { - mapElement->properties.track.sequence = map_element_get_track_sequence(mapElement) | ((speed >> 1) << 4); + mapElement->properties.track.sequence = tile_element_get_track_sequence(mapElement) | ((speed >> 1) << 4); } -bool map_element_is_taking_photo(const rct_map_element * mapElement) +bool tile_element_is_taking_photo(const rct_tile_element * mapElement) { return (mapElement->properties.track.sequence & MAP_ELEM_TRACK_SEQUENCE_TAKING_PHOTO_MASK) != 0; } -void map_element_set_onride_photo_timeout(rct_map_element * mapElement) +void tile_element_set_onride_photo_timeout(rct_tile_element * mapElement) { mapElement->properties.track.sequence &= MAP_ELEM_TRACK_SEQUENCE_SEQUENCE_MASK; mapElement->properties.track.sequence |= (3 << 4); } -void map_element_decrement_onride_photo_timout(rct_map_element * mapElement) +void tile_element_decrement_onride_photo_timout(rct_tile_element * mapElement) { // We should only touch the upper 4 bits, avoid underflow into the lower 4. if (mapElement->properties.track.sequence & MAP_ELEM_TRACK_SEQUENCE_TAKING_PHOTO_MASK) @@ -2936,19 +2936,19 @@ void map_element_decrement_onride_photo_timout(rct_map_element * mapElement) * * rct2: 0x0068B280 */ -void map_element_remove(rct_map_element *mapElement) +void tile_element_remove(rct_tile_element *mapElement) { // Replace Nth element by (N+1)th element. // This loop will make mapElement point to the old last element position, // after copy it to it's new position - if (!map_element_is_last_for_tile(mapElement)){ + if (!tile_element_is_last_for_tile(mapElement)){ do{ *mapElement = *(mapElement + 1); - } while (!map_element_is_last_for_tile(++mapElement)); + } while (!tile_element_is_last_for_tile(++mapElement)); } // Mark the latest element with the last element flag. - (mapElement - 1)->flags |= MAP_ELEMENT_FLAG_LAST_TILE; + (mapElement - 1)->flags |= TILE_ELEMENT_FLAG_LAST_TILE; mapElement->base_height = 0xFF; if ((mapElement + 1) == gNextFreeMapElement){ @@ -2962,30 +2962,30 @@ void map_element_remove(rct_map_element *mapElement) */ void map_remove_all_rides() { - map_element_iterator it; + tile_element_iterator it; - map_element_iterator_begin(&it); + tile_element_iterator_begin(&it); do { - switch (map_element_get_type(it.element)) { - case MAP_ELEMENT_TYPE_PATH: + switch (tile_element_get_type(it.element)) { + case TILE_ELEMENT_TYPE_PATH: if (it.element->type & 1) { it.element->properties.path.type &= ~8; it.element->properties.path.addition_status = 255; } break; - case MAP_ELEMENT_TYPE_ENTRANCE: + case TILE_ELEMENT_TYPE_ENTRANCE: if (it.element->properties.entrance.type == ENTRANCE_TYPE_PARK_ENTRANCE) break; // fall-through - case MAP_ELEMENT_TYPE_TRACK: + case TILE_ELEMENT_TYPE_TRACK: footpath_queue_chain_reset(); footpath_remove_edges_at(it.x * 32, it.y * 32, it.element); - map_element_remove(it.element); - map_element_iterator_restart_for_tile(&it); + tile_element_remove(it.element); + tile_element_iterator_restart_for_tile(&it); break; } - } while (map_element_iterator_next(&it)); + } while (tile_element_iterator_next(&it)); } /** @@ -3074,10 +3074,10 @@ void map_reorganise_elements() { context_setcurrentcursor(CURSOR_ZZZ); - rct_map_element* new_map_elements = malloc(3 * (MAXIMUM_MAP_SIZE_TECHNICAL * MAXIMUM_MAP_SIZE_TECHNICAL) * sizeof(rct_map_element)); - rct_map_element* new_elements_pointer = new_map_elements; + rct_tile_element* new_tile_elements = malloc(3 * (MAXIMUM_MAP_SIZE_TECHNICAL * MAXIMUM_MAP_SIZE_TECHNICAL) * sizeof(rct_tile_element)); + rct_tile_element* new_elements_pointer = new_tile_elements; - if (new_map_elements == NULL) { + if (new_tile_elements == NULL) { log_fatal("Unable to allocate memory for map elements."); return; } @@ -3086,21 +3086,21 @@ void map_reorganise_elements() for (sint32 y = 0; y < MAXIMUM_MAP_SIZE_TECHNICAL; y++) { for (sint32 x = 0; x < MAXIMUM_MAP_SIZE_TECHNICAL; x++) { - rct_map_element *startElement = map_get_first_element_at(x, y); - rct_map_element *endElement = startElement; - while (!map_element_is_last_for_tile(endElement++)); + rct_tile_element *startElement = map_get_first_element_at(x, y); + rct_tile_element *endElement = startElement; + while (!tile_element_is_last_for_tile(endElement++)); num_elements = (uint32)(endElement - startElement); - memcpy(new_elements_pointer, startElement, num_elements * sizeof(rct_map_element)); + memcpy(new_elements_pointer, startElement, num_elements * sizeof(rct_tile_element)); new_elements_pointer += num_elements; } } - num_elements = (uint32)(new_elements_pointer - new_map_elements); - memcpy(gMapElements, new_map_elements, num_elements * sizeof(rct_map_element)); - memset(gMapElements + num_elements, 0, (3 * (MAXIMUM_MAP_SIZE_TECHNICAL * MAXIMUM_MAP_SIZE_TECHNICAL) - num_elements) * sizeof(rct_map_element)); + num_elements = (uint32)(new_elements_pointer - new_tile_elements); + memcpy(gMapElements, new_tile_elements, num_elements * sizeof(rct_tile_element)); + memset(gMapElements + num_elements, 0, (3 * (MAXIMUM_MAP_SIZE_TECHNICAL * MAXIMUM_MAP_SIZE_TECHNICAL) - num_elements) * sizeof(rct_tile_element)); - free(new_map_elements); + free(new_tile_elements); map_update_tile_pointers(); } @@ -3113,18 +3113,18 @@ void map_reorganise_elements() */ bool map_check_free_elements_and_reorganise(sint32 num_elements) { - if ((gNextFreeMapElement + num_elements) <= gMapElements + MAX_MAP_ELEMENTS) + if ((gNextFreeMapElement + num_elements) <= gMapElements + MAX_TILE_ELEMENTS) return true; for (sint32 i = 1000; i != 0; --i) sub_68B089(); - if ((gNextFreeMapElement + num_elements) <= gMapElements + MAX_MAP_ELEMENTS) + if ((gNextFreeMapElement + num_elements) <= gMapElements + MAX_TILE_ELEMENTS) return true; map_reorganise_elements(); - if ((gNextFreeMapElement + num_elements) <= gMapElements + MAX_MAP_ELEMENTS) + if ((gNextFreeMapElement + num_elements) <= gMapElements + MAX_TILE_ELEMENTS) return true; else{ gGameCommandErrorText = STR_ERR_LANDSCAPE_DATA_AREA_FULL; @@ -3136,9 +3136,9 @@ bool map_check_free_elements_and_reorganise(sint32 num_elements) * * rct2: 0x0068B1F6 */ -rct_map_element *map_element_insert(sint32 x, sint32 y, sint32 z, sint32 flags) +rct_tile_element *tile_element_insert(sint32 x, sint32 y, sint32 z, sint32 flags) { - rct_map_element *originalMapElement, *newMapElement, *insertedElement; + rct_tile_element *originalMapElement, *newMapElement, *insertedElement; if (!map_check_free_elements_and_reorganise(1)) { log_error("Cannot insert new element"); @@ -3159,10 +3159,10 @@ rct_map_element *map_element_insert(sint32 x, sint32 y, sint32 z, sint32 flags) originalMapElement++; newMapElement++; - if ((newMapElement - 1)->flags & MAP_ELEMENT_FLAG_LAST_TILE) { + if ((newMapElement - 1)->flags & TILE_ELEMENT_FLAG_LAST_TILE) { // No more elements above the insert element - (newMapElement - 1)->flags &= ~MAP_ELEMENT_FLAG_LAST_TILE; - flags |= MAP_ELEMENT_FLAG_LAST_TILE; + (newMapElement - 1)->flags &= ~TILE_ELEMENT_FLAG_LAST_TILE; + flags |= TILE_ELEMENT_FLAG_LAST_TILE; break; } } @@ -3176,14 +3176,14 @@ rct_map_element *map_element_insert(sint32 x, sint32 y, sint32 z, sint32 flags) newMapElement++; // Insert rest of map elements above insert height - if (!(flags & MAP_ELEMENT_FLAG_LAST_TILE)) { + if (!(flags & TILE_ELEMENT_FLAG_LAST_TILE)) { do { // Copy over map element *newMapElement = *originalMapElement; originalMapElement->base_height = 255; originalMapElement++; newMapElement++; - } while (!((newMapElement - 1)->flags & MAP_ELEMENT_FLAG_LAST_TILE)); + } while (!((newMapElement - 1)->flags & TILE_ELEMENT_FLAG_LAST_TILE)); } gNextFreeMapElement = newMapElement; @@ -3195,12 +3195,12 @@ rct_map_element *map_element_insert(sint32 x, sint32 y, sint32 z, sint32 flags) * the user-accessible part of map elements, there is some scratch space behind that is not * considered valid here. */ -bool map_element_check_address(const rct_map_element * const element) +bool tile_element_check_address(const rct_tile_element * const element) { if (element >= gMapElements - && element < gMapElements + MAX_MAP_ELEMENTS + && element < gMapElements + MAX_TILE_ELEMENTS // condition below checks alignment - && gMapElements + (((uintptr_t)element - (uintptr_t)gMapElements) / sizeof(rct_map_element)) == element) + && gMapElements + (((uintptr_t)element - (uintptr_t)gMapElements) / sizeof(rct_tile_element)) == element) { return true; } @@ -3211,32 +3211,32 @@ bool map_element_check_address(const rct_map_element * const element) * * rct2: 0x0068BB18 */ -void map_obstruction_set_error_text(rct_map_element *mapElement) +void map_obstruction_set_error_text(rct_tile_element *mapElement) { rct_string_id errorStringId; Ride *ride; rct_scenery_entry *sceneryEntry; errorStringId = STR_OBJECT_IN_THE_WAY; - switch (map_element_get_type(mapElement)) { - case MAP_ELEMENT_TYPE_SURFACE: + switch (tile_element_get_type(mapElement)) { + case TILE_ELEMENT_TYPE_SURFACE: errorStringId = STR_RAISE_OR_LOWER_LAND_FIRST; break; - case MAP_ELEMENT_TYPE_PATH: + case TILE_ELEMENT_TYPE_PATH: errorStringId = STR_FOOTPATH_IN_THE_WAY; break; - case MAP_ELEMENT_TYPE_TRACK: + case TILE_ELEMENT_TYPE_TRACK: ride = get_ride(mapElement->properties.track.ride_index); errorStringId = STR_X_IN_THE_WAY; set_format_arg(0, rct_string_id, ride->name); set_format_arg(2, uint32, ride->name_arguments); break; - case MAP_ELEMENT_TYPE_SCENERY: + case TILE_ELEMENT_TYPE_SCENERY: sceneryEntry = get_small_scenery_entry(mapElement->properties.scenery.type); errorStringId = STR_X_IN_THE_WAY; set_format_arg(0, rct_string_id, sceneryEntry->name); break; - case MAP_ELEMENT_TYPE_ENTRANCE: + case TILE_ELEMENT_TYPE_ENTRANCE: switch (mapElement->properties.entrance.type) { case ENTRANCE_TYPE_RIDE_ENTRANCE: errorStringId = STR_RIDE_ENTRANCE_IN_THE_WAY; @@ -3249,12 +3249,12 @@ void map_obstruction_set_error_text(rct_map_element *mapElement) break; } break; - case MAP_ELEMENT_TYPE_WALL: + case TILE_ELEMENT_TYPE_WALL: sceneryEntry = get_wall_entry(mapElement->properties.scenery.type); errorStringId = STR_X_IN_THE_WAY; set_format_arg(0, rct_string_id, sceneryEntry->name); break; - case MAP_ELEMENT_TYPE_SCENERY_MULTIPLE: + case TILE_ELEMENT_TYPE_SCENERY_MULTIPLE: sceneryEntry = get_large_scenery_entry(mapElement->properties.scenery.type); errorStringId = STR_X_IN_THE_WAY; set_format_arg(0, rct_string_id, sceneryEntry->name); @@ -3281,18 +3281,18 @@ sint32 map_can_construct_with_clear_at(sint32 x, sint32 y, sint32 zLow, sint32 z gGameCommandErrorText = STR_OFF_EDGE_OF_MAP; return false; } - rct_map_element* map_element = map_get_first_element_at(x / 32, y / 32); + rct_tile_element* tile_element = map_get_first_element_at(x / 32, y / 32); do { - if (map_element_get_type(map_element) != MAP_ELEMENT_TYPE_SURFACE) { - if (zLow < map_element->clearance_height && zHigh > map_element->base_height && !(map_element->flags & MAP_ELEMENT_FLAG_GHOST)) { - if (map_element->flags & (bl & 0x0F)) { + if (tile_element_get_type(tile_element) != TILE_ELEMENT_TYPE_SURFACE) { + if (zLow < tile_element->clearance_height && zHigh > tile_element->base_height && !(tile_element->flags & TILE_ELEMENT_FLAG_GHOST)) { + if (tile_element->flags & (bl & 0x0F)) { goto loc_68BABC; } } continue; } - sint32 water_height = map_get_water_height(map_element) * 2; - if (water_height && water_height > zLow && map_element->base_height < zHigh) { + sint32 water_height = map_get_water_height(tile_element) * 2; + if (water_height && water_height > zLow && tile_element->base_height < zHigh) { gMapGroundFlags |= ELEMENT_IS_UNDERWATER; if (water_height < zHigh) { goto loc_68BAE6; @@ -3300,7 +3300,7 @@ sint32 map_can_construct_with_clear_at(sint32 x, sint32 y, sint32 zLow, sint32 z } loc_68B9B7: if (gParkFlags & PARK_FLAGS_FORBID_HIGH_CONSTRUCTION) { - sint32 al = zHigh - map_element->base_height; + sint32 al = zHigh - tile_element->base_height; if (al >= 0) { if (al > 18) { gGameCommandErrorText = STR_LOCAL_AUTHORITY_WONT_ALLOW_CONSTRUCTION_ABOVE_TREE_HEIGHT; @@ -3309,16 +3309,16 @@ sint32 map_can_construct_with_clear_at(sint32 x, sint32 y, sint32 zLow, sint32 z } } if ((bl & 0xF0) != 0xF0) { - if (map_element->base_height >= zHigh) { + if (tile_element->base_height >= zHigh) { // loc_68BA81 gMapGroundFlags |= ELEMENT_IS_UNDERGROUND; gMapGroundFlags &= ~ELEMENT_IS_ABOVE_GROUND; } else { - sint32 al = map_element->base_height; + sint32 al = tile_element->base_height; sint32 ah = al; sint32 cl = al; sint32 ch = al; - uint8 slope = map_element->properties.surface.slope & MAP_ELEMENT_SLOPE_MASK; + uint8 slope = tile_element->properties.surface.slope & TILE_ELEMENT_SLOPE_MASK; if (slope & 1) { al += 2; if (slope == 0x1B) @@ -3348,27 +3348,27 @@ sint32 map_can_construct_with_clear_at(sint32 x, sint32 y, sint32 zLow, sint32 z } loc_68BABC: if (clearFunc != NULL) { - if (!clearFunc(&map_element, x, y, flags, price)) { + if (!clearFunc(&tile_element, x, y, flags, price)) { continue; } } - if (map_element != NULL) { - map_obstruction_set_error_text(map_element); + if (tile_element != NULL) { + map_obstruction_set_error_text(tile_element); } return false; loc_68BAE6: if (clearFunc != NULL) { - if (!clearFunc(&map_element, x, y, flags, price)) { + if (!clearFunc(&tile_element, x, y, flags, price)) { goto loc_68B9B7; } } - if (map_element != NULL) { + if (tile_element != NULL) { gGameCommandErrorText = STR_CANNOT_BUILD_PARTLY_ABOVE_AND_PARTLY_BELOW_WATER; } return false; } } - } while (!map_element_is_last_for_tile(map_element++)); + } while (!tile_element_is_last_for_tile(tile_element++)); return true; } @@ -3405,7 +3405,7 @@ void map_update_tiles() interleaved_xy >>= 1; } - rct_map_element *mapElement = map_get_surface_element_at(x, y); + rct_tile_element *mapElement = map_get_surface_element_at(x, y); if (mapElement != NULL) { map_update_grass_length(x * 32, y * 32, mapElement); scenery_update_tile(x * 32, y * 32); @@ -3420,7 +3420,7 @@ void map_update_tiles() * * rct2: 0x006647A1 */ -static void map_update_grass_length(sint32 x, sint32 y, rct_map_element *mapElement) +static void map_update_grass_length(sint32 x, sint32 y, rct_tile_element *mapElement) { // Check if tile is grass if ((mapElement->properties.surface.terrain & 0xE0) && !(mapElement->type & 3)) @@ -3446,9 +3446,9 @@ static void map_update_grass_length(sint32 x, sint32 y, rct_map_element *mapElem z1 += 2; // Check objects above grass - rct_map_element *mapElementAbove = mapElement; + rct_tile_element *mapElementAbove = mapElement; for (;;) { - if (mapElementAbove->flags & MAP_ELEMENT_FLAG_LAST_TILE) { + if (mapElementAbove->flags & TILE_ELEMENT_FLAG_LAST_TILE) { // Grow grass // Check interim grass lengths @@ -3470,10 +3470,10 @@ static void map_update_grass_length(sint32 x, sint32 y, rct_map_element *mapElem } } else { mapElementAbove++; - if (map_element_get_type(mapElementAbove) == MAP_ELEMENT_TYPE_WALL) + if (tile_element_get_type(mapElementAbove) == TILE_ELEMENT_TYPE_WALL) continue; // Grass should not be affected by ghost elements. - if (map_element_is_ghost(mapElementAbove)) + if (tile_element_is_ghost(mapElementAbove)) continue; if (z0 >= mapElementAbove->clearance_height) continue; @@ -3487,7 +3487,7 @@ static void map_update_grass_length(sint32 x, sint32 y, rct_map_element *mapElem } } -static void map_set_grass_length(sint32 x, sint32 y, rct_map_element *mapElement, sint32 length) +static void map_set_grass_length(sint32 x, sint32 y, rct_tile_element *mapElement, sint32 length) { sint32 z0, z1; @@ -3529,36 +3529,36 @@ void map_restore_provisional_elements() } } -sint32 map_element_get_banner_index(rct_map_element *mapElement) +sint32 tile_element_get_banner_index(rct_tile_element *mapElement) { rct_scenery_entry* sceneryEntry; - switch (map_element_get_type(mapElement)) { - case MAP_ELEMENT_TYPE_SCENERY_MULTIPLE: + switch (tile_element_get_type(mapElement)) { + case TILE_ELEMENT_TYPE_SCENERY_MULTIPLE: sceneryEntry = get_large_scenery_entry(mapElement->properties.scenerymultiple.type & 0x3FF); if (sceneryEntry->large_scenery.scrolling_mode == 0xFF) return -1; return - (mapElement->type & MAP_ELEMENT_QUADRANT_MASK) | + (mapElement->type & TILE_ELEMENT_QUADRANT_MASK) | ((mapElement->properties.scenerymultiple.colour[0] & 0xE0) >> 2) | ((mapElement->properties.scenerymultiple.colour[1] & 0xE0) >> 5); - case MAP_ELEMENT_TYPE_WALL: + case TILE_ELEMENT_TYPE_WALL: sceneryEntry = get_wall_entry(mapElement->properties.wall.type); if (sceneryEntry == NULL || sceneryEntry->wall.scrolling_mode == 0xFF) return -1; return mapElement->properties.wall.banner_index; - case MAP_ELEMENT_TYPE_BANNER: + case TILE_ELEMENT_TYPE_BANNER: return mapElement->properties.banner.index; default: return -1; } } -void map_element_remove_banner_entry(rct_map_element *mapElement) +void tile_element_remove_banner_entry(rct_tile_element *mapElement) { - sint32 bannerIndex = map_element_get_banner_index(mapElement); + sint32 bannerIndex = tile_element_get_banner_index(mapElement); if (bannerIndex == -1) return; @@ -3594,7 +3594,7 @@ void map_remove_out_of_range_elements() */ void map_extend_boundary_surface() { - rct_map_element *existingMapElement, *newMapElement; + rct_tile_element *existingMapElement, *newMapElement; sint32 x, y, z, slope; y = gMapSize - 2; @@ -3674,11 +3674,11 @@ 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(sint32 x, sint32 y, rct_map_element **elementPtr) +static void clear_element_at(sint32 x, sint32 y, rct_tile_element **elementPtr) { - rct_map_element *element = *elementPtr; - switch (map_element_get_type(element)) { - case MAP_ELEMENT_TYPE_SURFACE: + rct_tile_element *element = *elementPtr; + switch (tile_element_get_type(element)) { + case TILE_ELEMENT_TYPE_SURFACE: element->base_height = 2; element->clearance_height = 2; element->properties.surface.slope = 0; @@ -3689,26 +3689,26 @@ static void clear_element_at(sint32 x, sint32 y, rct_map_element **elementPtr) // The rest of the elements are removed from the array, so the pointer doesn't need to be updated. (*elementPtr)++; break; - case MAP_ELEMENT_TYPE_ENTRANCE: + case TILE_ELEMENT_TYPE_ENTRANCE: viewport_interaction_remove_park_entrance(element, x, y); break; - case MAP_ELEMENT_TYPE_WALL: + case TILE_ELEMENT_TYPE_WALL: gGameCommandErrorTitle = STR_CANT_REMOVE_THIS; game_do_command( x, GAME_COMMAND_FLAG_APPLY, y, - map_element_get_direction(element) | (element->base_height << 8), + tile_element_get_direction(element) | (element->base_height << 8), GAME_COMMAND_REMOVE_WALL, 0, 0 ); break; - case MAP_ELEMENT_TYPE_SCENERY_MULTIPLE: + case TILE_ELEMENT_TYPE_SCENERY_MULTIPLE: gGameCommandErrorTitle = STR_CANT_REMOVE_THIS; game_do_command( x, - (GAME_COMMAND_FLAG_APPLY) | (map_element_get_direction(element) << 8), + (GAME_COMMAND_FLAG_APPLY) | (tile_element_get_direction(element) << 8), y, (element->base_height) | (((element->properties.scenerymultiple.type >> 8) >> 2) << 8), GAME_COMMAND_REMOVE_LARGE_SCENERY, @@ -3716,7 +3716,7 @@ static void clear_element_at(sint32 x, sint32 y, rct_map_element **elementPtr) 0 ); break; - case MAP_ELEMENT_TYPE_BANNER: + case TILE_ELEMENT_TYPE_BANNER: gGameCommandErrorTitle = STR_CANT_REMOVE_THIS; game_do_command( x, @@ -3729,7 +3729,7 @@ static void clear_element_at(sint32 x, sint32 y, rct_map_element **elementPtr) ); break; default: - map_element_remove(element); + tile_element_remove(element); break; } } @@ -3748,10 +3748,10 @@ static void clear_elements_at(sint32 x, sint32 y) } } - rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); + rct_tile_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); // Remove all elements except the last one - while(!map_element_is_last_for_tile(mapElement)) + while(!tile_element_is_last_for_tile(mapElement)) clear_element_at(x, y, &mapElement); // Remove the last element @@ -3760,7 +3760,7 @@ static void clear_elements_at(sint32 x, sint32 y) sint32 map_get_highest_z(sint32 tileX, sint32 tileY) { - rct_map_element *mapElement; + rct_tile_element *mapElement; sint32 z; mapElement = map_get_surface_element_at(tileX, tileY); @@ -3779,43 +3779,43 @@ sint32 map_get_highest_z(sint32 tileX, sint32 tileY) return z; } -bool map_element_is_underground(rct_map_element *mapElement) +bool tile_element_is_underground(rct_tile_element *mapElement) { do { mapElement++; - if (map_element_is_last_for_tile(mapElement - 1)) + if (tile_element_is_last_for_tile(mapElement - 1)) return false; - } while (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_SURFACE); + } while (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_SURFACE); return true; } -rct_map_element *map_get_large_scenery_segment(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 sequence) +rct_tile_element *map_get_large_scenery_segment(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 sequence) { - rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); + rct_tile_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); if (mapElement == NULL) { return NULL; } do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_SCENERY_MULTIPLE) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_SCENERY_MULTIPLE) continue; if (mapElement->base_height != z) continue; if ((mapElement->properties.scenerymultiple.type >> 10) != sequence) continue; - if ((map_element_get_direction(mapElement)) != direction) + if ((tile_element_get_direction(mapElement)) != direction) continue; return mapElement; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return NULL; } -rct_map_element *map_get_park_entrance_element_at(sint32 x, sint32 y, sint32 z, bool ghost) +rct_tile_element *map_get_park_entrance_element_at(sint32 x, sint32 y, sint32 z, bool ghost) { - rct_map_element* mapElement = map_get_first_element_at(x >> 5, y >> 5); + rct_tile_element* mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_ENTRANCE) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_ENTRANCE) continue; if (mapElement->base_height != z) @@ -3824,20 +3824,20 @@ rct_map_element *map_get_park_entrance_element_at(sint32 x, sint32 y, sint32 z, if (mapElement->properties.entrance.type != ENTRANCE_TYPE_PARK_ENTRANCE) continue; - if ((ghost == false) && (mapElement->flags & MAP_ELEMENT_FLAG_GHOST)) + if ((ghost == false) && (mapElement->flags & TILE_ELEMENT_FLAG_GHOST)) continue; return mapElement; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return NULL; } -rct_map_element * map_get_ride_entrance_element_at(sint32 x, sint32 y, sint32 z, bool ghost) +rct_tile_element * map_get_ride_entrance_element_at(sint32 x, sint32 y, sint32 z, bool ghost) { - rct_map_element * mapElement = map_get_first_element_at(x >> 5, y >> 5); + rct_tile_element * mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_ENTRANCE) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_ENTRANCE) continue; if (mapElement->base_height != z) @@ -3846,22 +3846,22 @@ rct_map_element * map_get_ride_entrance_element_at(sint32 x, sint32 y, sint32 z, if (mapElement->properties.entrance.type != ENTRANCE_TYPE_RIDE_ENTRANCE) continue; - if ((ghost == false) && (mapElement->flags & MAP_ELEMENT_FLAG_GHOST)) + if ((ghost == false) && (mapElement->flags & TILE_ELEMENT_FLAG_GHOST)) continue; return mapElement; } - while (!map_element_is_last_for_tile(mapElement++)); + while (!tile_element_is_last_for_tile(mapElement++)); return NULL; } -rct_map_element * map_get_ride_exit_element_at(sint32 x, sint32 y, sint32 z, bool ghost) +rct_tile_element * map_get_ride_exit_element_at(sint32 x, sint32 y, sint32 z, bool ghost) { - rct_map_element * mapElement = map_get_first_element_at(x >> 5, y >> 5); + rct_tile_element * mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_ENTRANCE) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_ENTRANCE) continue; if (mapElement->base_height != z) @@ -3870,21 +3870,21 @@ rct_map_element * map_get_ride_exit_element_at(sint32 x, sint32 y, sint32 z, boo if (mapElement->properties.entrance.type != ENTRANCE_TYPE_RIDE_EXIT) continue; - if ((ghost == false) && (mapElement->flags & MAP_ELEMENT_FLAG_GHOST)) + if ((ghost == false) && (mapElement->flags & TILE_ELEMENT_FLAG_GHOST)) continue; return mapElement; } - while (!map_element_is_last_for_tile(mapElement++)); + while (!tile_element_is_last_for_tile(mapElement++)); return NULL; } -rct_map_element *map_get_small_scenery_element_at(sint32 x, sint32 y, sint32 z, sint32 type, uint8 quadrant) +rct_tile_element *map_get_small_scenery_element_at(sint32 x, sint32 y, sint32 z, sint32 type, uint8 quadrant) { - rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); + rct_tile_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_SCENERY) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_SCENERY) continue; if (mapElement->type >> 6 != quadrant) continue; @@ -3894,15 +3894,15 @@ rct_map_element *map_get_small_scenery_element_at(sint32 x, sint32 y, sint32 z, continue; return mapElement; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return NULL; } bool map_large_scenery_get_origin( sint32 x, sint32 y, sint32 z, sint32 direction, sint32 sequence, - sint32 *outX, sint32 *outY, sint32 *outZ, rct_map_element** outElement + sint32 *outX, sint32 *outY, sint32 *outZ, rct_tile_element** outElement ) { - rct_map_element *mapElement; + rct_tile_element *mapElement; rct_scenery_entry *sceneryEntry; rct_large_scenery_tile *tile; sint16 offsetX, offsetY; @@ -3932,7 +3932,7 @@ bool map_large_scenery_get_origin( */ bool sign_set_colour(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 sequence, uint8 mainColour, uint8 textColour) { - rct_map_element *mapElement; + rct_tile_element *mapElement; rct_scenery_entry *sceneryEntry; rct_large_scenery_tile *sceneryTiles, *tile; sint16 offsetX, offsetY; @@ -4082,7 +4082,7 @@ void map_invalidate_tile_full(sint32 x, sint32 y) map_invalidate_tile(x, y, 0, 2080); } -void map_invalidate_element(sint32 x, sint32 y, rct_map_element *mapElement) +void map_invalidate_element(sint32 x, sint32 y, rct_tile_element *mapElement) { map_invalidate_tile(x, y, mapElement->base_height * 8, mapElement->clearance_height * 8); } @@ -4110,7 +4110,7 @@ sint32 map_get_tile_quadrant(sint32 mapX, sint32 mapY) * rct2: 0x00693BFF */ bool map_surface_is_blocked(sint16 x, sint16 y){ - rct_map_element *mapElement; + rct_tile_element *mapElement; if (x >= 8192 || y >= 8192) return true; @@ -4130,18 +4130,18 @@ bool map_surface_is_blocked(sint16 x, sint16 y){ if (mapElement->properties.surface.slope & (1 << 4)) clear_z += 2; - while (!map_element_is_last_for_tile(mapElement++)){ + while (!tile_element_is_last_for_tile(mapElement++)){ if (clear_z >= mapElement->clearance_height) continue; if (base_z < mapElement->base_height) continue; - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_PATH || - map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_WALL) + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_PATH || + tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_WALL) continue; - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_SCENERY) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_SCENERY) return true; rct_scenery_entry* scenery = get_small_scenery_entry(mapElement->properties.scenery.type); @@ -4250,20 +4250,20 @@ void game_command_set_sign_style(sint32* eax, sint32* ebx, sint32* ecx, sint32* if (*ebp == 0) { // small sign - rct_map_element* map_element = map_get_first_element_at(x / 32, y / 32); + rct_tile_element* tile_element = map_get_first_element_at(x / 32, y / 32); bool wall_found = false; do{ - if (map_element_get_type(map_element) != MAP_ELEMENT_TYPE_WALL) + if (tile_element_get_type(tile_element) != TILE_ELEMENT_TYPE_WALL) continue; - rct_scenery_entry* scenery_entry = get_wall_entry(map_element->properties.wall.type); + rct_scenery_entry* scenery_entry = get_wall_entry(tile_element->properties.wall.type); if (scenery_entry->wall.scrolling_mode == 0xFF) continue; - if (map_element->properties.wall.banner_index != bannerId) + if (tile_element->properties.wall.banner_index != bannerId) continue; wall_found = true; break; - } while (!map_element_is_last_for_tile(map_element++)); + } while (!tile_element_is_last_for_tile(tile_element++)); if (wall_found == false) { *ebx = MONEY32_UNDEFINED; @@ -4274,13 +4274,13 @@ void game_command_set_sign_style(sint32* eax, sint32* ebx, sint32* ecx, sint32* *ebx = 0; return; } - map_element->properties.wall.colour_1 = mainColour; - wall_element_set_secondary_colour(map_element, textColour); + tile_element->properties.wall.colour_1 = mainColour; + wall_element_set_secondary_colour(tile_element, textColour); - map_invalidate_tile(x, y, map_element->base_height * 8, map_element->clearance_height * 8); + map_invalidate_tile(x, y, tile_element->base_height * 8, tile_element->clearance_height * 8); } else { // large sign - rct_map_element *mapElement = banner_get_map_element(bannerId); - if (mapElement == NULL || map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_SCENERY_MULTIPLE) { + rct_tile_element *mapElement = banner_get_tile_element(bannerId); + if (mapElement == NULL || tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_SCENERY_MULTIPLE) { gGameCommandErrorText = STR_ERR_CANT_SET_BANNER_TEXT; *ebx = MONEY32_UNDEFINED; return; @@ -4295,7 +4295,7 @@ void game_command_set_sign_style(sint32* eax, sint32* ebx, sint32* ecx, sint32* banner->x * 32, banner->y * 32, mapElement->base_height, - map_element_get_direction(mapElement), + tile_element_get_direction(mapElement), mapElement->properties.scenerymultiple.type >> 10, mainColour, textColour @@ -4349,7 +4349,7 @@ void game_command_modify_tile(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx } case TILE_INSPECTOR_ANY_PASTE: { - rct_map_element elementToPaste; + rct_tile_element elementToPaste; const sint32 data[] = { *edx, *edi }; assert_struct_size(data, sizeof(elementToPaste)); memcpy(&elementToPaste, data, 8); @@ -4462,7 +4462,7 @@ void game_command_modify_tile(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx LocationXYZ16 coord; coord.x = (x << 5) + 16; coord.y = (y << 5) + 16; - coord.z = map_element_height(coord.x, coord.y); + coord.z = tile_element_height(coord.x, coord.y); network_set_player_last_action_coord(network_get_player_index(game_command_playerid), coord); } } @@ -4473,15 +4473,15 @@ void game_command_modify_tile(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx * @param y y units, not tiles. * @param z Base height. */ -rct_map_element *map_get_track_element_at(sint32 x, sint32 y, sint32 z) +rct_tile_element *map_get_track_element_at(sint32 x, sint32 y, sint32 z) { - rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); + rct_tile_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) continue; + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; if (mapElement->base_height != z) continue; return mapElement; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return NULL; } @@ -4493,16 +4493,16 @@ rct_map_element *map_get_track_element_at(sint32 x, sint32 y, sint32 z) * @param z Base height. * @param trackType */ -rct_map_element *map_get_track_element_at_of_type(sint32 x, sint32 y, sint32 z, sint32 trackType) +rct_tile_element *map_get_track_element_at_of_type(sint32 x, sint32 y, sint32 z, sint32 trackType) { - rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); + rct_tile_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) continue; + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; if (mapElement->base_height != z) continue; if (mapElement->properties.track.type != trackType) continue; return mapElement; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return NULL; } @@ -4515,18 +4515,18 @@ rct_map_element *map_get_track_element_at_of_type(sint32 x, sint32 y, sint32 z, * @param trackType * @param sequence */ -rct_map_element *map_get_track_element_at_of_type_seq(sint32 x, sint32 y, sint32 z, sint32 trackType, sint32 sequence) +rct_tile_element *map_get_track_element_at_of_type_seq(sint32 x, sint32 y, sint32 z, sint32 trackType, sint32 sequence) { - rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); + rct_tile_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { if (mapElement == NULL) break; - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) continue; + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; if (mapElement->base_height != z) continue; if (mapElement->properties.track.type != trackType) continue; - if (map_element_get_track_sequence(mapElement) != sequence) continue; + if (tile_element_get_track_sequence(mapElement) != sequence) continue; return mapElement; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return NULL; } @@ -4539,16 +4539,16 @@ rct_map_element *map_get_track_element_at_of_type_seq(sint32 x, sint32 y, sint32 * @param trackType * @param ride index */ -rct_map_element *map_get_track_element_at_of_type_from_ride(sint32 x, sint32 y, sint32 z, sint32 trackType, sint32 rideIndex) { - rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); +rct_tile_element *map_get_track_element_at_of_type_from_ride(sint32 x, sint32 y, sint32 z, sint32 trackType, sint32 rideIndex) { + rct_tile_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) continue; + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; if (mapElement->base_height != z) continue; if (mapElement->properties.track.ride_index != rideIndex) continue; if (mapElement->properties.track.type != trackType) continue; return mapElement; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return NULL; }; @@ -4560,15 +4560,15 @@ rct_map_element *map_get_track_element_at_of_type_from_ride(sint32 x, sint32 y, * @param z Base height. * @param ride index */ -rct_map_element *map_get_track_element_at_from_ride(sint32 x, sint32 y, sint32 z, sint32 rideIndex) { - rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); +rct_tile_element *map_get_track_element_at_from_ride(sint32 x, sint32 y, sint32 z, sint32 rideIndex) { + rct_tile_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) continue; + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; if (mapElement->base_height != z) continue; if (mapElement->properties.track.ride_index != rideIndex) continue; return mapElement; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return NULL; }; @@ -4581,17 +4581,17 @@ rct_map_element *map_get_track_element_at_from_ride(sint32 x, sint32 y, sint32 z * @param direction The direction (0 - 3). * @param ride index */ -rct_map_element *map_get_track_element_at_with_direction_from_ride(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 rideIndex) +rct_tile_element *map_get_track_element_at_with_direction_from_ride(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 rideIndex) { - rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); + rct_tile_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) continue; + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; if (mapElement->base_height != z) continue; if (mapElement->properties.track.ride_index != rideIndex) continue; - if (map_element_get_direction(mapElement) != direction) continue; + if (tile_element_get_direction(mapElement) != direction) continue; return mapElement; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return NULL; }; @@ -4599,38 +4599,38 @@ rct_map_element *map_get_track_element_at_with_direction_from_ride(sint32 x, sin void map_offset_with_rotation(sint16 *x, sint16 *y, sint16 offsetX, sint16 offsetY, uint8 rotation) { switch (rotation & 3) { - case MAP_ELEMENT_DIRECTION_WEST: + case TILE_ELEMENT_DIRECTION_WEST: *x += offsetX; *y += offsetY; break; - case MAP_ELEMENT_DIRECTION_NORTH: + case TILE_ELEMENT_DIRECTION_NORTH: *x += offsetY; *y -= offsetX; break; - case MAP_ELEMENT_DIRECTION_EAST: + case TILE_ELEMENT_DIRECTION_EAST: *x -= offsetX; *y -= offsetY; break; - case MAP_ELEMENT_DIRECTION_SOUTH: + case TILE_ELEMENT_DIRECTION_SOUTH: *x -= offsetY; *y += offsetX; break; } } -rct_map_element *map_get_wall_element_at(sint32 x, sint32 y, sint32 z, sint32 direction) +rct_tile_element *map_get_wall_element_at(sint32 x, sint32 y, sint32 z, sint32 direction) { - rct_map_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); + rct_tile_element *mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_WALL) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_WALL) continue; if (mapElement->base_height != z) continue; - if (map_element_get_direction(mapElement) != direction) + if (tile_element_get_direction(mapElement) != direction) continue; return mapElement; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return NULL; } @@ -4647,7 +4647,7 @@ uint32 map_get_available_peep_spawn_index_list(uint32* peepSpawnIndexList) uint16 check_max_allowable_land_rights_for_tile(uint8 x, uint8 y, uint8 base_z) { - rct_map_element * mapElement = map_get_first_element_at(x, y); + rct_tile_element * mapElement = map_get_first_element_at(x, y); uint16 destOwnership = OWNERSHIP_OWNED; // Sometimes done deliberately. @@ -4658,9 +4658,9 @@ uint16 check_max_allowable_land_rights_for_tile(uint8 x, uint8 y, uint8 base_z) do { - sint32 type = map_element_get_type(mapElement); - if (type == MAP_ELEMENT_TYPE_PATH || - (type == MAP_ELEMENT_TYPE_ENTRANCE && mapElement->properties.entrance.type == ENTRANCE_TYPE_PARK_ENTRANCE)) + sint32 type = tile_element_get_type(mapElement); + if (type == TILE_ELEMENT_TYPE_PATH || + (type == TILE_ELEMENT_TYPE_ENTRANCE && mapElement->properties.entrance.type == ENTRANCE_TYPE_PARK_ENTRANCE)) { destOwnership = OWNERSHIP_CONSTRUCTION_RIGHTS_OWNED; // Do not own construction rights if too high/below surface @@ -4672,7 +4672,7 @@ uint16 check_max_allowable_land_rights_for_tile(uint8 x, uint8 y, uint8 base_z) } } } - while (!map_element_is_last_for_tile(mapElement++)); + while (!tile_element_is_last_for_tile(mapElement++)); return destOwnership; } diff --git a/src/openrct2/world/map.h b/src/openrct2/world/map.h index e0f45028bf..7b75f75376 100644 --- a/src/openrct2/world/map.h +++ b/src/openrct2/world/map.h @@ -21,15 +21,15 @@ #include "Location.h" #pragma pack(push, 1) -typedef struct rct_map_element_surface_properties { +typedef struct rct_tile_element_surface_properties { uint8 slope; //4 0xE0 Edge Style, 0x1F Slope uint8 terrain; //5 0xE0 Terrain Style, 0x1F Water height uint8 grass_length; //6 uint8 ownership; //7 -} rct_map_element_surface_properties; -assert_struct_size(rct_map_element_surface_properties, 4); +} rct_tile_element_surface_properties; +assert_struct_size(rct_tile_element_surface_properties, 4); -typedef struct rct_map_element_path_properties { +typedef struct rct_tile_element_path_properties { uint8 type; //4 0xF0 Path type, 0x08 Ride sign, 0x04 Set when path is diagonal, 0x03 Rotation uint8 additions; //5 uint8 edges; //6 @@ -37,10 +37,10 @@ typedef struct rct_map_element_path_properties { uint8 addition_status; //7 uint8 ride_index; }; -} rct_map_element_path_properties; -assert_struct_size(rct_map_element_path_properties, 4); +} rct_tile_element_path_properties; +assert_struct_size(rct_tile_element_path_properties, 4); -typedef struct rct_map_element_track_properties { +typedef struct rct_tile_element_track_properties { uint8 type; //4 union{ struct{ @@ -61,26 +61,26 @@ typedef struct rct_map_element_track_properties { uint16 maze_entry; // 5 }; uint8 ride_index; //7 -} rct_map_element_track_properties; -assert_struct_size(rct_map_element_track_properties, 4); +} rct_tile_element_track_properties; +assert_struct_size(rct_tile_element_track_properties, 4); -typedef struct rct_map_element_scenery_properties { +typedef struct rct_tile_element_scenery_properties { uint8 type; //4 uint8 age; //5 uint8 colour_1; //6 uint8 colour_2; //7 -} rct_map_element_scenery_properties; -assert_struct_size(rct_map_element_scenery_properties, 4); +} rct_tile_element_scenery_properties; +assert_struct_size(rct_tile_element_scenery_properties, 4); -typedef struct rct_map_element_entrance_properties { +typedef struct rct_tile_element_entrance_properties { uint8 type; //4 uint8 index; //5 uint8 path_type; //6 uint8 ride_index; //7 -} rct_map_element_entrance_properties; -assert_struct_size(rct_map_element_entrance_properties, 4); +} rct_tile_element_entrance_properties; +assert_struct_size(rct_tile_element_entrance_properties, 4); -typedef struct rct_map_element_wall_properties { +typedef struct rct_tile_element_wall_properties { uint8 type; //4 union { uint8 colour_3; //5 @@ -88,87 +88,87 @@ typedef struct rct_map_element_wall_properties { }; uint8 colour_1; //6 0b_2221_1111 2 = colour_2 (uses flags for rest of colour2), 1 = colour_1 uint8 animation; //7 0b_dfff_ft00 d = direction, f = frame num, t = across track flag (not used) -} rct_map_element_wall_properties; -assert_struct_size(rct_map_element_wall_properties, 4); +} rct_tile_element_wall_properties; +assert_struct_size(rct_tile_element_wall_properties, 4); -typedef struct rct_map_element_scenerymultiple_properties { +typedef struct rct_tile_element_scenerymultiple_properties { uint16 type; //4 uint8 colour[2]; //6 -} rct_map_element_scenerymultiple_properties; -assert_struct_size(rct_map_element_scenerymultiple_properties, 4); +} rct_tile_element_scenerymultiple_properties; +assert_struct_size(rct_tile_element_scenerymultiple_properties, 4); -typedef struct rct_map_element_banner_properties { +typedef struct rct_tile_element_banner_properties { uint8 index; //4 uint8 position; //5 uint8 flags; //6 uint8 unused; //7 -} rct_map_element_banner_properties; -assert_struct_size(rct_map_element_banner_properties, 4); +} rct_tile_element_banner_properties; +assert_struct_size(rct_tile_element_banner_properties, 4); typedef union { - rct_map_element_surface_properties surface; - rct_map_element_path_properties path; - rct_map_element_track_properties track; - rct_map_element_scenery_properties scenery; - rct_map_element_entrance_properties entrance; - rct_map_element_wall_properties wall; - rct_map_element_scenerymultiple_properties scenerymultiple; - rct_map_element_banner_properties banner; -} rct_map_element_properties; -assert_struct_size(rct_map_element_properties, 4); + rct_tile_element_surface_properties surface; + rct_tile_element_path_properties path; + rct_tile_element_track_properties track; + rct_tile_element_scenery_properties scenery; + rct_tile_element_entrance_properties entrance; + rct_tile_element_wall_properties wall; + rct_tile_element_scenerymultiple_properties scenerymultiple; + rct_tile_element_banner_properties banner; +} rct_tile_element_properties; +assert_struct_size(rct_tile_element_properties, 4); /** * Map element structure * size: 0x08 */ -typedef struct rct_map_element { +typedef struct rct_tile_element { uint8 type; //0 uint8 flags; //1 uint8 base_height; //2 uint8 clearance_height; //3 - rct_map_element_properties properties; -} rct_map_element; -assert_struct_size(rct_map_element, 8); + rct_tile_element_properties properties; +} rct_tile_element; +assert_struct_size(rct_tile_element, 8); #pragma pack(pop) enum { - MAP_ELEMENT_QUADRANT_SW, - MAP_ELEMENT_QUADRANT_NW, - MAP_ELEMENT_QUADRANT_NE, - MAP_ELEMENT_QUADRANT_SE + TILE_ELEMENT_QUADRANT_SW, + TILE_ELEMENT_QUADRANT_NW, + TILE_ELEMENT_QUADRANT_NE, + TILE_ELEMENT_QUADRANT_SE }; enum { - MAP_ELEMENT_TYPE_SURFACE = (0 << 2), - MAP_ELEMENT_TYPE_PATH = (1 << 2), - MAP_ELEMENT_TYPE_TRACK = (2 << 2), - MAP_ELEMENT_TYPE_SCENERY = (3 << 2), - MAP_ELEMENT_TYPE_ENTRANCE = (4 << 2), - MAP_ELEMENT_TYPE_WALL = (5 << 2), - MAP_ELEMENT_TYPE_SCENERY_MULTIPLE = (6 << 2), - MAP_ELEMENT_TYPE_BANNER = (7 << 2), + TILE_ELEMENT_TYPE_SURFACE = (0 << 2), + TILE_ELEMENT_TYPE_PATH = (1 << 2), + TILE_ELEMENT_TYPE_TRACK = (2 << 2), + TILE_ELEMENT_TYPE_SCENERY = (3 << 2), + TILE_ELEMENT_TYPE_ENTRANCE = (4 << 2), + TILE_ELEMENT_TYPE_WALL = (5 << 2), + TILE_ELEMENT_TYPE_SCENERY_MULTIPLE = (6 << 2), + TILE_ELEMENT_TYPE_BANNER = (7 << 2), // The corrupt element type is used for skipping drawing other following // elements on a given tile. - MAP_ELEMENT_TYPE_CORRUPT = (8 << 2), + TILE_ELEMENT_TYPE_CORRUPT = (8 << 2), }; enum { - MAP_ELEMENT_TYPE_FLAG_HIGHLIGHT = (1 << 6) + TILE_ELEMENT_TYPE_FLAG_HIGHLIGHT = (1 << 6) }; enum { - MAP_ELEMENT_DIRECTION_WEST, - MAP_ELEMENT_DIRECTION_NORTH, - MAP_ELEMENT_DIRECTION_EAST, - MAP_ELEMENT_DIRECTION_SOUTH + TILE_ELEMENT_DIRECTION_WEST, + TILE_ELEMENT_DIRECTION_NORTH, + TILE_ELEMENT_DIRECTION_EAST, + TILE_ELEMENT_DIRECTION_SOUTH }; enum { - MAP_ELEMENT_FLAG_GHOST = (1 << 4), - MAP_ELEMENT_FLAG_BROKEN = (1 << 5), - MAP_ELEMENT_FLAG_BLOCK_BRAKE_CLOSED = (1 << 5), - MAP_ELEMENT_FLAG_INDESTRUCTIBLE_TRACK_PIECE = (1 << 6), - MAP_ELEMENT_FLAG_LAST_TILE = (1 << 7) + TILE_ELEMENT_FLAG_GHOST = (1 << 4), + TILE_ELEMENT_FLAG_BROKEN = (1 << 5), + TILE_ELEMENT_FLAG_BLOCK_BRAKE_CLOSED = (1 << 5), + TILE_ELEMENT_FLAG_INDESTRUCTIBLE_TRACK_PIECE = (1 << 6), + TILE_ELEMENT_FLAG_LAST_TILE = (1 << 7) }; enum { @@ -259,16 +259,16 @@ enum MAP_ELEM_SMALL_SCENERY_COLOUR_FLAG_NEEDS_SUPPORTS = (1 << 5), }; -#define MAP_ELEMENT_QUADRANT_MASK 0xC0 -#define MAP_ELEMENT_TYPE_MASK 0x3C -#define MAP_ELEMENT_DIRECTION_MASK 0x03 +#define TILE_ELEMENT_QUADRANT_MASK 0xC0 +#define TILE_ELEMENT_TYPE_MASK 0x3C +#define TILE_ELEMENT_DIRECTION_MASK 0x03 -#define MAP_ELEMENT_SLOPE_MASK 0x1F -#define MAP_ELEMENT_SLOPE_EDGE_STYLE_MASK 0xE0 +#define TILE_ELEMENT_SLOPE_MASK 0x1F +#define TILE_ELEMENT_SLOPE_EDGE_STYLE_MASK 0xE0 // Terrain -#define MAP_ELEMENT_WATER_HEIGHT_MASK 0x1F -#define MAP_ELEMENT_SURFACE_TERRAIN_MASK 0xE0 +#define TILE_ELEMENT_WATER_HEIGHT_MASK 0x1F +#define TILE_ELEMENT_SURFACE_TERRAIN_MASK 0xE0 #define MAP_ELEM_TRACK_SEQUENCE_STATION_INDEX_MASK 0x70 #define MAP_ELEM_TRACK_SEQUENCE_SEQUENCE_MASK 0x0F @@ -284,19 +284,19 @@ enum #define MAP_MINIMUM_X_Y -MAXIMUM_MAP_SIZE_TECHNICAL -#define MAX_MAP_ELEMENTS 196096 // 0x30000 -#define MAX_TILE_MAP_ELEMENT_POINTERS (MAXIMUM_MAP_SIZE_TECHNICAL * MAXIMUM_MAP_SIZE_TECHNICAL) +#define MAX_TILE_ELEMENTS 196096 // 0x30000 +#define MAX_TILE_TILE_ELEMENT_POINTERS (MAXIMUM_MAP_SIZE_TECHNICAL * MAXIMUM_MAP_SIZE_TECHNICAL) #define MAX_PEEP_SPAWNS 2 #define PEEP_SPAWN_UNDEFINED 0xFFFF -#define MAP_ELEMENT_LARGE_TYPE_MASK 0x3FF +#define TILE_ELEMENT_LARGE_TYPE_MASK 0x3FF -#define TILE_UNDEFINED_MAP_ELEMENT NULL +#define TILE_UNDEFINED_TILE_ELEMENT NULL #pragma pack(push, 1) typedef struct rct_xy_element { sint32 x, y; - rct_map_element *element; + rct_tile_element *element; } rct_xy_element; #ifdef PLATFORM_32BIT assert_struct_size(rct_xy_element, 12); @@ -362,17 +362,17 @@ extern uint8 gMapSelectArrowDirection; extern uint8 gMapGroundFlags; #ifdef NO_RCT2 -extern rct_map_element gMapElements[]; -extern rct_map_element *gMapElementTilePointers[]; +extern rct_tile_element gMapElements[]; +extern rct_tile_element *gMapElementTilePointers[]; #else -extern rct_map_element *gMapElements; -extern rct_map_element **gMapElementTilePointers; +extern rct_tile_element *gMapElements; +extern rct_tile_element **gMapElementTilePointers; #endif extern LocationXY16 gMapSelectionTiles[300]; extern rct2_peep_spawn gPeepSpawns[MAX_PEEP_SPAWNS]; -extern rct_map_element *gNextFreeMapElement; +extern rct_tile_element *gNextFreeMapElement; extern uint32 gNextFreeMapElementPointerIndex; // Used in the land tool window to enable mountain tool / land smoothing @@ -395,29 +395,29 @@ void map_init(sint32 size); void map_count_remaining_land_rights(); void map_strip_ghost_flag_from_elements(); void map_update_tile_pointers(); -rct_map_element *map_get_first_element_at(sint32 x, sint32 y); -rct_map_element *map_get_nth_element_at(sint32 x, sint32 y, sint32 n); -void map_set_tile_elements(sint32 x, sint32 y, rct_map_element *elements); -sint32 map_element_is_last_for_tile(const rct_map_element *element); -bool map_element_is_ghost(const rct_map_element *element); -uint8 map_element_get_scenery_quadrant(const rct_map_element *element); -sint32 map_element_get_type(const rct_map_element *element); -sint32 map_element_get_direction(const rct_map_element *element); -sint32 map_element_get_direction_with_offset(const rct_map_element *element, uint8 offset); -sint32 map_element_get_terrain(const rct_map_element *element); -sint32 map_element_get_terrain_edge(const rct_map_element *element); -void map_element_set_terrain(rct_map_element *element, sint32 terrain); -void map_element_set_terrain_edge(rct_map_element *element, sint32 terrain); +rct_tile_element *map_get_first_element_at(sint32 x, sint32 y); +rct_tile_element *map_get_nth_element_at(sint32 x, sint32 y, sint32 n); +void map_set_tile_elements(sint32 x, sint32 y, rct_tile_element *elements); +sint32 tile_element_is_last_for_tile(const rct_tile_element *element); +bool tile_element_is_ghost(const rct_tile_element *element); +uint8 tile_element_get_scenery_quadrant(const rct_tile_element *element); +sint32 tile_element_get_type(const rct_tile_element *element); +sint32 tile_element_get_direction(const rct_tile_element *element); +sint32 tile_element_get_direction_with_offset(const rct_tile_element *element, uint8 offset); +sint32 tile_element_get_terrain(const rct_tile_element *element); +sint32 tile_element_get_terrain_edge(const rct_tile_element *element); +void tile_element_set_terrain(rct_tile_element *element, sint32 terrain); +void tile_element_set_terrain_edge(rct_tile_element *element, sint32 terrain); sint32 map_height_from_slope(sint32 x, sint32 y, sint32 slope); -rct_map_element* map_get_banner_element_at(sint32 x, sint32 y, sint32 z, uint8 direction); -rct_map_element *map_get_surface_element_at(sint32 x, sint32 y); -rct_map_element* map_get_path_element_at(sint32 x, sint32 y, sint32 z); -rct_map_element *map_get_wall_element_at(sint32 x, sint32 y, sint32 z, sint32 direction); -rct_map_element *map_get_small_scenery_element_at(sint32 x, sint32 y, sint32 z, sint32 type, uint8 quadrant); -rct_map_element *map_get_park_entrance_element_at(sint32 x, sint32 y, sint32 z, bool ghost); -rct_map_element * map_get_ride_entrance_element_at(sint32 x, sint32 y, sint32 z, bool ghost); -rct_map_element * map_get_ride_exit_element_at(sint32 x, sint32 y, sint32 z, bool ghost); -sint32 map_element_height(sint32 x, sint32 y); +rct_tile_element* map_get_banner_element_at(sint32 x, sint32 y, sint32 z, uint8 direction); +rct_tile_element *map_get_surface_element_at(sint32 x, sint32 y); +rct_tile_element* map_get_path_element_at(sint32 x, sint32 y, sint32 z); +rct_tile_element *map_get_wall_element_at(sint32 x, sint32 y, sint32 z, sint32 direction); +rct_tile_element *map_get_small_scenery_element_at(sint32 x, sint32 y, sint32 z, sint32 type, uint8 quadrant); +rct_tile_element *map_get_park_entrance_element_at(sint32 x, sint32 y, sint32 z, bool ghost); +rct_tile_element * map_get_ride_entrance_element_at(sint32 x, sint32 y, sint32 z, bool ghost); +rct_tile_element * map_get_ride_exit_element_at(sint32 x, sint32 y, sint32 z, bool ghost); +sint32 tile_element_height(sint32 x, sint32 y); void sub_68B089(); sint32 map_coord_is_connected(sint32 x, sint32 y, sint32 z, uint8 faceDirection); void map_remove_provisional_elements(); @@ -429,35 +429,35 @@ bool map_is_location_owned(sint32 x, sint32 y, sint32 z); bool map_is_location_in_park(sint32 x, sint32 y); bool map_is_location_owned_or_has_rights(sint32 x, sint32 y); bool map_surface_is_blocked(sint16 x, sint16 y); -sint32 map_element_get_station(const rct_map_element * mapElement); -void map_element_set_station(rct_map_element * mapElement, uint32 stationIndex); -sint32 map_element_get_track_sequence(const rct_map_element * mapElement); -void map_element_set_track_sequence(rct_map_element * mapElement, sint32 trackSequence); -bool map_element_get_green_light(const rct_map_element * mapElement); -void map_element_set_green_light(rct_map_element * mapElement, bool greenLight); -sint32 map_element_get_brake_booster_speed(const rct_map_element *mapElement); -void map_element_set_brake_booster_speed(rct_map_element *mapElement, sint32 speed); -bool map_element_is_taking_photo(const rct_map_element * mapElement); -void map_element_set_onride_photo_timeout(rct_map_element * mapElement); -void map_element_decrement_onride_photo_timout(rct_map_element * mapElement); -void map_element_remove(rct_map_element *mapElement); +sint32 tile_element_get_station(const rct_tile_element * mapElement); +void tile_element_set_station(rct_tile_element * mapElement, uint32 stationIndex); +sint32 tile_element_get_track_sequence(const rct_tile_element * mapElement); +void tile_element_set_track_sequence(rct_tile_element * mapElement, sint32 trackSequence); +bool tile_element_get_green_light(const rct_tile_element * mapElement); +void tile_element_set_green_light(rct_tile_element * mapElement, bool greenLight); +sint32 tile_element_get_brake_booster_speed(const rct_tile_element *mapElement); +void tile_element_set_brake_booster_speed(rct_tile_element *mapElement, sint32 speed); +bool tile_element_is_taking_photo(const rct_tile_element * mapElement); +void tile_element_set_onride_photo_timeout(rct_tile_element * mapElement); +void tile_element_decrement_onride_photo_timout(rct_tile_element * mapElement); +void tile_element_remove(rct_tile_element *mapElement); void map_remove_all_rides(); void map_invalidate_map_selection_tiles(); void map_invalidate_selection_rect(); void map_reorganise_elements(); bool map_check_free_elements_and_reorganise(sint32 num_elements); -rct_map_element *map_element_insert(sint32 x, sint32 y, sint32 z, sint32 flags); -bool map_element_check_address(const rct_map_element * const element); +rct_tile_element *tile_element_insert(sint32 x, sint32 y, sint32 z, sint32 flags); +bool tile_element_check_address(const rct_tile_element * const element); -typedef sint32 (CLEAR_FUNC)(rct_map_element** map_element, sint32 x, sint32 y, uint8 flags, money32* price); -sint32 map_place_non_scenery_clear_func(rct_map_element** map_element, sint32 x, sint32 y, uint8 flags, money32* price); -sint32 map_place_scenery_clear_func(rct_map_element** map_element, sint32 x, sint32 y, uint8 flags, money32* price); +typedef sint32 (CLEAR_FUNC)(rct_tile_element** tile_element, sint32 x, sint32 y, uint8 flags, money32* price); +sint32 map_place_non_scenery_clear_func(rct_tile_element** tile_element, sint32 x, sint32 y, uint8 flags, money32* price); +sint32 map_place_scenery_clear_func(rct_tile_element** tile_element, sint32 x, sint32 y, uint8 flags, money32* price); sint32 map_can_construct_with_clear_at(sint32 x, sint32 y, sint32 zLow, sint32 zHigh, CLEAR_FUNC *clearFunc, uint8 bl, uint8 flags, money32 *price); sint32 map_can_construct_at(sint32 x, sint32 y, sint32 zLow, sint32 zHigh, uint8 bl); void rotate_map_coordinates(sint16 *x, sint16 *y, sint32 rotation); LocationXY16 coordinate_3d_to_2d(const LocationXYZ16* coordinate_3d, sint32 rotation); money32 map_clear_scenery(sint32 x0, sint32 y0, sint32 x1, sint32 y1, sint32 clear, sint32 flags); -sint32 map_get_water_height(const rct_map_element * mapElement); +sint32 map_get_water_height(const rct_tile_element * mapElement); money32 lower_water(sint16 x0, sint16 y0, sint16 x1, sint16 y1, uint8 flags); money32 raise_water(sint16 x0, sint16 y0, sint16 x1, sint16 y1, uint8 flags); money32 wall_place(sint32 type, sint32 x, sint32 y, sint32 z, sint32 edge, sint32 primaryColour, sint32 secondaryColour, sint32 tertiaryColour, sint32 flags); @@ -491,27 +491,27 @@ void game_command_set_banner_style(sint32* eax, sint32* ebx, sint32* ecx, sint32 void game_command_set_sign_style(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); void game_command_modify_tile(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp); -typedef struct map_element_iterator { +typedef struct tile_element_iterator { sint32 x; sint32 y; - rct_map_element *element; -} map_element_iterator; + rct_tile_element *element; +} tile_element_iterator; #ifdef PLATFORM_32BIT -assert_struct_size(map_element_iterator, 12); +assert_struct_size(tile_element_iterator, 12); #endif -void map_element_iterator_begin(map_element_iterator *it); -sint32 map_element_iterator_next(map_element_iterator *it); -void map_element_iterator_restart_for_tile(map_element_iterator *it); +void tile_element_iterator_begin(tile_element_iterator *it); +sint32 tile_element_iterator_next(tile_element_iterator *it); +void tile_element_iterator_restart_for_tile(tile_element_iterator *it); void wall_remove_intersecting_walls(sint32 x, sint32 y, sint32 z0, sint32 z1, sint32 direction); void map_update_tiles(); sint32 map_get_highest_z(sint32 tileX, sint32 tileY); -sint32 map_element_get_banner_index(rct_map_element *mapElement); -void map_element_remove_banner_entry(rct_map_element *mapElement); +sint32 tile_element_get_banner_index(rct_tile_element *mapElement); +void tile_element_remove_banner_entry(rct_tile_element *mapElement); -bool map_element_is_underground(rct_map_element *mapElement); +bool tile_element_is_underground(rct_tile_element *mapElement); void map_remove_out_of_range_elements(); void map_extend_boundary_surface(); @@ -524,35 +524,35 @@ void map_invalidate_tile(sint32 x, sint32 y, sint32 z0, sint32 z1); void map_invalidate_tile_zoom1(sint32 x, sint32 y, sint32 z0, sint32 z1); void map_invalidate_tile_zoom0(sint32 x, sint32 y, sint32 z0, sint32 z1); void map_invalidate_tile_full(sint32 x, sint32 y); -void map_invalidate_element(sint32 x, sint32 y, rct_map_element *mapElement); +void map_invalidate_element(sint32 x, sint32 y, rct_tile_element *mapElement); sint32 map_get_tile_side(sint32 mapX, sint32 mapY); sint32 map_get_tile_quadrant(sint32 mapX, sint32 mapY); void map_clear_all_elements(); -rct_map_element *map_get_large_scenery_segment(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 sequence); +rct_tile_element *map_get_large_scenery_segment(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 sequence); bool map_large_scenery_get_origin( sint32 x, sint32 y, sint32 z, sint32 direction, sint32 sequence, - sint32 *outX, sint32 *outY, sint32 *outZ, rct_map_element** outElement + sint32 *outX, sint32 *outY, sint32 *outZ, rct_tile_element** outElement ); void map_offset_with_rotation(sint16 *x, sint16 *y, sint16 offsetX, sint16 offsetY, uint8 rotation); LocationXY32 translate_3d_to_2d_with_z(sint32 rotation, LocationXYZ32 pos); -rct_map_element *map_get_track_element_at(sint32 x, sint32 y, sint32 z); -rct_map_element *map_get_track_element_at_of_type(sint32 x, sint32 y, sint32 z, sint32 trackType); -rct_map_element *map_get_track_element_at_of_type_seq(sint32 x, sint32 y, sint32 z, sint32 trackType, sint32 sequence); -rct_map_element *map_get_track_element_at_of_type_from_ride(sint32 x, sint32 y, sint32 z, sint32 trackType, sint32 rideIndex); -rct_map_element *map_get_track_element_at_from_ride(sint32 x, sint32 y, sint32 z, sint32 rideIndex); -rct_map_element *map_get_track_element_at_with_direction_from_ride(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 rideIndex); +rct_tile_element *map_get_track_element_at(sint32 x, sint32 y, sint32 z); +rct_tile_element *map_get_track_element_at_of_type(sint32 x, sint32 y, sint32 z, sint32 trackType); +rct_tile_element *map_get_track_element_at_of_type_seq(sint32 x, sint32 y, sint32 z, sint32 trackType, sint32 sequence); +rct_tile_element *map_get_track_element_at_of_type_from_ride(sint32 x, sint32 y, sint32 z, sint32 trackType, sint32 rideIndex); +rct_tile_element *map_get_track_element_at_from_ride(sint32 x, sint32 y, sint32 z, sint32 rideIndex); +rct_tile_element *map_get_track_element_at_with_direction_from_ride(sint32 x, sint32 y, sint32 z, sint32 direction, sint32 rideIndex); bool map_is_location_at_edge(sint32 x, sint32 y); -void map_obstruction_set_error_text(rct_map_element *mapElement); -uint8 wall_element_get_animation_frame(rct_map_element *fenceElement); -void wall_element_set_animation_frame(rct_map_element * wallElement, uint8 frameNum); -uint8 wall_element_get_secondary_colour(rct_map_element * wallElement); -void wall_element_set_secondary_colour(rct_map_element * wallElement, uint8 secondaryColour); +void map_obstruction_set_error_text(rct_tile_element *mapElement); +uint8 wall_element_get_animation_frame(rct_tile_element *fenceElement); +void wall_element_set_animation_frame(rct_tile_element * wallElement, uint8 frameNum); +uint8 wall_element_get_secondary_colour(rct_tile_element * wallElement); +void wall_element_set_secondary_colour(rct_tile_element * wallElement, uint8 secondaryColour); uint32 map_get_available_peep_spawn_index_list(uint32* peepSpawnIndexList); uint16 check_max_allowable_land_rights_for_tile(uint8 x, uint8 y, uint8 base_z); diff --git a/src/openrct2/world/map_animation.c b/src/openrct2/world/map_animation.c index 243b93eee8..35a2613a23 100644 --- a/src/openrct2/world/map_animation.c +++ b/src/openrct2/world/map_animation.c @@ -109,7 +109,7 @@ static bool map_animation_invalidate(rct_map_animation *obj) */ static bool map_animation_invalidate_ride_entrance(sint32 x, sint32 y, sint32 baseZ) { - rct_map_element *mapElement; + rct_tile_element *mapElement; Ride *ride; const rct_ride_entrance_definition *entranceDefinition; @@ -117,7 +117,7 @@ static bool map_animation_invalidate_ride_entrance(sint32 x, sint32 y, sint32 ba do { if (mapElement->base_height != baseZ) continue; - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_ENTRANCE) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_ENTRANCE) continue; if (mapElement->properties.entrance.type != ENTRANCE_TYPE_RIDE_ENTRANCE) continue; @@ -128,7 +128,7 @@ static bool map_animation_invalidate_ride_entrance(sint32 x, sint32 y, sint32 ba sint32 height = (mapElement->base_height * 8) + entranceDefinition->height + 8; map_invalidate_tile_zoom1(x, y, height, height + 16); return false; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return true; } @@ -139,13 +139,13 @@ static bool map_animation_invalidate_ride_entrance(sint32 x, sint32 y, sint32 ba */ static bool map_animation_invalidate_queue_banner(sint32 x, sint32 y, sint32 baseZ) { - rct_map_element *mapElement; + rct_tile_element *mapElement; mapElement = map_get_first_element_at(x >> 5, y >> 5); do { if (mapElement->base_height != baseZ) continue; - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_PATH) continue; if (!(mapElement->flags & 1)) continue; @@ -153,12 +153,12 @@ static bool map_animation_invalidate_queue_banner(sint32 x, sint32 y, sint32 bas continue; sint32 direction = ((mapElement->type >> 6) + get_current_rotation()) & 3; - if (direction == MAP_ELEMENT_DIRECTION_NORTH || direction == MAP_ELEMENT_DIRECTION_EAST) { + if (direction == TILE_ELEMENT_DIRECTION_NORTH || direction == TILE_ELEMENT_DIRECTION_EAST) { baseZ = mapElement->base_height * 8; map_invalidate_tile_zoom1(x, y, baseZ + 16, baseZ + 30); } return false; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return true; } @@ -169,7 +169,7 @@ static bool map_animation_invalidate_queue_banner(sint32 x, sint32 y, sint32 bas */ static bool map_animation_invalidate_small_scenery(sint32 x, sint32 y, sint32 baseZ) { - rct_map_element *mapElement; + rct_tile_element *mapElement; rct_scenery_entry *sceneryEntry; rct_sprite *sprite; rct_peep *peep; @@ -178,7 +178,7 @@ static bool map_animation_invalidate_small_scenery(sint32 x, sint32 y, sint32 ba do { if (mapElement->base_height != baseZ) continue; - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_SCENERY) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_SCENERY) continue; if (mapElement->flags & (1 << 4)) continue; @@ -192,7 +192,7 @@ static bool map_animation_invalidate_small_scenery(sint32 x, sint32 y, sint32 ba if (sceneryEntry->small_scenery.flags & SMALL_SCENERY_FLAG_IS_CLOCK) { // Peep, looking at scenery if (!(gCurrentTicks & 0x3FF) && game_is_not_paused()) { - sint32 direction = map_element_get_direction(mapElement); + sint32 direction = tile_element_get_direction(mapElement); sint32 x2 = x - TileDirectionDelta[direction].x; sint32 y2 = y - TileDirectionDelta[direction].y; @@ -222,7 +222,7 @@ static bool map_animation_invalidate_small_scenery(sint32 x, sint32 y, sint32 ba return false; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return true; } @@ -232,13 +232,13 @@ static bool map_animation_invalidate_small_scenery(sint32 x, sint32 y, sint32 ba */ static bool map_animation_invalidate_park_entrance(sint32 x, sint32 y, sint32 baseZ) { - rct_map_element *mapElement; + rct_tile_element *mapElement; mapElement = map_get_first_element_at(x >> 5, y >> 5); do { if (mapElement->base_height != baseZ) continue; - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_ENTRANCE) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_ENTRANCE) continue; if (mapElement->properties.entrance.type != ENTRANCE_TYPE_PARK_ENTRANCE) continue; @@ -248,7 +248,7 @@ static bool map_animation_invalidate_park_entrance(sint32 x, sint32 y, sint32 ba baseZ = mapElement->base_height * 8; map_invalidate_tile_zoom1(x, y, baseZ + 32, baseZ + 64); return false; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return true; } @@ -259,13 +259,13 @@ static bool map_animation_invalidate_park_entrance(sint32 x, sint32 y, sint32 ba */ static bool map_animation_invalidate_track_waterfall(sint32 x, sint32 y, sint32 baseZ) { - rct_map_element *mapElement; + rct_tile_element *mapElement; mapElement = map_get_first_element_at(x >> 5, y >> 5); do { if (mapElement->base_height != baseZ) continue; - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; if (mapElement->properties.track.type == TRACK_ELEM_WATERFALL) { @@ -273,7 +273,7 @@ static bool map_animation_invalidate_track_waterfall(sint32 x, sint32 y, sint32 map_invalidate_tile_zoom1(x, y, z + 14, z + 46); return false; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return true; } @@ -284,13 +284,13 @@ static bool map_animation_invalidate_track_waterfall(sint32 x, sint32 y, sint32 */ static bool map_animation_invalidate_track_rapids(sint32 x, sint32 y, sint32 baseZ) { - rct_map_element *mapElement; + rct_tile_element *mapElement; mapElement = map_get_first_element_at(x >> 5, y >> 5); do { if (mapElement->base_height != baseZ) continue; - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; if (mapElement->properties.track.type == TRACK_ELEM_RAPIDS) { @@ -298,7 +298,7 @@ static bool map_animation_invalidate_track_rapids(sint32 x, sint32 y, sint32 bas map_invalidate_tile_zoom1(x, y, z + 14, z + 18); return false; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return true; } @@ -309,7 +309,7 @@ static bool map_animation_invalidate_track_rapids(sint32 x, sint32 y, sint32 bas */ static bool map_animation_invalidate_track_onridephoto(sint32 x, sint32 y, sint32 baseZ) { - rct_map_element *mapElement; + rct_tile_element *mapElement; mapElement = map_get_first_element_at(x >> 5, y >> 5); do { @@ -317,7 +317,7 @@ static bool map_animation_invalidate_track_onridephoto(sint32 x, sint32 y, sint3 break; if (mapElement->base_height != baseZ) continue; - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; if (mapElement->properties.track.type == TRACK_ELEM_ON_RIDE_PHOTO) { @@ -325,14 +325,14 @@ static bool map_animation_invalidate_track_onridephoto(sint32 x, sint32 y, sint3 if (game_is_paused()) { return false; } - if (map_element_is_taking_photo(mapElement)) { - map_element_decrement_onride_photo_timout(mapElement); + if (tile_element_is_taking_photo(mapElement)) { + tile_element_decrement_onride_photo_timout(mapElement); return false; } else { return true; } } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return true; } @@ -343,13 +343,13 @@ static bool map_animation_invalidate_track_onridephoto(sint32 x, sint32 y, sint3 */ static bool map_animation_invalidate_track_whirlpool(sint32 x, sint32 y, sint32 baseZ) { - rct_map_element *mapElement; + rct_tile_element *mapElement; mapElement = map_get_first_element_at(x >> 5, y >> 5); do { if (mapElement->base_height != baseZ) continue; - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; if (mapElement->properties.track.type == TRACK_ELEM_WHIRLPOOL) { @@ -357,7 +357,7 @@ static bool map_animation_invalidate_track_whirlpool(sint32 x, sint32 y, sint32 map_invalidate_tile_zoom1(x, y, z + 14, z + 18); return false; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return true; } @@ -368,13 +368,13 @@ static bool map_animation_invalidate_track_whirlpool(sint32 x, sint32 y, sint32 */ static bool map_animation_invalidate_track_spinningtunnel(sint32 x, sint32 y, sint32 baseZ) { - rct_map_element *mapElement; + rct_tile_element *mapElement; mapElement = map_get_first_element_at(x >> 5, y >> 5); do { if (mapElement->base_height != baseZ) continue; - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; if (mapElement->properties.track.type == TRACK_ELEM_SPINNING_TUNNEL) { @@ -382,7 +382,7 @@ static bool map_animation_invalidate_track_spinningtunnel(sint32 x, sint32 y, si map_invalidate_tile_zoom1(x, y, z + 14, z + 32); return false; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return true; } @@ -402,19 +402,19 @@ static bool map_animation_invalidate_remove(sint32 x, sint32 y, sint32 baseZ) */ static bool map_animation_invalidate_banner(sint32 x, sint32 y, sint32 baseZ) { - rct_map_element *mapElement; + rct_tile_element *mapElement; mapElement = map_get_first_element_at(x >> 5, y >> 5); do { if (mapElement->base_height != baseZ) continue; - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_BANNER) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_BANNER) continue; baseZ = mapElement->base_height * 8; map_invalidate_tile_zoom1(x, y, baseZ, baseZ + 16); return false; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return true; } @@ -425,7 +425,7 @@ static bool map_animation_invalidate_banner(sint32 x, sint32 y, sint32 baseZ) */ static bool map_animation_invalidate_large_scenery(sint32 x, sint32 y, sint32 baseZ) { - rct_map_element *mapElement; + rct_tile_element *mapElement; rct_scenery_entry *sceneryEntry; bool wasInvalidated = false; @@ -433,7 +433,7 @@ static bool map_animation_invalidate_large_scenery(sint32 x, sint32 y, sint32 ba do { if (mapElement->base_height != baseZ) continue; - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_SCENERY_MULTIPLE) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_SCENERY_MULTIPLE) continue; sceneryEntry = get_large_scenery_entry(mapElement->properties.scenery.type & 0x3FF); @@ -442,7 +442,7 @@ static bool map_animation_invalidate_large_scenery(sint32 x, sint32 y, sint32 ba map_invalidate_tile_zoom1(x, y, z, z + 16); wasInvalidated = true; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return !wasInvalidated; } @@ -453,7 +453,7 @@ static bool map_animation_invalidate_large_scenery(sint32 x, sint32 y, sint32 ba */ static bool map_animation_invalidate_wall_door(sint32 x, sint32 y, sint32 baseZ) { - rct_map_element *mapElement; + rct_tile_element *mapElement; rct_scenery_entry *sceneryEntry; if (gCurrentTicks & 1) @@ -464,7 +464,7 @@ static bool map_animation_invalidate_wall_door(sint32 x, sint32 y, sint32 baseZ) do { if (mapElement->base_height != baseZ) continue; - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_WALL) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_WALL) continue; sceneryEntry = get_wall_entry(mapElement->properties.scenery.type); @@ -497,7 +497,7 @@ static bool map_animation_invalidate_wall_door(sint32 x, sint32 y, sint32 baseZ) sint32 z = mapElement->base_height * 8; map_invalidate_tile_zoom1(x, y, z, z + 32); } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return removeAnimation; } @@ -508,7 +508,7 @@ static bool map_animation_invalidate_wall_door(sint32 x, sint32 y, sint32 baseZ) */ static bool map_animation_invalidate_wall(sint32 x, sint32 y, sint32 baseZ) { - rct_map_element *mapElement; + rct_tile_element *mapElement; rct_scenery_entry *sceneryEntry; bool wasInvalidated = false; @@ -516,7 +516,7 @@ static bool map_animation_invalidate_wall(sint32 x, sint32 y, sint32 baseZ) do { if (mapElement->base_height != baseZ) continue; - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_WALL) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_WALL) continue; sceneryEntry = get_wall_entry(mapElement->properties.scenery.type); @@ -527,7 +527,7 @@ static bool map_animation_invalidate_wall(sint32 x, sint32 y, sint32 baseZ) sint32 z = mapElement->base_height * 8; map_invalidate_tile_zoom1(x, y, z, z + 16); wasInvalidated = true; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return !wasInvalidated; } diff --git a/src/openrct2/world/map_helpers.c b/src/openrct2/world/map_helpers.c index e9a33ea830..250de111d4 100644 --- a/src/openrct2/world/map_helpers.c +++ b/src/openrct2/world/map_helpers.c @@ -23,7 +23,7 @@ sint32 map_smooth(sint32 l, sint32 t, sint32 r, sint32 b) { sint32 i, x, y, highest, count, cornerHeights[4], doubleCorner, raisedLand = 0; - rct_map_element *mapElement, *mapElement2; + rct_tile_element *mapElement, *mapElement2; for (y = t; y < b; y++) { for (x = l; x < r; x++) { mapElement = map_get_surface_element_at(x, y); @@ -178,7 +178,7 @@ sint32 map_smooth(sint32 l, sint32 t, sint32 r, sint32 b) static sint32 map_get_corner_height(sint32 x, sint32 y, sint32 corner) { - rct_map_element *mapElement = map_get_surface_element_at(x, y); + rct_tile_element *mapElement = map_get_surface_element_at(x, y); sint32 baseHeight = mapElement->base_height; sint32 slope = mapElement->properties.surface.slope; sint32 doubleCorner = slope & 16; @@ -209,7 +209,7 @@ static sint32 map_get_corner_height(sint32 x, sint32 y, sint32 corner) static sint32 map_smooth_wavy(sint32 l, sint32 t, sint32 r, sint32 b) { sint32 i, x, y, highest, count, cornerHeights[4], doubleCorner, raisedLand = 0; - rct_map_element *mapElement; + rct_tile_element *mapElement; for (y = t; y < b; y++) { for (x = l; x < r; x++) { mapElement = map_get_surface_element_at(x, y); @@ -328,7 +328,7 @@ static sint32 map_smooth_wavy(sint32 l, sint32 t, sint32 r, sint32 b) */ sint32 tile_smooth(sint32 x, sint32 y) { - rct_map_element *const surfaceElement = map_get_surface_element_at(x, y); + rct_tile_element *const surfaceElement = map_get_surface_element_at(x, y); // +-----+-----+-----+ // | NW | N | NE | @@ -356,7 +356,7 @@ sint32 tile_smooth(sint32 x, sint32 y) continue; // Get neighbour height. If the element is not valid (outside of map) assume the same height - rct_map_element *neighbour_element = map_get_surface_element_at(x + x_offset, y + y_offset); + rct_tile_element *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; // Make the height relative to the current surface element @@ -401,7 +401,7 @@ sint32 tile_smooth(sint32 x, sint32 y) uint8 waterHeight = map_get_water_height(surfaceElement) * 2; if (waterHeight <= surfaceElement->base_height) { - surfaceElement->properties.surface.terrain &= ~MAP_ELEMENT_WATER_HEIGHT_MASK; + surfaceElement->properties.surface.terrain &= ~TILE_ELEMENT_WATER_HEIGHT_MASK; } } else diff --git a/src/openrct2/world/mapgen.c b/src/openrct2/world/mapgen.c index f7dcf591e1..7502174ea5 100644 --- a/src/openrct2/world/mapgen.c +++ b/src/openrct2/world/mapgen.c @@ -115,7 +115,7 @@ static void set_height(sint32 x, sint32 y, sint32 height) void mapgen_generate_blank(mapgen_settings *settings) { sint32 x, y; - rct_map_element *mapElement; + rct_tile_element *mapElement; map_clear_all_elements(); @@ -123,8 +123,8 @@ void mapgen_generate_blank(mapgen_settings *settings) for (y = 1; y < settings->mapSize - 1; y++) { for (x = 1; x < settings->mapSize - 1; x++) { mapElement = map_get_surface_element_at(x, y); - map_element_set_terrain(mapElement, settings->floor); - map_element_set_terrain_edge(mapElement, settings->wall); + tile_element_set_terrain(mapElement, settings->floor); + tile_element_set_terrain_edge(mapElement, settings->wall); mapElement->base_height = settings->height; mapElement->clearance_height = settings->height; } @@ -136,7 +136,7 @@ void mapgen_generate_blank(mapgen_settings *settings) void mapgen_generate(mapgen_settings *settings) { sint32 x, y, mapSize, floorTexture, wallTexture, waterLevel; - rct_map_element *mapElement; + rct_tile_element *mapElement; util_srand((sint32)platform_get_ticks()); @@ -170,8 +170,8 @@ void mapgen_generate(mapgen_settings *settings) for (y = 1; y < mapSize - 1; y++) { for (x = 1; x < mapSize - 1; x++) { mapElement = map_get_surface_element_at(x, y); - map_element_set_terrain(mapElement, floorTexture); - map_element_set_terrain_edge(mapElement, wallTexture); + tile_element_set_terrain(mapElement, floorTexture); + tile_element_set_terrain_edge(mapElement, wallTexture); mapElement->base_height = settings->height; mapElement->clearance_height = settings->height; } @@ -226,7 +226,7 @@ void mapgen_generate(mapgen_settings *settings) mapElement = map_get_surface_element_at(x, y); if (mapElement->base_height < waterLevel + 6) - map_element_set_terrain(mapElement, beachTexture); + tile_element_set_terrain(mapElement, beachTexture); } } @@ -240,15 +240,15 @@ void mapgen_generate(mapgen_settings *settings) static void mapgen_place_tree(sint32 type, sint32 x, sint32 y) { sint32 surfaceZ; - rct_map_element *mapElement; + rct_tile_element *mapElement; rct_scenery_entry *sceneryEntry = get_small_scenery_entry(type); - surfaceZ = map_element_height(x * 32 + 16, y * 32 + 16) / 8; - mapElement = map_element_insert(x, y, surfaceZ, (1 | 2 | 4 | 8)); + surfaceZ = tile_element_height(x * 32 + 16, y * 32 + 16) / 8; + mapElement = tile_element_insert(x, y, surfaceZ, (1 | 2 | 4 | 8)); assert(mapElement != NULL); mapElement->clearance_height = surfaceZ + (sceneryEntry->small_scenery.height >> 3); - mapElement->type = MAP_ELEMENT_TYPE_SCENERY | (util_rand() & 3); + mapElement->type = TILE_ELEMENT_TYPE_SCENERY | (util_rand() & 3); mapElement->properties.scenery.type = type; mapElement->properties.scenery.age = 0; scenery_small_set_primary_colour(mapElement, COLOUR_YELLOW); @@ -304,7 +304,7 @@ static void mapgen_place_trees() // Create list of available tiles for (sint32 y = 1; y < gMapSize - 1; y++) { for (sint32 x = 1; x < gMapSize - 1; x++) { - rct_map_element *mapElement = map_get_surface_element_at(x, y); + rct_tile_element *mapElement = map_get_surface_element_at(x, y); // Exclude water tiles if (map_get_water_height(mapElement) > 0) @@ -335,8 +335,8 @@ static void mapgen_place_trees() pos = &availablePositions[i]; sint32 type = -1; - rct_map_element *mapElement = map_get_surface_element_at(pos->x, pos->y); - switch (map_element_get_terrain(mapElement)) { + rct_tile_element *mapElement = map_get_surface_element_at(pos->x, pos->y); + switch (tile_element_get_terrain(mapElement)) { case TERRAIN_GRASS: case TERRAIN_DIRT: case TERRAIN_GRASS_CLUMPS: @@ -380,7 +380,7 @@ static void mapgen_place_trees() static void mapgen_set_water_level(sint32 waterLevel) { sint32 x, y, mapSize; - rct_map_element *mapElement; + rct_tile_element *mapElement; mapSize = gMapSize; @@ -613,7 +613,7 @@ static void mapgen_smooth_height(sint32 iterations) static void mapgen_set_height() { sint32 x, y, heightX, heightY, mapSize; - rct_map_element *mapElement; + rct_tile_element *mapElement; mapSize = _heightSize / 2; for (y = 1; y < mapSize - 1; y++) { @@ -960,7 +960,7 @@ void mapgen_generate_from_heightmap(mapgen_settings *settings) for (uint32 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_map_element *const surfaceElement = map_get_surface_element_at(y + 1, x + 1); + rct_tile_element *const surfaceElement = map_get_surface_element_at(y + 1, x + 1); // Read value from bitmap, and convert its range uint8 value = dest[x + y * _heightMapData.width]; diff --git a/src/openrct2/world/money_effect.c b/src/openrct2/world/money_effect.c index df19bb9ed8..576ee11e73 100644 --- a/src/openrct2/world/money_effect.c +++ b/src/openrct2/world/money_effect.c @@ -93,7 +93,7 @@ void money_effect_create(money32 value) if (mapPosition.x == LOCATION_NULL) return; - mapPosition.z = map_element_height(mapPosition.x, mapPosition.y) & 0xFFFF; + mapPosition.z = tile_element_height(mapPosition.x, mapPosition.y) & 0xFFFF; } mapPosition.z += 10; money_effect_create_at(-value, mapPosition.x, mapPosition.y, mapPosition.z, false); diff --git a/src/openrct2/world/park.c b/src/openrct2/world/park.c index 0c820163ba..5d83f5eccf 100644 --- a/src/openrct2/world/park.c +++ b/src/openrct2/world/park.c @@ -160,17 +160,17 @@ void park_reset_history() sint32 park_calculate_size() { sint32 tiles; - map_element_iterator it; + tile_element_iterator it; tiles = 0; - map_element_iterator_begin(&it); + tile_element_iterator_begin(&it); do { - if (map_element_get_type(it.element) == MAP_ELEMENT_TYPE_SURFACE) { + if (tile_element_get_type(it.element) == TILE_ELEMENT_TYPE_SURFACE) { if (it.element->properties.surface.ownership & (OWNERSHIP_CONSTRUCTION_RIGHTS_OWNED | OWNERSHIP_OWNED)) { tiles++; } } - } while (map_element_iterator_next(&it)); + } while (tile_element_iterator_next(&it)); if (tiles != gParkSize) { gParkSize = tiles; @@ -702,27 +702,27 @@ void update_park_fences(sint32 x, sint32 y) if (y <= 0 || y >= gMapSizeUnits) return; - rct_map_element* sufaceElement = map_get_surface_element_at(x / 32, y / 32); + rct_tile_element* sufaceElement = map_get_surface_element_at(x / 32, y / 32); if (sufaceElement == NULL)return; uint8 newOwnership = sufaceElement->properties.surface.ownership & 0xF0; if ((sufaceElement->properties.surface.ownership & OWNERSHIP_OWNED) == 0) { uint8 fence_required = 1; - rct_map_element* mapElement = map_get_first_element_at(x / 32, y / 32); + rct_tile_element* mapElement = map_get_first_element_at(x / 32, y / 32); // If an entrance element do not place flags around surface do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_ENTRANCE) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_ENTRANCE) continue; if (mapElement->properties.entrance.type != ENTRANCE_TYPE_PARK_ENTRANCE) continue; - if (!(mapElement->flags & MAP_ELEMENT_FLAG_GHOST)) { + if (!(mapElement->flags & TILE_ELEMENT_FLAG_GHOST)) { fence_required = 0; break; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); if (fence_required) { // As map_is_location_in_park sets the error text @@ -851,7 +851,7 @@ void game_command_set_park_name(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *e } static money32 map_buy_land_rights_for_tile(sint32 x, sint32 y, sint32 setting, sint32 flags) { - rct_map_element* surfaceElement = map_get_surface_element_at(x / 32, y / 32); + rct_tile_element* surfaceElement = map_get_surface_element_at(x / 32, y / 32); if (surfaceElement == NULL) return MONEY32_UNDEFINED; @@ -933,9 +933,9 @@ static money32 map_buy_land_rights_for_tile(sint32 x, sint32 y, sint32 setting, return 0; } - rct_map_element* mapElement = map_get_first_element_at(x / 32, y / 32); + rct_tile_element* mapElement = map_get_first_element_at(x / 32, y / 32); do { - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_ENTRANCE) { + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_ENTRANCE) { // Do not allow ownership of park entrance. if (newOwnership == OWNERSHIP_OWNED || newOwnership == OWNERSHIP_AVAILABLE) return 0; @@ -947,7 +947,7 @@ static money32 map_buy_land_rights_for_tile(sint32 x, sint32 y, sint32 setting, mapElement->base_height < surfaceElement->base_height)) return 0; } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); if (!(flags & GAME_COMMAND_FLAG_APPLY)) { return gLandPrice; @@ -989,7 +989,7 @@ sint32 map_buy_land_rights(sint32 x0, sint32 y0, sint32 x1, sint32 y1, sint32 se x = (x0 + x1) / 2 + 16; y = (y0 + y1) / 2 + 16; - z = map_element_height(x, y); + z = tile_element_height(x, y); gCommandPosition.x = x; gCommandPosition.y = y; gCommandPosition.z = z; diff --git a/src/openrct2/world/particle.c b/src/openrct2/world/particle.c index ffa45aa473..4aad321830 100644 --- a/src/openrct2/world/particle.c +++ b/src/openrct2/world/particle.c @@ -83,7 +83,7 @@ void crashed_vehicle_particle_update(rct_crashed_vehicle_particle *particle) particle->velocity_z = vz & 0xFFFF; // Check collision with land / water - uint32 waterLand = map_element_height(x, y); + uint32 waterLand = tile_element_height(x, y); sint16 landZ = (waterLand & 0xFFFF); sint16 waterZ = (waterLand >> 16); diff --git a/src/openrct2/world/scenery.c b/src/openrct2/world/scenery.c index 8c7432ed40..e1235b1147 100644 --- a/src/openrct2/world/scenery.c +++ b/src/openrct2/world/scenery.c @@ -38,7 +38,7 @@ colour_t gWindowScenerySecondaryColour; colour_t gWindowSceneryTertiaryColour; bool gWindowSceneryEyedropperEnabled; -rct_map_element *gSceneryMapElement; +rct_tile_element *gSceneryMapElement; uint8 gSceneryMapElementType; money32 gSceneryPlaceCost; @@ -73,11 +73,11 @@ const LocationXY8 ScenerySubTileOffsets[] = { { 23, 7 } }; -void scenery_increase_age(sint32 x, sint32 y, rct_map_element *mapElement); +void scenery_increase_age(sint32 x, sint32 y, rct_tile_element *mapElement); void scenery_update_tile(sint32 x, sint32 y) { - rct_map_element *mapElement; + rct_tile_element *mapElement; mapElement = map_get_first_element_at(x >> 5, y >> 5); do { @@ -85,13 +85,13 @@ void scenery_update_tile(sint32 x, sint32 y) // as that may lead to a desync. if (network_get_mode() != NETWORK_MODE_NONE) { - if (map_element_is_ghost(mapElement)) + if (tile_element_is_ghost(mapElement)) continue; } - if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_SCENERY) { + if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_SCENERY) { scenery_update_age(x, y, mapElement); - } else if (map_element_get_type(mapElement) == MAP_ELEMENT_TYPE_PATH) { + } else if (tile_element_get_type(mapElement) == TILE_ELEMENT_TYPE_PATH) { if (footpath_element_has_path_scenery(mapElement) && !footpath_element_path_scenery_is_ghost(mapElement)) { rct_scenery_entry *sceneryEntry = get_footpath_item_entry(footpath_element_get_path_scenery_index(mapElement)); if (sceneryEntry != NULL) { @@ -104,16 +104,16 @@ void scenery_update_tile(sint32 x, sint32 y) } } } - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); } /** * * rct2: 0x006E33D9 */ -void scenery_update_age(sint32 x, sint32 y, rct_map_element *mapElement) +void scenery_update_age(sint32 x, sint32 y, rct_tile_element *mapElement) { - rct_map_element *mapElementAbove; + rct_tile_element *mapElementAbove; rct_scenery_entry *sceneryEntry; sceneryEntry = get_small_scenery_entry(mapElement->properties.scenery.type); @@ -144,17 +144,17 @@ void scenery_update_age(sint32 x, sint32 y, rct_map_element *mapElement) // Ghosts are purely this-client-side and should not cause any interaction, // as that may lead to a desync. - if (map_element_is_ghost(mapElementAbove)) + if (tile_element_is_ghost(mapElementAbove)) continue; - switch (map_element_get_type(mapElementAbove)) { - case MAP_ELEMENT_TYPE_SCENERY_MULTIPLE: - case MAP_ELEMENT_TYPE_ENTRANCE: - case MAP_ELEMENT_TYPE_PATH: + switch (tile_element_get_type(mapElementAbove)) { + case TILE_ELEMENT_TYPE_SCENERY_MULTIPLE: + case TILE_ELEMENT_TYPE_ENTRANCE: + case TILE_ELEMENT_TYPE_PATH: map_invalidate_tile_zoom1(x, y, mapElementAbove->base_height * 8, mapElementAbove->clearance_height * 8); scenery_increase_age(x, y, mapElement); return; - case MAP_ELEMENT_TYPE_SCENERY: + case TILE_ELEMENT_TYPE_SCENERY: sceneryEntry = get_small_scenery_entry(mapElementAbove->properties.scenery.type); if (sceneryEntry->small_scenery.flags & SMALL_SCENERY_FLAG_VOFFSET_CENTRE) { scenery_increase_age(x, y, mapElement); @@ -169,7 +169,7 @@ void scenery_update_age(sint32 x, sint32 y, rct_map_element *mapElement) map_invalidate_tile_zoom1(x, y, mapElement->base_height * 8, mapElement->clearance_height * 8); } -void scenery_increase_age(sint32 x, sint32 y, rct_map_element *mapElement) +void scenery_increase_age(sint32 x, sint32 y, rct_tile_element *mapElement) { if (mapElement->flags & SMALL_SCENERY_FLAG_ANIMATED) return; @@ -205,13 +205,13 @@ void scenery_remove_ghost_tool_placement(){ if (gSceneryGhostType & (1 << 1)){ gSceneryGhostType &= ~(1 << 1); - rct_map_element* map_element = map_get_first_element_at(x / 32, y / 32); + rct_tile_element* tile_element = map_get_first_element_at(x / 32, y / 32); do{ - if (map_element_get_type(map_element) != MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(tile_element) != TILE_ELEMENT_TYPE_PATH) continue; - if (map_element->base_height != z) + if (tile_element->base_height != z) continue; game_do_command( @@ -223,7 +223,7 @@ void scenery_remove_ghost_tool_placement(){ gSceneryGhostPathObjectType & 0xFFFF0000, 0); break; - } while (!map_element_is_last_for_tile(map_element++)); + } while (!tile_element_is_last_for_tile(tile_element++)); } if (gSceneryGhostType & (1 << 2)){ @@ -323,17 +323,17 @@ sint32 get_scenery_id_from_entry_index(uint8 objectType, sint32 entryIndex) } } -sint32 scenery_small_get_primary_colour(const rct_map_element *mapElement) +sint32 scenery_small_get_primary_colour(const rct_tile_element *mapElement) { return (mapElement->properties.scenery.colour_1 & 0x1F); } -sint32 scenery_small_get_secondary_colour(const rct_map_element *mapElement) +sint32 scenery_small_get_secondary_colour(const rct_tile_element *mapElement) { return (mapElement->properties.scenery.colour_2 & 0x1F); } -void scenery_small_set_primary_colour(rct_map_element *mapElement, uint32 colour) +void scenery_small_set_primary_colour(rct_tile_element *mapElement, uint32 colour) { assert(colour <= 31); mapElement->properties.scenery.colour_1 &= ~0x1F; @@ -341,19 +341,19 @@ void scenery_small_set_primary_colour(rct_map_element *mapElement, uint32 colour } -void scenery_small_set_secondary_colour(rct_map_element *mapElement, uint32 colour) +void scenery_small_set_secondary_colour(rct_tile_element *mapElement, uint32 colour) { assert(colour <= 31); mapElement->properties.scenery.colour_2 &= ~0x1F; mapElement->properties.scenery.colour_2 |= colour; } -bool scenery_small_get_supports_needed(const rct_map_element *mapElement) +bool scenery_small_get_supports_needed(const rct_tile_element *mapElement) { return (bool)(mapElement->properties.scenery.colour_1 & MAP_ELEM_SMALL_SCENERY_COLOUR_FLAG_NEEDS_SUPPORTS); } -void scenery_small_set_supports_needed(rct_map_element *mapElement) +void scenery_small_set_supports_needed(rct_tile_element *mapElement) { mapElement->properties.scenery.colour_1 |= MAP_ELEM_SMALL_SCENERY_COLOUR_FLAG_NEEDS_SUPPORTS; } diff --git a/src/openrct2/world/scenery.h b/src/openrct2/world/scenery.h index ff3714ad98..ad787de6fe 100644 --- a/src/openrct2/world/scenery.h +++ b/src/openrct2/world/scenery.h @@ -252,7 +252,7 @@ extern colour_t gWindowScenerySecondaryColour; extern colour_t gWindowSceneryTertiaryColour; extern bool gWindowSceneryEyedropperEnabled; -extern rct_map_element *gSceneryMapElement; +extern rct_tile_element *gSceneryMapElement; extern uint8 gSceneryMapElementType; extern money32 gSceneryPlaceCost; @@ -285,7 +285,7 @@ extern money32 gClearSceneryCost; void init_scenery(); void scenery_update_tile(sint32 x, sint32 y); -void scenery_update_age(sint32 x, sint32 y, rct_map_element *mapElement); +void scenery_update_age(sint32 x, sint32 y, rct_tile_element *mapElement); void scenery_set_default_placement_configuration(); void scenery_remove_ghost_tool_placement(); bool window_scenery_set_selected_item(sint32 sceneryId); @@ -299,12 +299,12 @@ rct_scenery_set_entry *get_scenery_group_entry(sint32 entryIndex); sint32 get_scenery_id_from_entry_index(uint8 objectType, sint32 entryIndex); -sint32 scenery_small_get_primary_colour(const rct_map_element *mapElement); -sint32 scenery_small_get_secondary_colour(const rct_map_element *mapElement); -void scenery_small_set_primary_colour(rct_map_element *mapElement, uint32 colour); -void scenery_small_set_secondary_colour(rct_map_element *mapElement, uint32 colour); -bool scenery_small_get_supports_needed(const rct_map_element *mapElement); -void scenery_small_set_supports_needed(rct_map_element *mapElement); +sint32 scenery_small_get_primary_colour(const rct_tile_element *mapElement); +sint32 scenery_small_get_secondary_colour(const rct_tile_element *mapElement); +void scenery_small_set_primary_colour(rct_tile_element *mapElement, uint32 colour); +void scenery_small_set_secondary_colour(rct_tile_element *mapElement, uint32 colour); +bool scenery_small_get_supports_needed(const rct_tile_element *mapElement); +void scenery_small_set_supports_needed(rct_tile_element *mapElement); #ifdef __cplusplus } diff --git a/src/openrct2/world/sprite.c b/src/openrct2/world/sprite.c index eb46c9c89a..47bafc842a 100644 --- a/src/openrct2/world/sprite.c +++ b/src/openrct2/world/sprite.c @@ -627,25 +627,25 @@ void sprite_remove(rct_sprite *sprite) static bool litter_can_be_at(sint32 x, sint32 y, sint32 z) { - rct_map_element *mapElement; + rct_tile_element *mapElement; if (!map_is_location_owned(x & 0xFFE0, y & 0xFFE0, z)) return false; mapElement = map_get_first_element_at(x >> 5, y >> 5); do { - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_PATH) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_PATH) continue; sint32 pathZ = mapElement->base_height * 8; if (pathZ < z || pathZ >= z + 32) continue; - if (map_element_is_underground(mapElement)) + if (tile_element_is_underground(mapElement)) return false; return true; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); return false; } diff --git a/src/openrct2/world/tile_inspector.c b/src/openrct2/world/tile_inspector.c index 66a3e4d560..68512ed795 100644 --- a/src/openrct2/world/tile_inspector.c +++ b/src/openrct2/world/tile_inspector.c @@ -26,8 +26,8 @@ static bool map_swap_elements_at(sint32 x, sint32 y, sint16 first, sint16 second) { - rct_map_element *const firstElement = map_get_nth_element_at(x, y, first); - rct_map_element *const secondElement = map_get_nth_element_at(x, y, 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); if (firstElement == NULL) { log_error("First element is out of range for the tile"); @@ -43,15 +43,15 @@ static bool map_swap_elements_at(sint32 x, sint32 y, sint16 first, sint16 second } // Swap their memory - rct_map_element temp = *firstElement; + rct_tile_element temp = *firstElement; *firstElement = *secondElement; *secondElement = temp; // Swap the 'last map element for tile' flag if either one of them was last - if (map_element_is_last_for_tile(firstElement) || map_element_is_last_for_tile(secondElement)) + if (tile_element_is_last_for_tile(firstElement) || tile_element_is_last_for_tile(secondElement)) { - firstElement->flags ^= MAP_ELEMENT_FLAG_LAST_TILE; - secondElement->flags ^= MAP_ELEMENT_FLAG_LAST_TILE; + firstElement->flags ^= TILE_ELEMENT_FLAG_LAST_TILE; + secondElement->flags ^= TILE_ELEMENT_FLAG_LAST_TILE; } return true; @@ -74,16 +74,16 @@ sint32 tile_inspector_insert_corrupt_at(sint32 x, sint32 y, sint16 elementIndex, if (flags & GAME_COMMAND_FLAG_APPLY) { // Create new corrupt element - rct_map_element *corruptElement = map_element_insert(x, y, -1, 0); // Ugly hack: -1 guarantees this to be placed first + rct_tile_element *corruptElement = tile_element_insert(x, y, -1, 0); // Ugly hack: -1 guarantees this to be placed first if (corruptElement == NULL) { log_warning("Failed to insert corrupt element."); return MONEY32_UNDEFINED; } - corruptElement->type = MAP_ELEMENT_TYPE_CORRUPT; + corruptElement->type = TILE_ELEMENT_TYPE_CORRUPT; // Set the base height to be the same as the selected element - rct_map_element *const selectedElement = map_get_nth_element_at(x, y, elementIndex + 1); + rct_tile_element *const selectedElement = map_get_nth_element_at(x, y, elementIndex + 1); if (!selectedElement) { return MONEY32_UNDEFINED; } @@ -139,11 +139,11 @@ sint32 tile_inspector_remove_element_at(sint32 x, sint32 y, sint16 elementIndex, if (flags & GAME_COMMAND_FLAG_APPLY) { // Forcefully remove the element - rct_map_element *const mapElement = map_get_nth_element_at(x, y, elementIndex); + rct_tile_element *const mapElement = map_get_nth_element_at(x, y, elementIndex); if (!mapElement) { return MONEY32_UNDEFINED; } - map_element_remove(mapElement); + tile_element_remove(mapElement); map_invalidate_tile_full(x << 5, y << 5); // Update the window @@ -203,17 +203,17 @@ sint32 tile_inspector_rotate_element_at(sint32 x, sint32 y, sint32 elementIndex, { uint8 newRotation, pathEdges, pathCorners; - rct_map_element *const mapElement = map_get_nth_element_at(x, y, elementIndex); + rct_tile_element *const mapElement = map_get_nth_element_at(x, y, elementIndex); if (!mapElement) { return MONEY32_UNDEFINED; } - switch (map_element_get_type(mapElement)) + switch (tile_element_get_type(mapElement)) { - case MAP_ELEMENT_TYPE_PATH: + case TILE_ELEMENT_TYPE_PATH: if (footpath_element_is_sloped(mapElement)) { - newRotation = (footpath_element_get_slope_direction(mapElement) + 1) & MAP_ELEMENT_DIRECTION_MASK; - mapElement->properties.path.type &= ~MAP_ELEMENT_DIRECTION_MASK; + newRotation = (footpath_element_get_slope_direction(mapElement) + 1) & TILE_ELEMENT_DIRECTION_MASK; + mapElement->properties.path.type &= ~TILE_ELEMENT_DIRECTION_MASK; mapElement->properties.path.type |= newRotation; } pathEdges = mapElement->properties.path.edges & 0x0F; @@ -222,15 +222,15 @@ sint32 tile_inspector_rotate_element_at(sint32 x, sint32 y, sint32 elementIndex, mapElement->properties.path.edges |= ((pathEdges << 1) | (pathEdges >> 3)) & 0x0F; mapElement->properties.path.edges |= ((pathCorners << 1) | (pathCorners >> 3)) & 0xF0; break; - case MAP_ELEMENT_TYPE_TRACK: - case MAP_ELEMENT_TYPE_SCENERY: - case MAP_ELEMENT_TYPE_ENTRANCE: - case MAP_ELEMENT_TYPE_WALL: - newRotation = map_element_get_direction_with_offset(mapElement, 1); - mapElement->type &= ~MAP_ELEMENT_DIRECTION_MASK; + case TILE_ELEMENT_TYPE_TRACK: + case TILE_ELEMENT_TYPE_SCENERY: + case TILE_ELEMENT_TYPE_ENTRANCE: + case TILE_ELEMENT_TYPE_WALL: + newRotation = tile_element_get_direction_with_offset(mapElement, 1); + mapElement->type &= ~TILE_ELEMENT_DIRECTION_MASK; mapElement->type |= newRotation; break; - case MAP_ELEMENT_TYPE_BANNER: + case TILE_ELEMENT_TYPE_BANNER: mapElement->properties.banner.flags ^= 1 << mapElement->properties.banner.position; mapElement->properties.banner.position++; mapElement->properties.banner.position &= 3; @@ -249,7 +249,7 @@ sint32 tile_inspector_rotate_element_at(sint32 x, sint32 y, sint32 elementIndex, return 0; } -sint32 tile_inspector_paste_element_at(sint32 x, sint32 y, rct_map_element element, sint32 flags) +sint32 tile_inspector_paste_element_at(sint32 x, sint32 y, rct_tile_element element, sint32 flags) { // Make sure there is enough space for the new element if (!map_check_free_elements_and_reorganise(1)) @@ -259,14 +259,14 @@ sint32 tile_inspector_paste_element_at(sint32 x, sint32 y, rct_map_element eleme if (flags & GAME_COMMAND_FLAG_APPLY) { - rct_map_element *const pastedElement = map_element_insert(x, y, element.base_height, 0); + rct_tile_element *const pastedElement = tile_element_insert(x, y, element.base_height, 0); - bool lastForTile = map_element_is_last_for_tile(pastedElement); + bool lastForTile = tile_element_is_last_for_tile(pastedElement); *pastedElement = element; - pastedElement->flags &= ~MAP_ELEMENT_FLAG_LAST_TILE; + pastedElement->flags &= ~TILE_ELEMENT_FLAG_LAST_TILE; if (lastForTile) { - pastedElement->flags |= MAP_ELEMENT_FLAG_LAST_TILE; + pastedElement->flags |= TILE_ELEMENT_FLAG_LAST_TILE; } map_invalidate_tile_full(x << 5, y << 5); @@ -295,22 +295,22 @@ sint32 tile_inspector_sort_elements_at(sint32 x, sint32 y, sint32 flags) { if (flags & GAME_COMMAND_FLAG_APPLY) { - const rct_map_element *const firstElement = map_get_first_element_at(x, y); + const rct_tile_element *const firstElement = map_get_first_element_at(x, y); // Count elements on tile sint32 numElement = 0; - const rct_map_element *elementIterator = firstElement; + const rct_tile_element *elementIterator = firstElement; do { numElement++; - } while (!map_element_is_last_for_tile(elementIterator++)); + } while (!tile_element_is_last_for_tile(elementIterator++)); // Bubble sort for (sint32 loopStart = 1; loopStart < numElement; loopStart++) { sint32 currentId = loopStart; - const rct_map_element *currentElement = firstElement + currentId; - const rct_map_element *otherElement = currentElement - 1; + const rct_tile_element *currentElement = firstElement + currentId; + const rct_tile_element *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... while (currentId > 0 && @@ -348,7 +348,7 @@ sint32 tile_inspector_sort_elements_at(sint32 x, sint32 y, sint32 flags) sint32 tile_inspector_any_base_height_offset(sint32 x, sint32 y, sint16 elementIndex, sint8 heightOffset, sint32 flags) { - rct_map_element *const mapElement = map_get_nth_element_at(x, y, elementIndex); + rct_tile_element *const mapElement = map_get_nth_element_at(x, y, elementIndex); if (!mapElement) { return MONEY32_UNDEFINED; } @@ -378,7 +378,7 @@ sint32 tile_inspector_any_base_height_offset(sint32 x, sint32 y, sint16 elementI sint32 tile_inspector_surface_show_park_fences(sint32 x, sint32 y, bool showFences, sint32 flags) { - rct_map_element *const surfaceelement = map_get_surface_element_at(x, y); + rct_tile_element *const surfaceelement = map_get_surface_element_at(x, y); // No surface element on tile if (surfaceelement == NULL) @@ -405,7 +405,7 @@ sint32 tile_inspector_surface_show_park_fences(sint32 x, sint32 y, bool showFenc sint32 tile_inspector_surface_toggle_corner(sint32 x, sint32 y, sint32 cornerIndex, sint32 flags) { - rct_map_element *const surfaceElement = map_get_surface_element_at(x, y); + rct_tile_element *const surfaceElement = map_get_surface_element_at(x, y); // No surface element on tile if (surfaceElement == NULL) @@ -461,7 +461,7 @@ sint32 tile_inspector_surface_toggle_corner(sint32 x, sint32 y, sint32 cornerInd sint32 tile_inspector_surface_toggle_diagonal(sint32 x, sint32 y, sint32 flags) { - rct_map_element *const surfaceElement = map_get_surface_element_at(x, y); + rct_tile_element *const surfaceElement = map_get_surface_element_at(x, y); // No surface element on tile if (surfaceElement == NULL) @@ -497,9 +497,9 @@ sint32 tile_inspector_surface_toggle_diagonal(sint32 x, sint32 y, sint32 flags) sint32 tile_inspector_path_set_sloped(sint32 x, sint32 y, sint32 elementIndex, bool sloped, sint32 flags) { - rct_map_element *const pathElement = map_get_nth_element_at(x, y, elementIndex); + rct_tile_element *const pathElement = map_get_nth_element_at(x, y, elementIndex); - if (!pathElement || map_element_get_type(pathElement) != MAP_ELEMENT_TYPE_PATH) + if (!pathElement || tile_element_get_type(pathElement) != TILE_ELEMENT_TYPE_PATH) { return MONEY32_UNDEFINED; } @@ -526,9 +526,9 @@ sint32 tile_inspector_path_set_sloped(sint32 x, sint32 y, sint32 elementIndex, b sint32 tile_inspector_path_toggle_edge(sint32 x, sint32 y, sint32 elementIndex, sint32 edgeIndex, sint32 flags) { - rct_map_element *const pathElement = map_get_nth_element_at(x, y, elementIndex); + rct_tile_element *const pathElement = map_get_nth_element_at(x, y, elementIndex); - if (!pathElement || map_element_get_type(pathElement) != MAP_ELEMENT_TYPE_PATH) + if (!pathElement || tile_element_get_type(pathElement) != TILE_ELEMENT_TYPE_PATH) { return MONEY32_UNDEFINED; } @@ -551,9 +551,9 @@ sint32 tile_inspector_path_toggle_edge(sint32 x, sint32 y, sint32 elementIndex, sint32 tile_inspector_wall_set_slope(sint32 x, sint32 y, sint32 elementIndex, sint32 slopeValue, sint32 flags) { - rct_map_element *const wallElement = map_get_nth_element_at(x, y, elementIndex); + rct_tile_element *const wallElement = map_get_nth_element_at(x, y, elementIndex); - if (!wallElement || map_element_get_type(wallElement) != MAP_ELEMENT_TYPE_WALL) + if (!wallElement || tile_element_get_type(wallElement) != TILE_ELEMENT_TYPE_WALL) { return MONEY32_UNDEFINED; } @@ -580,14 +580,14 @@ sint32 tile_inspector_wall_set_slope(sint32 x, sint32 y, sint32 elementIndex, si // Broxzier: Copied from track_remove and stripped of unneeded code, but I think this should be smaller sint32 tile_inspector_track_base_height_offset(sint32 x, sint32 y, sint32 elementIndex, sint8 offset, sint32 flags) { - rct_map_element *const trackElement = map_get_nth_element_at(x, y, elementIndex); + rct_tile_element *const trackElement = map_get_nth_element_at(x, y, elementIndex); if (offset == 0) { return MONEY32_UNDEFINED; } - if (!trackElement || map_element_get_type(trackElement) != MAP_ELEMENT_TYPE_TRACK) + if (!trackElement || tile_element_get_type(trackElement) != TILE_ELEMENT_TYPE_TRACK) { return MONEY32_UNDEFINED; } @@ -598,13 +598,13 @@ sint32 tile_inspector_track_base_height_offset(sint32 x, sint32 y, sint32 elemen sint16 originX = x << 5; sint16 originY = y << 5; sint16 originZ = trackElement->base_height * 8; - uint8 rotation = map_element_get_direction(trackElement); + uint8 rotation = tile_element_get_direction(trackElement); uint8 rideIndex = trackElement->properties.track.ride_index; Ride* ride = get_ride(rideIndex); const rct_preview_track* trackBlock = get_track_def_from_ride(ride, type); - trackBlock += map_element_get_track_sequence(trackElement); + trackBlock += tile_element_get_track_sequence(trackElement); - uint8 originDirection = map_element_get_direction(trackElement); + uint8 originDirection = tile_element_get_direction(trackElement); switch (originDirection) { case 0: @@ -657,19 +657,19 @@ sint32 tile_inspector_track_base_height_offset(sint32 x, sint32 y, sint32 elemen map_invalidate_tile_full(elemX, elemY); bool found = false; - rct_map_element *mapElement = map_get_first_element_at(elemX >> 5, elemY >> 5); + rct_tile_element *mapElement = map_get_first_element_at(elemX >> 5, elemY >> 5); do { if (mapElement->base_height != elemZ / 8) continue; - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; - if ((map_element_get_direction(mapElement)) != rotation) + if ((tile_element_get_direction(mapElement)) != rotation) continue; - if (map_element_get_track_sequence(mapElement) != trackBlock->index) + if (tile_element_get_track_sequence(mapElement) != trackBlock->index) continue; if (mapElement->properties.track.type != type) @@ -677,7 +677,7 @@ sint32 tile_inspector_track_base_height_offset(sint32 x, sint32 y, sint32 elemen found = true; break; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); if (!found) { @@ -706,9 +706,9 @@ sint32 tile_inspector_track_base_height_offset(sint32 x, sint32 y, sint32 elemen // Broxzier: Basically a copy of the above function, with just two different lines... should probably be combined somehow sint32 tile_inspector_track_set_chain(sint32 x, sint32 y, sint32 elementIndex, bool entireTrackBlock, bool setChain, sint32 flags) { - rct_map_element *const trackElement = map_get_nth_element_at(x, y, elementIndex); + rct_tile_element *const trackElement = map_get_nth_element_at(x, y, elementIndex); - if (!trackElement || map_element_get_type(trackElement) != MAP_ELEMENT_TYPE_TRACK) + if (!trackElement || tile_element_get_type(trackElement) != TILE_ELEMENT_TYPE_TRACK) { return MONEY32_UNDEFINED; } @@ -730,13 +730,13 @@ sint32 tile_inspector_track_set_chain(sint32 x, sint32 y, sint32 elementIndex, b sint16 originX = x << 5; sint16 originY = y << 5; sint16 originZ = trackElement->base_height * 8; - uint8 rotation = map_element_get_direction(trackElement); + uint8 rotation = tile_element_get_direction(trackElement); uint8 rideIndex = trackElement->properties.track.ride_index; Ride* ride = get_ride(rideIndex); const rct_preview_track* trackBlock = get_track_def_from_ride(ride, type); - trackBlock += map_element_get_track_sequence(trackElement); + trackBlock += tile_element_get_track_sequence(trackElement); - uint8 originDirection = map_element_get_direction(trackElement); + uint8 originDirection = tile_element_get_direction(trackElement); switch (originDirection) { case 0: @@ -789,19 +789,19 @@ sint32 tile_inspector_track_set_chain(sint32 x, sint32 y, sint32 elementIndex, b map_invalidate_tile_full(elemX, elemY); bool found = false; - rct_map_element *mapElement = map_get_first_element_at(elemX >> 5, elemY >> 5); + rct_tile_element *mapElement = map_get_first_element_at(elemX >> 5, elemY >> 5); do { if (mapElement->base_height != elemZ / 8) continue; - if (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_TRACK) + if (tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_TRACK) continue; - if ((map_element_get_direction(mapElement)) != rotation) + if ((tile_element_get_direction(mapElement)) != rotation) continue; - if (map_element_get_track_sequence(mapElement) != trackBlock->index) + if (tile_element_get_track_sequence(mapElement) != trackBlock->index) continue; if (mapElement->properties.track.type != type) @@ -809,7 +809,7 @@ sint32 tile_inspector_track_set_chain(sint32 x, sint32 y, sint32 elementIndex, b found = true; break; - } while (!map_element_is_last_for_tile(mapElement++)); + } while (!tile_element_is_last_for_tile(mapElement++)); if (!found) { @@ -838,9 +838,9 @@ sint32 tile_inspector_track_set_chain(sint32 x, sint32 y, sint32 elementIndex, b sint32 tile_inspector_scenery_set_quarter_location(sint32 x, sint32 y, sint32 elementIndex, sint32 quarterIndex, sint32 flags) { - rct_map_element *const mapElement = map_get_nth_element_at(x, y, elementIndex); + rct_tile_element *const mapElement = map_get_nth_element_at(x, y, elementIndex); - if (!mapElement || map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_SCENERY) + if (!mapElement || tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_SCENERY) { return MONEY32_UNDEFINED; } @@ -848,7 +848,7 @@ sint32 tile_inspector_scenery_set_quarter_location(sint32 x, sint32 y, sint32 el if (flags & GAME_COMMAND_FLAG_APPLY) { // Set quadrant index - mapElement->type &= ~MAP_ELEMENT_QUADRANT_MASK; + mapElement->type &= ~TILE_ELEMENT_QUADRANT_MASK; mapElement->type |= quarterIndex << 6; // Update collision @@ -867,9 +867,9 @@ sint32 tile_inspector_scenery_set_quarter_location(sint32 x, sint32 y, sint32 el sint32 tile_inspector_scenery_set_quarter_collision(sint32 x, sint32 y, sint32 elementIndex, sint32 quarterIndex, sint32 flags) { - rct_map_element *const mapElement = map_get_nth_element_at(x, y, elementIndex); + rct_tile_element *const mapElement = map_get_nth_element_at(x, y, elementIndex); - if (!mapElement || map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_SCENERY) + if (!mapElement || tile_element_get_type(mapElement) != TILE_ELEMENT_TYPE_SCENERY) { return MONEY32_UNDEFINED; } @@ -890,9 +890,9 @@ sint32 tile_inspector_scenery_set_quarter_collision(sint32 x, sint32 y, sint32 e sint32 tile_inspector_banner_toggle_blocking_edge(sint32 x, sint32 y, sint32 elementIndex, sint32 edgeIndex, sint32 flags) { - rct_map_element *const bannerElement = map_get_nth_element_at(x, y, elementIndex); + rct_tile_element *const bannerElement = map_get_nth_element_at(x, y, elementIndex); - if (!bannerElement || map_element_get_type(bannerElement) != MAP_ELEMENT_TYPE_BANNER) + if (!bannerElement || tile_element_get_type(bannerElement) != TILE_ELEMENT_TYPE_BANNER) { return MONEY32_UNDEFINED; } @@ -912,21 +912,21 @@ sint32 tile_inspector_banner_toggle_blocking_edge(sint32 x, sint32 y, sint32 ele sint32 tile_inspector_corrupt_clamp(sint32 x, sint32 y, sint32 elementIndex, sint32 flags) { - rct_map_element *const corruptElement = map_get_nth_element_at(x, y, elementIndex); + rct_tile_element *const corruptElement = map_get_nth_element_at(x, y, elementIndex); - if (!corruptElement || map_element_get_type(corruptElement) != MAP_ELEMENT_TYPE_CORRUPT) + if (!corruptElement || tile_element_get_type(corruptElement) != TILE_ELEMENT_TYPE_CORRUPT) { return MONEY32_UNDEFINED; } - if (map_element_is_last_for_tile(corruptElement)) + if (tile_element_is_last_for_tile(corruptElement)) { return MONEY32_UNDEFINED; } if (flags & GAME_COMMAND_FLAG_APPLY) { - rct_map_element *const nextElement = corruptElement + 1; + rct_tile_element *const nextElement = corruptElement + 1; corruptElement->base_height = corruptElement->clearance_height = nextElement->base_height; if ((uint32)x == windowTileInspectorTileX && (uint32)y == windowTileInspectorTileY) diff --git a/src/openrct2/world/tile_inspector.h b/src/openrct2/world/tile_inspector.h index f5f0a234f6..bd79a6d077 100644 --- a/src/openrct2/world/tile_inspector.h +++ b/src/openrct2/world/tile_inspector.h @@ -62,7 +62,7 @@ sint32 tile_inspector_insert_corrupt_at(sint32 x, sint32 y, sint16 elementIndex, sint32 tile_inspector_remove_element_at(sint32 x, sint32 y, sint16 elementIndex, sint32 flags); sint32 tile_inspector_swap_elements_at(sint32 x, sint32 y, sint16 first, sint16 second, sint32 flags); sint32 tile_inspector_rotate_element_at(sint32 x, sint32 y, sint32 elementIndex, sint32 flags); -sint32 tile_inspector_paste_element_at(sint32 x, sint32 y, rct_map_element element, sint32 flags); +sint32 tile_inspector_paste_element_at(sint32 x, sint32 y, rct_tile_element element, sint32 flags); sint32 tile_inspector_sort_elements_at(sint32 x, sint32 y, sint32 flags); sint32 tile_inspector_any_base_height_offset(sint32 x, sint32 y, sint16 elementIndex, sint8 heightOffset, sint32 flags); sint32 tile_inspector_surface_show_park_fences(sint32 x, sint32 y, bool enabled, sint32 flags); diff --git a/test/testpaint/CMakeLists.txt b/test/testpaint/CMakeLists.txt index 9a9ce38849..441fe5b5cd 100644 --- a/test/testpaint/CMakeLists.txt +++ b/test/testpaint/CMakeLists.txt @@ -13,7 +13,7 @@ file(GLOB_RECURSE ORCT2_RIDE_DEP_SOURCES "${OPENRCT2_SRCPATH}/ride/ride_data.c" "${OPENRCT2_SRCPATH}/rct2/addresses.c" "${OPENRCT2_SRCPATH}/diagnostic.c" "${OPENRCT2_SRCPATH}/rct2/hook.c" - "${OPENRCT2_SRCPATH}/paint/map_element/map_element.c" + "${OPENRCT2_SRCPATH}/paint/tile_element/tile_element.c" "${OPENRCT2_SRCPATH}/paint/paint_helpers.c") file(GLOB_RECURSE ORCT2_TESTPAINT_SOURCES "${CMAKE_CURRENT_LIST_DIR}/*.c" "${CMAKE_CURRENT_LIST_DIR}/*.cpp" diff --git a/test/testpaint/SegmentSupportHeightCall.cpp b/test/testpaint/SegmentSupportHeightCall.cpp index a9e21083bd..99749d496b 100644 --- a/test/testpaint/SegmentSupportHeightCall.cpp +++ b/test/testpaint/SegmentSupportHeightCall.cpp @@ -19,7 +19,7 @@ #include "SegmentSupportHeightCall.hpp" -#include +#include static bool SortSegmentSupportCalls(SegmentSupportCall lhs, SegmentSupportCall rhs) { diff --git a/test/testpaint/TestPaint.hpp b/test/testpaint/TestPaint.hpp index 3e0d67ba93..008e7498df 100644 --- a/test/testpaint/TestPaint.hpp +++ b/test/testpaint/TestPaint.hpp @@ -25,7 +25,7 @@ extern "C" #include #include #include - #include + #include } #define gRideEntries RCT2_ADDRESS(RCT2_ADDRESS_RIDE_ENTRIES, rct_ride_entry*) diff --git a/test/testpaint/TestTrack.cpp b/test/testpaint/TestTrack.cpp index 45baaa51cf..09e6c58ce7 100644 --- a/test/testpaint/TestTrack.cpp +++ b/test/testpaint/TestTrack.cpp @@ -29,7 +29,7 @@ #include "Utils.hpp" #include "VerticalTunnelCall.hpp" -#include +#include #include #include #include @@ -46,7 +46,7 @@ public: virtual std::string VariantName(uint8 rideType, uint8 trackType, int variant) abstract; virtual void ApplyTo(uint8 rideType, uint8 trackType, int variant, - rct_map_element *mapElement, rct_map_element *surfaceElement, + rct_tile_element *mapElement, rct_tile_element *surfaceElement, Ride *ride, rct_ride_entry *rideEntry ) abstract; }; @@ -66,7 +66,7 @@ public: } virtual void ApplyTo(uint8 rideType, uint8 trackType, int variant, - rct_map_element *mapElement, rct_map_element *surfaceElement, + rct_tile_element *mapElement, rct_tile_element *surfaceElement, Ride *ride, rct_ride_entry *rideEntry ) override { if (variant == 0) { @@ -92,7 +92,7 @@ public: } virtual void ApplyTo(uint8 rideType, uint8 trackType, int variant, - rct_map_element *mapElement, rct_map_element *surfaceElement, + rct_tile_element *mapElement, rct_tile_element *surfaceElement, Ride *ride, rct_ride_entry *rideEntry ) override { if (variant == 0) { @@ -124,7 +124,7 @@ public: } virtual void ApplyTo(uint8 rideType, uint8 trackType, int variant, - rct_map_element *mapElement, rct_map_element *surfaceElement, + rct_tile_element *mapElement, rct_tile_element *surfaceElement, Ride *ride, rct_ride_entry *rideEntry ) override { if (variant == 0) { @@ -156,7 +156,7 @@ public: } virtual void ApplyTo(uint8 rideType, uint8 trackType, int variant, - rct_map_element *mapElement, rct_map_element *surfaceElement, + rct_tile_element *mapElement, rct_tile_element *surfaceElement, Ride *ride, rct_ride_entry *rideEntry ) override { ride->entrance_style = variant; @@ -171,7 +171,7 @@ static void CallOriginal( uint8 direction, uint8 trackSequence, uint16 height, - rct_map_element *mapElement + rct_tile_element *mapElement ) { uint32 *trackDirectionList = (uint32 *) RideTypeTrackPaintFunctionsOld[rideType][trackType]; const uint8 rideIndex = 0; @@ -195,7 +195,7 @@ static void CallNew( uint8 direction, uint8 trackSequence, uint16 height, - rct_map_element *mapElement + rct_tile_element *mapElement ) { TRACK_PAINT_FUNCTION_GETTER newPaintFunctionGetter = RideTypeTrackPaintFunctions[rideType]; TRACK_PAINT_FUNCTION newPaintFunction = newPaintFunctionGetter(trackType, direction); @@ -258,14 +258,14 @@ uint8 TestTrack::TestPaintTrackElement(uint8 rideType, uint8 trackType, std::str static uint8 TestTrackElementPaintCalls(uint8 rideType, uint8 trackType, uint8 trackSequence, std::string *error) { uint16 height = 3 * 16; - rct_map_element mapElement = {0}; - mapElement.flags |= MAP_ELEMENT_FLAG_LAST_TILE; + rct_tile_element mapElement = {0}; + mapElement.flags |= TILE_ELEMENT_FLAG_LAST_TILE; mapElement.properties.track.type = trackType; mapElement.base_height = height / 16; g_currently_drawn_item = &mapElement; - rct_map_element surfaceElement = {0}; - surfaceElement.type = MAP_ELEMENT_TYPE_SURFACE; + rct_tile_element surfaceElement = {0}; + surfaceElement.type = TILE_ELEMENT_TYPE_SURFACE; surfaceElement.base_height = 2; gSurfaceElement = &surfaceElement; gDidPassSurface = true; @@ -404,14 +404,14 @@ static uint8 TestTrackElementPaintCalls(uint8 rideType, uint8 trackType, uint8 t static uint8 TestTrackElementSegmentSupportHeight(uint8 rideType, uint8 trackType, uint8 trackSequence, std::string *error) { uint16 height = 3 * 16; - rct_map_element mapElement = {0}; - mapElement.flags |= MAP_ELEMENT_FLAG_LAST_TILE; + rct_tile_element mapElement = {0}; + mapElement.flags |= TILE_ELEMENT_FLAG_LAST_TILE; mapElement.properties.track.type = trackType; mapElement.base_height = height / 16; g_currently_drawn_item = &mapElement; - rct_map_element surfaceElement = {0}; - surfaceElement.type = MAP_ELEMENT_TYPE_SURFACE; + rct_tile_element surfaceElement = {0}; + surfaceElement.type = TILE_ELEMENT_TYPE_SURFACE; surfaceElement.base_height = 2; gSurfaceElement = &surfaceElement; gDidPassSurface = true; @@ -483,14 +483,14 @@ static uint8 TestTrackElementSegmentSupportHeight(uint8 rideType, uint8 trackTyp static uint8 TestTrackElementGeneralSupportHeight(uint8 rideType, uint8 trackType, uint8 trackSequence, std::string *error) { uint16 height = 3 * 16; - rct_map_element mapElement = {0}; - mapElement.flags |= MAP_ELEMENT_FLAG_LAST_TILE; + rct_tile_element mapElement = {0}; + mapElement.flags |= TILE_ELEMENT_FLAG_LAST_TILE; mapElement.properties.track.type = trackType; mapElement.base_height = height / 16; g_currently_drawn_item = &mapElement; - rct_map_element surfaceElement = {0}; - surfaceElement.type = MAP_ELEMENT_TYPE_SURFACE; + rct_tile_element surfaceElement = {0}; + surfaceElement.type = TILE_ELEMENT_TYPE_SURFACE; surfaceElement.base_height = 2; gSurfaceElement = &surfaceElement; gDidPassSurface = true; @@ -579,14 +579,14 @@ static uint8 TestTrackElementGeneralSupportHeight(uint8 rideType, uint8 trackTyp static uint8 TestTrackElementSideTunnels(uint8 rideType, uint8 trackType, uint8 trackSequence, std::string *error) { uint16 height = 3 * 16; - rct_map_element mapElement = {0}; - mapElement.flags |= MAP_ELEMENT_FLAG_LAST_TILE; + rct_tile_element mapElement = {0}; + mapElement.flags |= TILE_ELEMENT_FLAG_LAST_TILE; mapElement.properties.track.type = trackType; mapElement.base_height = height / 16; g_currently_drawn_item = &mapElement; - rct_map_element surfaceElement = {0}; - surfaceElement.type = MAP_ELEMENT_TYPE_SURFACE; + rct_tile_element surfaceElement = {0}; + surfaceElement.type = TILE_ELEMENT_TYPE_SURFACE; surfaceElement.base_height = 2; gSurfaceElement = &surfaceElement; gDidPassSurface = true; @@ -695,14 +695,14 @@ static uint8 TestTrackElementSideTunnels(uint8 rideType, uint8 trackType, uint8 static uint8 TestTrackElementVerticalTunnels(uint8 rideType, uint8 trackType, uint8 trackSequence, std::string *error) { uint16 height = 3 * 16; - rct_map_element mapElement = {0}; - mapElement.flags |= MAP_ELEMENT_FLAG_LAST_TILE; + rct_tile_element mapElement = {0}; + mapElement.flags |= TILE_ELEMENT_FLAG_LAST_TILE; mapElement.properties.track.type = trackType; mapElement.base_height = height / 16; g_currently_drawn_item = &mapElement; - rct_map_element surfaceElement = {0}; - surfaceElement.type = MAP_ELEMENT_TYPE_SURFACE; + rct_tile_element surfaceElement = {0}; + surfaceElement.type = TILE_ELEMENT_TYPE_SURFACE; surfaceElement.base_height = 2; gSurfaceElement = &surfaceElement; gDidPassSurface = true; diff --git a/test/testpaint/compat.c b/test/testpaint/compat.c index 47b315a4bf..1b6ffd1696 100644 --- a/test/testpaint/compat.c +++ b/test/testpaint/compat.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #define RCT2_ADDRESS_SPRITE_LIST 0x010E63BC @@ -29,8 +29,8 @@ #define gRideEntries RCT2_ADDRESS(RCT2_ADDRESS_RIDE_ENTRIES, rct_ride_entry*) #define gCurrentRotation RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_ROTATION, uint8) -rct_map_element *gMapElements = (rct_map_element *) RCT2_ADDRESS_MAP_ELEMENTS; -rct_map_element **gMapElementTilePointers = (rct_map_element **) RCT2_ADDRESS_TILE_MAP_ELEMENT_POINTERS; +rct_tile_element *gMapElements = (rct_tile_element *) RCT2_ADDRESS_TILE_ELEMENTS; +rct_tile_element **gMapElementTilePointers = (rct_tile_element **) RCT2_ADDRESS_TILE_TILE_ELEMENT_POINTERS; Ride *gRideList = RCT2_ADDRESS(RCT2_ADDRESS_RIDE_LIST, Ride); rct_sprite *sprite_list = RCT2_ADDRESS(RCT2_ADDRESS_SPRITE_LIST, rct_sprite); sint16 gMapSizeUnits; @@ -81,13 +81,13 @@ LocationXY16 gMapSelectPositionB; LocationXYZ16 gMapSelectArrowPosition; uint8 gMapSelectArrowDirection; -void entrance_paint(paint_session * session, uint8 direction, int height, rct_map_element *map_element) { } -void banner_paint(paint_session * session, uint8 direction, int height, rct_map_element *map_element) { } -void surface_paint(paint_session * session, uint8 direction, uint16 height, rct_map_element *mapElement) { } -void path_paint(paint_session * session, uint8 direction, uint16 height, rct_map_element *mapElement) { } -void scenery_paint(paint_session * session, uint8 direction, int height, rct_map_element *mapElement) { } -void fence_paint(paint_session * session, uint8 direction, int height, rct_map_element *mapElement) { } -void scenery_multiple_paint(paint_session * session, uint8 direction, uint16 height, rct_map_element *mapElement) { } +void entrance_paint(paint_session * session, uint8 direction, int height, rct_tile_element *tile_element) { } +void banner_paint(paint_session * session, uint8 direction, int height, rct_tile_element *tile_element) { } +void surface_paint(paint_session * session, uint8 direction, uint16 height, rct_tile_element *mapElement) { } +void path_paint(paint_session * session, uint8 direction, uint16 height, rct_tile_element *mapElement) { } +void scenery_paint(paint_session * session, uint8 direction, int height, rct_tile_element *mapElement) { } +void fence_paint(paint_session * session, uint8 direction, int height, rct_tile_element *mapElement) { } +void scenery_multiple_paint(paint_session * session, uint8 direction, uint16 height, rct_tile_element *mapElement) { } Ride *get_ride(int index) { if (index < 0 || index >= MAX_RIDES) { @@ -119,23 +119,23 @@ rct_sprite *get_sprite(size_t sprite_idx) { return &sprite_list[sprite_idx]; } -int map_element_is_last_for_tile(const rct_map_element *element) { - return element->flags & MAP_ELEMENT_FLAG_LAST_TILE; +int tile_element_is_last_for_tile(const rct_tile_element *element) { + return element->flags & TILE_ELEMENT_FLAG_LAST_TILE; } -int map_element_get_type(const rct_map_element *element) { - return element->type & MAP_ELEMENT_TYPE_MASK; +int tile_element_get_type(const rct_tile_element *element) { + return element->type & TILE_ELEMENT_TYPE_MASK; } -int map_element_get_direction(const rct_map_element *element) { - return element->type & MAP_ELEMENT_DIRECTION_MASK; +int tile_element_get_direction(const rct_tile_element *element) { + return element->type & TILE_ELEMENT_DIRECTION_MASK; } -int map_element_get_direction_with_offset(const rct_map_element *element, uint8 offset) { - return ((element->type & MAP_ELEMENT_DIRECTION_MASK) + offset) & MAP_ELEMENT_DIRECTION_MASK; +int tile_element_get_direction_with_offset(const rct_tile_element *element, uint8 offset) { + return ((element->type & TILE_ELEMENT_DIRECTION_MASK) + offset) & TILE_ELEMENT_DIRECTION_MASK; } -rct_map_element *map_get_first_element_at(int x, int y) { +rct_tile_element *map_get_first_element_at(int x, int y) { if (x < 0 || y < 0 || x > 255 || y > 255) { log_error("Trying to access element outside of range"); return NULL; @@ -143,33 +143,33 @@ rct_map_element *map_get_first_element_at(int x, int y) { return gMapElementTilePointers[x + y * 256]; } -int map_element_get_station(const rct_map_element * mapElement) { +int tile_element_get_station(const rct_tile_element * mapElement) { return (mapElement->properties.track.sequence & MAP_ELEM_TRACK_SEQUENCE_STATION_INDEX_MASK) >> 4; } -void map_element_set_station(rct_map_element * mapElement, uint32 stationIndex) +void tile_element_set_station(rct_tile_element * mapElement, uint32 stationIndex) { mapElement->properties.track.sequence &= ~MAP_ELEM_TRACK_SEQUENCE_STATION_INDEX_MASK; mapElement->properties.track.sequence |= (stationIndex << 4); } -sint32 map_element_get_track_sequence(const rct_map_element * mapElement) +sint32 tile_element_get_track_sequence(const rct_tile_element * mapElement) { return mapElement->properties.track.sequence & MAP_ELEM_TRACK_SEQUENCE_SEQUENCE_MASK; } -void map_element_set_track_sequence(rct_map_element * mapElement, int trackSequence) +void tile_element_set_track_sequence(rct_tile_element * mapElement, int trackSequence) { mapElement->properties.track.sequence &= ~MAP_ELEM_TRACK_SEQUENCE_SEQUENCE_MASK; mapElement->properties.track.sequence |= (trackSequence & MAP_ELEM_TRACK_SEQUENCE_SEQUENCE_MASK); } -bool map_element_get_green_light(const rct_map_element * mapElement) +bool tile_element_get_green_light(const rct_tile_element * mapElement) { return (mapElement->properties.track.sequence & MAP_ELEM_TRACK_SEQUENCE_GREEN_LIGHT) != 0; } -void map_element_set_green_light(rct_map_element * mapElement, bool greenLight) +void tile_element_set_green_light(rct_tile_element * mapElement, bool greenLight) { mapElement->properties.track.sequence &= ~MAP_ELEM_TRACK_SEQUENCE_GREEN_LIGHT; if (greenLight) @@ -178,28 +178,28 @@ void map_element_set_green_light(rct_map_element * mapElement, bool greenLight) } } -int map_element_get_brake_booster_speed(const rct_map_element *mapElement) +int tile_element_get_brake_booster_speed(const rct_tile_element *mapElement) { return (mapElement->properties.track.sequence >> 4) << 1; } -void map_element_set_brake_booster_speed(rct_map_element *mapElement, int speed) +void tile_element_set_brake_booster_speed(rct_tile_element *mapElement, int speed) { - mapElement->properties.track.sequence = map_element_get_track_sequence(mapElement) | ((speed >> 1) << 4); + mapElement->properties.track.sequence = tile_element_get_track_sequence(mapElement) | ((speed >> 1) << 4); } -bool map_element_is_taking_photo(const rct_map_element * mapElement) +bool tile_element_is_taking_photo(const rct_tile_element * mapElement) { return (mapElement->properties.track.sequence & MAP_ELEM_TRACK_SEQUENCE_TAKING_PHOTO_MASK) != 0; } -void map_element_set_onride_photo_timeout(rct_map_element * mapElement) +void tile_element_set_onride_photo_timeout(rct_tile_element * mapElement) { mapElement->properties.track.sequence &= MAP_ELEM_TRACK_SEQUENCE_SEQUENCE_MASK; mapElement->properties.track.sequence |= (3 << 4); } -void map_element_decrement_onride_photo_timout(rct_map_element * mapElement) +void tile_element_decrement_onride_photo_timout(rct_tile_element * mapElement) { // We should only touch the upper 4 bits, avoid underflow into the lower 4. if (mapElement->properties.track.sequence & MAP_ELEM_TRACK_SEQUENCE_TAKING_PHOTO_MASK) @@ -208,9 +208,9 @@ void map_element_decrement_onride_photo_timout(rct_map_element * mapElement) } } -sint32 map_get_water_height(const rct_map_element * mapElement) +sint32 map_get_water_height(const rct_tile_element * mapElement) { - return mapElement->properties.surface.terrain & MAP_ELEMENT_WATER_HEIGHT_MASK; + return mapElement->properties.surface.terrain & TILE_ELEMENT_WATER_HEIGHT_MASK; } bool ride_type_has_flag(int rideType, int flag) @@ -223,17 +223,17 @@ sint16 get_height_marker_offset() return 0; } -bool track_element_is_lift_hill(rct_map_element *trackElement) +bool track_element_is_lift_hill(rct_tile_element *trackElement) { return trackElement->type & 0x80; } -bool track_element_is_cable_lift(rct_map_element *trackElement) +bool track_element_is_cable_lift(rct_tile_element *trackElement) { return trackElement->properties.track.colour & TRACK_ELEMENT_COLOUR_FLAG_CABLE_LIFT; } -bool track_element_is_inverted(rct_map_element *trackElement) +bool track_element_is_inverted(rct_tile_element *trackElement) { return trackElement->properties.track.colour & TRACK_ELEMENT_COLOUR_FLAG_INVERTED; } @@ -243,7 +243,7 @@ bool is_csg_loaded() return false; } -uint8 track_element_get_colour_scheme(const rct_map_element * mapElement) +uint8 track_element_get_colour_scheme(const rct_tile_element * mapElement) { return mapElement->properties.track.colour & 0x3; } diff --git a/test/testpaint/generate.cpp b/test/testpaint/generate.cpp index 7b459d3365..f3ca8dac51 100644 --- a/test/testpaint/generate.cpp +++ b/test/testpaint/generate.cpp @@ -107,7 +107,7 @@ private: "../../drawing/drawing.h", "../../paint/supports.h", "../../interface/viewport.h", - "../../paint/map_element/map_element.h", + "../../paint/tile_element/tile_element.h", "../../paint/paint.h", "../../sprites.h", "../../world/map.h", @@ -137,7 +137,7 @@ private: { const uint32 * paintFunctionList = RideTypeTrackPaintFunctionsOld[_rideType]; WriteLine(0, "/** rct2: 0x%08X, 0x%08X, 0x%08X */", paintFunctionList[TRACK_ELEM_END_STATION], paintFunctionList[TRACK_ELEM_BEGIN_STATION], paintFunctionList[TRACK_ELEM_MIDDLE_STATION]); - WriteLine(0, "static void " + _rideName + "_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)"); + WriteLine(0, "static void " + _rideName + "_track_station(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_tile_element * mapElement)"); WriteLine(0, "{"); WriteLine(0, "}"); WriteLine(); @@ -148,7 +148,7 @@ private: void GenerateTrackFunction(int trackType) { WriteLine(0, "/** rct2: 0x%08X */", RideTypeTrackPaintFunctionsOld[_rideType][trackType]); - WriteLine(0, "static void " + GetTrackFunctionName(trackType) + "(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_map_element * mapElement)"); + WriteLine(0, "static void " + GetTrackFunctionName(trackType) + "(uint8 rideIndex, uint8 trackSequence, uint8 direction, int height, rct_tile_element * mapElement)"); WriteLine(0, "{"); if (!GenerateMirrorCall(1, trackType)) { @@ -405,8 +405,8 @@ private: std::vector segmentSupportCalls[4]; support_height generalSupports[4] = { 0 }; for (int direction = 0; direction < 4; direction++) { - rct_map_element mapElement = { 0 }; - mapElement.flags |= MAP_ELEMENT_FLAG_LAST_TILE; + rct_tile_element mapElement = { 0 }; + mapElement.flags |= TILE_ELEMENT_FLAG_LAST_TILE; mapElement.properties.track.type = trackType; mapElement.base_height = 3; if (_invertedTrack) @@ -736,7 +736,7 @@ private: int direction, int trackSequence, int height, - rct_map_element * mapElement, + rct_tile_element * mapElement, TunnelCall tileTunnelCalls[4][4], sint16 verticalTunnelHeights[4]) { @@ -1005,7 +1005,7 @@ private: return true; } - void CallOriginal(int trackType, int direction, int trackSequence, int height, rct_map_element *mapElement) + void CallOriginal(int trackType, int direction, int trackSequence, int height, rct_tile_element *mapElement) { TestPaint::ResetEnvironment(); TestPaint::ResetSupportHeights();