mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Code Issues Releases Wiki Activity

Fix #24661: convert console command always crashes with a segmentation fault

Browse Source
This commit is contained in:
Gymnasiast
2025-06-24 01:00:27 +02:00
parent 44decc9ce0
commit f7612d56d0
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@@ -21,6 +21,7 @@
- Fix: [#24615] Blank strings in Windows installer. - Fix: [#24615] Blank strings in Windows installer.
- Fix: [#24617] ‘Divide by zero’ error when updating boat hire acceleration. - Fix: [#24617] ‘Divide by zero’ error when updating boat hire acceleration.
- Fix: [#24626] Viewports that only follow sprites (e.g. in the Ride and Guest windows) can be made to unfollow them. - Fix: [#24626] Viewports that only follow sprites (e.g. in the Ride and Guest windows) can be made to unfollow them.
- Fix: [#24661] `convert` console command always crashes with a segmentation fault.
0.4.23 (2025-06-07) 0.4.23 (2025-06-07)
------------------------------------------------------------------------ ------------------------------------------------------------------------

12
src/openrct2/park/ParkPreview.cpp
View File

@@ -183,21 +183,23 @@ namespace OpenRCT2
const auto mainWindow = WindowGetMain(); const auto mainWindow = WindowGetMain();
const auto mainViewport = WindowGetViewport(mainWindow); const auto mainViewport = WindowGetViewport(mainWindow);
CoordsXYZ mapPosXYZ{}; CoordsXYZD mapPosXYZD{};
if (mainViewport != nullptr) if (mainViewport != nullptr)
{ {
const auto centre = mainViewport->viewPos const auto centre = mainViewport->viewPos
+ ScreenCoordsXY{ mainViewport->ViewWidth() / 2, mainViewport->ViewHeight() / 2 }; + ScreenCoordsXY{ mainViewport->ViewWidth() / 2, mainViewport->ViewHeight() / 2 };
const auto mapPos = ViewportPosToMapPos(centre, 24, mainViewport->rotation); const auto mapPos = ViewportPosToMapPos(centre, 24, mainViewport->rotation);
mapPosXYZ = CoordsXYZ(mapPos.x, mapPos.y, int32_t{ TileElementHeight(mapPos) }); mapPosXYZD = CoordsXYZD(mapPos.x, mapPos.y, int32_t{ TileElementHeight(mapPos) }, mainViewport->rotation);
} }
else if (!gameState.park.Entrances.empty()) else if (!gameState.park.Entrances.empty())
{ {
const auto& entrance = gameState.park.Entrances[0]; const auto& entrance = gameState.park.Entrances[0];
mapPosXYZ = CoordsXYZ{ entrance.x + 16, entrance.y + 16, entrance.z + 32 }; mapPosXYZD = CoordsXYZD(entrance.x + 16, entrance.y + 16, entrance.z + 32, DirectionReverse(entrance.direction));
} }
else else
{
return std::nullopt; return std::nullopt;
}
PreviewImage image{ PreviewImage image{
.type = PreviewImageType::screenshot, .type = PreviewImageType::screenshot,
@@ -210,10 +212,10 @@ namespace OpenRCT2
.height = image.height, .height = image.height,
.flags = 0, .flags = 0,
.zoom = ZoomLevel{ 1 }, .zoom = ZoomLevel{ 1 },
.rotation = mainViewport->rotation, .rotation = mapPosXYZD.direction,
}; };
auto viewPos = centre_2d_coordinates(mapPosXYZ, &saveVp); auto viewPos = centre_2d_coordinates(mapPosXYZD, &saveVp);
if (viewPos == std::nullopt) if (viewPos == std::nullopt)
return std::nullopt; return std::nullopt;