From d14637e1ca19e258598993232f3b39aa8346c2b7 Mon Sep 17 00:00:00 2001
From: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
Date: Sat, 6 Apr 2019 10:09:18 +0100
Subject: [PATCH] Fix narrowing and formatting

---
 src/openrct2-ui/windows/Banner.cpp     | 2 +-
 src/openrct2-ui/windows/TopToolbar.cpp | 6 ++++--
 src/openrct2/world/Map.cpp             | 2 +-
 src/openrct2/world/Scenery.cpp         | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/openrct2-ui/windows/Banner.cpp b/src/openrct2-ui/windows/Banner.cpp
index 08237a7d8f..a1597cbe85 100644
--- a/src/openrct2-ui/windows/Banner.cpp
+++ b/src/openrct2-ui/windows/Banner.cpp
@@ -10,9 +10,9 @@
 #include <openrct2-ui/interface/Dropdown.h>
 #include <openrct2-ui/interface/Viewport.h>
 #include <openrct2-ui/interface/Widget.h>
-#include <openrct2/actions/BannerRemoveAction.hpp>
 #include <openrct2-ui/windows/Window.h>
 #include <openrct2/Game.h>
+#include <openrct2/actions/BannerRemoveAction.hpp>
 #include <openrct2/actions/BannerSetColourAction.hpp>
 #include <openrct2/actions/BannerSetNameAction.hpp>
 #include <openrct2/actions/BannerSetStyleAction.hpp>
diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp
index c842b743f3..8bf483e0ba 100644
--- a/src/openrct2-ui/windows/TopToolbar.cpp
+++ b/src/openrct2-ui/windows/TopToolbar.cpp
@@ -1922,7 +1922,8 @@ static void window_top_toolbar_scenery_tool_down(int16_t x, int16_t y, rct_windo
         case SCENERY_TYPE_BANNER:
         {
             uint8_t direction = (parameter_2 >> 8) & 0xFF;
-            CoordsXYZD loc{ gridX, gridY, (parameter_2 & 0xFF) * 16, direction };
+            int32_t z = (parameter_2 & 0xFF) * 16;
+            CoordsXYZD loc{ gridX, gridY, z, direction };
             auto primaryColour = gWindowSceneryPrimaryColour;
             auto bannerType = (parameter_1 & 0xFF00) >> 8;
             auto bannerIndex = create_new_banner(0);
@@ -2629,7 +2630,8 @@ static money32 try_place_ghost_scenery(
             // Banners
             // 6e2612
             uint8_t direction = (parameter_2 >> 8) & 0xFF;
-            CoordsXYZD loc{ map_tile.x, map_tile.y, (parameter_2 & 0xFF) * 16, direction };
+            int32_t z = (parameter_2 & 0xFF) * 16;
+            CoordsXYZD loc{ map_tile.x, map_tile.y, z, direction };
             auto primaryColour = gWindowSceneryPrimaryColour;
             auto bannerType = (parameter_1 & 0xFF00) >> 8;
             auto bannerIndex = create_new_banner(0);
diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp
index 66c5ee7754..f9ce97242f 100644
--- a/src/openrct2/world/Map.cpp
+++ b/src/openrct2/world/Map.cpp
@@ -14,6 +14,7 @@
 #include "../Game.h"
 #include "../Input.h"
 #include "../OpenRCT2.h"
+#include "../actions/BannerRemoveAction.hpp"
 #include "../actions/FootpathRemoveAction.hpp"
 #include "../actions/LandLowerAction.hpp"
 #include "../actions/LandRaiseAction.hpp"
@@ -23,7 +24,6 @@
 #include "../actions/SmallSceneryRemoveAction.hpp"
 #include "../actions/WallRemoveAction.hpp"
 #include "../actions/WaterSetHeightAction.hpp"
-#include "../actions/BannerRemoveAction.hpp"
 #include "../audio/audio.h"
 #include "../config/Config.h"
 #include "../core/Guard.hpp"
diff --git a/src/openrct2/world/Scenery.cpp b/src/openrct2/world/Scenery.cpp
index a9e97144f7..5d2bf86b0b 100644
--- a/src/openrct2/world/Scenery.cpp
+++ b/src/openrct2/world/Scenery.cpp
@@ -12,11 +12,11 @@
 #include "../Cheats.h"
 #include "../Context.h"
 #include "../Game.h"
+#include "../actions/BannerRemoveAction.hpp"
 #include "../actions/FootpathSceneryRemoveAction.hpp"
 #include "../actions/LargeSceneryRemoveAction.hpp"
 #include "../actions/SmallSceneryRemoveAction.hpp"
 #include "../actions/WallRemoveAction.hpp"
-#include "../actions/BannerRemoveAction.hpp"
 #include "../common.h"
 #include "../localisation/Localisation.h"
 #include "../network/network.h"