mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 14:02:59 +01:00
Code Issues Releases Wiki Activity

Fix #11438: Crash when decreasing map size

Browse Source
This commit is contained in:
Michael Steenbeek
2021-01-12 22:04:22 +01:00
committed by GitHub
parent 93b7b86ad4
commit bf63a562ae
1 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1731,28 +1731,48 @@ static void clear_element_at(const CoordsXY& loc, TileElement** elementPtr)
break;
}
auto parkEntranceRemoveAction = ParkEntranceRemoveAction(CoordsXYZ{ seqLoc, element->GetBaseZ() });
GameActions::Execute(&parkEntranceRemoveAction);
auto result = GameActions::Execute(&parkEntranceRemoveAction);
// If asking nicely did not work, forcibly remove this to avoid an infinite loop.
if (result->Error != GameActions::Status::Ok)
{
tile_element_remove(element);
}
break;
}
case TILE_ELEMENT_TYPE_WALL:
{
CoordsXYZD wallLocation = { loc.x, loc.y, element->GetBaseZ(), element->GetDirection() };
auto wallRemoveAction = WallRemoveAction(wallLocation);
GameActions::Execute(&wallRemoveAction);
auto result = GameActions::Execute(&wallRemoveAction);
// If asking nicely did not work, forcibly remove this to avoid an infinite loop.
if (result->Error != GameActions::Status::Ok)
{
tile_element_remove(element);
}
}
break;
case TILE_ELEMENT_TYPE_LARGE_SCENERY:
{
auto removeSceneryAction = LargeSceneryRemoveAction(
{ loc.x, loc.y, element->GetBaseZ(), element->GetDirection() }, element->AsLargeScenery()->GetSequenceIndex());
GameActions::Execute(&removeSceneryAction);
auto result = GameActions::Execute(&removeSceneryAction);
// If asking nicely did not work, forcibly remove this to avoid an infinite loop.
if (result->Error != GameActions::Status::Ok)
{
tile_element_remove(element);
}
}
break;
case TILE_ELEMENT_TYPE_BANNER:
{
auto bannerRemoveAction = BannerRemoveAction(
{ loc.x, loc.y, element->GetBaseZ(), element->AsBanner()->GetPosition() });
GameActions::Execute(&bannerRemoveAction);
auto result = GameActions::Execute(&bannerRemoveAction);
// If asking nicely did not work, forcibly remove this to avoid an infinite loop.
if (result->Error != GameActions::Status::Ok)
{
tile_element_remove(element);
}
break;
}
default: