diff --git a/src/openrct2-ui/scripting/CustomWindow.cpp b/src/openrct2-ui/scripting/CustomWindow.cpp index d5299bc9f2..5f7ddd1923 100644 --- a/src/openrct2-ui/scripting/CustomWindow.cpp +++ b/src/openrct2-ui/scripting/CustomWindow.cpp @@ -415,8 +415,8 @@ namespace OpenRCT2::Ui::Windows set_format_arg_on((uint8_t*)&gDropdownItemsArgs[i], 0, const char*, items[i].c_str()); } window_dropdown_show_text_custom_width( - w->x + widget->left, w->y + widget->top, widget->bottom - widget->top + 1, w->colours[widget->colour], 0, - DROPDOWN_FLAG_STAY_OPEN, numItems, widget->right - widget->left - 3); + w->windowPos.x + widget->left, w->windowPos.y + widget->top, widget->bottom - widget->top + 1, + w->colours[widget->colour], 0, DROPDOWN_FLAG_STAY_OPEN, numItems, widget->right - widget->left - 3); } else if (widgetDesc->Type == "spinner") { @@ -507,15 +507,16 @@ namespace OpenRCT2::Ui::Windows { if (w->viewport == nullptr) { - auto left = w->x + viewportWidget->left + 1; - auto top = w->y + viewportWidget->top + 1; + auto left = w->windowPos.x + viewportWidget->left + 1; + auto top = w->windowPos.y + viewportWidget->top + 1; auto width = (viewportWidget->right - viewportWidget->left) - 1; auto height = (viewportWidget->bottom - viewportWidget->top) - 1; auto mapX = 0; auto mapY = 0; auto mapZ = 0; viewport_create( - w, left, top, width, height, 0, mapX, mapY, mapZ, VIEWPORT_FOCUS_TYPE_COORDINATE, SPRITE_INDEX_NULL); + w, { left, top }, width, height, 0, { mapX, mapY, mapZ }, VIEWPORT_FOCUS_TYPE_COORDINATE, + SPRITE_INDEX_NULL); w->flags |= WF_NO_SCROLLING; w->Invalidate(); } diff --git a/src/openrct2-ui/scripting/ScViewport.hpp b/src/openrct2-ui/scripting/ScViewport.hpp index 012205e12a..3730b9fc40 100644 --- a/src/openrct2-ui/scripting/ScViewport.hpp +++ b/src/openrct2-ui/scripting/ScViewport.hpp @@ -42,7 +42,7 @@ namespace OpenRCT2::Scripting auto viewport = GetViewport(); if (viewport != nullptr) { - return viewport->view_x; + return viewport->viewPos.x; } return 0; } @@ -51,7 +51,7 @@ namespace OpenRCT2::Scripting auto viewport = GetViewport(); if (viewport != nullptr) { - SetViewLeftTop(value, viewport->view_y); + SetViewLeftTop(value, viewport->viewPos.y); } } @@ -60,7 +60,7 @@ namespace OpenRCT2::Scripting auto viewport = GetViewport(); if (viewport != nullptr) { - return viewport->view_y; + return viewport->viewPos.y; } return 0; } @@ -69,7 +69,7 @@ namespace OpenRCT2::Scripting auto viewport = GetViewport(); if (viewport != nullptr) { - SetViewLeftTop(viewport->view_x, value); + SetViewLeftTop(viewport->viewPos.x, value); } } @@ -78,7 +78,7 @@ namespace OpenRCT2::Scripting auto viewport = GetViewport(); if (viewport != nullptr) { - return viewport->view_x + viewport->view_width; + return viewport->viewPos.x + viewport->view_width; } return 0; } @@ -87,7 +87,7 @@ namespace OpenRCT2::Scripting auto viewport = GetViewport(); if (viewport != nullptr) { - SetViewLeftTop(value - viewport->view_width, viewport->view_y); + SetViewLeftTop(value - viewport->view_width, viewport->viewPos.y); } } @@ -96,7 +96,7 @@ namespace OpenRCT2::Scripting auto viewport = GetViewport(); if (viewport != nullptr) { - return viewport->view_y + viewport->view_height; + return viewport->viewPos.y + viewport->view_height; } return 0; } @@ -105,7 +105,7 @@ namespace OpenRCT2::Scripting auto viewport = GetViewport(); if (viewport != nullptr) { - SetViewLeftTop(viewport->view_x, value - viewport->view_height); + SetViewLeftTop(viewport->viewPos.x, value - viewport->view_height); } } @@ -177,8 +177,8 @@ namespace OpenRCT2::Scripting auto viewport = GetViewport(); if (viewport != nullptr) { - auto centreX = viewport->view_x + (viewport->view_width / 2); - auto centreY = viewport->view_y + (viewport->view_height / 2); + auto centreX = viewport->viewPos.x + (viewport->view_width / 2); + auto centreY = viewport->viewPos.y + (viewport->view_height / 2); auto coords = viewport_coord_to_map_coord(centreX, centreY, 24); auto ctx = GetContext()->GetScriptEngine().GetContext(); @@ -268,11 +268,11 @@ namespace OpenRCT2::Scripting auto viewport = w->viewport; if (viewport != nullptr) { - viewport->view_x = left; - viewport->view_y = top; + viewport->viewPos.x = left; + viewport->viewPos.y = top; viewport->flags &= ~WF_SCROLLING_TO_LOCATION; - w->saved_view_x = viewport->view_x; - w->saved_view_y = viewport->view_y; + w->savedViewPos.x = viewport->viewPos.x; + w->savedViewPos.y = viewport->viewPos.y; } } } diff --git a/src/openrct2-ui/scripting/ScWindow.hpp b/src/openrct2-ui/scripting/ScWindow.hpp index a6067aaccc..9d7e2fbbfb 100644 --- a/src/openrct2-ui/scripting/ScWindow.hpp +++ b/src/openrct2-ui/scripting/ScWindow.hpp @@ -53,21 +53,21 @@ namespace OpenRCT2::Scripting int32_t x_get() { - return GetWindow()->x; + return GetWindow()->windowPos.x; } void x_set(int32_t value) { auto w = GetWindow(); - window_set_position(w, { value, w->y }); + window_set_position(w, { value, w->windowPos.y }); } int32_t y_get() { - return GetWindow()->y; + return GetWindow()->windowPos.y; } void y_set(int32_t value) { auto w = GetWindow(); - window_set_position(w, { w->x, value }); + window_set_position(w, { w->windowPos.x, value }); } int32_t width_get() { diff --git a/src/openrct2/scripting/ScTile.hpp b/src/openrct2/scripting/ScTile.hpp index 55746dacaf..1c0e5aa6df 100644 --- a/src/openrct2/scripting/ScTile.hpp +++ b/src/openrct2/scripting/ScTile.hpp @@ -96,18 +96,16 @@ namespace OpenRCT2::Scripting bool broken_get() const { - return _element->flags & TILE_ELEMENT_FLAG_BROKEN; + auto el = _element->AsPath(); + return el != nullptr ? el->IsBroken() : false; } void broken_set(bool value) { ThrowIfGameStateNotMutable(); - if (value) + auto el = _element->AsPath(); + if (el != nullptr) { - _element->flags |= TILE_ELEMENT_FLAG_BROKEN; - } - else - { - _element->flags &= ~TILE_ELEMENT_FLAG_BROKEN; + el->SetIsBroken(value); } } @@ -422,7 +420,7 @@ namespace OpenRCT2::Scripting case TILE_ELEMENT_TYPE_PATH: { auto el = _element->AsPath(); - return el->GetPathEntryIndex(); + return el->GetSurfaceEntryIndex(); } case TILE_ELEMENT_TYPE_SMALL_SCENERY: { @@ -455,7 +453,7 @@ namespace OpenRCT2::Scripting case TILE_ELEMENT_TYPE_PATH: { auto el = _element->AsPath(); - el->SetPathEntryIndex(value & 0xFF); + el->SetSurfaceEntryIndex(value & 0xFF); break; } case TILE_ELEMENT_TYPE_SMALL_SCENERY: