From 5ef750a879b33265025c4484e323f9d557bd6503 Mon Sep 17 00:00:00 2001 From: Daniel Karandikar Date: Mon, 22 Mar 2021 19:03:22 +0000 Subject: [PATCH] Tidy up BannerWindow::Initialise --- src/openrct2-ui/windows/Banner.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/openrct2-ui/windows/Banner.cpp b/src/openrct2-ui/windows/Banner.cpp index eebf8ce9f9..a2225df03d 100644 --- a/src/openrct2-ui/windows/Banner.cpp +++ b/src/openrct2-ui/windows/Banner.cpp @@ -118,20 +118,18 @@ public: WindowInitScrollWidgets(this); } - BannerWindow* Initialise(rct_windownumber _number) + void Initialise(rct_windownumber _number) { number = _number; _banner = GetBanner(number); InitTileElement(); if (_tileElement == nullptr) - return nullptr; + return; frame_no = _tileElement->GetBaseZ(); _bannerViewPos = CoordsXYZ{ _banner->position.ToCoordsXY().ToTileCentre(), frame_no }; CreateViewport(); - - return this; } void OnMouseDown(rct_widgetindex widgetIndex) override @@ -280,7 +278,7 @@ rct_window* window_banner_open(rct_windownumber number) w = WindowCreate(WC_BANNER, WW, WH, 0); if (w != nullptr) - w = w->Initialise(number); + w->Initialise(number); return w; }