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

Merge pull request #14436 from Gymnasiast/fix/14409

Browse Source 
Fix #14409: NPE when demolishing banner
This commit is contained in:
Michael Steenbeek
2021-04-03 23:39:38 +02:00
committed by GitHub
parent 7c73e271ad 79302e88a5
commit 9b2c946484
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/openrct2-ui/windows/Banner.cpp
View File

@@ -76,7 +76,7 @@ class BannerWindow final : public Window
private:
Banner* _banner;
CoordsXYZ _bannerViewPos;
TileElement* _tileElement = nullptr;
BannerElement* _bannerElement = nullptr;
void CreateViewport()
{
@@ -99,7 +99,7 @@ private:
{
if ((tileElement->GetType() == TILE_ELEMENT_TYPE_BANNER) && (tileElement->AsBanner()->GetIndex() == number))
{
_tileElement = tileElement;
_bannerElement = tileElement->AsBanner();
return;
}
if (tileElement->IsLastForTile())
@@ -107,7 +107,7 @@ private:
tileElement++;
}
}
_tileElement = nullptr;
_bannerElement = nullptr;
}
public:
@@ -126,10 +126,10 @@ public:
_banner = GetBanner(number);
InitTileElement();
if (_tileElement == nullptr)
if (_bannerElement == nullptr)
return;
frame_no = _tileElement->GetBaseZ();
frame_no = _bannerElement->GetBaseZ();
_bannerViewPos = CoordsXYZ{ _banner->position.ToCoordsXY().ToTileCentre(), frame_no };
CreateViewport();
}
@@ -172,8 +172,11 @@ public:
break;
case WIDX_BANNER_DEMOLISH:
{
if (_banner == nullptr || _bannerElement == nullptr)
break;
auto bannerRemoveAction = BannerRemoveAction(
{ _banner->position.ToCoordsXY(), _tileElement->GetBaseZ(), _tileElement->AsBanner()->GetPosition() });
{ _banner->position.ToCoordsXY(), _bannerElement->GetBaseZ(), _bannerElement->GetPosition() });
GameActions::Execute(&bannerRemoveAction);
break;
}