diff --git a/distribution/changelog.txt b/distribution/changelog.txt index c9945e5d09..ce60e57bab 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -1,6 +1,7 @@ 0.3.4+ (in development) ------------------------------------------------------------------------ - Fix: [#15028] Crash when placing large scenery. +- Fix: [#15048] Crash when removing litter with cheats. - Fix: [#15052] Crash when using banner window. - Improved: [#12626] Allow using RCT2 saves to mark RCT Classic (.sea) parks as finished and vice versa. diff --git a/src/openrct2-ui/interface/ViewportInteraction.cpp b/src/openrct2-ui/interface/ViewportInteraction.cpp index 8211f06472..5bd98c98fc 100644 --- a/src/openrct2-ui/interface/ViewportInteraction.cpp +++ b/src/openrct2-ui/interface/ViewportInteraction.cpp @@ -474,7 +474,7 @@ InteractionInfo ViewportInteractionGetItemRight(const ScreenCoordsXY& screenCoor { ft.Add(STR_BROKEN); } - ft.Add(pathAddEntry->name); + ft.Add(pathAddEntry != nullptr ? pathAddEntry->name : STR_NONE); SetMapTooltip(ft); return info; } 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));