mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use CoordsXY on windows/Sign.cpp

This commit is contained in:
Tulio Leao 2020-05-01 12:19:20 -03:00
parent fc860e8b6e
commit 1da24fed40
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/openrct2-ui/windows/Sign.cpp
View File

@ -214,9 +214,8 @@ static void window_sign_mouseup(rct_window* w, rct_widgetindex widgetIndex)
case WIDX_SIGN_DEMOLISH:
{
auto banner = GetBanner(w->number);
int32_t x = banner->position.x << 5;
int32_t y = banner->position.y << 5;
auto tile_element = map_get_first_element_at({ x, y });
auto bannerCoords = banner->position.ToCoordsXY();
auto tile_element = map_get_first_element_at(bannerCoords);
if (tile_element == nullptr)
return;
while (1)
@ -235,7 +234,7 @@ static void window_sign_mouseup(rct_window* w, rct_widgetindex widgetIndex)
}
auto sceneryRemoveAction = LargeSceneryRemoveAction(
{ x, y, tile_element->GetBaseZ(), tile_element->GetDirection() },
{ bannerCoords, tile_element->GetBaseZ(), tile_element->GetDirection() },
tile_element->AsLargeScenery()->GetSequenceIndex());
GameActions::Execute(&sceneryRemoveAction);
break;
@ -458,9 +457,8 @@ static void window_sign_small_mouseup(rct_window* w, rct_widgetindex widgetIndex
case WIDX_SIGN_DEMOLISH:
{
auto banner = GetBanner(w->number);
int32_t x = banner->position.x << 5;
int32_t y = banner->position.y << 5;
auto tile_element = map_get_first_element_at({ x, y });
auto bannerCoords = banner->position.ToCoordsXY();
auto tile_element = map_get_first_element_at(bannerCoords);
if (tile_element == nullptr)
return;
while (true)
@ -476,7 +474,7 @@ static void window_sign_small_mouseup(rct_window* w, rct_widgetindex widgetIndex
}
tile_element++;
}
CoordsXYZD wallLocation = { x, y, tile_element->GetBaseZ(), tile_element->GetDirection() };
CoordsXYZD wallLocation = { bannerCoords, tile_element->GetBaseZ(), tile_element->GetDirection() };
auto wallRemoveAction = WallRemoveAction(wallLocation);
GameActions::Execute(&wallRemoveAction);
break;