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 #13609: Crash in LargeSceneryRemoveAction.cpp (#13663)

Browse Source
This commit is contained in:
Michael Steenbeek
2021-01-02 15:06:51 +01:00
committed by GitHub
parent 1b686816db
commit ac6cc9d63e
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2/actions/LargeSceneryRemoveAction.cpp
View File

@@ -67,6 +67,9 @@ GameActions::Result::Ptr LargeSceneryRemoveAction::Query() const
}
rct_scenery_entry* scenery_entry = tileElement->AsLargeScenery()->GetEntry();
// If we have a bugged scenery entry, do not touch the tile element.
if (scenery_entry == nullptr)
return MakeResult(GameActions::Status::Unknown, STR_CANT_REMOVE_THIS);
auto rotatedOffsets = CoordsXYZ{ CoordsXY{ scenery_entry->large_scenery.tiles[_tileIndex].x_offset,
scenery_entry->large_scenery.tiles[_tileIndex].y_offset }
@@ -136,9 +139,12 @@ GameActions::Result::Ptr LargeSceneryRemoveAction::Execute() const
return MakeResult(GameActions::Status::InvalidParameters, STR_INVALID_SELECTION_OF_OBJECTS);
}
tileElement->RemoveBannerEntry();
rct_scenery_entry* scenery_entry = tileElement->AsLargeScenery()->GetEntry();
// If we have a bugged scenery entry, do not touch the tile element.
if (scenery_entry == nullptr)
return MakeResult(GameActions::Status::Unknown, STR_CANT_REMOVE_THIS);
tileElement->RemoveBannerEntry();
auto rotatedFirstTile = CoordsXYZ{ CoordsXY{ scenery_entry->large_scenery.tiles[_tileIndex].x_offset,
scenery_entry->large_scenery.tiles[_tileIndex].y_offset }