mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 19:13:07 +01:00
Code Issues Releases Wiki Activity

Use edge as template for new tiles

Browse Source
This commit is contained in:
Ted John
2023-05-21 15:11:16 +01:00
committed by Gymnasiast
parent abc67f09e6
commit 776fa71a4f
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/openrct2/world/Map.cpp
View File

@@ -2251,8 +2251,8 @@ void ShiftMap(const TileCoordsXY& amount)
{
auto srcX = x - amount.x;
auto srcY = y - amount.y;
if (x >= 0 && y >= 0 && x < gMapSize.x && y < gMapSize.y && srcX >= 0 && srcY >= 0 && srcX < gMapSize.x
&& srcY < gMapSize.y)
if (x > 0 && y > 0 && x < gMapSize.x - 1 && y < gMapSize.y - 1 && srcX > 0 && srcY > 0 && srcX < gMapSize.x - 1
&& srcY < gMapSize.y - 1)
{
auto srcTile = _tileIndex.GetFirstElementAt(TileCoordsXY(srcX, srcY));
do
@@ -2271,7 +2271,21 @@ void ShiftMap(const TileCoordsXY& amount)
}
else
{
newElements.push_back(GetDefaultSurfaceElement());
auto copyX = std::clamp(srcX, 1, gMapSize.x - 2);
auto copyY = std::clamp(srcY, 1, gMapSize.y - 2);
auto srcTile = MapGetSurfaceElementAt(TileCoordsXY(copyX, copyY));
if (srcTile != nullptr)
{
auto tileEl = *srcTile;
tileEl.SetOwner(OWNERSHIP_UNOWNED);
tileEl.SetParkFences(0);
tileEl.SetLastForTile(true);
newElements.push_back(*reinterpret_cast<TileElement*>(&tileEl));
}
else
{
newElements.push_back(GetDefaultSurfaceElement());
}
}
}
}
@@ -2324,6 +2338,8 @@ void ShiftMap(const TileCoordsXY& amount)
duck->target_y += amountToMove.y;
break;
}
default:
break;
}
if (entityType == EntityType::Staff)
{