diff --git a/src/openrct2-ui/scripting/ScViewport.hpp b/src/openrct2-ui/scripting/ScViewport.hpp index 88d4683fe2..09e913c5c6 100644 --- a/src/openrct2-ui/scripting/ScViewport.hpp +++ b/src/openrct2-ui/scripting/ScViewport.hpp @@ -203,7 +203,7 @@ namespace OpenRCT2::Scripting auto coords = GetCoordsFromObject(position); if (coords) { - auto screenCoords = translate_3d_to_2d_with_z(get_current_rotation(), *coords); + auto screenCoords = Translate3DTo2DWithZ(get_current_rotation(), *coords); auto left = screenCoords.x - (viewport->view_width / 2); auto top = screenCoords.y - (viewport->view_height / 2); SetViewLeftTop(left, top); diff --git a/src/openrct2-ui/windows/Footpath.cpp b/src/openrct2-ui/windows/Footpath.cpp index abd421db17..578e1937c9 100644 --- a/src/openrct2-ui/windows/Footpath.cpp +++ b/src/openrct2-ui/windows/Footpath.cpp @@ -564,7 +564,7 @@ private: { gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_ARROW; } - map_invalidate_tile_full(footpathLoc); + MapInvalidateTileFull(footpathLoc); } } diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp index f332e3ceaf..7d42e21d1a 100644 --- a/src/openrct2-ui/windows/Ride.cpp +++ b/src/openrct2-ui/windows/Ride.cpp @@ -1093,14 +1093,14 @@ static void WindowRideUpdateOverallView(Ride* ride) // Calculate x, y, z bounds of the entire ride using its track elements tile_element_iterator it; - tile_element_iterator_begin(&it); + TileElementIteratorBegin(&it); CoordsXYZ min = { std::numeric_limits::max(), std::numeric_limits::max(), std::numeric_limits::max() }; CoordsXYZ max = { std::numeric_limits::min(), std::numeric_limits::min(), std::numeric_limits::min() }; - while (tile_element_iterator_next(&it)) + while (TileElementIteratorNext(&it)) { if (it.element->GetType() != TileElementType::Track) continue; diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp index 80bf2ea36b..03ba42f85d 100644 --- a/src/openrct2-ui/windows/RideConstruction.cpp +++ b/src/openrct2-ui/windows/RideConstruction.cpp @@ -2613,7 +2613,7 @@ private: int16_t previewZOffset = ted.Definition.preview_z_offset; mapCoords.z -= previewZOffset; - const ScreenCoordsXY rotatedScreenCoords = translate_3d_to_2d_with_z(get_current_rotation(), mapCoords); + const ScreenCoordsXY rotatedScreenCoords = Translate3DTo2DWithZ(get_current_rotation(), mapCoords); dpi->x += rotatedScreenCoords.x - widgetWidth / 2; dpi->y += rotatedScreenCoords.y - widgetHeight / 2 - 16; @@ -3139,7 +3139,7 @@ void UpdateGhostTrackAndArrow() gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_ARROW; if (_currentTrackSelectionFlags & TRACK_SELECTION_FLAG_ARROW) gMapSelectFlags |= MAP_SELECT_FLAG_ENABLE_ARROW; - map_invalidate_tile_full(trackPos); + MapInvalidateTileFull(trackPos); break; } case RideConstructionState::Selected: @@ -3189,7 +3189,7 @@ void UpdateGhostTrackAndArrow() gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_ARROW; if (_currentTrackSelectionFlags & TRACK_SELECTION_FLAG_ARROW) gMapSelectFlags |= MAP_SELECT_FLAG_ENABLE_ARROW; - map_invalidate_tile_full(trackPos); + MapInvalidateTileFull(trackPos); break; } default: @@ -3220,7 +3220,7 @@ void ride_construction_toolupdate_construct(const ScreenCoordsXY& screenCoords) z = _trackPlaceZ; if (z == 0) - z = map_get_highest_z(*mapCoords); + z = MapGetHighestZ(*mapCoords); gMapSelectFlags |= MAP_SELECT_FLAG_ENABLE_CONSTRUCT; gMapSelectFlags |= MAP_SELECT_FLAG_ENABLE_ARROW; @@ -3270,14 +3270,14 @@ void ride_construction_toolupdate_construct(const ScreenCoordsXY& screenCoords) { if (MapIsLocationValid(selectedTile)) { - z = map_get_highest_z(selectedTile); + z = MapGetHighestZ(selectedTile); if (z > highestZ) highestZ = z; } } } // loc_6CC8BF: - // z = map_get_highest_z(x >> 5, y >> 5); + // z = MapGetHighestZ(x >> 5, y >> 5); } // loc_6CC91B: const auto& ted = GetTrackElementDescriptor(trackType); @@ -3491,7 +3491,7 @@ void ride_construction_tooldown_construct(const ScreenCoordsXY& screenCoords) if (!MapIsLocationValid(selectedTile)) continue; - z = map_get_highest_z(selectedTile); + z = MapGetHighestZ(selectedTile); if (z > highestZ) highestZ = z; } @@ -3508,7 +3508,7 @@ void ride_construction_tooldown_construct(const ScreenCoordsXY& screenCoords) z = _trackPlaceZ; if (z == 0) - z = map_get_highest_z(mapCoords); + z = MapGetHighestZ(mapCoords); tool_cancel(); diff --git a/src/openrct2-ui/windows/ViewClipping.cpp b/src/openrct2-ui/windows/ViewClipping.cpp index bb2fedda66..0588ebd124 100644 --- a/src/openrct2-ui/windows/ViewClipping.cpp +++ b/src/openrct2-ui/windows/ViewClipping.cpp @@ -203,9 +203,9 @@ public: if (mapCoords.has_value()) { gMapSelectFlags |= MAP_SELECT_FLAG_ENABLE; - map_invalidate_tile_full(gMapSelectPositionA); + MapInvalidateTileFull(gMapSelectPositionA); gMapSelectPositionA = gMapSelectPositionB = mapCoords.value(); - map_invalidate_tile_full(mapCoords.value()); + MapInvalidateTileFull(mapCoords.value()); gMapSelectType = MAP_SELECT_TYPE_FULL; } } diff --git a/src/openrct2/EditorObjectSelectionSession.cpp b/src/openrct2/EditorObjectSelectionSession.cpp index 4bc5e7ab93..937547ac54 100644 --- a/src/openrct2/EditorObjectSelectionSession.cpp +++ b/src/openrct2/EditorObjectSelectionSession.cpp @@ -141,7 +141,7 @@ void setup_in_use_selection_flags() } tile_element_iterator iter; - tile_element_iterator_begin(&iter); + TileElementIteratorBegin(&iter); do { ObjectEntryIndex type; @@ -230,7 +230,7 @@ void setup_in_use_selection_flags() break; } } - } while (tile_element_iterator_next(&iter)); + } while (TileElementIteratorNext(&iter)); for (auto& ride : GetRideManager()) { diff --git a/src/openrct2/GameState.cpp b/src/openrct2/GameState.cpp index b347212b32..77f0d31774 100644 --- a/src/openrct2/GameState.cpp +++ b/src/openrct2/GameState.cpp @@ -321,7 +321,7 @@ void GameState::UpdateLogic(LogicTimings* timings) report_time(LogicTimePart::Scenario); ClimateUpdate(); report_time(LogicTimePart::Climate); - map_update_tiles(); + MapUpdateTiles(); report_time(LogicTimePart::MapTiles); // Temporarily remove provisional paths to prevent peep from interacting with them MapRemoveProvisionalElements(); diff --git a/src/openrct2/actions/BannerPlaceAction.cpp b/src/openrct2/actions/BannerPlaceAction.cpp index bf12c9545a..f834c9c824 100644 --- a/src/openrct2/actions/BannerPlaceAction.cpp +++ b/src/openrct2/actions/BannerPlaceAction.cpp @@ -151,7 +151,7 @@ GameActions::Result BannerPlaceAction::Execute() const bannerElement->SetIndex(banner->id); bannerElement->SetGhost(GetFlags() & GAME_COMMAND_FLAG_GHOST); - map_invalidate_tile_full(_loc); + MapInvalidateTileFull(_loc); MapAnimationCreate(MAP_ANIMATION_TYPE_BANNER, CoordsXYZ{ _loc, bannerElement->GetBaseZ() }); res.Cost = bannerEntry->price; diff --git a/src/openrct2/actions/BannerRemoveAction.cpp b/src/openrct2/actions/BannerRemoveAction.cpp index 04708aee84..7b8a794275 100644 --- a/src/openrct2/actions/BannerRemoveAction.cpp +++ b/src/openrct2/actions/BannerRemoveAction.cpp @@ -121,7 +121,7 @@ GameActions::Result BannerRemoveAction::Execute() const } reinterpret_cast(bannerElement)->RemoveBannerEntry(); - map_invalidate_tile_zoom1({ _loc, _loc.z, _loc.z + 32 }); + MapInvalidateTileZoom1({ _loc, _loc.z, _loc.z + 32 }); bannerElement->Remove(); return res; diff --git a/src/openrct2/actions/BannerSetColourAction.cpp b/src/openrct2/actions/BannerSetColourAction.cpp index cb834872f6..7a1c8f090d 100644 --- a/src/openrct2/actions/BannerSetColourAction.cpp +++ b/src/openrct2/actions/BannerSetColourAction.cpp @@ -98,7 +98,7 @@ GameActions::Result BannerSetColourAction::QueryExecute(bool isExecuting) const context_broadcast_intent(&intent); banner->colour = _primaryColour; - map_invalidate_tile_zoom1({ _loc, _loc.z, _loc.z + 32 }); + MapInvalidateTileZoom1({ _loc, _loc.z, _loc.z + 32 }); } return res; diff --git a/src/openrct2/actions/ChangeMapSizeAction.cpp b/src/openrct2/actions/ChangeMapSizeAction.cpp index 720ec3d696..72a5943514 100644 --- a/src/openrct2/actions/ChangeMapSizeAction.cpp +++ b/src/openrct2/actions/ChangeMapSizeAction.cpp @@ -51,19 +51,19 @@ GameActions::Result ChangeMapSizeAction::Execute() const while (_targetSize.x > gMapSize.x) { gMapSize.x++; - map_extend_boundary_surface_x(); + MapExtendBoundarySurfaceX(); } while (_targetSize.y > gMapSize.y) { gMapSize.y++; - map_extend_boundary_surface_y(); + MapExtendBoundarySurfaceY(); } // Shrink map if (_targetSize.x < gMapSize.x || _targetSize.y < gMapSize.y) { gMapSize = _targetSize; - map_remove_out_of_range_elements(); + MapRemoveOutOfRangeElements(); } auto* ctx = OpenRCT2::GetContext(); diff --git a/src/openrct2/actions/FootpathAdditionPlaceAction.cpp b/src/openrct2/actions/FootpathAdditionPlaceAction.cpp index 960bf1859b..8f32f94b1d 100644 --- a/src/openrct2/actions/FootpathAdditionPlaceAction.cpp +++ b/src/openrct2/actions/FootpathAdditionPlaceAction.cpp @@ -197,6 +197,6 @@ GameActions::Result FootpathAdditionPlaceAction::Execute() const pathElement->SetAdditionStatus(255); } } - map_invalidate_tile_full(_loc); + MapInvalidateTileFull(_loc); return res; } diff --git a/src/openrct2/actions/FootpathAdditionRemoveAction.cpp b/src/openrct2/actions/FootpathAdditionRemoveAction.cpp index 8505e86dc6..669dda1d84 100644 --- a/src/openrct2/actions/FootpathAdditionRemoveAction.cpp +++ b/src/openrct2/actions/FootpathAdditionRemoveAction.cpp @@ -106,7 +106,7 @@ GameActions::Result FootpathAdditionRemoveAction::Execute() const } pathElement->SetAddition(0); - map_invalidate_tile_full(_loc); + MapInvalidateTileFull(_loc); auto res = GameActions::Result(); res.Position = _loc; diff --git a/src/openrct2/actions/FootpathPlaceAction.cpp b/src/openrct2/actions/FootpathPlaceAction.cpp index dee757968b..646db9de7e 100644 --- a/src/openrct2/actions/FootpathPlaceAction.cpp +++ b/src/openrct2/actions/FootpathPlaceAction.cpp @@ -401,7 +401,7 @@ GameActions::Result FootpathPlaceAction::ElementInsertExecute(GameActions::Resul { entranceElement->SetSurfaceEntryIndex(_type); } - map_invalidate_tile_full(_loc); + MapInvalidateTileFull(_loc); } } else @@ -505,7 +505,7 @@ void FootpathPlaceAction::RemoveIntersectingWalls(PathElement* pathElement) cons FootpathConnectEdges(_loc, reinterpret_cast(pathElement), GetFlags()); FootpathUpdateQueueChains(); - map_invalidate_tile_full(_loc); + MapInvalidateTileFull(_loc); } PathElement* FootpathPlaceAction::map_get_footpath_element_slope(const CoordsXYZ& footpathPos, int32_t slope) const diff --git a/src/openrct2/actions/FootpathPlaceFromTrackAction.cpp b/src/openrct2/actions/FootpathPlaceFromTrackAction.cpp index d398b75e8f..a862b36774 100644 --- a/src/openrct2/actions/FootpathPlaceFromTrackAction.cpp +++ b/src/openrct2/actions/FootpathPlaceFromTrackAction.cpp @@ -245,7 +245,7 @@ GameActions::Result FootpathPlaceFromTrackAction::ElementInsertExecute(GameActio { entranceElement->SetSurfaceEntryIndex(_type); } - map_invalidate_tile_full(_loc); + MapInvalidateTileFull(_loc); } } else @@ -274,7 +274,7 @@ GameActions::Result FootpathPlaceFromTrackAction::ElementInsertExecute(GameActio pathElement->SetCorners(0); pathElement->SetGhost(GetFlags() & GAME_COMMAND_FLAG_GHOST); - map_invalidate_tile_full(_loc); + MapInvalidateTileFull(_loc); } // Prevent the place sound from being spammed diff --git a/src/openrct2/actions/FootpathRemoveAction.cpp b/src/openrct2/actions/FootpathRemoveAction.cpp index 808817c1c2..1b67596c5d 100644 --- a/src/openrct2/actions/FootpathRemoveAction.cpp +++ b/src/openrct2/actions/FootpathRemoveAction.cpp @@ -96,7 +96,7 @@ GameActions::Result FootpathRemoveAction::Execute() const res.Cost += bannerRes.Cost; } FootpathRemoveEdgesAt(_loc, footpathElement); - map_invalidate_tile_full(_loc); + MapInvalidateTileFull(_loc); TileElementRemove(footpathElement); FootpathUpdateQueueChains(); diff --git a/src/openrct2/actions/LandBuyRightsAction.cpp b/src/openrct2/actions/LandBuyRightsAction.cpp index b8534059c6..18cdeb657d 100644 --- a/src/openrct2/actions/LandBuyRightsAction.cpp +++ b/src/openrct2/actions/LandBuyRightsAction.cpp @@ -155,7 +155,7 @@ GameActions::Result LandBuyRightsAction::map_buy_land_rights_for_tile(const Coor { surfaceElement->SetOwnership(surfaceElement->GetOwnership() | OWNERSHIP_CONSTRUCTION_RIGHTS_OWNED); uint16_t baseZ = surfaceElement->GetBaseZ(); - map_invalidate_tile({ loc, baseZ, baseZ + 16 }); + MapInvalidateTile({ loc, baseZ, baseZ + 16 }); } res.Cost = gConstructionRightsPrice; return res; diff --git a/src/openrct2/actions/LandSetHeightAction.cpp b/src/openrct2/actions/LandSetHeightAction.cpp index f65252598f..00909f26a0 100644 --- a/src/openrct2/actions/LandSetHeightAction.cpp +++ b/src/openrct2/actions/LandSetHeightAction.cpp @@ -319,8 +319,8 @@ money32 LandSetHeightAction::GetSurfaceHeightChangeCost(SurfaceElement* surfaceE money32 cost{ 0 }; for (Direction i : ALL_DIRECTIONS) { - int32_t cornerHeight = tile_element_get_corner_height(surfaceElement, i); - cornerHeight -= map_get_corner_height(_height, _style & TILE_ELEMENT_SURFACE_SLOPE_MASK, i); + int32_t cornerHeight = TileElementGetCornerHeight(surfaceElement, i); + cornerHeight -= MapGetCornerHeight(_height, _style & TILE_ELEMENT_SURFACE_SLOPE_MASK, i); cost += 2.50_GBP * abs(cornerHeight); } return cost; @@ -337,7 +337,7 @@ void LandSetHeightAction::SetSurfaceHeight(TileElement* surfaceElement) const surfaceElement->AsSurface()->SetWaterHeight(0); } - map_invalidate_tile_full(_coords); + MapInvalidateTileFull(_coords); } int32_t LandSetHeightAction::map_set_land_height_clear_func( diff --git a/src/openrct2/actions/LandSetRightsAction.cpp b/src/openrct2/actions/LandSetRightsAction.cpp index 5d17c92c7a..81947a3771 100644 --- a/src/openrct2/actions/LandSetRightsAction.cpp +++ b/src/openrct2/actions/LandSetRightsAction.cpp @@ -128,7 +128,7 @@ GameActions::Result LandSetRightsAction::map_buy_land_rights_for_tile(const Coor { surfaceElement->SetOwnership(surfaceElement->GetOwnership() & ~OWNERSHIP_CONSTRUCTION_RIGHTS_OWNED); uint16_t baseZ = surfaceElement->GetBaseZ(); - map_invalidate_tile({ loc, baseZ, baseZ + 16 }); + MapInvalidateTile({ loc, baseZ, baseZ + 16 }); } return res; case LandSetRightSetting::SetForSale: @@ -136,7 +136,7 @@ GameActions::Result LandSetRightsAction::map_buy_land_rights_for_tile(const Coor { surfaceElement->SetOwnership(surfaceElement->GetOwnership() | OWNERSHIP_AVAILABLE); uint16_t baseZ = surfaceElement->GetBaseZ(); - map_invalidate_tile({ loc, baseZ, baseZ + 16 }); + MapInvalidateTile({ loc, baseZ, baseZ + 16 }); } return res; case LandSetRightSetting::SetConstructionRightsForSale: @@ -144,7 +144,7 @@ GameActions::Result LandSetRightsAction::map_buy_land_rights_for_tile(const Coor { surfaceElement->SetOwnership(surfaceElement->GetOwnership() | OWNERSHIP_CONSTRUCTION_RIGHTS_AVAILABLE); uint16_t baseZ = surfaceElement->GetBaseZ(); - map_invalidate_tile({ loc, baseZ, baseZ + 16 }); + MapInvalidateTile({ loc, baseZ, baseZ + 16 }); } return res; case LandSetRightSetting::SetOwnershipWithChecks: diff --git a/src/openrct2/actions/LandSmoothAction.cpp b/src/openrct2/actions/LandSmoothAction.cpp index 45887f2f2e..b9a6fef4cb 100644 --- a/src/openrct2/actions/LandSmoothAction.cpp +++ b/src/openrct2/actions/LandSmoothAction.cpp @@ -105,21 +105,21 @@ money32 LandSmoothAction::SmoothLandRowByEdge( { return 0; } - if (tile_element_get_corner_height(surfaceElement, checkDirection1) != expectedLandHeight1 + landChangePerTile) + if (TileElementGetCornerHeight(surfaceElement, checkDirection1) != expectedLandHeight1 + landChangePerTile) { shouldContinue &= ~0x1; } - if (tile_element_get_corner_height(surfaceElement, checkDirection2) != expectedLandHeight2 + landChangePerTile) + if (TileElementGetCornerHeight(surfaceElement, checkDirection2) != expectedLandHeight2 + landChangePerTile) { shouldContinue &= ~0x2; } - if (tile_element_get_corner_height(surfaceElement, checkDirection1) - != tile_element_get_corner_height(nextSurfaceElement, direction1)) + if (TileElementGetCornerHeight(surfaceElement, checkDirection1) + != TileElementGetCornerHeight(nextSurfaceElement, direction1)) { shouldContinue &= ~0x1; } - if (tile_element_get_corner_height(surfaceElement, checkDirection2) - != tile_element_get_corner_height(nextSurfaceElement, direction2)) + if (TileElementGetCornerHeight(surfaceElement, checkDirection2) + != TileElementGetCornerHeight(nextSurfaceElement, direction2)) { shouldContinue &= ~0x2; } @@ -143,25 +143,25 @@ money32 LandSmoothAction::SmoothLandRowByEdge( { shouldContinue &= ~0x3; } - if (tile_element_get_corner_height(surfaceElement, direction1) + landChangePerTile - != tile_element_get_corner_height(surfaceElement, checkDirection1)) + if (TileElementGetCornerHeight(surfaceElement, direction1) + landChangePerTile + != TileElementGetCornerHeight(surfaceElement, checkDirection1)) { shouldContinue &= ~0x1; } - if (tile_element_get_corner_height(surfaceElement, direction2) + landChangePerTile - != tile_element_get_corner_height(surfaceElement, checkDirection2)) + if (TileElementGetCornerHeight(surfaceElement, direction2) + landChangePerTile + != TileElementGetCornerHeight(surfaceElement, checkDirection2)) { shouldContinue &= ~0x2; } if ((shouldContinue & 0x1) - && tile_element_get_corner_height(surfaceElement, checkDirection1) - != tile_element_get_corner_height(nextSurfaceElement, direction1)) + && TileElementGetCornerHeight(surfaceElement, checkDirection1) + != TileElementGetCornerHeight(nextSurfaceElement, direction1)) { shouldContinue &= ~0x1; } if ((shouldContinue & 0x2) - && tile_element_get_corner_height(surfaceElement, checkDirection2) - != tile_element_get_corner_height(nextSurfaceElement, direction2)) + && TileElementGetCornerHeight(surfaceElement, checkDirection2) + != TileElementGetCornerHeight(nextSurfaceElement, direction2)) { shouldContinue &= ~0x2; } @@ -184,8 +184,8 @@ money32 LandSmoothAction::SmoothLandRowByEdge( } } if ((shouldContinue & 0x8) - && map_get_corner_height(surfaceElement->base_height, oldSlope, direction2) - == map_get_corner_height(targetBaseZ, slope, direction2)) + && MapGetCornerHeight(surfaceElement->base_height, oldSlope, direction2) + == MapGetCornerHeight(targetBaseZ, slope, direction2)) { slope = tile_element_lower_styles[direction2][slope]; if (slope & SURFACE_STYLE_FLAG_RAISE_OR_LOWER_BASE_HEIGHT) @@ -207,8 +207,8 @@ money32 LandSmoothAction::SmoothLandRowByEdge( } } if ((shouldContinue & 0x8) - && map_get_corner_height(surfaceElement->base_height, oldSlope, direction2) - == map_get_corner_height(targetBaseZ, slope, direction2)) + && MapGetCornerHeight(surfaceElement->base_height, oldSlope, direction2) + == MapGetCornerHeight(targetBaseZ, slope, direction2)) { slope = tile_element_raise_styles[direction2][slope]; if (slope & SURFACE_STYLE_FLAG_RAISE_OR_LOWER_BASE_HEIGHT) @@ -257,12 +257,11 @@ money32 LandSmoothAction::SmoothLandRowByCorner( { return 0; } - if (tile_element_get_corner_height(surfaceElement, checkDirection) != expectedLandHeight + (_isLowering ? 2 : -2)) + if (TileElementGetCornerHeight(surfaceElement, checkDirection) != expectedLandHeight + (_isLowering ? 2 : -2)) { return 0; } - if (tile_element_get_corner_height(surfaceElement, checkDirection) - != tile_element_get_corner_height(nextSurfaceElement, direction)) + if (TileElementGetCornerHeight(surfaceElement, checkDirection) != TileElementGetCornerHeight(nextSurfaceElement, direction)) { return 0; } @@ -286,14 +285,14 @@ money32 LandSmoothAction::SmoothLandRowByCorner( { shouldContinue = false; } - if (tile_element_get_corner_height(surfaceElement, direction) + landChangePerTile - != tile_element_get_corner_height(surfaceElement, checkDirection)) + if (TileElementGetCornerHeight(surfaceElement, direction) + landChangePerTile + != TileElementGetCornerHeight(surfaceElement, checkDirection)) { shouldContinue = false; } if (shouldContinue - && tile_element_get_corner_height(surfaceElement, checkDirection) - != tile_element_get_corner_height(nextSurfaceElement, direction)) + && TileElementGetCornerHeight(surfaceElement, checkDirection) + != TileElementGetCornerHeight(nextSurfaceElement, direction)) { shouldContinue = false; } @@ -351,7 +350,7 @@ GameActions::Result LandSmoothAction::SmoothLand(bool isExecuting) const if (surfaceElement != nullptr) { int32_t z = std::clamp( - static_cast(tile_element_get_corner_height(surfaceElement, 2)), minHeight, maxHeight); + static_cast(TileElementGetCornerHeight(surfaceElement, 2)), minHeight, maxHeight); res.Cost += SmoothLandRowByCorner( isExecuting, { validRange.GetLeft(), validRange.GetTop() }, z, -32, -32, 0, 2); } @@ -361,7 +360,7 @@ GameActions::Result LandSmoothAction::SmoothLand(bool isExecuting) const if (surfaceElement != nullptr) { int32_t z = std::clamp( - static_cast(tile_element_get_corner_height(surfaceElement, 3)), minHeight, maxHeight); + static_cast(TileElementGetCornerHeight(surfaceElement, 3)), minHeight, maxHeight); res.Cost += SmoothLandRowByCorner( isExecuting, { validRange.GetLeft(), validRange.GetBottom() }, z, -32, 32, 1, 3); } @@ -371,7 +370,7 @@ GameActions::Result LandSmoothAction::SmoothLand(bool isExecuting) const if (surfaceElement != nullptr) { int32_t z = std::clamp( - static_cast(tile_element_get_corner_height(surfaceElement, 0)), minHeight, maxHeight); + static_cast(TileElementGetCornerHeight(surfaceElement, 0)), minHeight, maxHeight); res.Cost += SmoothLandRowByCorner( isExecuting, { validRange.GetRight(), validRange.GetBottom() }, z, 32, 32, 2, 0); } @@ -381,7 +380,7 @@ GameActions::Result LandSmoothAction::SmoothLand(bool isExecuting) const if (surfaceElement != nullptr) { int32_t z = std::clamp( - static_cast(tile_element_get_corner_height(surfaceElement, 1)), minHeight, maxHeight); + static_cast(TileElementGetCornerHeight(surfaceElement, 1)), minHeight, maxHeight); res.Cost += SmoothLandRowByCorner( isExecuting, { validRange.GetRight(), validRange.GetTop() }, z, 32, -32, 3, 1); } @@ -394,20 +393,16 @@ GameActions::Result LandSmoothAction::SmoothLand(bool isExecuting) const auto surfaceElement = MapGetSurfaceElementAt(CoordsXY{ validRange.GetLeft(), y }); if (surfaceElement != nullptr) { - z1 = std::clamp( - static_cast(tile_element_get_corner_height(surfaceElement, 3)), minHeight, maxHeight); - z2 = std::clamp( - static_cast(tile_element_get_corner_height(surfaceElement, 2)), minHeight, maxHeight); + z1 = std::clamp(static_cast(TileElementGetCornerHeight(surfaceElement, 3)), minHeight, maxHeight); + z2 = std::clamp(static_cast(TileElementGetCornerHeight(surfaceElement, 2)), minHeight, maxHeight); res.Cost += SmoothLandRowByEdge(isExecuting, { validRange.GetLeft(), y }, z1, z2, -32, 0, 0, 1, 3, 2); } surfaceElement = MapGetSurfaceElementAt(CoordsXY{ validRange.GetRight(), y }); if (surfaceElement != nullptr) { - z1 = std::clamp( - static_cast(tile_element_get_corner_height(surfaceElement, 1)), minHeight, maxHeight); - z2 = std::clamp( - static_cast(tile_element_get_corner_height(surfaceElement, 0)), minHeight, maxHeight); + z1 = std::clamp(static_cast(TileElementGetCornerHeight(surfaceElement, 1)), minHeight, maxHeight); + z2 = std::clamp(static_cast(TileElementGetCornerHeight(surfaceElement, 0)), minHeight, maxHeight); res.Cost += SmoothLandRowByEdge(isExecuting, { validRange.GetRight(), y }, z1, z2, 32, 0, 2, 3, 1, 0); } } @@ -417,20 +412,16 @@ GameActions::Result LandSmoothAction::SmoothLand(bool isExecuting) const auto surfaceElement = MapGetSurfaceElementAt(CoordsXY{ x, validRange.GetTop() }); if (surfaceElement != nullptr) { - z1 = std::clamp( - static_cast(tile_element_get_corner_height(surfaceElement, 1)), minHeight, maxHeight); - z2 = std::clamp( - static_cast(tile_element_get_corner_height(surfaceElement, 2)), minHeight, maxHeight); + z1 = std::clamp(static_cast(TileElementGetCornerHeight(surfaceElement, 1)), minHeight, maxHeight); + z2 = std::clamp(static_cast(TileElementGetCornerHeight(surfaceElement, 2)), minHeight, maxHeight); res.Cost += SmoothLandRowByEdge(isExecuting, { x, validRange.GetTop() }, z1, z2, 0, -32, 0, 3, 1, 2); } surfaceElement = MapGetSurfaceElementAt(CoordsXY{ x, validRange.GetBottom() }); if (surfaceElement != nullptr) { - z1 = std::clamp( - static_cast(tile_element_get_corner_height(surfaceElement, 0)), minHeight, maxHeight); - z2 = std::clamp( - static_cast(tile_element_get_corner_height(surfaceElement, 3)), minHeight, maxHeight); + z1 = std::clamp(static_cast(TileElementGetCornerHeight(surfaceElement, 0)), minHeight, maxHeight); + z2 = std::clamp(static_cast(TileElementGetCornerHeight(surfaceElement, 3)), minHeight, maxHeight); res.Cost += SmoothLandRowByEdge(isExecuting, { x, validRange.GetBottom() }, z1, z2, 0, 32, 1, 2, 0, 3); } } @@ -463,67 +454,67 @@ GameActions::Result LandSmoothAction::SmoothLand(bool isExecuting) const } // Smooth the corners - int32_t z = map_get_corner_height(newBaseZ, newSlope, 2); + int32_t z = MapGetCornerHeight(newBaseZ, newSlope, 2); res.Cost += SmoothLandRowByCorner(isExecuting, { validRange.GetLeft(), validRange.GetTop() }, z, -32, -32, 0, 2); - z = map_get_corner_height(newBaseZ, newSlope, 0); + z = MapGetCornerHeight(newBaseZ, newSlope, 0); res.Cost += SmoothLandRowByCorner(isExecuting, { validRange.GetLeft(), validRange.GetTop() }, z, 32, 32, 2, 0); - z = map_get_corner_height(newBaseZ, newSlope, 3); + z = MapGetCornerHeight(newBaseZ, newSlope, 3); res.Cost += SmoothLandRowByCorner(isExecuting, { validRange.GetLeft(), validRange.GetTop() }, z, -32, 32, 1, 3); - z = map_get_corner_height(newBaseZ, newSlope, 1); + z = MapGetCornerHeight(newBaseZ, newSlope, 1); res.Cost += SmoothLandRowByCorner(isExecuting, { validRange.GetLeft(), validRange.GetTop() }, z, 32, -32, 3, 1); // Smooth the edges switch (selectionType) { case MAP_SELECT_TYPE_CORNER_0: - z = map_get_corner_height(newBaseZ, newSlope, 0); + z = MapGetCornerHeight(newBaseZ, newSlope, 0); res.Cost += SmoothLandRowByCorner( isExecuting, { validRange.GetLeft(), validRange.GetTop() }, z, 32, 0, 3, 0); res.Cost += SmoothLandRowByCorner( isExecuting, { validRange.GetLeft(), validRange.GetTop() }, z, 0, 32, 1, 0); - z = map_get_corner_height(newBaseZ, newSlope, 3); + z = MapGetCornerHeight(newBaseZ, newSlope, 3); res.Cost += SmoothLandRowByCorner( isExecuting, { validRange.GetLeft(), validRange.GetTop() }, z, -32, 0, 0, 3); - z = map_get_corner_height(newBaseZ, newSlope, 1); + z = MapGetCornerHeight(newBaseZ, newSlope, 1); res.Cost += SmoothLandRowByCorner( isExecuting, { validRange.GetLeft(), validRange.GetTop() }, z, 0, -32, 0, 1); break; case MAP_SELECT_TYPE_CORNER_1: - z = map_get_corner_height(newBaseZ, newSlope, 1); + z = MapGetCornerHeight(newBaseZ, newSlope, 1); res.Cost += SmoothLandRowByCorner( isExecuting, { validRange.GetLeft(), validRange.GetTop() }, z, 32, 0, 2, 1); res.Cost += SmoothLandRowByCorner( isExecuting, { validRange.GetLeft(), validRange.GetTop() }, z, 0, -32, 0, 1); - z = map_get_corner_height(newBaseZ, newSlope, 2); + z = MapGetCornerHeight(newBaseZ, newSlope, 2); res.Cost += SmoothLandRowByCorner( isExecuting, { validRange.GetLeft(), validRange.GetTop() }, z, -32, 0, 1, 2); - z = map_get_corner_height(newBaseZ, newSlope, 0); + z = MapGetCornerHeight(newBaseZ, newSlope, 0); res.Cost += SmoothLandRowByCorner( isExecuting, { validRange.GetLeft(), validRange.GetTop() }, z, 0, 32, 1, 0); break; case MAP_SELECT_TYPE_CORNER_2: - z = map_get_corner_height(newBaseZ, newSlope, 2); + z = MapGetCornerHeight(newBaseZ, newSlope, 2); res.Cost += SmoothLandRowByCorner( isExecuting, { validRange.GetLeft(), validRange.GetTop() }, z, -32, 0, 1, 2); res.Cost += SmoothLandRowByCorner( isExecuting, { validRange.GetLeft(), validRange.GetTop() }, z, 0, -32, 3, 2); - z = map_get_corner_height(newBaseZ, newSlope, 1); + z = MapGetCornerHeight(newBaseZ, newSlope, 1); res.Cost += SmoothLandRowByCorner( isExecuting, { validRange.GetLeft(), validRange.GetTop() }, z, 32, 0, 2, 1); - z = map_get_corner_height(newBaseZ, newSlope, 3); + z = MapGetCornerHeight(newBaseZ, newSlope, 3); res.Cost += SmoothLandRowByCorner( isExecuting, { validRange.GetLeft(), validRange.GetTop() }, z, 0, 32, 2, 3); break; case MAP_SELECT_TYPE_CORNER_3: - z = map_get_corner_height(newBaseZ, newSlope, 3); + z = MapGetCornerHeight(newBaseZ, newSlope, 3); res.Cost += SmoothLandRowByCorner( isExecuting, { validRange.GetLeft(), validRange.GetTop() }, z, -32, 0, 0, 3); res.Cost += SmoothLandRowByCorner( isExecuting, { validRange.GetLeft(), validRange.GetTop() }, z, 0, 32, 2, 3); - z = map_get_corner_height(newBaseZ, newSlope, 0); + z = MapGetCornerHeight(newBaseZ, newSlope, 0); res.Cost += SmoothLandRowByCorner( isExecuting, { validRange.GetLeft(), validRange.GetTop() }, z, 32, 0, 3, 0); - z = map_get_corner_height(newBaseZ, newSlope, 2); + z = MapGetCornerHeight(newBaseZ, newSlope, 2); res.Cost += SmoothLandRowByCorner( isExecuting, { validRange.GetLeft(), validRange.GetTop() }, z, 0, -32, 3, 2); break; @@ -576,10 +567,10 @@ GameActions::Result LandSmoothAction::SmoothLand(bool isExecuting) const uint8_t c2 = cornerIndices[edge][1]; uint8_t c3 = cornerIndices[edge][2]; uint8_t c4 = cornerIndices[edge][3]; - uint8_t z1 = map_get_corner_height(newBaseZ, newSlope, c1); - uint8_t z2 = map_get_corner_height(newBaseZ, newSlope, c2); - uint8_t z3 = map_get_corner_height(newBaseZ, newSlope, c3); - uint8_t z4 = map_get_corner_height(newBaseZ, newSlope, c4); + uint8_t z1 = MapGetCornerHeight(newBaseZ, newSlope, c1); + uint8_t z2 = MapGetCornerHeight(newBaseZ, newSlope, c2); + uint8_t z3 = MapGetCornerHeight(newBaseZ, newSlope, c3); + uint8_t z4 = MapGetCornerHeight(newBaseZ, newSlope, c4); // Smooth the edge at the top of the new slope res.Cost += SmoothLandRowByEdge( isExecuting, { validRange.GetLeft(), validRange.GetTop() }, z1, z2, stepOffsets[edge].x, stepOffsets[edge].y, @@ -596,13 +587,13 @@ GameActions::Result LandSmoothAction::SmoothLand(bool isExecuting) const res.Cost += SmoothLandRowByCorner( isExecuting, { validRange.GetLeft(), validRange.GetTop() }, z2, stepOffsets[edge].y, -stepOffsets[edge].x, c1, c2); - int32_t z = map_get_corner_height(newBaseZ, newSlope, 2); + int32_t z = MapGetCornerHeight(newBaseZ, newSlope, 2); res.Cost += SmoothLandRowByCorner(isExecuting, { validRange.GetLeft(), validRange.GetTop() }, z, -32, -32, 0, 2); - z = map_get_corner_height(newBaseZ, newSlope, 0); + z = MapGetCornerHeight(newBaseZ, newSlope, 0); res.Cost += SmoothLandRowByCorner(isExecuting, { validRange.GetLeft(), validRange.GetTop() }, z, 32, 32, 2, 0); - z = map_get_corner_height(newBaseZ, newSlope, 3); + z = MapGetCornerHeight(newBaseZ, newSlope, 3); res.Cost += SmoothLandRowByCorner(isExecuting, { validRange.GetLeft(), validRange.GetTop() }, z, -32, 32, 1, 3); - z = map_get_corner_height(newBaseZ, newSlope, 1); + z = MapGetCornerHeight(newBaseZ, newSlope, 1); res.Cost += SmoothLandRowByCorner(isExecuting, { validRange.GetLeft(), validRange.GetTop() }, z, 32, -32, 3, 1); break; } diff --git a/src/openrct2/actions/LargeSceneryPlaceAction.cpp b/src/openrct2/actions/LargeSceneryPlaceAction.cpp index e1e53ca75c..cbec898e32 100644 --- a/src/openrct2/actions/LargeSceneryPlaceAction.cpp +++ b/src/openrct2/actions/LargeSceneryPlaceAction.cpp @@ -293,7 +293,7 @@ GameActions::Result LargeSceneryPlaceAction::Execute() const } MapAnimationCreate(MAP_ANIMATION_TYPE_LARGE_SCENERY, { curTile, zLow }); - map_invalidate_tile_full(curTile); + MapInvalidateTileFull(curTile); if (tileNum == 0) { diff --git a/src/openrct2/actions/LargeSceneryRemoveAction.cpp b/src/openrct2/actions/LargeSceneryRemoveAction.cpp index f9bc0c93ac..d41c1979d9 100644 --- a/src/openrct2/actions/LargeSceneryRemoveAction.cpp +++ b/src/openrct2/actions/LargeSceneryRemoveAction.cpp @@ -174,7 +174,7 @@ GameActions::Result LargeSceneryRemoveAction::Execute() const auto* sceneryElement = FindLargeSceneryElement(currentTile, i); if (sceneryElement != nullptr) { - map_invalidate_tile_full(currentTile); + MapInvalidateTileFull(currentTile); TileElementRemove(sceneryElement); } else diff --git a/src/openrct2/actions/LargeScenerySetColourAction.cpp b/src/openrct2/actions/LargeScenerySetColourAction.cpp index 7a3f5ebd92..c2c1263373 100644 --- a/src/openrct2/actions/LargeScenerySetColourAction.cpp +++ b/src/openrct2/actions/LargeScenerySetColourAction.cpp @@ -80,7 +80,7 @@ GameActions::Result LargeScenerySetColourAction::QueryExecute(bool isExecuting) return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_NONE); } - auto largeElement = map_get_large_scenery_segment(_loc, _tileIndex); + auto largeElement = MapGetLargeScenerySegment(_loc, _tileIndex); if (largeElement == nullptr) { @@ -130,7 +130,7 @@ GameActions::Result LargeScenerySetColourAction::QueryExecute(bool isExecuting) return GameActions::Result(GameActions::Status::NotOwned, STR_CANT_REPAINT_THIS, STR_LAND_NOT_OWNED_BY_PARK); } - auto tileElement = map_get_large_scenery_segment({ currentTile.x, currentTile.y, _loc.z, _loc.direction }, i); + auto tileElement = MapGetLargeScenerySegment({ currentTile.x, currentTile.y, _loc.z, _loc.direction }, i); if (tileElement == nullptr) { @@ -145,7 +145,7 @@ GameActions::Result LargeScenerySetColourAction::QueryExecute(bool isExecuting) tileElement->SetSecondaryColour(_secondaryColour); tileElement->SetTertiaryColour(_tertiaryColour); - map_invalidate_tile_full(currentTile); + MapInvalidateTileFull(currentTile); } } return res; diff --git a/src/openrct2/actions/MazePlaceTrackAction.cpp b/src/openrct2/actions/MazePlaceTrackAction.cpp index e5737ceb17..1cee40a0d1 100644 --- a/src/openrct2/actions/MazePlaceTrackAction.cpp +++ b/src/openrct2/actions/MazePlaceTrackAction.cpp @@ -174,7 +174,7 @@ GameActions::Result MazePlaceTrackAction::Execute() const trackElement->SetMazeEntry(_mazeEntry); trackElement->SetGhost(flags & GAME_COMMAND_FLAG_GHOST); - map_invalidate_tile_full(startLoc); + MapInvalidateTileFull(startLoc); ride->maze_tiles++; ride->GetStation().SetBaseZ(trackElement->GetBaseZ()); diff --git a/src/openrct2/actions/MazeSetTrackAction.cpp b/src/openrct2/actions/MazeSetTrackAction.cpp index feb4fbf9cd..3af8b440ec 100644 --- a/src/openrct2/actions/MazeSetTrackAction.cpp +++ b/src/openrct2/actions/MazeSetTrackAction.cpp @@ -100,7 +100,7 @@ GameActions::Result MazeSetTrackAction::Query() const } } - TileElement* tileElement = map_get_track_element_at_of_type_from_ride(_loc, TrackElemType::Maze, _rideIndex); + TileElement* tileElement = MapGetTrackElementAtOfTypeFromRide(_loc, TrackElemType::Maze, _rideIndex); if (tileElement == nullptr) { if (_mode != GC_SET_MAZE_TRACK_BUILD) @@ -170,7 +170,7 @@ GameActions::Result MazeSetTrackAction::Execute() const WallRemoveAt({ _loc.ToTileStart(), _loc.z, _loc.z + 32 }); } - auto tileElement = map_get_track_element_at_of_type_from_ride(_loc, TrackElemType::Maze, _rideIndex); + auto tileElement = MapGetTrackElementAtOfTypeFromRide(_loc, TrackElemType::Maze, _rideIndex); if (tileElement == nullptr) { res.Cost = MazeCalculateCost(0, *ride, _loc); @@ -189,7 +189,7 @@ GameActions::Result MazeSetTrackAction::Execute() const tileElement = trackElement->as(); - map_invalidate_tile_full(startLoc); + MapInvalidateTileFull(startLoc); ride->maze_tiles++; ride->GetStation().SetBaseZ(tileElement->GetBaseZ()); @@ -219,7 +219,7 @@ GameActions::Result MazeSetTrackAction::Execute() const { auto previousElementLoc = CoordsXY{ _loc }.ToTileStart() - CoordsDirectionDelta[_loc.direction]; - TileElement* previousTileElement = map_get_track_element_at_of_type_from_ride( + TileElement* previousTileElement = MapGetTrackElementAtOfTypeFromRide( { previousElementLoc, _loc.z }, TrackElemType::Maze, _rideIndex); if (previousTileElement != nullptr) @@ -245,10 +245,9 @@ GameActions::Result MazeSetTrackAction::Execute() const auto previousSegment = CoordsXY{ _loc.x - CoordsDirectionDelta[_loc.direction].x / 2, _loc.y - CoordsDirectionDelta[_loc.direction].y / 2 }; - tileElement = map_get_track_element_at_of_type_from_ride( - { previousSegment, _loc.z }, TrackElemType::Maze, _rideIndex); + tileElement = MapGetTrackElementAtOfTypeFromRide({ previousSegment, _loc.z }, TrackElemType::Maze, _rideIndex); - map_invalidate_tile_full(previousSegment.ToTileStart()); + MapInvalidateTileFull(previousSegment.ToTileStart()); if (tileElement == nullptr) { log_error("No surface found"); @@ -273,7 +272,7 @@ GameActions::Result MazeSetTrackAction::Execute() const uint32_t direction1 = byte_993D0C[segmentBit]; auto nextElementLoc = previousSegment.ToTileStart() + CoordsDirectionDelta[direction1]; - TileElement* tmp_tileElement = map_get_track_element_at_of_type_from_ride( + TileElement* tmp_tileElement = MapGetTrackElementAtOfTypeFromRide( { nextElementLoc, _loc.z }, TrackElemType::Maze, _rideIndex); if (tmp_tileElement != nullptr) @@ -288,7 +287,7 @@ GameActions::Result MazeSetTrackAction::Execute() const break; } - map_invalidate_tile({ _loc.ToTileStart(), tileElement->GetBaseZ(), tileElement->GetClearanceZ() }); + MapInvalidateTile({ _loc.ToTileStart(), tileElement->GetBaseZ(), tileElement->GetClearanceZ() }); if ((tileElement->AsTrack()->GetMazeEntry() & 0x8888) == 0x8888) { diff --git a/src/openrct2/actions/ParkEntranceRemoveAction.cpp b/src/openrct2/actions/ParkEntranceRemoveAction.cpp index 34edb76188..37991f9adc 100644 --- a/src/openrct2/actions/ParkEntranceRemoveAction.cpp +++ b/src/openrct2/actions/ParkEntranceRemoveAction.cpp @@ -91,7 +91,7 @@ void ParkEntranceRemoveAction::ParkEntranceRemoveSegment(const CoordsXYZ& loc) c return; } - map_invalidate_tile({ loc, entranceElement->GetBaseZ(), entranceElement->GetClearanceZ() }); + MapInvalidateTile({ loc, entranceElement->GetBaseZ(), entranceElement->GetClearanceZ() }); entranceElement->Remove(); ParkUpdateFences({ loc.x, loc.y }); } diff --git a/src/openrct2/actions/PlaceParkEntranceAction.cpp b/src/openrct2/actions/PlaceParkEntranceAction.cpp index bd102e22c5..7c9dfdc807 100644 --- a/src/openrct2/actions/PlaceParkEntranceAction.cpp +++ b/src/openrct2/actions/PlaceParkEntranceAction.cpp @@ -166,7 +166,7 @@ GameActions::Result PlaceParkEntranceAction::Execute() const ParkUpdateFences({ entranceLoc.x, entranceLoc.y - COORDS_XY_STEP }); ParkUpdateFences({ entranceLoc.x, entranceLoc.y + COORDS_XY_STEP }); - map_invalidate_tile({ entranceLoc, entranceElement->GetBaseZ(), entranceElement->GetClearanceZ() }); + MapInvalidateTile({ entranceLoc, entranceElement->GetBaseZ(), entranceElement->GetClearanceZ() }); if (index == 0) { diff --git a/src/openrct2/actions/PlacePeepSpawnAction.cpp b/src/openrct2/actions/PlacePeepSpawnAction.cpp index 0cd01ec34d..a90b004e9c 100644 --- a/src/openrct2/actions/PlacePeepSpawnAction.cpp +++ b/src/openrct2/actions/PlacePeepSpawnAction.cpp @@ -108,7 +108,7 @@ GameActions::Result PlacePeepSpawnAction::Execute() const if (foundSpawn != std::end(gPeepSpawns)) { gPeepSpawns.erase(foundSpawn); - map_invalidate_tile_full(spawn); + MapInvalidateTileFull(spawn); return res; } } @@ -118,14 +118,14 @@ GameActions::Result PlacePeepSpawnAction::Execute() const { PeepSpawn oldestSpawn = *gPeepSpawns.begin(); gPeepSpawns.erase(gPeepSpawns.begin()); - map_invalidate_tile_full(oldestSpawn); + MapInvalidateTileFull(oldestSpawn); } // Set peep spawn gPeepSpawns.push_back(spawn); // Invalidate tile - map_invalidate_tile_full(_location); + MapInvalidateTileFull(_location); return res; } diff --git a/src/openrct2/actions/RideEntranceExitPlaceAction.cpp b/src/openrct2/actions/RideEntranceExitPlaceAction.cpp index 28215d1b9b..fef741ca27 100644 --- a/src/openrct2/actions/RideEntranceExitPlaceAction.cpp +++ b/src/openrct2/actions/RideEntranceExitPlaceAction.cpp @@ -215,7 +215,7 @@ GameActions::Result RideEntranceExitPlaceAction::Execute() const FootpathConnectEdges(_loc, entranceElement->as(), GetFlags()); FootpathUpdateQueueChains(); - map_invalidate_tile_full(_loc); + MapInvalidateTileFull(_loc); return res; } diff --git a/src/openrct2/actions/RideEntranceExitRemoveAction.cpp b/src/openrct2/actions/RideEntranceExitRemoveAction.cpp index ac51cd6075..6177968150 100644 --- a/src/openrct2/actions/RideEntranceExitRemoveAction.cpp +++ b/src/openrct2/actions/RideEntranceExitRemoveAction.cpp @@ -158,6 +158,6 @@ GameActions::Result RideEntranceExitRemoveAction::Execute() const FootpathUpdateQueueChains(); - map_invalidate_tile_full(_loc); + MapInvalidateTileFull(_loc); return res; } diff --git a/src/openrct2/actions/SetCheatAction.cpp b/src/openrct2/actions/SetCheatAction.cpp index 395fc453bb..fc1c05a770 100644 --- a/src/openrct2/actions/SetCheatAction.cpp +++ b/src/openrct2/actions/SetCheatAction.cpp @@ -380,14 +380,14 @@ void SetCheatAction::WaterPlants() const { tile_element_iterator it; - tile_element_iterator_begin(&it); + TileElementIteratorBegin(&it); do { if (it.element->GetType() == TileElementType::SmallScenery) { it.element->AsSmallScenery()->SetAge(0); } - } while (tile_element_iterator_next(&it)); + } while (TileElementIteratorNext(&it)); gfx_invalidate_screen(); } @@ -396,7 +396,7 @@ void SetCheatAction::FixVandalism() const { tile_element_iterator it; - tile_element_iterator_begin(&it); + TileElementIteratorBegin(&it); do { if (it.element->GetType() != TileElementType::Path) @@ -406,7 +406,7 @@ void SetCheatAction::FixVandalism() const continue; it.element->AsPath()->SetIsBroken(false); - } while (tile_element_iterator_next(&it)); + } while (TileElementIteratorNext(&it)); gfx_invalidate_screen(); } @@ -419,7 +419,7 @@ void SetCheatAction::RemoveLitter() const } tile_element_iterator it{}; - tile_element_iterator_begin(&it); + TileElementIteratorBegin(&it); do { if (it.element->GetType() != TileElementType::Path) @@ -433,7 +433,7 @@ void SetCheatAction::RemoveLitter() const if (pathBitEntry != nullptr && pathBitEntry->flags & PATH_BIT_FLAG_IS_BIN) path->SetAdditionStatus(0xFF); - } while (tile_element_iterator_next(&it)); + } while (TileElementIteratorNext(&it)); gfx_invalidate_screen(); } @@ -699,14 +699,14 @@ void SetCheatAction::OwnAllLand() const continue; int32_t baseZ = surfaceElement->GetBaseZ(); - int32_t destOwnership = check_max_allowable_land_rights_for_tile({ coords, baseZ }); + int32_t destOwnership = CheckMaxAllowableLandRightsForTile({ coords, baseZ }); // only own tiles that were not set to 0 if (destOwnership != OWNERSHIP_UNOWNED) { surfaceElement->SetOwnership(destOwnership); ParkUpdateFencesAroundTile(coords); - map_invalidate_tile({ coords, baseZ, baseZ + 16 }); + MapInvalidateTile({ coords, baseZ, baseZ + 16 }); } } } @@ -720,7 +720,7 @@ void SetCheatAction::OwnAllLand() const surfaceElement->SetOwnership(OWNERSHIP_UNOWNED); ParkUpdateFencesAroundTile(spawn); uint16_t baseZ = surfaceElement->GetBaseZ(); - map_invalidate_tile({ spawn, baseZ, baseZ + 16 }); + MapInvalidateTile({ spawn, baseZ, baseZ + 16 }); } } diff --git a/src/openrct2/actions/SignSetStyleAction.cpp b/src/openrct2/actions/SignSetStyleAction.cpp index 6c62b21d45..d09baff81e 100644 --- a/src/openrct2/actions/SignSetStyleAction.cpp +++ b/src/openrct2/actions/SignSetStyleAction.cpp @@ -88,7 +88,7 @@ GameActions::Result SignSetStyleAction::Execute() const if (_isLarge) { TileElement* tileElement = BannerGetTileElement(_bannerIndex); - if (!map_large_scenery_sign_set_colour( + if (!MapLargeScenerySignSetColour( { coords, tileElement->GetBaseZ(), tileElement->GetDirection() }, tileElement->AsLargeScenery()->GetSequenceIndex(), _mainColour, _textColour)) { @@ -101,7 +101,7 @@ GameActions::Result SignSetStyleAction::Execute() const wallElement->SetPrimaryColour(_mainColour); wallElement->SetSecondaryColour(_textColour); - map_invalidate_tile({ coords, wallElement->GetBaseZ(), wallElement->GetClearanceZ() }); + MapInvalidateTile({ coords, wallElement->GetBaseZ(), wallElement->GetClearanceZ() }); } auto intent = Intent(INTENT_ACTION_UPDATE_BANNER); diff --git a/src/openrct2/actions/SmallSceneryPlaceAction.cpp b/src/openrct2/actions/SmallSceneryPlaceAction.cpp index 847f137279..371e246d66 100644 --- a/src/openrct2/actions/SmallSceneryPlaceAction.cpp +++ b/src/openrct2/actions/SmallSceneryPlaceAction.cpp @@ -433,7 +433,7 @@ GameActions::Result SmallSceneryPlaceAction::Execute() const const uint8_t groundFlags = clearanceData.GroundFlags & (ELEMENT_IS_ABOVE_GROUND | ELEMENT_IS_UNDERGROUND); res.SetData(SmallSceneryPlaceActionResult{ groundFlags, sceneryElement->GetBaseZ(), sceneryElement->GetSceneryQuadrant() }); - map_invalidate_tile_full(_loc); + MapInvalidateTileFull(_loc); if (sceneryEntry->HasFlag(SMALL_SCENERY_FLAG_ANIMATED)) { MapAnimationCreate(MAP_ANIMATION_TYPE_SMALL_SCENERY, CoordsXYZ{ _loc, sceneryElement->GetBaseZ() }); diff --git a/src/openrct2/actions/SmallSceneryRemoveAction.cpp b/src/openrct2/actions/SmallSceneryRemoveAction.cpp index 38a9b81d20..d6f8511625 100644 --- a/src/openrct2/actions/SmallSceneryRemoveAction.cpp +++ b/src/openrct2/actions/SmallSceneryRemoveAction.cpp @@ -130,7 +130,7 @@ GameActions::Result SmallSceneryRemoveAction::Execute() const res.Position.z = TileElementHeight(res.Position); - map_invalidate_tile_full(_loc); + MapInvalidateTileFull(_loc); TileElementRemove(tileElement); return res; diff --git a/src/openrct2/actions/SmallScenerySetColourAction.cpp b/src/openrct2/actions/SmallScenerySetColourAction.cpp index 5018e3d952..c9ae6c08f2 100644 --- a/src/openrct2/actions/SmallScenerySetColourAction.cpp +++ b/src/openrct2/actions/SmallScenerySetColourAction.cpp @@ -100,7 +100,7 @@ GameActions::Result SmallScenerySetColourAction::QueryExecute(bool isExecuting) sceneryElement->SetSecondaryColour(_secondaryColour); sceneryElement->SetTertiaryColour(_tertiaryColour); - map_invalidate_tile_full(_loc); + MapInvalidateTileFull(_loc); } return res; diff --git a/src/openrct2/actions/StaffSetPatrolAreaAction.cpp b/src/openrct2/actions/StaffSetPatrolAreaAction.cpp index c24313ff22..a764583be2 100644 --- a/src/openrct2/actions/StaffSetPatrolAreaAction.cpp +++ b/src/openrct2/actions/StaffSetPatrolAreaAction.cpp @@ -52,7 +52,7 @@ GameActions::Result StaffSetPatrolAreaAction::Execute() const static void InvalidatePatrolTiles(const MapRange& range) { - map_invalidate_region(range.Point1, range.Point2); + MapInvalidateRegion(range.Point1, range.Point2); } GameActions::Result StaffSetPatrolAreaAction::QueryExecute(bool executing) const diff --git a/src/openrct2/actions/SurfaceSetStyleAction.cpp b/src/openrct2/actions/SurfaceSetStyleAction.cpp index a307f60d75..b40081c95a 100644 --- a/src/openrct2/actions/SurfaceSetStyleAction.cpp +++ b/src/openrct2/actions/SurfaceSetStyleAction.cpp @@ -197,7 +197,7 @@ GameActions::Result SurfaceSetStyleAction::Execute() const surfaceElement->SetSurfaceStyle(_surfaceStyle); - map_invalidate_tile_full(coords); + MapInvalidateTileFull(coords); FootpathRemoveLitter({ coords, TileElementHeight(coords) }); } } @@ -212,14 +212,14 @@ GameActions::Result SurfaceSetStyleAction::Execute() const edgeCost += 100; surfaceElement->SetEdgeStyle(_edgeStyle); - map_invalidate_tile_full(coords); + MapInvalidateTileFull(coords); } } if (surfaceElement->CanGrassGrow() && (surfaceElement->GetGrassLength() & 7) != GRASS_LENGTH_CLEAR_0) { surfaceElement->SetGrassLength(GRASS_LENGTH_CLEAR_0); - map_invalidate_tile_full(coords); + MapInvalidateTileFull(coords); } } } diff --git a/src/openrct2/actions/TrackPlaceAction.cpp b/src/openrct2/actions/TrackPlaceAction.cpp index ec1959e1cf..5697e2d90e 100644 --- a/src/openrct2/actions/TrackPlaceAction.cpp +++ b/src/openrct2/actions/TrackPlaceAction.cpp @@ -698,7 +698,7 @@ GameActions::Result TrackPlaceAction::Execute() const { FootpathConnectEdges(mapLoc, tileElement, GetFlags()); } - map_invalidate_tile_full(mapLoc); + MapInvalidateTileFull(mapLoc); } money64 price = ride->GetRideTypeDescriptor().BuildCosts.TrackPrice; diff --git a/src/openrct2/actions/TrackRemoveAction.cpp b/src/openrct2/actions/TrackRemoveAction.cpp index 59c91635d5..2817a6ce17 100644 --- a/src/openrct2/actions/TrackRemoveAction.cpp +++ b/src/openrct2/actions/TrackRemoveAction.cpp @@ -164,7 +164,7 @@ GameActions::Result TrackRemoveAction::Query() const return GameActions::Result( GameActions::Status::NotOwned, STR_RIDE_CONSTRUCTION_CANT_REMOVE_THIS, STR_LAND_NOT_OWNED_BY_PARK); } - map_invalidate_tile_full(mapLoc); + MapInvalidateTileFull(mapLoc); found = false; tileElement = MapGetFirstElementAt(mapLoc); @@ -343,7 +343,7 @@ GameActions::Result TrackRemoveAction::Execute() const rotatedTrackLoc = CoordsXYZ{ CoordsXY{ trackBlock->x, trackBlock->y }.Rotate(startLoc.direction), trackBlock->z }; auto mapLoc = CoordsXYZ{ startLoc.x, startLoc.y, startLoc.z } + rotatedTrackLoc; - map_invalidate_tile_full(mapLoc); + MapInvalidateTileFull(mapLoc); found = false; tileElement = MapGetFirstElementAt(mapLoc); diff --git a/src/openrct2/actions/TrackSetBrakeSpeedAction.cpp b/src/openrct2/actions/TrackSetBrakeSpeedAction.cpp index fb43cc500f..b6dfed02bb 100644 --- a/src/openrct2/actions/TrackSetBrakeSpeedAction.cpp +++ b/src/openrct2/actions/TrackSetBrakeSpeedAction.cpp @@ -60,7 +60,7 @@ GameActions::Result TrackSetBrakeSpeedAction::QueryExecute(bool isExecuting) con return GameActions::Result(GameActions::Status::NotOwned, STR_NONE, STR_NONE); } - TileElement* tileElement = map_get_track_element_at_of_type(_loc, _trackType); + TileElement* tileElement = MapGetTrackElementAtOfType(_loc, _trackType); if (tileElement == nullptr) { log_warning("Invalid game command for setting brakes speed. x = %d, y = %d", _loc.x, _loc.y); diff --git a/src/openrct2/actions/WallPlaceAction.cpp b/src/openrct2/actions/WallPlaceAction.cpp index 6cfeef32e3..ffdba0aec5 100644 --- a/src/openrct2/actions/WallPlaceAction.cpp +++ b/src/openrct2/actions/WallPlaceAction.cpp @@ -382,7 +382,7 @@ GameActions::Result WallPlaceAction::Execute() const wallElement->SetGhost(GetFlags() & GAME_COMMAND_FLAG_GHOST); MapAnimationCreate(MAP_ANIMATION_TYPE_WALL, targetLoc); - map_invalidate_tile_zoom1({ _loc, wallElement->GetBaseZ(), wallElement->GetBaseZ() + 72 }); + MapInvalidateTileZoom1({ _loc, wallElement->GetBaseZ(), wallElement->GetBaseZ() + 72 }); res.Cost = wallEntry->price; @@ -496,7 +496,7 @@ GameActions::Result WallPlaceAction::WallCheckObstruction( WallSceneryEntry* wall, int32_t z0, int32_t z1, bool* wallAcrossTrack) const { *wallAcrossTrack = false; - if (map_is_location_at_edge(_loc)) + if (MapIsLocationAtEdge(_loc)) { return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_BUILD_THIS_HERE, STR_OFF_EDGE_OF_MAP); } diff --git a/src/openrct2/actions/WallRemoveAction.cpp b/src/openrct2/actions/WallRemoveAction.cpp index 9d0b02da6e..168afe49ef 100644 --- a/src/openrct2/actions/WallRemoveAction.cpp +++ b/src/openrct2/actions/WallRemoveAction.cpp @@ -87,7 +87,7 @@ GameActions::Result WallRemoveAction::Execute() const res.Position.z = TileElementHeight(res.Position); wallElement->RemoveBannerEntry(); - map_invalidate_tile_zoom1({ _loc, wallElement->GetBaseZ(), (wallElement->GetBaseZ()) + 72 }); + MapInvalidateTileZoom1({ _loc, wallElement->GetBaseZ(), (wallElement->GetBaseZ()) + 72 }); TileElementRemove(wallElement); return res; diff --git a/src/openrct2/actions/WallSetColourAction.cpp b/src/openrct2/actions/WallSetColourAction.cpp index 93b372232d..656bd932cc 100644 --- a/src/openrct2/actions/WallSetColourAction.cpp +++ b/src/openrct2/actions/WallSetColourAction.cpp @@ -140,7 +140,7 @@ GameActions::Result WallSetColourAction::Execute() const { wallElement->SetTertiaryColour(_tertiaryColour); } - map_invalidate_tile_zoom1({ _loc, _loc.z, _loc.z + 72 }); + MapInvalidateTileZoom1({ _loc, _loc.z, _loc.z + 72 }); return res; } diff --git a/src/openrct2/actions/WaterSetHeightAction.cpp b/src/openrct2/actions/WaterSetHeightAction.cpp index bacf225b6b..8b0490b15f 100644 --- a/src/openrct2/actions/WaterSetHeightAction.cpp +++ b/src/openrct2/actions/WaterSetHeightAction.cpp @@ -124,7 +124,7 @@ GameActions::Result WaterSetHeightAction::Execute() const { surfaceElement->SetWaterHeight(0); } - map_invalidate_tile_full(_coords); + MapInvalidateTileFull(_coords); res.Cost = 250; diff --git a/src/openrct2/audio/Audio.cpp b/src/openrct2/audio/Audio.cpp index 0eafb44791..19827f53b3 100644 --- a/src/openrct2/audio/Audio.cpp +++ b/src/openrct2/audio/Audio.cpp @@ -170,7 +170,7 @@ namespace OpenRCT2::Audio } uint8_t rotation = get_current_rotation(); - auto pos2 = translate_3d_to_2d_with_z(rotation, location); + auto pos2 = Translate3DTo2DWithZ(rotation, location); rct_viewport* viewport = nullptr; while ((viewport = window_get_previous_viewport(viewport)) != nullptr) diff --git a/src/openrct2/cmdline/BenchSpriteSort.cpp b/src/openrct2/cmdline/BenchSpriteSort.cpp index a9ef4b8e78..cdc0d8900c 100644 --- a/src/openrct2/cmdline/BenchSpriteSort.cpp +++ b/src/openrct2/cmdline/BenchSpriteSort.cpp @@ -104,7 +104,7 @@ static std::vector extract_paint_session(std::string_view auto customXY = TileCoordsXY(gMapSize.x / 2, gMapSize.y / 2).ToCoordsXY().ToTileCentre(); auto customXYZ = CoordsXYZ(customXY, TileElementHeight(customXY)); - auto screenXY = translate_3d_to_2d_with_z(0, customXYZ); + auto screenXY = Translate3DTo2DWithZ(0, customXYZ); viewport.viewPos = { screenXY.x - (viewport.view_width / 2), screenXY.y - (viewport.view_height / 2) }; viewport.zoom = ZoomLevel{ 0 }; diff --git a/src/openrct2/drawing/LightFX.cpp b/src/openrct2/drawing/LightFX.cpp index 3d6c223afe..b088e1b147 100644 --- a/src/openrct2/drawing/LightFX.cpp +++ b/src/openrct2/drawing/LightFX.cpp @@ -647,7 +647,7 @@ static void LightfxAdd3DLight( continue; entry->Position = loc; - entry->ViewCoords = translate_3d_to_2d_with_z(get_current_rotation(), loc); + entry->ViewCoords = Translate3DTo2DWithZ(get_current_rotation(), loc); entry->Type = lightType; entry->LightIntensity = 0xFF; entry->LightHash = lightHash; @@ -661,7 +661,7 @@ static void LightfxAdd3DLight( LightListEntry* entry = &_LightListBack[LightListCurrentCountBack++]; entry->Position = loc; - entry->ViewCoords = translate_3d_to_2d_with_z(get_current_rotation(), loc); + entry->ViewCoords = Translate3DTo2DWithZ(get_current_rotation(), loc); entry->Type = lightType; entry->LightIntensity = 0xFF; entry->LightHash = lightHash; diff --git a/src/openrct2/entity/EntityRegistry.cpp b/src/openrct2/entity/EntityRegistry.cpp index c09d2c8f54..03456148a4 100644 --- a/src/openrct2/entity/EntityRegistry.cpp +++ b/src/openrct2/entity/EntityRegistry.cpp @@ -476,7 +476,7 @@ void EntityBase::MoveTo(const CoordsXYZ& newLocation) void EntitySetCoordinates(const CoordsXYZ& entityPos, EntityBase* entity) { - auto screenCoords = translate_3d_to_2d_with_z(get_current_rotation(), entityPos); + auto screenCoords = Translate3DTo2DWithZ(get_current_rotation(), entityPos); entity->SpriteRect = ScreenRect( screenCoords - ScreenCoordsXY{ entity->sprite_width, entity->sprite_height_negative }, diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp index bc0cbf581e..a637cfd72a 100644 --- a/src/openrct2/entity/Guest.cpp +++ b/src/openrct2/entity/Guest.cpp @@ -4831,7 +4831,7 @@ void Guest::UpdateRideMazePathfinding() auto stationBaseZ = ride->GetStation().GetBaseZ(); // Find the station track element - auto trackElement = map_get_track_element_at({ targetLoc, stationBaseZ }); + auto trackElement = MapGetTrackElementAt({ targetLoc, stationBaseZ }); if (trackElement == nullptr) { return; @@ -5830,7 +5830,7 @@ void Guest::UpdateUsingBin() additionStatus |= spaceLeftInBin << selectedBin; foundElement->SetAdditionStatus(additionStatus); - map_invalidate_tile_zoom0({ NextLoc, foundElement->GetBaseZ(), foundElement->GetClearanceZ() }); + MapInvalidateTileZoom0({ NextLoc, foundElement->GetBaseZ(), foundElement->GetClearanceZ() }); StateReset(); break; } @@ -6127,7 +6127,7 @@ static void peep_update_walking_break_scenery(Guest* peep) tileElement->SetIsBroken(true); - map_invalidate_tile_zoom1({ peep->NextLoc, tileElement->GetBaseZ(), tileElement->GetBaseZ() + 32 }); + MapInvalidateTileZoom1({ peep->NextLoc, tileElement->GetBaseZ(), tileElement->GetBaseZ() + 32 }); peep->Angriness = 16; } diff --git a/src/openrct2/entity/Peep.cpp b/src/openrct2/entity/Peep.cpp index a13bad8696..5bcfbd4fa1 100644 --- a/src/openrct2/entity/Peep.cpp +++ b/src/openrct2/entity/Peep.cpp @@ -341,7 +341,7 @@ bool Peep::ShouldWaitForLevelCrossing() bool Peep::IsOnLevelCrossing() { - auto trackElement = map_get_track_element_at(GetLocation()); + auto trackElement = MapGetTrackElementAt(GetLocation()); return trackElement != nullptr; } diff --git a/src/openrct2/entity/Staff.cpp b/src/openrct2/entity/Staff.cpp index d9699d6169..f42827ba58 100644 --- a/src/openrct2/entity/Staff.cpp +++ b/src/openrct2/entity/Staff.cpp @@ -1102,7 +1102,7 @@ void Staff::UpdateMowing() if (surfaceElement != nullptr && surfaceElement->CanGrassGrow()) { surfaceElement->SetGrassLength(GRASS_LENGTH_MOWED); - map_invalidate_tile_zoom0({ NextLoc, surfaceElement->GetBaseZ(), surfaceElement->GetBaseZ() + 16 }); + MapInvalidateTileZoom0({ NextLoc, surfaceElement->GetBaseZ(), surfaceElement->GetBaseZ() + 16 }); } StaffLawnsMown++; WindowInvalidateFlags |= PEEP_INVALIDATE_STAFF_STATS; @@ -1163,7 +1163,7 @@ void Staff::UpdateWatering() continue; tile_element->AsSmallScenery()->SetAge(0); - map_invalidate_tile_zoom0({ actionLoc, tile_element->GetBaseZ(), tile_element->GetClearanceZ() }); + MapInvalidateTileZoom0({ actionLoc, tile_element->GetBaseZ(), tile_element->GetClearanceZ() }); StaffGardensWatered++; WindowInvalidateFlags |= PEEP_INVALIDATE_STAFF_STATS; } while (!(tile_element++)->IsLastForTile()); @@ -1247,7 +1247,7 @@ void Staff::UpdateEmptyingBin() uint8_t additionStatus = tile_element->AsPath()->GetAdditionStatus() | ((3 << Var37) << Var37); tile_element->AsPath()->SetAdditionStatus(additionStatus); - map_invalidate_tile_zoom0({ NextLoc, tile_element->GetBaseZ(), tile_element->GetClearanceZ() }); + MapInvalidateTileZoom0({ NextLoc, tile_element->GetBaseZ(), tile_element->GetClearanceZ() }); StaffBinsEmptied++; WindowInvalidateFlags |= PEEP_INVALIDATE_STAFF_STATS; } @@ -2207,7 +2207,7 @@ bool Staff::UpdateFixingMoveToStationEnd(bool firstRun, const Ride* ride) return true; } - auto tileElement = map_get_track_element_at(stationPos); + auto tileElement = MapGetTrackElementAt(stationPos); if (tileElement == nullptr) { log_error("Couldn't find tile_element"); @@ -2296,7 +2296,7 @@ bool Staff::UpdateFixingMoveToStationStart(bool firstRun, const Ride* ride) CoordsXYE input; input.x = stationPosition.x; input.y = stationPosition.y; - input.element = map_get_track_element_at_from_ride({ input.x, input.y, stationPosition.z }, CurrentRide); + input.element = MapGetTrackElementAtFromRide({ input.x, input.y, stationPosition.z }, CurrentRide); if (input.element == nullptr) { return true; diff --git a/src/openrct2/interface/InteractiveConsole.cpp b/src/openrct2/interface/InteractiveConsole.cpp index 052c90cf25..946cdcc71d 100644 --- a/src/openrct2/interface/InteractiveConsole.cpp +++ b/src/openrct2/interface/InteractiveConsole.cpp @@ -1397,7 +1397,7 @@ static int32_t cc_remove_floating_objects(InteractiveConsole& console, const arg static int32_t cc_remove_park_fences(InteractiveConsole& console, [[maybe_unused]] const arguments_t& argv) { tile_element_iterator it; - tile_element_iterator_begin(&it); + TileElementIteratorBegin(&it); do { if (it.element->GetType() == TileElementType::Surface) @@ -1405,7 +1405,7 @@ static int32_t cc_remove_park_fences(InteractiveConsole& console, [[maybe_unused // Remove all park fence flags it.element->AsSurface()->SetParkFences(0); } - } while (tile_element_iterator_next(&it)); + } while (TileElementIteratorNext(&it)); gfx_invalidate_screen(); diff --git a/src/openrct2/interface/Screenshot.cpp b/src/openrct2/interface/Screenshot.cpp index a5d0efbdc8..66c71eff55 100644 --- a/src/openrct2/interface/Screenshot.cpp +++ b/src/openrct2/interface/Screenshot.cpp @@ -241,7 +241,7 @@ static int32_t GetTallestVisibleTileTop( { auto location = TileCoordsXY(x, y).ToCoordsXY(); int32_t z = GetHighestBaseClearanceZ(location, useViewClipping); - int32_t viewY = translate_3d_to_2d_with_z(rotation, CoordsXYZ(location.ToTileCentre(), z)).y; + int32_t viewY = Translate3DTo2DWithZ(rotation, CoordsXYZ(location.ToTileCentre(), z)).y; minViewY = std::min(minViewY, viewY); } } @@ -304,10 +304,10 @@ static rct_viewport GetGiantViewport(int32_t rotation, ZoomLevel zoom) // Calculate the viewport bounds auto corners = cornerCoords[useViewClipping ? 1 : 0]; - auto screenCoords1 = translate_3d_to_2d_with_z(rotation, { corners[0].ToCoordsXY().ToTileCentre(), 0 }); - auto screenCoords2 = translate_3d_to_2d_with_z(rotation, { corners[1].ToCoordsXY().ToTileCentre(), 0 }); - auto screenCoords3 = translate_3d_to_2d_with_z(rotation, { corners[2].ToCoordsXY().ToTileCentre(), 0 }); - auto screenCoords4 = translate_3d_to_2d_with_z(rotation, { corners[3].ToCoordsXY().ToTileCentre(), 0 }); + auto screenCoords1 = Translate3DTo2DWithZ(rotation, { corners[0].ToCoordsXY().ToTileCentre(), 0 }); + auto screenCoords2 = Translate3DTo2DWithZ(rotation, { corners[1].ToCoordsXY().ToTileCentre(), 0 }); + auto screenCoords3 = Translate3DTo2DWithZ(rotation, { corners[2].ToCoordsXY().ToTileCentre(), 0 }); + auto screenCoords4 = Translate3DTo2DWithZ(rotation, { corners[3].ToCoordsXY().ToTileCentre(), 0 }); auto left = std::min({ screenCoords1.x, screenCoords2.x, screenCoords3.x, screenCoords4.x }) - 32; auto top = GetTallestVisibleTileTop(rotation, corners[0], corners[1], useViewClipping); @@ -670,7 +670,7 @@ int32_t cmdline_for_screenshot(const char** argv, int32_t argc, ScreenshotOption int32_t z = TileElementHeight({ customX, customY }); CoordsXYZ coords3d = { customX, customY, z }; - auto coords2d = translate_3d_to_2d_with_z(customRotation, coords3d); + auto coords2d = Translate3DTo2DWithZ(customRotation, coords3d); viewport.viewPos = { coords2d.x - ((viewport.view_width << customZoom) / 2), coords2d.y - ((viewport.view_height << customZoom) / 2) }; @@ -765,7 +765,7 @@ void CaptureImage(const CaptureOptions& options) auto z = TileElementHeight(options.View->Position); CoordsXYZ coords3d(options.View->Position, z); - auto coords2d = translate_3d_to_2d_with_z(options.Rotation, coords3d); + auto coords2d = Translate3DTo2DWithZ(options.Rotation, coords3d); viewport.viewPos = { coords2d.x - ((options.Zoom.ApplyTo(viewport.view_width)) / 2), coords2d.y - ((options.Zoom.ApplyTo(viewport.view_height)) / 2) }; viewport.zoom = options.Zoom; diff --git a/src/openrct2/interface/Viewport.cpp b/src/openrct2/interface/Viewport.cpp index a7eab51259..ca4ca0ff7f 100644 --- a/src/openrct2/interface/Viewport.cpp +++ b/src/openrct2/interface/Viewport.cpp @@ -117,7 +117,7 @@ std::optional centre_2d_coordinates(const CoordsXYZ& loc, rct_vi return std::nullopt; } - auto screenCoord = translate_3d_to_2d_with_z(get_current_rotation(), loc); + auto screenCoord = Translate3DTo2DWithZ(get_current_rotation(), loc); screenCoord.x -= viewport->view_width / 2; screenCoord.y -= viewport->view_height / 2; return { screenCoord }; @@ -1169,7 +1169,7 @@ void rct_viewport::Invalidate() const CoordsXY viewport_coord_to_map_coord(const ScreenCoordsXY& coords, int32_t z) { - // Reverse of translate_3d_to_2d_with_z + // Reverse of Translate3DTo2DWithZ CoordsXY ret = { coords.y - coords.x / 2 + z, coords.y + coords.x / 2 + z }; auto inverseRotation = DirectionFlipXAxis(get_current_rotation()); return ret.Rotate(inverseRotation); @@ -2042,7 +2042,7 @@ std::optional screen_get_map_xy_quadrant(const ScreenCoordsXY& screenC if (!mapCoords.has_value()) return std::nullopt; - *quadrant = map_get_tile_quadrant(*mapCoords); + *quadrant = MapGetTileQuadrant(*mapCoords); return mapCoords->ToTileStart(); } @@ -2056,7 +2056,7 @@ std::optional screen_get_map_xy_quadrant_with_z(const ScreenCoordsXY& if (!mapCoords.has_value()) return std::nullopt; - *quadrant = map_get_tile_quadrant(*mapCoords); + *quadrant = MapGetTileQuadrant(*mapCoords); return mapCoords->ToTileStart(); } @@ -2070,7 +2070,7 @@ std::optional screen_get_map_xy_side(const ScreenCoordsXY& screenCoord if (!mapCoords.has_value()) return std::nullopt; - *side = map_get_tile_side(*mapCoords); + *side = MapGetTileSide(*mapCoords); return mapCoords->ToTileStart(); } @@ -2084,7 +2084,7 @@ std::optional screen_get_map_xy_side_with_z(const ScreenCoordsXY& scre if (!mapCoords.has_value()) return std::nullopt; - *side = map_get_tile_side(*mapCoords); + *side = MapGetTileSide(*mapCoords); return mapCoords->ToTileStart(); } diff --git a/src/openrct2/interface/Window.cpp b/src/openrct2/interface/Window.cpp index df29b56055..ee2ac4928b 100644 --- a/src/openrct2/interface/Window.cpp +++ b/src/openrct2/interface/Window.cpp @@ -838,7 +838,7 @@ void window_scroll_to_location(rct_window& w, const CoordsXYZ& coords) } } - auto screenCoords = translate_3d_to_2d_with_z(get_current_rotation(), coords); + auto screenCoords = Translate3DTo2DWithZ(get_current_rotation(), coords); int32_t i = 0; if (!(gScreenFlags & SCREEN_FLAGS_TITLE_DEMO)) diff --git a/src/openrct2/paint/Paint.cpp b/src/openrct2/paint/Paint.cpp index 782326a897..ce76e52d60 100644 --- a/src/openrct2/paint/Paint.cpp +++ b/src/openrct2/paint/Paint.cpp @@ -161,7 +161,7 @@ static paint_struct* CreateNormalPaintStruct( auto swappedRotCoord = CoordsXYZ{ offset.Rotate(swappedRotation), offset.z }; swappedRotCoord += session.SpritePosition; - const auto imagePos = translate_3d_to_2d_with_z(session.CurrentRotation, swappedRotCoord); + const auto imagePos = Translate3DTo2DWithZ(session.CurrentRotation, swappedRotCoord); if (!ImageWithinDPI(imagePos, *g1, session.DPI)) { @@ -575,56 +575,56 @@ static void PaintPSImageWithBoundingBoxes(rct_drawpixelinfo* dpi, paint_struct* ps->bounds.y_end, ps->bounds.z_end, }; - const auto screenCoordFrontTop = translate_3d_to_2d_with_z(rotation, frontTop); + const auto screenCoordFrontTop = Translate3DTo2DWithZ(rotation, frontTop); const CoordsXYZ frontBottom = { ps->bounds.x_end, ps->bounds.y_end, ps->bounds.z, }; - const auto screenCoordFrontBottom = translate_3d_to_2d_with_z(rotation, frontBottom); + const auto screenCoordFrontBottom = Translate3DTo2DWithZ(rotation, frontBottom); const CoordsXYZ leftTop = { ps->bounds.x, ps->bounds.y_end, ps->bounds.z_end, }; - const auto screenCoordLeftTop = translate_3d_to_2d_with_z(rotation, leftTop); + const auto screenCoordLeftTop = Translate3DTo2DWithZ(rotation, leftTop); const CoordsXYZ leftBottom = { ps->bounds.x, ps->bounds.y_end, ps->bounds.z, }; - const auto screenCoordLeftBottom = translate_3d_to_2d_with_z(rotation, leftBottom); + const auto screenCoordLeftBottom = Translate3DTo2DWithZ(rotation, leftBottom); const CoordsXYZ rightTop = { ps->bounds.x_end, ps->bounds.y, ps->bounds.z_end, }; - const auto screenCoordRightTop = translate_3d_to_2d_with_z(rotation, rightTop); + const auto screenCoordRightTop = Translate3DTo2DWithZ(rotation, rightTop); const CoordsXYZ rightBottom = { ps->bounds.x_end, ps->bounds.y, ps->bounds.z, }; - const auto screenCoordRightBottom = translate_3d_to_2d_with_z(rotation, rightBottom); + const auto screenCoordRightBottom = Translate3DTo2DWithZ(rotation, rightBottom); const CoordsXYZ backTop = { ps->bounds.x, ps->bounds.y, ps->bounds.z_end, }; - const auto screenCoordBackTop = translate_3d_to_2d_with_z(rotation, backTop); + const auto screenCoordBackTop = Translate3DTo2DWithZ(rotation, backTop); const CoordsXYZ backBottom = { ps->bounds.x, ps->bounds.y, ps->bounds.z, }; - const auto screenCoordBackBottom = translate_3d_to_2d_with_z(rotation, backBottom); + const auto screenCoordBackBottom = Translate3DTo2DWithZ(rotation, backBottom); // bottom square gfx_draw_line(dpi, { screenCoordFrontBottom, screenCoordLeftBottom }, colour); @@ -894,7 +894,7 @@ void PaintFloatingMoneyEffect( session.SpritePosition.y, z, }; - const auto coord = translate_3d_to_2d_with_z(rotation, position); + const auto coord = Translate3DTo2DWithZ(rotation, position); ps->string_id = string_id; ps->next = nullptr; diff --git a/src/openrct2/paint/VirtualFloor.cpp b/src/openrct2/paint/VirtualFloor.cpp index 8f3087afc3..e43cfeb7bc 100644 --- a/src/openrct2/paint/VirtualFloor.cpp +++ b/src/openrct2/paint/VirtualFloor.cpp @@ -140,7 +140,7 @@ void VirtualFloorInvalidate() log_verbose( "Invalidating previous region, Min: %d %d, Max: %d %d", _virtualFloorLastMinPos.x, _virtualFloorLastMinPos.y, _virtualFloorLastMaxPos.x, _virtualFloorLastMaxPos.y); - map_invalidate_region(_virtualFloorLastMinPos, _virtualFloorLastMaxPos); + MapInvalidateRegion(_virtualFloorLastMinPos, _virtualFloorLastMaxPos); } } @@ -161,7 +161,7 @@ void VirtualFloorInvalidate() if (min_position.x != std::numeric_limits::max() && min_position.y != std::numeric_limits::max() && max_position.x != std::numeric_limits::lowest() && max_position.y != std::numeric_limits::lowest()) { - map_invalidate_region(min_position, max_position); + MapInvalidateRegion(min_position, max_position); // Save minimal and maximal positions. _virtualFloorLastMinPos.x = min_position.x; diff --git a/src/openrct2/paint/tile_element/Paint.TileElement.cpp b/src/openrct2/paint/tile_element/Paint.TileElement.cpp index c2e683f96e..575f95c81d 100644 --- a/src/openrct2/paint/tile_element/Paint.TileElement.cpp +++ b/src/openrct2/paint/tile_element/Paint.TileElement.cpp @@ -164,7 +164,7 @@ static void PaintTileElementBase(paint_session& session, const CoordsXY& origCoo break; } - int32_t screenMinY = translate_3d_to_2d_with_z(rotation, { coords, 0 }).y; + int32_t screenMinY = Translate3DTo2DWithZ(rotation, { coords, 0 }).y; // Display little yellow arrow when building footpaths? if ((gMapSelectFlags & MAP_SELECT_FLAG_ENABLE_ARROW) && session.MapPosition.x == gMapSelectArrowPosition.x diff --git a/src/openrct2/park/ParkFile.cpp b/src/openrct2/park/ParkFile.cpp index e6a7b46d29..de777a633e 100644 --- a/src/openrct2/park/ParkFile.cpp +++ b/src/openrct2/park/ParkFile.cpp @@ -991,8 +991,8 @@ namespace OpenRCT2 SetTileElements(std::move(tileElements)); { tile_element_iterator it; - tile_element_iterator_begin(&it); - while (tile_element_iterator_next(&it)) + TileElementIteratorBegin(&it); + while (TileElementIteratorNext(&it)) { if (it.element->GetType() == TileElementType::Path) { diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 890c7f25f6..fabaf62e5f 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -2408,8 +2408,8 @@ namespace RCT1 { gParkEntrances.clear(); tile_element_iterator it; - tile_element_iterator_begin(&it); - while (tile_element_iterator_next(&it) && gParkEntrances.size() < Limits::MaxParkEntrances) + TileElementIteratorBegin(&it); + while (TileElementIteratorNext(&it) && gParkEntrances.size() < Limits::MaxParkEntrances) { TileElement* element = it.element; diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index b81822ee65..18e5399145 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -1969,7 +1969,7 @@ namespace RCT2 // ride is on. It's possible to create unwanted behavior if a user layers spinning control track on top of // booster track but this is unlikely since only two rides have spinning control track - by default they load as // booster - TileElement* tileElement2 = map_get_track_element_at_of_type_seq( + TileElement* tileElement2 = MapGetTrackElementAtOfTypeSeq( dst->TrackLocation, TrackElemType::RotationControlToggle, 0); if (tileElement2 != nullptr) diff --git a/src/openrct2/ride/CableLift.cpp b/src/openrct2/ride/CableLift.cpp index 6033a50484..64a2615f09 100644 --- a/src/openrct2/ride/CableLift.cpp +++ b/src/openrct2/ride/CableLift.cpp @@ -244,7 +244,7 @@ bool Vehicle::CableLiftUpdateTrackMotionForwards() uint16_t trackTotalProgress = GetTrackProgress(); if (trackProgress >= trackTotalProgress) { - TileElement* trackElement = map_get_track_element_at_of_type_seq(TrackLocation, trackType, 0); + TileElement* trackElement = MapGetTrackElementAtOfTypeSeq(TrackLocation, trackType, 0); CoordsXYE output; int32_t outputZ; @@ -307,7 +307,7 @@ bool Vehicle::CableLiftUpdateTrackMotionBackwards() if (static_cast(trackProgress) == -1) { auto trackType = GetTrackType(); - TileElement* trackElement = map_get_track_element_at_of_type_seq(TrackLocation, trackType, 0); + TileElement* trackElement = MapGetTrackElementAtOfTypeSeq(TrackLocation, trackType, 0); auto input = CoordsXYE{ TrackLocation, trackElement }; track_begin_end output; diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp index 0c7bf0880b..520f167a6f 100644 --- a/src/openrct2/ride/Ride.cpp +++ b/src/openrct2/ride/Ride.cpp @@ -421,7 +421,7 @@ bool ride_try_get_origin_element(const Ride* ride, CoordsXYE* output) TileElement* resultTileElement = nullptr; tile_element_iterator it; - tile_element_iterator_begin(&it); + TileElementIteratorBegin(&it); do { if (it.element->GetType() != TileElementType::Track) @@ -455,7 +455,7 @@ bool ride_try_get_origin_element(const Ride* ride, CoordsXYE* output) { return true; } - } while (tile_element_iterator_next(&it)); + } while (TileElementIteratorNext(&it)); return resultTileElement != nullptr; } @@ -1126,10 +1126,10 @@ void UpdateChairlift(Ride& ride) return; auto bullwheelLoc = ride.ChairliftBullwheelLocation[0].ToCoordsXYZ(); - map_invalidate_tile_zoom1({ bullwheelLoc, bullwheelLoc.z, bullwheelLoc.z + (4 * COORDS_Z_STEP) }); + MapInvalidateTileZoom1({ bullwheelLoc, bullwheelLoc.z, bullwheelLoc.z + (4 * COORDS_Z_STEP) }); bullwheelLoc = ride.ChairliftBullwheelLocation[1].ToCoordsXYZ(); - map_invalidate_tile_zoom1({ bullwheelLoc, bullwheelLoc.z, bullwheelLoc.z + (4 * COORDS_Z_STEP) }); + MapInvalidateTileZoom1({ bullwheelLoc, bullwheelLoc.z, bullwheelLoc.z + (4 * COORDS_Z_STEP) }); } /** @@ -1242,7 +1242,7 @@ void UpdateSpiralSlide(Ride& ride) int32_t rotation = tileElement->GetDirection(); startLoc += ride_spiral_slide_main_tile_offset[rotation][current_rotation]; - map_invalidate_tile_zoom0({ startLoc, tileElement->GetBaseZ(), tileElement->GetClearanceZ() }); + MapInvalidateTileZoom0({ startLoc, tileElement->GetBaseZ(), tileElement->GetClearanceZ() }); } } @@ -3404,7 +3404,7 @@ static void ride_create_vehicles_find_first_block(Ride* ride, CoordsXYE* outXYEl return; auto curTrackPos = vehicle->TrackLocation; - auto curTrackElement = map_get_track_element_at(curTrackPos); + auto curTrackElement = MapGetTrackElementAt(curTrackPos); assert(curTrackElement != nullptr); @@ -3435,7 +3435,7 @@ static void ride_create_vehicles_find_first_block(Ride* ride, CoordsXYE* outXYEl case TrackElemType::DiagUp60ToFlat: if (trackElement->HasChain()) { - TileElement* tileElement = map_get_track_element_at_of_type_seq( + TileElement* tileElement = MapGetTrackElementAtOfTypeSeq( { trackBeginEnd.begin_x, trackBeginEnd.begin_y, trackBeginEnd.begin_z }, trackType, 0); if (tileElement != nullptr) @@ -3493,7 +3493,7 @@ ResultWithMessage Ride::CreateVehicles(const CoordsXYE& element, bool isApplying { vehiclePos -= CoordsXYZ{ CoordsDirectionDelta[direction], 0 }; - trackElement = map_get_track_element_at(vehiclePos); + trackElement = MapGetTrackElementAt(vehiclePos); vehiclePos.z = trackElement->GetBaseZ(); } @@ -3744,7 +3744,7 @@ static ResultWithMessage ride_create_cable_lift(RideId rideIndex, bool isApplyin } auto cableLiftLoc = ride->CableLiftLoc; - auto tileElement = map_get_track_element_at(cableLiftLoc); + auto tileElement = MapGetTrackElementAt(cableLiftLoc); int32_t direction = tileElement->GetDirection(); Vehicle* head = nullptr; @@ -4601,8 +4601,8 @@ bool ride_has_any_track_elements(const Ride* ride) { tile_element_iterator it; - tile_element_iterator_begin(&it); - while (tile_element_iterator_next(&it)) + TileElementIteratorBegin(&it); + while (TileElementIteratorNext(&it)) { if (it.element->GetType() != TileElementType::Track) continue; @@ -5908,8 +5908,8 @@ std::vector GetTracklessRides() std::vector seen; seen.resize(256); tile_element_iterator it; - tile_element_iterator_begin(&it); - while (tile_element_iterator_next(&it)) + TileElementIteratorBegin(&it); + while (TileElementIteratorNext(&it)) { auto trackEl = it.element->AsTrack(); if (trackEl != nullptr && !trackEl->IsGhost()) diff --git a/src/openrct2/ride/RideAudio.cpp b/src/openrct2/ride/RideAudio.cpp index 34a1300340..ee58667f10 100644 --- a/src/openrct2/ride/RideAudio.cpp +++ b/src/openrct2/ride/RideAudio.cpp @@ -382,7 +382,7 @@ namespace OpenRCT2::RideAudio { if (!(gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) && !gGameSoundsOff && g_music_tracking_viewport != nullptr) { - auto rotatedCoords = translate_3d_to_2d_with_z(get_current_rotation(), rideCoords); + auto rotatedCoords = Translate3DTo2DWithZ(get_current_rotation(), rideCoords); auto viewport = g_music_tracking_viewport; auto viewWidth = viewport->view_width; auto viewWidth2 = viewWidth * 2; diff --git a/src/openrct2/ride/RideConstruction.cpp b/src/openrct2/ride/RideConstruction.cpp index 46db9a4c89..7e28446e40 100644 --- a/src/openrct2/ride/RideConstruction.cpp +++ b/src/openrct2/ride/RideConstruction.cpp @@ -379,10 +379,10 @@ std::optional GetTrackElementOriginAndApplyChanges( const CoordsXYZD& location, track_type_t type, uint16_t extra_params, TileElement** output_element, uint16_t flags) { // Find the relevant track piece, prefer sequence 0 (this ensures correct behaviour for diagonal track pieces) - auto trackElement = map_get_track_element_at_of_type_seq(location, type, 0); + auto trackElement = MapGetTrackElementAtOfTypeSeq(location, type, 0); if (trackElement == nullptr) { - trackElement = map_get_track_element_at_of_type(location, type); + trackElement = MapGetTrackElementAtOfType(location, type); if (trackElement == nullptr) { return std::nullopt; @@ -414,9 +414,9 @@ std::optional GetTrackElementOriginAndApplyChanges( cur += offsets.Rotate(mapDirection); int32_t cur_z = start_z + trackBlock[i].z; - map_invalidate_tile_full(cur); + MapInvalidateTileFull(cur); - trackElement = map_get_track_element_at_of_type_seq( + trackElement = MapGetTrackElementAtOfTypeSeq( { cur, cur_z, static_cast(location.direction) }, type, trackBlock[i].index); if (trackElement == nullptr) { @@ -563,7 +563,7 @@ void ride_construction_invalidate_current_track() case RideConstructionState::Back: if (_currentTrackSelectionFlags & TRACK_SELECTION_FLAG_ARROW) { - map_invalidate_tile_full(_currentTrackBegin.ToTileStart()); + MapInvalidateTileFull(_currentTrackBegin.ToTileStart()); } ride_construction_remove_ghosts(); break; @@ -574,7 +574,7 @@ void ride_construction_invalidate_current_track() { _currentTrackSelectionFlags &= ~TRACK_SELECTION_FLAG_ARROW; gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_ARROW; - map_invalidate_tile_full(_currentTrackBegin); + MapInvalidateTileFull(_currentTrackBegin); } ride_construction_remove_ghosts(); break; @@ -1576,7 +1576,7 @@ void Ride::ValidateStations() MazeEntranceHedgeReplacement({ location, tileElement }); FootpathRemoveEdgesAt(location, tileElement); FootpathUpdateQueueChains(); - map_invalidate_tile_full(location); + MapInvalidateTileFull(location); TileElementRemove(tileElement); tileElement--; } diff --git a/src/openrct2/ride/Station.cpp b/src/openrct2/ride/Station.cpp index dd7bc97ea8..db893963f2 100644 --- a/src/openrct2/ride/Station.cpp +++ b/src/openrct2/ride/Station.cpp @@ -330,7 +330,7 @@ static void ride_invalidate_station_start(Ride* ride, StationIndex stationIndex, tileElement->AsTrack()->SetHasGreenLight(greenLight); // Invalidate map tile - map_invalidate_tile_zoom1({ startPos, tileElement->GetBaseZ(), tileElement->GetClearanceZ() }); + MapInvalidateTileZoom1({ startPos, tileElement->GetBaseZ(), tileElement->GetClearanceZ() }); } TileElement* ride_get_station_start_track_element(const Ride* ride, StationIndex stationIndex) diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp index 861acd973f..ffa318575f 100644 --- a/src/openrct2/ride/Track.cpp +++ b/src/openrct2/ride/Track.cpp @@ -244,7 +244,7 @@ ResultWithMessage track_add_station_element(CoordsXYZD loc, RideId rideIndex, in } stationElement->AsTrack()->SetTrackType(targetTrackType); - map_invalidate_element(loc, stationElement); + MapInvalidateElement(loc, stationElement); if (stationBackLoc != loc) { @@ -275,7 +275,7 @@ ResultWithMessage track_remove_station_element(const CoordsXYZD& loc, RideId rid if (ride->GetRideTypeDescriptor().HasFlag(RIDE_TYPE_FLAG_HAS_SINGLE_PIECE_STATION)) { - TileElement* tileElement = map_get_track_element_at_with_direction_from_ride(loc, rideIndex); + TileElement* tileElement = MapGetTrackElementAtWithDirectionFromRide(loc, rideIndex); if (tileElement != nullptr) { if (flags & GAME_COMMAND_FLAG_APPLY) @@ -390,7 +390,7 @@ ResultWithMessage track_remove_station_element(const CoordsXYZD& loc, RideId rid } stationElement->AsTrack()->SetTrackType(targetTrackType); - map_invalidate_element(currentLoc, stationElement); + MapInvalidateElement(currentLoc, stationElement); } } diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp index 1e99b2019b..54002069da 100644 --- a/src/openrct2/ride/TrackDesign.cpp +++ b/src/openrct2/ride/TrackDesign.cpp @@ -2166,7 +2166,7 @@ void TrackDesignDrawPreview(TrackDesign* td6, uint8_t* pixels) { gCurrentRotation = i; - view.viewPos = translate_3d_to_2d_with_z(i, centre) - offset; + view.viewPos = Translate3DTo2DWithZ(i, centre) - offset; viewport_paint(&view, &dpi, { view.viewPos, view.viewPos + ScreenCoordsXY{ size_x, size_y } }); dpi.bits += TRACK_PREVIEW_IMAGE_SIZE; diff --git a/src/openrct2/ride/TrackDesignSave.cpp b/src/openrct2/ride/TrackDesignSave.cpp index afb28f5d93..35819e4738 100644 --- a/src/openrct2/ride/TrackDesignSave.cpp +++ b/src/openrct2/ride/TrackDesignSave.cpp @@ -109,14 +109,14 @@ void track_design_save_select_tile_element( void track_design_save_select_nearby_scenery(RideId rideIndex) { tile_element_iterator it; - tile_element_iterator_begin(&it); + TileElementIteratorBegin(&it); do { if (track_design_save_should_select_scenery_around(rideIndex, it.element)) { track_design_save_select_nearby_scenery_for_tile(rideIndex, it.x, it.y); } - } while (tile_element_iterator_next(&it)); + } while (TileElementIteratorNext(&it)); gfx_invalidate_screen(); } @@ -204,7 +204,7 @@ static void track_design_save_push_tile_element(const CoordsXY& loc, TileElement if (_trackSavedTileElements.size() < TRACK_MAX_SAVED_TILE_ELEMENTS) { _trackSavedTileElements.push_back(tileElement); - map_invalidate_tile_full(loc); + MapInvalidateTileFull(loc); } } @@ -276,7 +276,7 @@ static TrackDesignAddStatus track_design_save_add_large_scenery(const CoordsXY& auto direction = tileElement->GetDirection(); auto sequence = tileElement->GetSequenceIndex(); - auto sceneryOrigin = map_large_scenery_get_origin( + auto sceneryOrigin = MapLargeSceneryGetOrigin( { loc.x, loc.y, z << 3, static_cast(direction) }, sequence, nullptr); if (!sceneryOrigin.has_value()) { @@ -292,7 +292,7 @@ static TrackDesignAddStatus track_design_save_add_large_scenery(const CoordsXY& CoordsXYZ tileLoc = { sceneryOrigin->x + rotatedOffsetPos.x, sceneryOrigin->y + rotatedOffsetPos.y, sceneryOrigin->z + tile->z_offset }; - auto largeElement = map_get_large_scenery_segment({ tileLoc, static_cast(direction) }, sequence); + auto largeElement = MapGetLargeScenerySegment({ tileLoc, static_cast(direction) }, sequence); if (largeElement != nullptr) { if (sequence == 0) @@ -414,7 +414,7 @@ static TrackDesignAddStatus track_design_save_add_tile_element( */ static void track_design_save_pop_tile_element(const CoordsXY& loc, TileElement* tileElement) { - map_invalidate_tile_full(loc); + MapInvalidateTileFull(loc); // Find index of map element to remove size_t removeIndex = SIZE_MAX; @@ -493,7 +493,7 @@ static void track_design_save_remove_large_scenery(const CoordsXY& loc, LargeSce auto direction = tileElement->GetDirection(); auto sequence = tileElement->GetSequenceIndex(); - auto sceneryOrigin = map_large_scenery_get_origin( + auto sceneryOrigin = MapLargeSceneryGetOrigin( { loc.x, loc.y, z << 3, static_cast(direction) }, sequence, nullptr); if (!sceneryOrigin) { @@ -509,7 +509,7 @@ static void track_design_save_remove_large_scenery(const CoordsXY& loc, LargeSce CoordsXYZ tileLoc = { sceneryOrigin->x + rotatedOffsetPos.x, sceneryOrigin->y + rotatedOffsetPos.y, sceneryOrigin->z + tile->z_offset }; - auto largeElement = map_get_large_scenery_segment({ tileLoc, static_cast(direction) }, sequence); + auto largeElement = MapGetLargeScenerySegment({ tileLoc, static_cast(direction) }, sequence); if (largeElement != nullptr) { if (sequence == 0) diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index 42cfdc8a95..c4211a2382 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -2719,7 +2719,7 @@ static bool ride_station_can_depart_synchronised(const Ride& ride, StationIndex const auto& station = ride.GetStation(stationIndex); auto location = station.GetStart(); - auto tileElement = map_get_track_element_at(location); + auto tileElement = MapGetTrackElementAt(location); if (tileElement == nullptr) { return false; @@ -3027,7 +3027,7 @@ void Vehicle::TestReset() // Therefore, it will return true if anything is amiss. bool Vehicle::CurrentTowerElementIsTop() { - TileElement* tileElement = map_get_track_element_at_of_type(TrackLocation, GetTrackType()); + TileElement* tileElement = MapGetTrackElementAtOfType(TrackLocation, GetTrackType()); if (tileElement == nullptr) return true; @@ -3957,7 +3957,7 @@ void Vehicle::UpdateArriving() return; } - auto trackElement = map_get_track_element_at(TrackLocation); + auto trackElement = MapGetTrackElementAt(TrackLocation); if (trackElement == nullptr) { @@ -4239,7 +4239,7 @@ void Vehicle::TryReconnectBoatToTrack(const CoordsXY& currentBoatLocation, const TrackLocation.x = trackCoords.x; TrackLocation.y = trackCoords.y; - auto trackElement = map_get_track_element_at(TrackLocation); + auto trackElement = MapGetTrackElementAt(TrackLocation); auto curRide = GetRide(); if (curRide != nullptr) @@ -6127,7 +6127,7 @@ void Vehicle::CheckAndApplyBlockSectionStopSite() auto trackType = GetTrackType(); - TileElement* trackElement = map_get_track_element_at_of_type(TrackLocation, trackType); + TileElement* trackElement = MapGetTrackElementAtOfType(TrackLocation, trackType); if (trackElement == nullptr) { @@ -6240,13 +6240,13 @@ static void block_brakes_open_previous_section(Ride& ride, const CoordsXYZ& vehi // Get the start of the track block instead of the end location = { trackBeginEnd.begin_x, trackBeginEnd.begin_y, trackBeginEnd.begin_z }; - auto trackElement = map_get_track_element_at(location); + auto trackElement = MapGetTrackElementAt(location); if (trackElement == nullptr) { return; } trackElement->SetBlockBrakeClosed(false); - map_invalidate_element(location, reinterpret_cast(trackElement)); + MapInvalidateElement(location, reinterpret_cast(trackElement)); auto trackType = trackElement->GetTrackType(); if (trackType == TrackElemType::BlockBrakes || trackType == TrackElemType::EndStation) @@ -6625,7 +6625,7 @@ void Vehicle::UpdateAnimationAnimalFlying() if (animation_frame == 0) { auto trackType = GetTrackType(); - TileElement* trackElement = map_get_track_element_at_of_type_seq(TrackLocation, trackType, 0); + TileElement* trackElement = MapGetTrackElementAtOfTypeSeq(TrackLocation, trackType, 0); if (trackElement != nullptr && trackElement->AsTrack()->HasChain()) { // start flapping, bird @@ -6917,7 +6917,7 @@ void Vehicle::UpdateLandscapeDoor() const } auto coords = CoordsXYZ{ x, y, TrackLocation.z }.ToTileStart(); - auto* tileElement = map_get_track_element_at_from_ride(coords, ride); + auto* tileElement = MapGetTrackElementAtFromRide(coords, ride); if (tileElement != nullptr && tileElement->GetType() == TileElementType::Track) { AnimateLandscapeDoor(tileElement->AsTrack(), next_vehicle_on_train.IsNull()); @@ -6990,7 +6990,7 @@ void Vehicle::UpdateLandscapeDoorBackwards() const } auto coords = CoordsXYZ{ TrackLocation, TrackLocation.z }; - auto* tileElement = map_get_track_element_at_from_ride(coords, ride); + auto* tileElement = MapGetTrackElementAtFromRide(coords, ride); if (tileElement != nullptr && tileElement->GetType() == TileElementType::Track) { AnimateLandscapeDoor(tileElement->AsTrack(), next_vehicle_on_train.IsNull()); @@ -7322,7 +7322,7 @@ void Vehicle::Sub6DBF3E() TileElement* tileElement = nullptr; if (MapIsLocationValid(TrackLocation)) { - tileElement = map_get_track_element_at_of_type_seq(TrackLocation, trackType, 0); + tileElement = MapGetTrackElementAtOfTypeSeq(TrackLocation, trackType, 0); } if (tileElement == nullptr) @@ -7399,7 +7399,7 @@ bool Vehicle::UpdateTrackMotionForwardsGetNewTrack(uint16_t trackType, Ride* cur CoordsXYZD location = {}; auto pitchAndRollEnd = TrackPitchAndRollEnd(trackType); - TileElement* tileElement = map_get_track_element_at_of_type_seq(TrackLocation, trackType, 0); + TileElement* tileElement = MapGetTrackElementAtOfTypeSeq(TrackLocation, trackType, 0); if (tileElement == nullptr) { @@ -7423,7 +7423,7 @@ bool Vehicle::UpdateTrackMotionForwardsGetNewTrack(uint16_t trackType, Ride* cur OpenRCT2::Audio::Play3D(OpenRCT2::Audio::SoundId::BlockBrakeRelease, TrackLocation); } } - map_invalidate_element(TrackLocation, tileElement); + MapInvalidateElement(TrackLocation, tileElement); block_brakes_open_previous_section(*curRide, TrackLocation, tileElement); } } @@ -7820,7 +7820,7 @@ static PitchAndRoll PitchAndRollEnd(Ride* curRide, bool useInvertedSprites, uint bool Vehicle::UpdateTrackMotionBackwardsGetNewTrack(uint16_t trackType, Ride* curRide, uint16_t* progress) { auto pitchAndRollStart = TrackPitchAndRollStart(trackType); - TileElement* tileElement = map_get_track_element_at_of_type_seq(TrackLocation, trackType, 0); + TileElement* tileElement = MapGetTrackElementAtOfTypeSeq(TrackLocation, trackType, 0); if (tileElement == nullptr) return false; @@ -8238,7 +8238,7 @@ loc_6DC476: } } - tileElement = map_get_track_element_at_of_type_seq(TrackLocation, GetTrackType(), 0); + tileElement = MapGetTrackElementAtOfTypeSeq(TrackLocation, GetTrackType(), 0); { CoordsXYE output; int32_t outZ{}; @@ -8455,7 +8455,7 @@ loc_6DCA9A: goto loc_6DCC2C; } - tileElement = map_get_track_element_at_of_type_seq(TrackLocation, GetTrackType(), 0); + tileElement = MapGetTrackElementAtOfTypeSeq(TrackLocation, GetTrackType(), 0); { track_begin_end trackBeginEnd; if (!track_block_get_previous({ TrackLocation, tileElement }, &trackBeginEnd)) @@ -9182,8 +9182,7 @@ void Vehicle::UpdateCrossings() const int32_t direction{}; CoordsXYE xyElement = { frontVehicle->TrackLocation, - map_get_track_element_at_of_type_seq( - frontVehicle->TrackLocation, frontVehicle->GetTrackType(), 0) }; + MapGetTrackElementAtOfTypeSeq(frontVehicle->TrackLocation, frontVehicle->GetTrackType(), 0) }; int32_t curZ = frontVehicle->TrackLocation.z; if (xyElement.element != nullptr && status != Vehicle::Status::Arriving) @@ -9254,7 +9253,7 @@ void Vehicle::UpdateCrossings() const } xyElement = { backVehicle->TrackLocation, - map_get_track_element_at_of_type_seq(backVehicle->TrackLocation, backVehicle->GetTrackType(), 0) }; + MapGetTrackElementAtOfTypeSeq(backVehicle->TrackLocation, backVehicle->GetTrackType(), 0) }; if (xyElement.element == nullptr) { return; diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp index 44bd6e0f0a..1e4f8eabdb 100644 --- a/src/openrct2/scenario/Scenario.cpp +++ b/src/openrct2/scenario/Scenario.cpp @@ -568,7 +568,7 @@ static ResultWithMessage scenario_prepare_rides_for_save() bool markTrackAsIndestructible; tile_element_iterator it; - tile_element_iterator_begin(&it); + TileElementIteratorBegin(&it); do { if (it.element->GetType() == TileElementType::Track) @@ -588,7 +588,7 @@ static ResultWithMessage scenario_prepare_rides_for_save() it.element->AsTrack()->SetIsIndestructible(markTrackAsIndestructible); } - } while (tile_element_iterator_next(&it)); + } while (TileElementIteratorNext(&it)); return { true }; } diff --git a/src/openrct2/scripting/bindings/entity/ScStaff.cpp b/src/openrct2/scripting/bindings/entity/ScStaff.cpp index 5898ba4926..c738074bcc 100644 --- a/src/openrct2/scripting/bindings/entity/ScStaff.cpp +++ b/src/openrct2/scripting/bindings/entity/ScStaff.cpp @@ -176,7 +176,7 @@ namespace OpenRCT2::Scripting { auto coord = FromDuk(dukCoord); staff->SetPatrolArea(coord, value); - map_invalidate_tile_full(coord); + MapInvalidateTileFull(coord); } } else @@ -188,7 +188,7 @@ namespace OpenRCT2::Scripting { CoordsXY coord(x, y); staff->SetPatrolArea(coord, value); - map_invalidate_tile_full(coord); + MapInvalidateTileFull(coord); } } } diff --git a/src/openrct2/scripting/bindings/ride/ScTrackIterator.cpp b/src/openrct2/scripting/bindings/ride/ScTrackIterator.cpp index 60d69af49c..ec7585d479 100644 --- a/src/openrct2/scripting/bindings/ride/ScTrackIterator.cpp +++ b/src/openrct2/scripting/bindings/ride/ScTrackIterator.cpp @@ -75,7 +75,7 @@ DukValue ScTrackIterator::previousPosition_get() const auto& seq0 = ted.Block; auto pos = _position + CoordsXYZ(seq0->x, seq0->y, seq0->z); - auto el = map_get_track_element_at_of_type_seq(pos, _type, 0); + auto el = MapGetTrackElementAtOfTypeSeq(pos, _type, 0); if (el == nullptr) return ToDuk(ctx, nullptr); @@ -95,7 +95,7 @@ DukValue ScTrackIterator::nextPosition_get() const auto& seq0 = ted.Block; auto pos = _position + CoordsXYZ(seq0->x, seq0->y, seq0->z); - auto el = map_get_track_element_at_of_type_seq(pos, _type, 0); + auto el = MapGetTrackElementAtOfTypeSeq(pos, _type, 0); if (el == nullptr) return ToDuk(ctx, nullptr); @@ -114,7 +114,7 @@ bool ScTrackIterator::previous() auto& seq0 = ted.Block; auto pos = _position + CoordsXYZ(seq0->x, seq0->y, seq0->z); - auto el = map_get_track_element_at_of_type_seq(pos, _type, 0); + auto el = MapGetTrackElementAtOfTypeSeq(pos, _type, 0); if (el == nullptr) return false; @@ -140,7 +140,7 @@ bool ScTrackIterator::next() auto& seq0 = ted.Block; auto pos = _position + CoordsXYZ(seq0->x, seq0->y, seq0->z); - auto el = map_get_track_element_at_of_type_seq(pos, _type, 0); + auto el = MapGetTrackElementAtOfTypeSeq(pos, _type, 0); if (el == nullptr) return false; diff --git a/src/openrct2/scripting/bindings/world/ScTile.cpp b/src/openrct2/scripting/bindings/world/ScTile.cpp index 89acddb65c..902e0234aa 100644 --- a/src/openrct2/scripting/bindings/world/ScTile.cpp +++ b/src/openrct2/scripting/bindings/world/ScTile.cpp @@ -125,7 +125,7 @@ namespace OpenRCT2::Scripting first[numElements - 1].SetLastForTile(true); } } - map_invalidate_tile_full(_coords); + MapInvalidateTileFull(_coords); } } @@ -177,7 +177,7 @@ namespace OpenRCT2::Scripting first[i].SetLastForTile(false); } first[origNumElements].SetLastForTile(true); - map_invalidate_tile_full(_coords); + MapInvalidateTileFull(_coords); result = std::make_shared(_coords, &first[index]); } } @@ -196,7 +196,7 @@ namespace OpenRCT2::Scripting if (index < GetNumElements(first)) { TileElementRemove(&first[index]); - map_invalidate_tile_full(_coords); + MapInvalidateTileFull(_coords); } } diff --git a/src/openrct2/scripting/bindings/world/ScTileElement.cpp b/src/openrct2/scripting/bindings/world/ScTileElement.cpp index 6fb5594b60..82f76ed6c1 100644 --- a/src/openrct2/scripting/bindings/world/ScTileElement.cpp +++ b/src/openrct2/scripting/bindings/world/ScTileElement.cpp @@ -2005,7 +2005,7 @@ namespace OpenRCT2::Scripting void ScTileElement::Invalidate() { - map_invalidate_tile_full(_coords); + MapInvalidateTileFull(_coords); } void ScTileElement::Register(duk_context* ctx) diff --git a/src/openrct2/world/ConstructionClearance.cpp b/src/openrct2/world/ConstructionClearance.cpp index ce463abf5f..2d80b807a4 100644 --- a/src/openrct2/world/ConstructionClearance.cpp +++ b/src/openrct2/world/ConstructionClearance.cpp @@ -45,7 +45,7 @@ static int32_t MapPlaceClearFunc( if (!(flags & GAME_COMMAND_FLAG_APPLY)) return 0; - map_invalidate_tile({ coords, (*tile_element)->GetBaseZ(), (*tile_element)->GetClearanceZ() }); + MapInvalidateTile({ coords, (*tile_element)->GetBaseZ(), (*tile_element)->GetClearanceZ() }); TileElementRemove(*tile_element); diff --git a/src/openrct2/world/Entrance.cpp b/src/openrct2/world/Entrance.cpp index fed2001622..fa2b12412a 100644 --- a/src/openrct2/world/Entrance.cpp +++ b/src/openrct2/world/Entrance.cpp @@ -160,7 +160,7 @@ void MazeEntranceHedgeReplacement(const CoordsXYE& entrance) // Add the bottom outer wall tileElement->AsTrack()->MazeEntryAdd(1 << ((mazeSection + 12) & 0x0F)); - map_invalidate_tile({ hedgePos, tileElement->GetBaseZ(), tileElement->GetClearanceZ() }); + MapInvalidateTile({ hedgePos, tileElement->GetBaseZ(), tileElement->GetClearanceZ() }); return; } while (!(tileElement++)->IsLastForTile()); } @@ -203,7 +203,7 @@ void MazeEntranceHedgeRemoval(const CoordsXYE& entrance) // Remove the bottom hedge section tileElement->AsTrack()->MazeEntrySubtract(1 << ((mazeSection + 15) & 0x0F)); - map_invalidate_tile({ hedgePos, tileElement->GetBaseZ(), tileElement->GetClearanceZ() }); + MapInvalidateTile({ hedgePos, tileElement->GetBaseZ(), tileElement->GetClearanceZ() }); return; } while (!(tileElement++)->IsLastForTile()); } @@ -222,8 +222,8 @@ void ParkEntranceUpdateLocations() { gParkEntrances.clear(); tile_element_iterator it; - tile_element_iterator_begin(&it); - while (tile_element_iterator_next(&it)) + TileElementIteratorBegin(&it); + while (TileElementIteratorNext(&it)) { auto entranceElement = it.element->AsEntrance(); if (entranceElement != nullptr && entranceElement->GetEntranceType() == ENTRANCE_TYPE_PARK_ENTRANCE diff --git a/src/openrct2/world/Footpath.cpp b/src/openrct2/world/Footpath.cpp index 71777d5a4d..e1a30e91e5 100644 --- a/src/openrct2/world/Footpath.cpp +++ b/src/openrct2/world/Footpath.cpp @@ -219,7 +219,7 @@ void FootpathProvisionalUpdate() gProvisionalFootpath.Flags &= ~PROVISIONAL_PATH_FLAG_SHOW_ARROW; gMapSelectFlags &= ~MAP_SELECT_FLAG_ENABLE_ARROW; - map_invalidate_tile_full(gFootpathConstructFromPosition); + MapInvalidateTileFull(gFootpathConstructFromPosition); } FootpathProvisionalRemove(); } @@ -541,25 +541,21 @@ static void FootpathConnectCorners(const CoordsXY& footpathPos, PathElement* ini direction = DirectionNext(direction); std::get<3>(tileElements).first->SetCorners(std::get<3>(tileElements).first->GetCorners() | (1 << (direction))); - map_invalidate_element( - std::get<3>(tileElements).second, reinterpret_cast(std::get<3>(tileElements).first)); + MapInvalidateElement(std::get<3>(tileElements).second, reinterpret_cast(std::get<3>(tileElements).first)); direction = DirectionPrev(direction); std::get<2>(tileElements).first->SetCorners(std::get<2>(tileElements).first->GetCorners() | (1 << (direction))); - map_invalidate_element( - std::get<2>(tileElements).second, reinterpret_cast(std::get<2>(tileElements).first)); + MapInvalidateElement(std::get<2>(tileElements).second, reinterpret_cast(std::get<2>(tileElements).first)); direction = DirectionPrev(direction); std::get<1>(tileElements).first->SetCorners(std::get<1>(tileElements).first->GetCorners() | (1 << (direction))); - map_invalidate_element( - std::get<1>(tileElements).second, reinterpret_cast(std::get<1>(tileElements).first)); + MapInvalidateElement(std::get<1>(tileElements).second, reinterpret_cast(std::get<1>(tileElements).first)); direction = initialDirection; std::get<0>(tileElements).first->SetCorners(std::get<0>(tileElements).first->GetCorners() | (1 << (direction))); - map_invalidate_element( - std::get<0>(tileElements).second, reinterpret_cast(std::get<0>(tileElements).first)); + MapInvalidateElement(std::get<0>(tileElements).second, reinterpret_cast(std::get<0>(tileElements).first)); } } @@ -714,7 +710,7 @@ static bool FootpathReconnectQueueToPath( targetQueueElement->SetEdges(targetQueueElement->GetEdges() | (1 << (DirectionReverse(direction) & 3))); } if (action != 0) - map_invalidate_tile_full(targetQueuePos); + MapInvalidateTileFull(targetQueuePos); return true; } return false; @@ -762,7 +758,7 @@ static void loc_6A6FD2(const CoordsXYZ& initialTileElementPos, int32_t direction if (!query) { initialTileElement->AsPath()->SetEdges(initialTileElement->AsPath()->GetEdges() | (1 << direction)); - map_invalidate_element(initialTileElementPos, initialTileElement); + MapInvalidateElement(initialTileElementPos, initialTileElement); } } } @@ -816,7 +812,7 @@ static void loc_6A6F1F( { FootpathInterruptPeeps({ targetPos, tileElement->GetBaseZ() }); } - map_invalidate_element(targetPos, tileElement); + MapInvalidateElement(targetPos, tileElement); loc_6A6FD2(initialTileElementPos, direction, initialTileElement, query); } @@ -1151,7 +1147,7 @@ void FootpathChainRideQueue( tileElement->AsPath()->SetStationIndex(entranceIndex); curQueuePos = targetQueuePos; - map_invalidate_element(targetQueuePos, tileElement); + MapInvalidateElement(targetQueuePos, tileElement); if (lastQueuePathElement == nullptr) { @@ -1257,7 +1253,7 @@ static void FootpathFixOwnership(const CoordsXY& mapPos) if (surfaceElement != nullptr) { // If the tile is not safe to own construction rights of, erase them. - if (check_max_allowable_land_rights_for_tile({ mapPos, surfaceElement->base_height << 3 }) == OWNERSHIP_UNOWNED) + if (CheckMaxAllowableLandRightsForTile({ mapPos, surfaceElement->base_height << 3 }) == OWNERSHIP_UNOWNED) { ownership = OWNERSHIP_UNOWNED; } @@ -1822,7 +1818,7 @@ static TileElement* FootpathCanBeWide(const CoordsXYZ& footpathPos) */ void FootpathUpdatePathWideFlags(const CoordsXY& footpathPos) { - if (map_is_location_at_edge(footpathPos)) + if (MapIsLocationAtEdge(footpathPos)) return; FootpathClearWide(footpathPos); @@ -2075,7 +2071,7 @@ static void FootpathRemoveEdgesTowardsHere( tileElement->AsPath()->SetCorners(tileElement->AsPath()->GetCorners() & ~(1 << cd)); cd = ((cd + 1) & 3); tileElement->AsPath()->SetCorners(tileElement->AsPath()->GetCorners() & ~(1 << cd)); - map_invalidate_tile({ footpathPos, tileElement->GetBaseZ(), tileElement->GetClearanceZ() }); + MapInvalidateTile({ footpathPos, tileElement->GetBaseZ(), tileElement->GetClearanceZ() }); if (isQueue) FootpathDisconnectQueueFromPath(footpathPos, tileElement, -1); @@ -2098,7 +2094,7 @@ static void FootpathRemoveEdgesTowardsHere( cd = ((shiftedDirection + 1) & 3); tileElement->AsPath()->SetCorners(tileElement->AsPath()->GetCorners() & ~(1 << cd)); - map_invalidate_tile({ targetFootPathPos, tileElement->GetBaseZ(), tileElement->GetClearanceZ() }); + MapInvalidateTile({ targetFootPathPos, tileElement->GetBaseZ(), tileElement->GetClearanceZ() }); break; } while (!(tileElement++)->IsLastForTile()); } @@ -2553,7 +2549,7 @@ void PathElement::SetEdgesAndCorners(uint8_t newEdgesAndCorners) bool PathElement::IsLevelCrossing(const CoordsXY& coords) const { - auto trackElement = map_get_track_element_at({ coords, GetBaseZ() }); + auto trackElement = MapGetTrackElementAt({ coords, GetBaseZ() }); if (trackElement == nullptr) { return false; diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp index af0554afcc..70422cd559 100644 --- a/src/openrct2/world/Map.cpp +++ b/src/openrct2/world/Map.cpp @@ -234,7 +234,7 @@ void ReorganiseTileElements() ReorganiseTileElements(_tileElements.size()); } -static bool map_check_free_elements_and_reorganise(size_t numElementsOnTile, size_t numNewElements) +static bool MapCheckFreeElementsAndReorganise(size_t numElementsOnTile, size_t numNewElements) { // Check hard cap on num in use tiles (this would be the size of _tileElements immediately after a reorg) if (_tileElementsInUse + numNewElements > MAX_TILE_ELEMENTS) @@ -272,20 +272,20 @@ static size_t CountElementsOnTile(const CoordsXY& loc); bool MapCheckCapacityAndReorganise(const CoordsXY& loc, size_t numElements) { auto numElementsOnTile = CountElementsOnTile(loc); - return map_check_free_elements_and_reorganise(numElementsOnTile, numElements); + return MapCheckFreeElementsAndReorganise(numElementsOnTile, numElements); } -static void clear_elements_at(const CoordsXY& loc); -static ScreenCoordsXY translate_3d_to_2d(int32_t rotation, const CoordsXY& pos); +static void ClearElementsAt(const CoordsXY& loc); +static ScreenCoordsXY Translate3DTo2D(int32_t rotation, const CoordsXY& pos); -void tile_element_iterator_begin(tile_element_iterator* it) +void TileElementIteratorBegin(tile_element_iterator* it) { it->x = 0; it->y = 0; it->element = MapGetFirstElementAt(TileCoordsXY{ 0, 0 }); } -int32_t tile_element_iterator_next(tile_element_iterator* it) +int32_t TileElementIteratorNext(tile_element_iterator* it) { if (it->element == nullptr) { @@ -317,7 +317,7 @@ int32_t tile_element_iterator_next(tile_element_iterator* it) return 0; } -void tile_element_iterator_restart_for_tile(tile_element_iterator* it) +void TileElementIteratorRestartForTile(tile_element_iterator* it) { it->element = nullptr; } @@ -444,7 +444,7 @@ void MapInit(const TileCoordsXY& size) gWidePathTileLoopPosition = {}; gMapSize = size; gMapBaseZ = 7; - map_remove_out_of_range_elements(); + MapRemoveOutOfRangeElements(); MapAnimationAutoCreate(); auto intent = Intent(INTENT_ACTION_MAP); @@ -942,7 +942,7 @@ const uint8_t tile_element_lower_styles[9][32] = { }, // MAP_SELECT_TYPE_EDGE_3 }; -int32_t map_get_corner_height(int32_t z, int32_t slope, int32_t direction) +int32_t MapGetCornerHeight(int32_t z, int32_t slope, int32_t direction) { switch (direction) { @@ -990,11 +990,11 @@ int32_t map_get_corner_height(int32_t z, int32_t slope, int32_t direction) return z; } -int32_t tile_element_get_corner_height(const SurfaceElement* surfaceElement, int32_t direction) +int32_t TileElementGetCornerHeight(const SurfaceElement* surfaceElement, int32_t direction) { int32_t z = surfaceElement->base_height; int32_t slope = surfaceElement->GetSlope(); - return map_get_corner_height(z, slope, direction); + return MapGetCornerHeight(z, slope, direction); } uint8_t MapGetLowestLandHeight(const MapRange& range) @@ -1062,7 +1062,7 @@ uint8_t MapGetHighestLandHeight(const MapRange& range) return max_height; } -bool map_is_location_at_edge(const CoordsXY& loc) +bool MapIsLocationAtEdge(const CoordsXY& loc) { return loc.x < 32 || loc.y < 32 || loc.x >= (MAXIMUM_TILE_START_XY) || loc.y >= (MAXIMUM_TILE_START_XY); } @@ -1102,7 +1102,7 @@ void MapRemoveAllRides() { tile_element_iterator it; - tile_element_iterator_begin(&it); + TileElementIteratorBegin(&it); do { switch (it.element->GetType()) @@ -1122,12 +1122,12 @@ void MapRemoveAllRides() FootpathQueueChainReset(); FootpathRemoveEdgesAt(TileCoordsXY{ it.x, it.y }.ToCoordsXY(), it.element); TileElementRemove(it.element); - tile_element_iterator_restart_for_tile(&it); + TileElementIteratorRestartForTile(&it); break; default: break; } - } while (tile_element_iterator_next(&it)); + } while (TileElementIteratorNext(&it)); } /** @@ -1140,10 +1140,10 @@ void MapInvalidateMapSelectionTiles() return; for (const auto& position : gMapSelectionTiles) - map_invalidate_tile_full(position); + MapInvalidateTileFull(position); } -static void map_get_bounding_box(const MapRange& _range, int32_t* left, int32_t* top, int32_t* right, int32_t* bottom) +static void MapGetBoundingBox(const MapRange& _range, int32_t* left, int32_t* top, int32_t* right, int32_t* bottom) { uint32_t rotation = get_current_rotation(); const std::array corners{ @@ -1160,7 +1160,7 @@ static void map_get_bounding_box(const MapRange& _range, int32_t* left, int32_t* for (const auto& corner : corners) { - auto screenCoord = translate_3d_to_2d(rotation, corner); + auto screenCoord = Translate3DTo2D(rotation, corner); if (screenCoord.x < *left) *left = screenCoord.x; if (screenCoord.x > *right) @@ -1187,7 +1187,7 @@ void MapInvalidateSelectionRect() y0 = gMapSelectPositionA.y + 16; x1 = gMapSelectPositionB.x + 16; y1 = gMapSelectPositionB.y + 16; - map_get_bounding_box({ x0, y0, x1, y1 }, &left, &top, &right, &bottom); + MapGetBoundingBox({ x0, y0, x1, y1 }, &left, &top, &right, &bottom); left -= 32; right += 32; bottom += 32; @@ -1209,7 +1209,7 @@ static size_t CountElementsOnTile(const CoordsXY& loc) static TileElement* AllocateTileElements(size_t numElementsOnTile, size_t numNewElements) { - if (!map_check_free_elements_and_reorganise(numElementsOnTile, numNewElements)) + if (!MapCheckFreeElementsAndReorganise(numElementsOnTile, numNewElements)) { log_error("Cannot insert new element"); return nullptr; @@ -1301,7 +1301,7 @@ TileElement* TileElementInsert(const CoordsXYZ& loc, int32_t occupiedQuadrants, * * rct2: 0x006646E1 */ -void map_update_tiles() +void MapUpdateTiles() { PROFILED_FUNCTION(); @@ -1396,7 +1396,7 @@ void MapRestoreProvisionalElements() * Removes elements that are out of the map size range and crops the park perimeter. * rct2: 0x0068ADBC */ -void map_remove_out_of_range_elements() +void MapRemoveOutOfRangeElements() { auto mapSizeMax = GetMapSizeMaxXY(); @@ -1421,7 +1421,7 @@ void map_remove_out_of_range_elements() surfaceElement->SetOwnership(OWNERSHIP_UNOWNED); ParkUpdateFencesAroundTile({ x, y }); } - clear_elements_at({ x, y }); + ClearElementsAt({ x, y }); } } } @@ -1430,7 +1430,7 @@ void map_remove_out_of_range_elements() gCheatsBuildInPauseMode = buildState; } -static void map_extend_boundary_surface_extend_tile(const SurfaceElement& sourceTile, SurfaceElement& destTile) +static void MapExtendBoundarySurfaceExtendTile(const SurfaceElement& sourceTile, SurfaceElement& destTile) { destTile.SetSurfaceStyle(sourceTile.GetSurfaceStyle()); destTile.SetEdgeStyle(sourceTile.GetEdgeStyle()); @@ -1470,7 +1470,7 @@ static void map_extend_boundary_surface_extend_tile(const SurfaceElement& source /** * Copies the terrain and slope from the Y edge of the map to the new tiles. Used when increasing the size of the map. */ -void map_extend_boundary_surface_y() +void MapExtendBoundarySurfaceY() { auto y = gMapSize.y - 2; for (auto x = 0; x < MAXIMUM_MAP_SIZE_TECHNICAL; x++) @@ -1480,7 +1480,7 @@ void map_extend_boundary_surface_y() if (existingTileElement != nullptr && newTileElement != nullptr) { - map_extend_boundary_surface_extend_tile(*existingTileElement, *newTileElement); + MapExtendBoundarySurfaceExtendTile(*existingTileElement, *newTileElement); } ParkUpdateFences({ x << 5, y << 5 }); @@ -1490,7 +1490,7 @@ void map_extend_boundary_surface_y() /** * Copies the terrain and slope from the X edge of the map to the new tiles. Used when increasing the size of the map. */ -void map_extend_boundary_surface_x() +void MapExtendBoundarySurfaceX() { auto x = gMapSize.x - 2; for (auto y = 0; y < MAXIMUM_MAP_SIZE_TECHNICAL; y++) @@ -1499,7 +1499,7 @@ void map_extend_boundary_surface_x() auto newTileElement = MapGetSurfaceElementAt(TileCoordsXY{ x, y }.ToCoordsXY()); if (existingTileElement != nullptr && newTileElement != nullptr) { - map_extend_boundary_surface_extend_tile(*existingTileElement, *newTileElement); + MapExtendBoundarySurfaceExtendTile(*existingTileElement, *newTileElement); } ParkUpdateFences({ x << 5, y << 5 }); } @@ -1509,7 +1509,7 @@ void map_extend_boundary_surface_x() * 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(const CoordsXY& loc, TileElement** elementPtr) +static void ClearElementAt(const CoordsXY& loc, TileElement** elementPtr) { TileElement* element = *elementPtr; switch (element->GetType()) @@ -1597,7 +1597,7 @@ static void clear_element_at(const CoordsXY& loc, TileElement** elementPtr) * Clears all elements properly from a certain tile. * rct2: 0x0068AE2A */ -static void clear_elements_at(const CoordsXY& loc) +static void ClearElementsAt(const CoordsXY& loc) { // Remove the spawn point (if there is one in the current tile) gPeepSpawns.erase( @@ -1612,13 +1612,13 @@ static void clear_elements_at(const CoordsXY& loc) // Remove all elements except the last one while (!tileElement->IsLastForTile()) - clear_element_at(loc, &tileElement); + ClearElementAt(loc, &tileElement); // Remove the last element - clear_element_at(loc, &tileElement); + ClearElementAt(loc, &tileElement); } -int32_t map_get_highest_z(const CoordsXY& loc) +int32_t MapGetHighestZ(const CoordsXY& loc) { auto surfaceElement = MapGetSurfaceElementAt(loc); if (surfaceElement == nullptr) @@ -1636,7 +1636,7 @@ int32_t map_get_highest_z(const CoordsXY& loc) return z; } -LargeSceneryElement* map_get_large_scenery_segment(const CoordsXYZD& sceneryPos, int32_t sequence) +LargeSceneryElement* MapGetLargeScenerySegment(const CoordsXYZD& sceneryPos, int32_t sequence) { TileElement* tileElement = MapGetFirstElementAt(sceneryPos); if (tileElement == nullptr) @@ -1761,12 +1761,12 @@ SmallSceneryElement* MapGetSmallSceneryElementAt(const CoordsXYZ& sceneryCoords, return nullptr; } -std::optional map_large_scenery_get_origin( +std::optional MapLargeSceneryGetOrigin( const CoordsXYZD& sceneryPos, int32_t sequence, LargeSceneryElement** outElement) { rct_large_scenery_tile* tile; - auto tileElement = map_get_large_scenery_segment(sceneryPos, sequence); + auto tileElement = MapGetLargeScenerySegment(sceneryPos, sequence); if (tileElement == nullptr) return std::nullopt; @@ -1787,12 +1787,12 @@ std::optional map_large_scenery_get_origin( * * rct2: 0x006B9B05 */ -bool map_large_scenery_sign_set_colour(const CoordsXYZD& signPos, int32_t sequence, uint8_t mainColour, uint8_t textColour) +bool MapLargeScenerySignSetColour(const CoordsXYZD& signPos, int32_t sequence, uint8_t mainColour, uint8_t textColour) { LargeSceneryElement* tileElement; rct_large_scenery_tile *sceneryTiles, *tile; - auto sceneryOrigin = map_large_scenery_get_origin(signPos, sequence, &tileElement); + auto sceneryOrigin = MapLargeSceneryGetOrigin(signPos, sequence, &tileElement); if (!sceneryOrigin) { return false; @@ -1810,32 +1810,32 @@ bool map_large_scenery_sign_set_colour(const CoordsXYZD& signPos, int32_t sequen auto tmpSignPos = CoordsXYZD{ sceneryOrigin->x + rotatedOffsetPos.x, sceneryOrigin->y + rotatedOffsetPos.y, sceneryOrigin->z + tile->z_offset, signPos.direction }; - tileElement = map_get_large_scenery_segment(tmpSignPos, sequence); + tileElement = MapGetLargeScenerySegment(tmpSignPos, sequence); if (tileElement != nullptr) { tileElement->SetPrimaryColour(mainColour); tileElement->SetSecondaryColour(textColour); - map_invalidate_tile({ tmpSignPos, tileElement->GetBaseZ(), tileElement->GetClearanceZ() }); + MapInvalidateTile({ tmpSignPos, tileElement->GetBaseZ(), tileElement->GetClearanceZ() }); } } return true; } -static ScreenCoordsXY translate_3d_to_2d(int32_t rotation, const CoordsXY& pos) +static ScreenCoordsXY Translate3DTo2D(int32_t rotation, const CoordsXY& pos) { - return translate_3d_to_2d_with_z(rotation, CoordsXYZ{ pos, 0 }); + return Translate3DTo2DWithZ(rotation, CoordsXYZ{ pos, 0 }); } -ScreenCoordsXY translate_3d_to_2d_with_z(int32_t rotation, const CoordsXYZ& pos) +ScreenCoordsXY Translate3DTo2DWithZ(int32_t rotation, const CoordsXYZ& pos) { auto rotated = pos.Rotate(rotation); // Use right shift to avoid issues like #9301 return ScreenCoordsXY{ rotated.y - rotated.x, ((rotated.x + rotated.y) >> 1) - pos.z }; } -static void map_invalidate_tile_under_zoom(int32_t x, int32_t y, int32_t z0, int32_t z1, ZoomLevel maxZoom) +static void MapInvalidateTileUnderZoom(int32_t x, int32_t y, int32_t z0, int32_t z1, ZoomLevel maxZoom) { if (gOpenRCT2Headless) return; @@ -1844,7 +1844,7 @@ static void map_invalidate_tile_under_zoom(int32_t x, int32_t y, int32_t z0, int x += 16; y += 16; - auto screenCoord = translate_3d_to_2d(get_current_rotation(), { x, y }); + auto screenCoord = Translate3DTo2D(get_current_rotation(), { x, y }); x1 = screenCoord.x - 32; y1 = screenCoord.y - 32 - z1; @@ -1858,44 +1858,44 @@ static void map_invalidate_tile_under_zoom(int32_t x, int32_t y, int32_t z0, int * * rct2: 0x006EC847 */ -void map_invalidate_tile(const CoordsXYRangedZ& tilePos) +void MapInvalidateTile(const CoordsXYRangedZ& tilePos) { - map_invalidate_tile_under_zoom(tilePos.x, tilePos.y, tilePos.baseZ, tilePos.clearanceZ, ZoomLevel{ -1 }); + MapInvalidateTileUnderZoom(tilePos.x, tilePos.y, tilePos.baseZ, tilePos.clearanceZ, ZoomLevel{ -1 }); } /** * * rct2: 0x006ECB60 */ -void map_invalidate_tile_zoom1(const CoordsXYRangedZ& tilePos) +void MapInvalidateTileZoom1(const CoordsXYRangedZ& tilePos) { - map_invalidate_tile_under_zoom(tilePos.x, tilePos.y, tilePos.baseZ, tilePos.clearanceZ, ZoomLevel{ 1 }); + MapInvalidateTileUnderZoom(tilePos.x, tilePos.y, tilePos.baseZ, tilePos.clearanceZ, ZoomLevel{ 1 }); } /** * * rct2: 0x006EC9CE */ -void map_invalidate_tile_zoom0(const CoordsXYRangedZ& tilePos) +void MapInvalidateTileZoom0(const CoordsXYRangedZ& tilePos) { - map_invalidate_tile_under_zoom(tilePos.x, tilePos.y, tilePos.baseZ, tilePos.clearanceZ, ZoomLevel{ 0 }); + MapInvalidateTileUnderZoom(tilePos.x, tilePos.y, tilePos.baseZ, tilePos.clearanceZ, ZoomLevel{ 0 }); } /** * * rct2: 0x006EC6D7 */ -void map_invalidate_tile_full(const CoordsXY& tilePos) +void MapInvalidateTileFull(const CoordsXY& tilePos) { - map_invalidate_tile({ tilePos, 0, 2080 }); + MapInvalidateTile({ tilePos, 0, 2080 }); } -void map_invalidate_element(const CoordsXY& elementPos, TileElement* tileElement) +void MapInvalidateElement(const CoordsXY& elementPos, TileElement* tileElement) { - map_invalidate_tile({ elementPos, tileElement->GetBaseZ(), tileElement->GetClearanceZ() }); + MapInvalidateTile({ elementPos, tileElement->GetBaseZ(), tileElement->GetClearanceZ() }); } -void map_invalidate_region(const CoordsXY& mins, const CoordsXY& maxs) +void MapInvalidateRegion(const CoordsXY& mins, const CoordsXY& maxs) { int32_t x0, y0, x1, y1, left, right, top, bottom; @@ -1905,7 +1905,7 @@ void map_invalidate_region(const CoordsXY& mins, const CoordsXY& maxs) x1 = maxs.x + 16; y1 = maxs.y + 16; - map_get_bounding_box({ x0, y0, x1, y1 }, &left, &top, &right, &bottom); + MapGetBoundingBox({ x0, y0, x1, y1 }, &left, &top, &right, &bottom); left -= 32; right += 32; @@ -1915,14 +1915,14 @@ void map_invalidate_region(const CoordsXY& mins, const CoordsXY& maxs) viewports_invalidate({ { left, top }, { right, bottom } }); } -int32_t map_get_tile_side(const CoordsXY& mapPos) +int32_t MapGetTileSide(const CoordsXY& mapPos) { int32_t subMapX = mapPos.x & (32 - 1); int32_t subMapY = mapPos.y & (32 - 1); return (subMapX < subMapY) ? ((subMapX + subMapY) < 32 ? 0 : 1) : ((subMapX + subMapY) < 32 ? 3 : 2); } -int32_t map_get_tile_quadrant(const CoordsXY& mapPos) +int32_t MapGetTileQuadrant(const CoordsXY& mapPos) { int32_t subMapX = mapPos.x & (32 - 1); int32_t subMapY = mapPos.y & (32 - 1); @@ -1980,13 +1980,13 @@ bool MapSurfaceIsBlocked(const CoordsXY& mapCoords) } /* Clears all map elements, to be used before generating a new map */ -void map_clear_all_elements() +void MapClearAllElements() { for (int32_t y = 0; y < MAXIMUM_MAP_SIZE_BIG; y += COORDS_XY_STEP) { for (int32_t x = 0; x < MAXIMUM_MAP_SIZE_BIG; x += COORDS_XY_STEP) { - clear_elements_at({ x, y }); + ClearElementsAt({ x, y }); } } } @@ -1997,7 +1997,7 @@ void map_clear_all_elements() * @param y y units, not tiles. * @param z Base height. */ -TrackElement* map_get_track_element_at(const CoordsXYZ& trackPos) +TrackElement* MapGetTrackElementAt(const CoordsXYZ& trackPos) { TileElement* tileElement = MapGetFirstElementAt(trackPos); if (tileElement == nullptr) @@ -2021,7 +2021,7 @@ TrackElement* map_get_track_element_at(const CoordsXYZ& trackPos) * @param y y units, not tiles. * @param z Base height. */ -TileElement* map_get_track_element_at_of_type(const CoordsXYZ& trackPos, track_type_t trackType) +TileElement* MapGetTrackElementAtOfType(const CoordsXYZ& trackPos, track_type_t trackType) { TileElement* tileElement = MapGetFirstElementAt(trackPos); if (tileElement == nullptr) @@ -2048,7 +2048,7 @@ TileElement* map_get_track_element_at_of_type(const CoordsXYZ& trackPos, track_t * @param y y units, not tiles. * @param z Base height. */ -TileElement* map_get_track_element_at_of_type_seq(const CoordsXYZ& trackPos, track_type_t trackType, int32_t sequence) +TileElement* MapGetTrackElementAtOfTypeSeq(const CoordsXYZ& trackPos, track_type_t trackType, int32_t sequence) { TileElement* tileElement = MapGetFirstElementAt(trackPos); auto trackTilePos = TileCoordsXYZ{ trackPos }; @@ -2071,7 +2071,7 @@ TileElement* map_get_track_element_at_of_type_seq(const CoordsXYZ& trackPos, tra return nullptr; } -TrackElement* map_get_track_element_at_of_type(const CoordsXYZD& location, track_type_t trackType) +TrackElement* MapGetTrackElementAtOfType(const CoordsXYZD& location, track_type_t trackType) { auto tileElement = MapGetFirstElementAt(location); if (tileElement != nullptr) @@ -2094,7 +2094,7 @@ TrackElement* map_get_track_element_at_of_type(const CoordsXYZD& location, track return nullptr; } -TrackElement* map_get_track_element_at_of_type_seq(const CoordsXYZD& location, track_type_t trackType, int32_t sequence) +TrackElement* MapGetTrackElementAtOfTypeSeq(const CoordsXYZD& location, track_type_t trackType, int32_t sequence) { auto tileElement = MapGetFirstElementAt(location); if (tileElement != nullptr) @@ -2125,7 +2125,7 @@ TrackElement* map_get_track_element_at_of_type_seq(const CoordsXYZD& location, t * @param y y units, not tiles. * @param z Base height. */ -TileElement* map_get_track_element_at_of_type_from_ride(const CoordsXYZ& trackPos, track_type_t trackType, RideId rideIndex) +TileElement* MapGetTrackElementAtOfTypeFromRide(const CoordsXYZ& trackPos, track_type_t trackType, RideId rideIndex) { TileElement* tileElement = MapGetFirstElementAt(trackPos); if (tileElement == nullptr) @@ -2154,7 +2154,7 @@ TileElement* map_get_track_element_at_of_type_from_ride(const CoordsXYZ& trackPo * @param y y units, not tiles. * @param z Base height. */ -TileElement* map_get_track_element_at_from_ride(const CoordsXYZ& trackPos, RideId rideIndex) +TileElement* MapGetTrackElementAtFromRide(const CoordsXYZ& trackPos, RideId rideIndex) { TileElement* tileElement = MapGetFirstElementAt(trackPos); if (tileElement == nullptr) @@ -2182,7 +2182,7 @@ TileElement* map_get_track_element_at_from_ride(const CoordsXYZ& trackPos, RideI * @param z Base height. * @param direction The direction (0 - 3). */ -TileElement* map_get_track_element_at_with_direction_from_ride(const CoordsXYZD& trackPos, RideId rideIndex) +TileElement* MapGetTrackElementAtWithDirectionFromRide(const CoordsXYZD& trackPos, RideId rideIndex) { TileElement* tileElement = MapGetFirstElementAt(trackPos); if (tileElement == nullptr) @@ -2244,7 +2244,7 @@ WallElement* MapGetWallElementAt(const CoordsXYZD& wallCoords) return nullptr; } -uint16_t check_max_allowable_land_rights_for_tile(const CoordsXYZ& tileMapPos) +uint16_t CheckMaxAllowableLandRightsForTile(const CoordsXYZ& tileMapPos) { TileElement* tileElement = MapGetFirstElementAt(tileMapPos); uint16_t destOwnership = OWNERSHIP_OWNED; diff --git a/src/openrct2/world/Map.h b/src/openrct2/world/Map.h index 8a223379e0..58ac7022b0 100644 --- a/src/openrct2/world/Map.h +++ b/src/openrct2/world/Map.h @@ -220,56 +220,56 @@ struct tile_element_iterator assert_struct_size(tile_element_iterator, 12); #endif -void tile_element_iterator_begin(tile_element_iterator* it); -int32_t tile_element_iterator_next(tile_element_iterator* it); -void tile_element_iterator_restart_for_tile(tile_element_iterator* it); +void TileElementIteratorBegin(tile_element_iterator* it); +int32_t TileElementIteratorNext(tile_element_iterator* it); +void TileElementIteratorRestartForTile(tile_element_iterator* it); -void map_update_tiles(); -int32_t map_get_highest_z(const CoordsXY& loc); +void MapUpdateTiles(); +int32_t MapGetHighestZ(const CoordsXY& loc); bool TileElementWantsPathConnectionTowards(const TileCoordsXYZD& coords, const TileElement* const elementToBeRemoved); -void map_remove_out_of_range_elements(); -void map_extend_boundary_surface_x(); -void map_extend_boundary_surface_y(); +void MapRemoveOutOfRangeElements(); +void MapExtendBoundarySurfaceX(); +void MapExtendBoundarySurfaceY(); -bool map_large_scenery_sign_set_colour(const CoordsXYZD& signPos, int32_t sequence, uint8_t mainColour, uint8_t textColour); +bool MapLargeScenerySignSetColour(const CoordsXYZD& signPos, int32_t sequence, uint8_t mainColour, uint8_t textColour); void WallRemoveAt(const CoordsXYRangedZ& wallPos); void WallRemoveAtZ(const CoordsXYZ& wallPos); void WallRemoveIntersectingWalls(const CoordsXYRangedZ& wallPos, Direction direction); -void map_invalidate_tile(const CoordsXYRangedZ& tilePos); -void map_invalidate_tile_zoom1(const CoordsXYRangedZ& tilePos); -void map_invalidate_tile_zoom0(const CoordsXYRangedZ& tilePos); -void map_invalidate_tile_full(const CoordsXY& tilePos); -void map_invalidate_element(const CoordsXY& elementPos, TileElement* tileElement); -void map_invalidate_region(const CoordsXY& mins, const CoordsXY& maxs); +void MapInvalidateTile(const CoordsXYRangedZ& tilePos); +void MapInvalidateTileZoom1(const CoordsXYRangedZ& tilePos); +void MapInvalidateTileZoom0(const CoordsXYRangedZ& tilePos); +void MapInvalidateTileFull(const CoordsXY& tilePos); +void MapInvalidateElement(const CoordsXY& elementPos, TileElement* tileElement); +void MapInvalidateRegion(const CoordsXY& mins, const CoordsXY& maxs); -int32_t map_get_tile_side(const CoordsXY& mapPos); -int32_t map_get_tile_quadrant(const CoordsXY& mapPos); -int32_t map_get_corner_height(int32_t z, int32_t slope, int32_t direction); -int32_t tile_element_get_corner_height(const SurfaceElement* surfaceElement, int32_t direction); +int32_t MapGetTileSide(const CoordsXY& mapPos); +int32_t MapGetTileQuadrant(const CoordsXY& mapPos); +int32_t MapGetCornerHeight(int32_t z, int32_t slope, int32_t direction); +int32_t TileElementGetCornerHeight(const SurfaceElement* surfaceElement, int32_t direction); -void map_clear_all_elements(); +void MapClearAllElements(); -LargeSceneryElement* map_get_large_scenery_segment(const CoordsXYZD& sceneryPos, int32_t sequence); -std::optional map_large_scenery_get_origin( +LargeSceneryElement* MapGetLargeScenerySegment(const CoordsXYZD& sceneryPos, int32_t sequence); +std::optional MapLargeSceneryGetOrigin( const CoordsXYZD& sceneryPos, int32_t sequence, LargeSceneryElement** outElement); -ScreenCoordsXY translate_3d_to_2d_with_z(int32_t rotation, const CoordsXYZ& pos); +ScreenCoordsXY Translate3DTo2DWithZ(int32_t rotation, const CoordsXYZ& pos); -TrackElement* map_get_track_element_at(const CoordsXYZ& trackPos); -TileElement* map_get_track_element_at_of_type(const CoordsXYZ& trackPos, track_type_t trackType); -TileElement* map_get_track_element_at_of_type_seq(const CoordsXYZ& trackPos, track_type_t trackType, int32_t sequence); -TrackElement* map_get_track_element_at_of_type(const CoordsXYZD& location, track_type_t trackType); -TrackElement* map_get_track_element_at_of_type_seq(const CoordsXYZD& location, track_type_t trackType, int32_t sequence); -TileElement* map_get_track_element_at_of_type_from_ride(const CoordsXYZ& trackPos, track_type_t trackType, RideId rideIndex); -TileElement* map_get_track_element_at_from_ride(const CoordsXYZ& trackPos, RideId rideIndex); -TileElement* map_get_track_element_at_with_direction_from_ride(const CoordsXYZD& trackPos, RideId rideIndex); +TrackElement* MapGetTrackElementAt(const CoordsXYZ& trackPos); +TileElement* MapGetTrackElementAtOfType(const CoordsXYZ& trackPos, track_type_t trackType); +TileElement* MapGetTrackElementAtOfTypeSeq(const CoordsXYZ& trackPos, track_type_t trackType, int32_t sequence); +TrackElement* MapGetTrackElementAtOfType(const CoordsXYZD& location, track_type_t trackType); +TrackElement* MapGetTrackElementAtOfTypeSeq(const CoordsXYZD& location, track_type_t trackType, int32_t sequence); +TileElement* MapGetTrackElementAtOfTypeFromRide(const CoordsXYZ& trackPos, track_type_t trackType, RideId rideIndex); +TileElement* MapGetTrackElementAtFromRide(const CoordsXYZ& trackPos, RideId rideIndex); +TileElement* MapGetTrackElementAtWithDirectionFromRide(const CoordsXYZD& trackPos, RideId rideIndex); -bool map_is_location_at_edge(const CoordsXY& loc); +bool MapIsLocationAtEdge(const CoordsXY& loc); -uint16_t check_max_allowable_land_rights_for_tile(const CoordsXYZ& tileMapPos); +uint16_t CheckMaxAllowableLandRightsForTile(const CoordsXYZ& tileMapPos); void FixLandOwnershipTiles(std::initializer_list tiles); void FixLandOwnershipTilesWithOwnership( diff --git a/src/openrct2/world/MapAnimation.cpp b/src/openrct2/world/MapAnimation.cpp index 589087ab9b..56917fddda 100644 --- a/src/openrct2/world/MapAnimation.cpp +++ b/src/openrct2/world/MapAnimation.cpp @@ -113,7 +113,7 @@ static bool MapAnimationInvalidateRideEntrance(const CoordsXYZ& loc) if (stationObj != nullptr) { int32_t height = loc.z + stationObj->Height + 8; - map_invalidate_tile_zoom1({ loc, height, height + 16 }); + MapInvalidateTileZoom1({ loc, height, height + 16 }); } } return false; @@ -148,7 +148,7 @@ static bool MapAnimationInvalidateQueueBanner(const CoordsXYZ& loc) int32_t direction = (tileElement->AsPath()->GetQueueBannerDirection() + get_current_rotation()) & 3; if (direction == TILE_ELEMENT_DIRECTION_NORTH || direction == TILE_ELEMENT_DIRECTION_EAST) { - map_invalidate_tile_zoom1({ loc, loc.z + 16, loc.z + 30 }); + MapInvalidateTileZoom1({ loc, loc.z + 16, loc.z + 30 }); } return false; } while (!(tileElement++)->IsLastForTile()); @@ -184,7 +184,7 @@ static bool MapAnimationInvalidateSmallScenery(const CoordsXYZ& loc) SMALL_SCENERY_FLAG_FOUNTAIN_SPRAY_1 | SMALL_SCENERY_FLAG_FOUNTAIN_SPRAY_4 | SMALL_SCENERY_FLAG_SWAMP_GOO | SMALL_SCENERY_FLAG_HAS_FRAME_OFFSETS)) { - map_invalidate_tile_zoom1({ loc, loc.z, tileElement->GetClearanceZ() }); + MapInvalidateTileZoom1({ loc, loc.z, tileElement->GetClearanceZ() }); return false; } @@ -212,7 +212,7 @@ static bool MapAnimationInvalidateSmallScenery(const CoordsXYZ& loc) break; } } - map_invalidate_tile_zoom1({ loc, loc.z, tileElement->GetClearanceZ() }); + MapInvalidateTileZoom1({ loc, loc.z, tileElement->GetClearanceZ() }); return false; } @@ -243,7 +243,7 @@ static bool MapAnimationInvalidateParkEntrance(const CoordsXYZ& loc) if (tileElement->AsEntrance()->GetSequenceIndex()) continue; - map_invalidate_tile_zoom1({ loc, loc.z + 32, loc.z + 64 }); + MapInvalidateTileZoom1({ loc, loc.z + 32, loc.z + 64 }); return false; } while (!(tileElement++)->IsLastForTile()); @@ -271,7 +271,7 @@ static bool MapAnimationInvalidateTrackWaterfall(const CoordsXYZ& loc) if (tileElement->AsTrack()->GetTrackType() == TrackElemType::Waterfall) { - map_invalidate_tile_zoom1({ loc, loc.z + 14, loc.z + 46 }); + MapInvalidateTileZoom1({ loc, loc.z + 14, loc.z + 46 }); return false; } } while (!(tileElement++)->IsLastForTile()); @@ -300,7 +300,7 @@ static bool MapAnimationInvalidateTrackRapids(const CoordsXYZ& loc) if (tileElement->AsTrack()->GetTrackType() == TrackElemType::Rapids) { - map_invalidate_tile_zoom1({ loc, loc.z + 14, loc.z + 18 }); + MapInvalidateTileZoom1({ loc, loc.z + 14, loc.z + 18 }); return false; } } while (!(tileElement++)->IsLastForTile()); @@ -329,7 +329,7 @@ static bool MapAnimationInvalidateTrackOnRidePhoto(const CoordsXYZ& loc) if (tileElement->AsTrack()->GetTrackType() == TrackElemType::OnRidePhoto) { - map_invalidate_tile_zoom1({ loc, loc.z, tileElement->GetClearanceZ() }); + MapInvalidateTileZoom1({ loc, loc.z, tileElement->GetClearanceZ() }); if (game_is_paused()) { return false; @@ -368,7 +368,7 @@ static bool MapAnimationInvalidateTrackWhirlpool(const CoordsXYZ& loc) if (tileElement->AsTrack()->GetTrackType() == TrackElemType::Whirlpool) { - map_invalidate_tile_zoom1({ loc, loc.z + 14, loc.z + 18 }); + MapInvalidateTileZoom1({ loc, loc.z + 14, loc.z + 18 }); return false; } } while (!(tileElement++)->IsLastForTile()); @@ -397,7 +397,7 @@ static bool MapAnimationInvalidateTrackSpinningTunnel(const CoordsXYZ& loc) if (tileElement->AsTrack()->GetTrackType() == TrackElemType::SpinningTunnel) { - map_invalidate_tile_zoom1({ loc, loc.z + 14, loc.z + 32 }); + MapInvalidateTileZoom1({ loc, loc.z + 14, loc.z + 32 }); return false; } } while (!(tileElement++)->IsLastForTile()); @@ -432,7 +432,7 @@ static bool MapAnimationInvalidateBanner(const CoordsXYZ& loc) continue; if (tileElement->GetType() != TileElementType::Banner) continue; - map_invalidate_tile_zoom1({ loc, loc.z, loc.z + 16 }); + MapInvalidateTileZoom1({ loc, loc.z, loc.z + 16 }); return false; } while (!(tileElement++)->IsLastForTile()); @@ -462,7 +462,7 @@ static bool MapAnimationInvalidateLargeScenery(const CoordsXYZ& loc) auto* sceneryEntry = tileElement->AsLargeScenery()->GetEntry(); if (sceneryEntry != nullptr && sceneryEntry->flags & LARGE_SCENERY_FLAG_ANIMATED) { - map_invalidate_tile_zoom1({ loc, loc.z, loc.z + 16 }); + MapInvalidateTileZoom1({ loc, loc.z, loc.z + 16 }); wasInvalidated = true; } } while (!(tileElement++)->IsLastForTile()); @@ -527,7 +527,7 @@ static bool MapAnimationInvalidateWallDoor(const CoordsXYZ& loc) tileElement->AsWall()->SetAnimationFrame(currentFrame); if (invalidate) { - map_invalidate_tile_zoom1({ loc, loc.z, loc.z + 32 }); + MapInvalidateTileZoom1({ loc, loc.z, loc.z + 32 }); } } while (!(tileElement++)->IsLastForTile()); @@ -560,7 +560,7 @@ static bool MapAnimationInvalidateWall(const CoordsXYZ& loc) || (!(wallEntry->flags2 & WALL_SCENERY_2_ANIMATED) && wallEntry->scrolling_mode == SCROLLING_MODE_NONE)) continue; - map_invalidate_tile_zoom1({ loc, loc.z, loc.z + 16 }); + MapInvalidateTileZoom1({ loc, loc.z, loc.z + 16 }); wasInvalidated = true; } while (!(tileElement++)->IsLastForTile()); @@ -606,8 +606,8 @@ void MapAnimationAutoCreate() ClearMapAnimations(); tile_element_iterator it; - tile_element_iterator_begin(&it); - while (tile_element_iterator_next(&it)) + TileElementIteratorBegin(&it); + while (TileElementIteratorNext(&it)) { auto el = it.element; auto loc = CoordsXYZ{ TileCoordsXY(it.x, it.y).ToCoordsXY(), el->GetBaseZ() }; diff --git a/src/openrct2/world/MapGen.cpp b/src/openrct2/world/MapGen.cpp index 64befbe128..8800886f6a 100644 --- a/src/openrct2/world/MapGen.cpp +++ b/src/openrct2/world/MapGen.cpp @@ -118,7 +118,7 @@ static void SetHeight(int32_t x, int32_t y, int32_t height) void MapGenGenerateBlank(mapgen_settings* settings) { int32_t x, y; - map_clear_all_elements(); + MapClearAllElements(); MapInit(settings->mapSize); for (y = 1; y < settings->mapSize.y - 1; y++) @@ -181,7 +181,7 @@ void MapGenGenerate(mapgen_settings* settings) auto floorTextureId = objectManager.GetLoadedObjectEntryIndex(ObjectEntryDescriptor(floorTexture)); auto edgeTextureId = objectManager.GetLoadedObjectEntryIndex(ObjectEntryDescriptor(edgeTexture)); - map_clear_all_elements(); + MapClearAllElements(); // Initialise the base map MapInit(mapSize); diff --git a/src/openrct2/world/Park.cpp b/src/openrct2/world/Park.cpp index bd28a5b116..21a919e9ce 100644 --- a/src/openrct2/world/Park.cpp +++ b/src/openrct2/world/Park.cpp @@ -163,7 +163,7 @@ void ParkUpdateFences(const CoordsXY& coords) { int32_t baseZ = surfaceElement->GetBaseZ(); int32_t clearZ = baseZ + 16; - map_invalidate_tile({ coords, baseZ, clearZ }); + MapInvalidateTile({ coords, baseZ, clearZ }); surfaceElement->SetParkFences(newFences); } } @@ -342,7 +342,7 @@ uint32_t Park::CalculateParkSize() const { uint32_t tiles = 0; tile_element_iterator it; - tile_element_iterator_begin(&it); + TileElementIteratorBegin(&it); do { if (it.element->GetType() == TileElementType::Surface) @@ -352,7 +352,7 @@ uint32_t Park::CalculateParkSize() const tiles++; } } - } while (tile_element_iterator_next(&it)); + } while (TileElementIteratorNext(&it)); if (tiles != gParkSize) { diff --git a/src/openrct2/world/Scenery.cpp b/src/openrct2/world/Scenery.cpp index 0508dc9aef..6af904f3b7 100644 --- a/src/openrct2/world/Scenery.cpp +++ b/src/openrct2/world/Scenery.cpp @@ -202,7 +202,7 @@ void SmallSceneryElement::UpdateAge(const CoordsXY& sceneryPos) case TileElementType::LargeScenery: case TileElementType::Entrance: case TileElementType::Path: - map_invalidate_tile_zoom1({ sceneryPos, tileElementAbove->GetBaseZ(), tileElementAbove->GetClearanceZ() }); + MapInvalidateTileZoom1({ sceneryPos, tileElementAbove->GetBaseZ(), tileElementAbove->GetClearanceZ() }); IncreaseAge(sceneryPos); return; case TileElementType::SmallScenery: @@ -220,7 +220,7 @@ void SmallSceneryElement::UpdateAge(const CoordsXY& sceneryPos) // Reset age / water plant SetAge(0); - map_invalidate_tile_zoom1({ sceneryPos, GetBaseZ(), GetClearanceZ() }); + MapInvalidateTileZoom1({ sceneryPos, GetBaseZ(), GetClearanceZ() }); } /** diff --git a/src/openrct2/world/SmallScenery.cpp b/src/openrct2/world/SmallScenery.cpp index 50cfd66290..123bfe91e0 100644 --- a/src/openrct2/world/SmallScenery.cpp +++ b/src/openrct2/world/SmallScenery.cpp @@ -71,7 +71,7 @@ void SmallSceneryElement::IncreaseAge(const CoordsXY& sceneryPos) if (sceneryEntry->HasFlag(SMALL_SCENERY_FLAG_CAN_WITHER)) { - map_invalidate_tile_zoom1({ sceneryPos, GetBaseZ(), GetClearanceZ() }); + MapInvalidateTileZoom1({ sceneryPos, GetBaseZ(), GetClearanceZ() }); } } } diff --git a/src/openrct2/world/Surface.cpp b/src/openrct2/world/Surface.cpp index 8d7726b418..90fd261bfb 100644 --- a/src/openrct2/world/Surface.cpp +++ b/src/openrct2/world/Surface.cpp @@ -106,7 +106,7 @@ void SurfaceElement::SetGrassLengthAndInvalidate(uint8_t length, const CoordsXY& } int32_t z = GetBaseZ(); - map_invalidate_tile({ coords, z, z + 16 }); + MapInvalidateTile({ coords, z, z + 16 }); } /** diff --git a/src/openrct2/world/TileInspector.cpp b/src/openrct2/world/TileInspector.cpp index a874a9176b..d01407b50a 100644 --- a/src/openrct2/world/TileInspector.cpp +++ b/src/openrct2/world/TileInspector.cpp @@ -163,7 +163,7 @@ namespace OpenRCT2::TileInspector } TileElementRemove(tileElement); - map_invalidate_tile_full(loc); + MapInvalidateTileFull(loc); if (auto* inspector = GetTileInspectorWithPos(loc); inspector != nullptr) { @@ -194,7 +194,7 @@ namespace OpenRCT2::TileInspector { return GameActions::Result(GameActions::Status::Unknown, STR_NONE, STR_NONE); } - map_invalidate_tile_full(loc); + MapInvalidateTileFull(loc); if (auto* inspector = GetTileInspectorWithPos(loc); inspector != nullptr) { @@ -285,7 +285,7 @@ namespace OpenRCT2::TileInspector break; } - map_invalidate_tile_full(loc); + MapInvalidateTileFull(loc); if (auto* inspector = GetTileInspectorWithPos(loc); inspector != nullptr) { @@ -310,7 +310,7 @@ namespace OpenRCT2::TileInspector bool currentlyInvisible = tileElement->IsInvisible(); tileElement->SetInvisible(!currentlyInvisible); - map_invalidate_tile_full(loc); + MapInvalidateTileFull(loc); if (loc == windowTileInspectorTile.ToCoordsXY()) { window_invalidate_by_class(WindowClass::TileInspector); @@ -359,7 +359,7 @@ namespace OpenRCT2::TileInspector *pastedElement = element; pastedElement->SetLastForTile(lastForTile); - map_invalidate_tile_full(loc); + MapInvalidateTileFull(loc); if (auto* inspector = GetTileInspectorWithPos(loc); inspector != nullptr) { @@ -423,7 +423,7 @@ namespace OpenRCT2::TileInspector } } - map_invalidate_tile_full(loc); + MapInvalidateTileFull(loc); if (auto* inspector = GetTileInspectorWithPos(loc); inspector != nullptr) { @@ -499,7 +499,7 @@ namespace OpenRCT2::TileInspector tileElement->base_height += heightOffset; tileElement->clearance_height += heightOffset; - map_invalidate_tile_full(loc); + MapInvalidateTileFull(loc); if (auto* inspector = GetTileInspectorWithPos(loc); inspector != nullptr) { @@ -525,7 +525,7 @@ namespace OpenRCT2::TileInspector else ParkUpdateFences(loc); - map_invalidate_tile_full(loc); + MapInvalidateTileFull(loc); if (auto* inspector = GetTileInspectorWithPos(loc); inspector != nullptr) { @@ -578,7 +578,7 @@ namespace OpenRCT2::TileInspector surfaceElement->SetSlope(newSlope); - map_invalidate_tile_full(loc); + MapInvalidateTileFull(loc); if (auto* inspector = GetTileInspectorWithPos(loc); inspector != nullptr) { @@ -602,7 +602,7 @@ namespace OpenRCT2::TileInspector uint8_t newSlope = surfaceElement->GetSlope() ^ TILE_ELEMENT_SLOPE_DOUBLE_HEIGHT; surfaceElement->SetSlope(newSlope); - map_invalidate_tile_full(loc); + MapInvalidateTileFull(loc); if (auto* inspector = GetTileInspectorWithPos(loc); inspector != nullptr) { @@ -623,7 +623,7 @@ namespace OpenRCT2::TileInspector { pathElement->AsPath()->SetSloped(sloped); - map_invalidate_tile_full(loc); + MapInvalidateTileFull(loc); if (auto* inspector = GetTileInspectorWithPos(loc); inspector != nullptr) { @@ -644,7 +644,7 @@ namespace OpenRCT2::TileInspector { pathElement->AsPath()->SetIsBroken(broken); - map_invalidate_tile_full(loc); + MapInvalidateTileFull(loc); if (auto* inspector = GetTileInspectorWithPos(loc); inspector != nullptr) { @@ -666,7 +666,7 @@ namespace OpenRCT2::TileInspector uint8_t newEdges = pathElement->AsPath()->GetEdgesAndCorners() ^ (1 << edgeIndex); pathElement->AsPath()->SetEdgesAndCorners(newEdges); - map_invalidate_tile_full(loc); + MapInvalidateTileFull(loc); if (auto* inspector = GetTileInspectorWithPos(loc); inspector != nullptr) { @@ -722,7 +722,7 @@ namespace OpenRCT2::TileInspector // Set new slope value wallElement->AsWall()->SetSlope(slopeValue); - map_invalidate_tile_full(loc); + MapInvalidateTileFull(loc); if (auto* inspector = GetTileInspectorWithPos(loc); inspector != nullptr) { @@ -745,7 +745,7 @@ namespace OpenRCT2::TileInspector uint8_t animationFrame = wallElement->AsWall()->GetAnimationFrame(); wallElement->AsWall()->SetAnimationFrame(animationFrame + animationFrameOffset); - map_invalidate_tile_full(loc); + MapInvalidateTileFull(loc); if (auto* inspector = GetTileInspectorWithPos(loc); inspector != nullptr) { @@ -800,7 +800,7 @@ namespace OpenRCT2::TileInspector offsets.y = trackBlock->y; elem += offsets.Rotate(originDirection); - TrackElement* tileElement = map_get_track_element_at_of_type_seq(elem, type, trackBlock->index); + TrackElement* tileElement = MapGetTrackElementAtOfTypeSeq(elem, type, trackBlock->index); if (tileElement == nullptr) { log_error("Track map element part not found!"); @@ -811,7 +811,7 @@ namespace OpenRCT2::TileInspector // for when you decrease the map size. openrct2_assert(MapGetSurfaceElementAt(elem) != nullptr, "No surface at %d,%d", elem.x >> 5, elem.y >> 5); - map_invalidate_tile_full(elem); + MapInvalidateTileFull(elem); // Keep? // invalidate_test_results(ride); @@ -883,7 +883,7 @@ namespace OpenRCT2::TileInspector offsets.y = trackBlock->y; elem += offsets.Rotate(originDirection); - TrackElement* tileElement = map_get_track_element_at_of_type_seq(elem, type, trackBlock->index); + TrackElement* tileElement = MapGetTrackElementAtOfTypeSeq(elem, type, trackBlock->index); if (tileElement == nullptr) { log_error("Track map element part not found!"); @@ -894,7 +894,7 @@ namespace OpenRCT2::TileInspector // for when you decrease the map size. openrct2_assert(MapGetSurfaceElementAt(elem) != nullptr, "No surface at %d,%d", elem.x >> 5, elem.y >> 5); - map_invalidate_tile_full(elem); + MapInvalidateTileFull(elem); // Keep? // invalidate_test_results(ride); @@ -924,7 +924,7 @@ namespace OpenRCT2::TileInspector { trackElement->AsTrack()->SetBlockBrakeClosed(blockBrake); - map_invalidate_tile_full(loc); + MapInvalidateTileFull(loc); if (auto* inspector = GetTileInspectorWithPos(loc); inspector != nullptr) { @@ -946,7 +946,7 @@ namespace OpenRCT2::TileInspector { trackElement->AsTrack()->SetIsIndestructible(isIndestructible); - map_invalidate_tile_full(loc); + MapInvalidateTileFull(loc); if (auto* inspector = GetTileInspectorWithPos(loc); inspector != nullptr) { @@ -972,7 +972,7 @@ namespace OpenRCT2::TileInspector // Update collision tileElement->SetOccupiedQuadrants(1 << ((quarterIndex + 2) & 3)); - map_invalidate_tile_full(loc); + MapInvalidateTileFull(loc); if (auto* inspector = GetTileInspectorWithPos(loc); inspector != nullptr) { @@ -996,7 +996,7 @@ namespace OpenRCT2::TileInspector occupiedQuadrants ^= 1 << quarterIndex; tileElement->SetOccupiedQuadrants(occupiedQuadrants); - map_invalidate_tile_full(loc); + MapInvalidateTileFull(loc); if (auto* inspector = GetTileInspectorWithPos(loc); inspector != nullptr) { diff --git a/src/openrct2/world/Wall.cpp b/src/openrct2/world/Wall.cpp index 50fbab8f51..6ed5ef83d3 100644 --- a/src/openrct2/world/Wall.cpp +++ b/src/openrct2/world/Wall.cpp @@ -37,7 +37,7 @@ void WallRemoveAt(const CoordsXYRangedZ& wallPos) for (auto wallElement = MapGetWallElementAt(wallPos); wallElement != nullptr; wallElement = MapGetWallElementAt(wallPos)) { reinterpret_cast(wallElement)->RemoveBannerEntry(); - map_invalidate_tile_zoom1({ wallPos, wallElement->GetBaseZ(), wallElement->GetBaseZ() + 72 }); + MapInvalidateTileZoom1({ wallPos, wallElement->GetBaseZ(), wallElement->GetBaseZ() + 72 }); TileElementRemove(reinterpret_cast(wallElement)); } } @@ -74,7 +74,7 @@ void WallRemoveIntersectingWalls(const CoordsXYRangedZ& wallPos, Direction direc continue; tileElement->RemoveBannerEntry(); - map_invalidate_tile_zoom1({ wallPos, tileElement->GetBaseZ(), tileElement->GetBaseZ() + 72 }); + MapInvalidateTileZoom1({ wallPos, tileElement->GetBaseZ(), tileElement->GetBaseZ() + 72 }); TileElementRemove(tileElement); tileElement--; } while (!(tileElement++)->IsLastForTile()); diff --git a/test/tests/TileElements.cpp b/test/tests/TileElements.cpp index a88503919c..253b9eb1c9 100644 --- a/test/tests/TileElements.cpp +++ b/test/tests/TileElements.cpp @@ -91,7 +91,7 @@ TEST_F(TileElementWantsFootpathConnection, Stall) { // Stalls usually have one path direction flag, but can have multiple (info kiosk for example) auto tileCoords = TileCoordsXYZ{ 19, 15, 14 }; - const TrackElement* const stallElement = map_get_track_element_at(tileCoords.ToCoordsXYZ()); + const TrackElement* const stallElement = MapGetTrackElementAt(tileCoords.ToCoordsXYZ()); ASSERT_NE(stallElement, nullptr); EXPECT_TRUE(TileElementWantsPathConnectionTowards({ 19, 15, 14, 0 }, nullptr)); EXPECT_FALSE(TileElementWantsPathConnectionTowards({ 19, 15, 14, 1 }, nullptr));