diff --git a/src/openrct2-ui/windows/Player.cpp b/src/openrct2-ui/windows/Player.cpp index eec33d4a61..600dc6b364 100644 --- a/src/openrct2-ui/windows/Player.cpp +++ b/src/openrct2-ui/windows/Player.cpp @@ -292,7 +292,7 @@ namespace OpenRCT2::Ui::Windows auto coord = Network::GetPlayerLastActionCoord(playerIndex); if (coord.x != 0 || coord.y != 0 || coord.z != 0) { - auto centreLoc = centre_2d_coordinates(coord, viewport); + auto centreLoc = centre2dCoordinates(coord, viewport); if (!centreLoc.has_value()) { return; diff --git a/src/openrct2/interface/Viewport.cpp b/src/openrct2/interface/Viewport.cpp index a9a1db811c..8a74724e43 100644 --- a/src/openrct2/interface/Viewport.cpp +++ b/src/openrct2/interface/Viewport.cpp @@ -123,7 +123,7 @@ namespace OpenRCT2 * out_x : ax * out_y : bx */ - std::optional centre_2d_coordinates(const CoordsXYZ& loc, Viewport* viewport) + std::optional centre2dCoordinates(const CoordsXYZ& loc, Viewport* viewport) { // If the start location was invalid // propagate the invalid location to the output. @@ -217,7 +217,7 @@ namespace OpenRCT2 }, focus.data); - auto centreLoc = centre_2d_coordinates(centrePos, viewport); + auto centreLoc = centre2dCoordinates(centrePos, viewport); if (!centreLoc.has_value()) { LOG_ERROR("Invalid location for viewport."); @@ -612,7 +612,7 @@ namespace OpenRCT2 if (at_map_edge) { - auto centreLoc = centre_2d_coordinates({ mapCoord, 0 }, viewport); + auto centreLoc = centre2dCoordinates({ mapCoord, 0 }, viewport); if (centreLoc.has_value()) { window->savedViewPos = centreLoc.value(); @@ -676,7 +676,7 @@ namespace OpenRCT2 ViewportSetUndergroundFlag(underground, window, window->viewport); } - auto centreLoc = centre_2d_coordinates(sprite->GetLocation(), window->viewport); + auto centreLoc = centre2dCoordinates(sprite->GetLocation(), window->viewport); if (centreLoc.has_value()) { window->savedViewPos = *centreLoc; @@ -830,7 +830,7 @@ namespace OpenRCT2 viewport->rotation = (viewport->rotation + direction) & 3; - auto centreLoc = centre_2d_coordinates(coords, viewport); + auto centreLoc = centre2dCoordinates(coords, viewport); if (centreLoc.has_value()) { diff --git a/src/openrct2/interface/Viewport.h b/src/openrct2/interface/Viewport.h index 79ef21a7c8..c5fe5f1bf2 100644 --- a/src/openrct2/interface/Viewport.h +++ b/src/openrct2/interface/Viewport.h @@ -184,7 +184,7 @@ namespace OpenRCT2 extern Viewport* gMusicTrackingViewport; void ViewportInitAll(); - std::optional centre_2d_coordinates(const CoordsXYZ& loc, Viewport* viewport); + std::optional centre2dCoordinates(const CoordsXYZ& loc, Viewport* viewport); void ViewportCreate(WindowBase& w, const ScreenCoordsXY& screenCoords, int32_t width, int32_t height, const Focus& focus); void ViewportRemove(Viewport* viewport); diff --git a/src/openrct2/park/ParkPreview.cpp b/src/openrct2/park/ParkPreview.cpp index dd56a04dee..cd7cbf6f6a 100644 --- a/src/openrct2/park/ParkPreview.cpp +++ b/src/openrct2/park/ParkPreview.cpp @@ -216,7 +216,7 @@ namespace OpenRCT2 .rotation = mapPosXYZD.direction, }; - auto viewPos = centre_2d_coordinates(mapPosXYZD, &saveVp); + auto viewPos = centre2dCoordinates(mapPosXYZD, &saveVp); if (viewPos == std::nullopt) return std::nullopt;