mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

fix png map generator smoothMap and beach generation (see also #24782)

Browse Source
This commit is contained in:
Jan Strauss
2025-08-04 02:41:11 +02:00
parent 622acf61a6
commit 745e1c4277
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@@ -18,6 +18,7 @@
- Fix: [#24173] Allow all game speeds between 1 and 8 if developer mode is on.
- Fix: [#24745] Potential crash when lighting effects are enabled and loading a save or a new scenario.
- Fix: [#24835] Dive loop track pieces do not have tunnels.
- Fix: [#24884] Smooth map and add beaches functions use incorrect map size with height map image files.
- Fix: [#24915] LIM Launched (original bug), Corkscrew and Twister Roller Coaster inline twists have some incorrect tunnels.
- Fix: [#24953] Crash when opening the Scenario Editor, Track Designer or Track Designs Manager.
- Fix: [#24955] Hybrid Zero G Rolls do not fully block metal supports.

6
src/openrct2/world/map_generator/MapGen.cpp
View File

@@ -93,10 +93,10 @@ namespace OpenRCT2::World::MapGenerator
return;
// Add sandy beaches
const auto& mapSize = settings->mapSize;
for (auto y = 1; y < mapSize.y - 1; y++)
auto& gameState = getGameState();
for (auto y = 1; y < gameState.mapSize.y - 1; y++)
{
for (auto x = 1; x < mapSize.x - 1; x++)
for (auto x = 1; x < gameState.mapSize.x - 1; x++)
{
auto surfaceElement = MapGetSurfaceElementAt(TileCoordsXY{ x, y });

8
src/openrct2/world/map_generator/PngTerrainGenerator.cpp
View File

@@ -158,7 +158,10 @@ namespace OpenRCT2::World::MapGenerator
// Get technical map size, +2 for the black tiles around the map
auto mapWidth = static_cast<int32_t>(dest.width + 2);
auto mapHeight = static_cast<int32_t>(dest.height + 2);
MapInit({ mapHeight, mapWidth });
// The x and y axis are flipped in the world, so this uses y for x and x for y.
TileCoordsXY flippedMapSize{ mapHeight, mapWidth };
MapInit(flippedMapSize);
if (settings->smooth_height_map)
{
@@ -203,7 +206,6 @@ namespace OpenRCT2::World::MapGenerator
{
for (auto x = 0; x < dest.width; x++)
{
// The x and y axis are flipped in the world, so this uses y for x and x for y.
auto tileCoords = HeightmapCoordToTileCoordsXY(x, y);
auto* const surfaceElement = MapGetSurfaceElementAt(tileCoords);
if (surfaceElement == nullptr)
@@ -236,7 +238,7 @@ namespace OpenRCT2::World::MapGenerator
if (settings->smoothTileEdges)
{
// Set the tile slopes so that there are no cliffs
smoothMap({ mapWidth, mapHeight }, smoothTileWeak);
smoothMap(flippedMapSize, smoothTileWeak);
}
}
} // namespace OpenRCT2::World::MapGenerator