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

Fix narrowing and formatting

Browse Source
This commit is contained in:
duncanspumpkin
2019-04-06 10:09:18 +01:00
parent f6b610c325
commit d14637e1ca
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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>

6
src/openrct2-ui/windows/TopToolbar.cpp
View File

@@ -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);

2
src/openrct2/world/Map.cpp
View File

@@ -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"

2
src/openrct2/world/Scenery.cpp
View File

@@ -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"