From e4758df2e9a6a36c5706e174a4dd6fa2c728c01a Mon Sep 17 00:00:00 2001 From: ZehMatt Date: Thu, 22 Jul 2021 22:06:48 +0300 Subject: [PATCH] Fix #15048: Crash removing litter from cheats --- src/openrct2/actions/SetCheatAction.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/openrct2/actions/SetCheatAction.cpp b/src/openrct2/actions/SetCheatAction.cpp index 3b335234fd..ee749f9911 100644 --- a/src/openrct2/actions/SetCheatAction.cpp +++ b/src/openrct2/actions/SetCheatAction.cpp @@ -417,20 +417,20 @@ void SetCheatAction::RemoveLitter() const sprite_remove(litter); } - tile_element_iterator it; - + tile_element_iterator it{}; tile_element_iterator_begin(&it); do { if (it.element->GetType() != TILE_ELEMENT_TYPE_PATH) continue; - if (!(it.element)->AsPath()->HasAddition()) + auto* path = it.element->AsPath(); + if (path->HasAddition()) continue; - auto* pathBitEntry = it.element->AsPath()->GetAdditionEntry(); - if (pathBitEntry->flags & PATH_BIT_FLAG_IS_BIN) - it.element->AsPath()->SetAdditionStatus(0xFF); + auto* pathBitEntry = path->GetAdditionEntry(); + if (pathBitEntry != nullptr && pathBitEntry->flags & PATH_BIT_FLAG_IS_BIN) + path->SetAdditionStatus(0xFF); } while (tile_element_iterator_next(&it));