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

Part of #11569: Use ScreenCoordsXY instead of <x,y>

This commit is contained in:
Tulio Leao 2020-06-11 10:11:12 -03:00
parent fab0ea131f
commit 183ee1e595
8 changed files with 121 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2-ui/scripting/CustomListView.cpp
View File

@ -650,13 +650,15 @@ void CustomListView::PaintHeading(
{ {
auto ft = Formatter::Common(); auto ft = Formatter::Common();
ft.Add<rct_string_id>(STR_UP); ft.Add<rct_string_id>(STR_UP);
gfx_draw_string_right(dpi, STR_BLACK_STRING, gCommonFormatArgs, COLOUR_BLACK, { pos.x + size.width - 1, pos.y }); gfx_draw_string_right(
dpi, STR_BLACK_STRING, gCommonFormatArgs, COLOUR_BLACK, pos + ScreenCoordsXY{ size.width - 1, 0 });
} }
else if (sortOrder == ColumnSortOrder::Descending) else if (sortOrder == ColumnSortOrder::Descending)
{ {
auto ft = Formatter::Common(); auto ft = Formatter::Common();
ft.Add<rct_string_id>(STR_DOWN); ft.Add<rct_string_id>(STR_DOWN);
gfx_draw_string_right(dpi, STR_BLACK_STRING, gCommonFormatArgs, COLOUR_BLACK, { pos.x + size.width - 1, pos.y }); gfx_draw_string_right(
dpi, STR_BLACK_STRING, gCommonFormatArgs, COLOUR_BLACK, pos + ScreenCoordsXY{ size.width - 1, 0 });
} }
} }

58
src/openrct2-ui/windows/EditorObjectSelection.cpp
View File

@ -952,22 +952,22 @@ static void window_editor_object_selection_invalidate(rct_window* w)
*/ */
static void window_editor_object_selection_paint(rct_window* w, rct_drawpixelinfo* dpi) static void window_editor_object_selection_paint(rct_window* w, rct_drawpixelinfo* dpi)
{ {
int32_t x, y, width; int32_t width;
rct_widget* widget; rct_widget* widget;
rct_string_id stringId; rct_string_id stringId;
window_draw_widgets(w, dpi); window_draw_widgets(w, dpi);
// Draw tabs // Draw tabs
ScreenCoordsXY screenPos{};
for (size_t i = 0; i < std::size(ObjectSelectionPages); i++) for (size_t i = 0; i < std::size(ObjectSelectionPages); i++)
{ {
widget = &w->widgets[WIDX_TAB_1 + i]; widget = &w->widgets[WIDX_TAB_1 + i];
if (widget->type != WWT_EMPTY) if (widget->type != WWT_EMPTY)
{ {
auto image = ObjectSelectionPages[i].Image; auto image = ObjectSelectionPages[i].Image;
x = w->windowPos.x + widget->left; screenPos = w->windowPos + ScreenCoordsXY{ widget->left, widget->top };
y = w->windowPos.y + widget->top; gfx_draw_sprite(dpi, image, screenPos.x, screenPos.y, 0);
gfx_draw_sprite(dpi, image, x, y, 0);
} }
} }
@ -994,9 +994,8 @@ static void window_editor_object_selection_paint(rct_window* w, rct_drawpixelinf
} }
spriteIndex += (i == 4 ? ThrillRidesTabAnimationSequence[frame] : frame); spriteIndex += (i == 4 ? ThrillRidesTabAnimationSequence[frame] : frame);
x = w->windowPos.x + widget->left; screenPos = w->windowPos + ScreenCoordsXY{ widget->left, widget->top };
y = w->windowPos.y + widget->top; gfx_draw_sprite(dpi, spriteIndex | (w->colours[1] << 19), screenPos.x, screenPos.y, 0);
gfx_draw_sprite(dpi, spriteIndex | (w->colours[1] << 19), x, y, 0);
} }
} }
@ -1009,8 +1008,7 @@ static void window_editor_object_selection_paint(rct_window* w, rct_drawpixelinf
// Draw number of selected items // Draw number of selected items
if (!(gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER)) if (!(gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER))
{ {
x = w->windowPos.x + 3; screenPos = w->windowPos + ScreenCoordsXY{ 3, w->height - 13 };
y = w->windowPos.y + w->height - 13;
int32_t numSelected = _numSelectedObjectsForType[get_selected_object_type(w)]; int32_t numSelected = _numSelectedObjectsForType[get_selected_object_type(w)];
int32_t totalSelectable = object_entry_group_counts[get_selected_object_type(w)]; int32_t totalSelectable = object_entry_group_counts[get_selected_object_type(w)];
@ -1020,7 +1018,8 @@ static void window_editor_object_selection_paint(rct_window* w, rct_drawpixelinf
auto ft = Formatter::Common(); auto ft = Formatter::Common();
ft.Add<uint16_t>(numSelected); ft.Add<uint16_t>(numSelected);
ft.Add<uint16_t>(totalSelectable); ft.Add<uint16_t>(totalSelectable);
gfx_draw_string_left(dpi, STR_OBJECT_SELECTION_SELECTION_SIZE, gCommonFormatArgs, COLOUR_BLACK, x, y); gfx_draw_string_left(
dpi, STR_OBJECT_SELECTION_SELECTION_SIZE, gCommonFormatArgs, COLOUR_BLACK, screenPos.x, screenPos.y);
} }
// Draw sort button text // Draw sort button text
@ -1029,18 +1028,18 @@ static void window_editor_object_selection_paint(rct_window* w, rct_drawpixelinf
{ {
stringId = _listSortType == RIDE_SORT_TYPE ? static_cast<rct_string_id>(_listSortDescending ? STR_DOWN : STR_UP) stringId = _listSortType == RIDE_SORT_TYPE ? static_cast<rct_string_id>(_listSortDescending ? STR_DOWN : STR_UP)
: STR_NONE; : STR_NONE;
ScreenCoordsXY screenCoords = { w->windowPos.x + widget->left + 1, w->windowPos.y + widget->top + 1 }; screenPos = w->windowPos + ScreenCoordsXY{ widget->left + 1, widget->top + 1 };
gfx_draw_string_left_clipped( gfx_draw_string_left_clipped(
dpi, STR_OBJECTS_SORT_TYPE, &stringId, w->colours[1], screenCoords, widget->right - widget->left); dpi, STR_OBJECTS_SORT_TYPE, &stringId, w->colours[1], screenPos, widget->right - widget->left);
} }
widget = &w->widgets[WIDX_LIST_SORT_RIDE]; widget = &w->widgets[WIDX_LIST_SORT_RIDE];
if (widget->type != WWT_EMPTY) if (widget->type != WWT_EMPTY)
{ {
stringId = _listSortType == RIDE_SORT_RIDE ? static_cast<rct_string_id>(_listSortDescending ? STR_DOWN : STR_UP) stringId = _listSortType == RIDE_SORT_RIDE ? static_cast<rct_string_id>(_listSortDescending ? STR_DOWN : STR_UP)
: STR_NONE; : STR_NONE;
ScreenCoordsXY screenCoord = { w->windowPos.x + widget->left + 1, w->windowPos.y + widget->top + 1 }; screenPos = w->windowPos + ScreenCoordsXY{ widget->left + 1, widget->top + 1 };
gfx_draw_string_left_clipped( gfx_draw_string_left_clipped(
dpi, STR_OBJECTS_SORT_RIDE, &stringId, w->colours[1], screenCoord, widget->right - widget->left); dpi, STR_OBJECTS_SORT_RIDE, &stringId, w->colours[1], screenPos, widget->right - widget->left);
} }
if (w->selected_list_item == -1 || _loadedObject == nullptr) if (w->selected_list_item == -1 || _loadedObject == nullptr)
@ -1052,24 +1051,23 @@ static void window_editor_object_selection_paint(rct_window* w, rct_drawpixelinf
widget = &w->widgets[WIDX_PREVIEW]; widget = &w->widgets[WIDX_PREVIEW];
{ {
rct_drawpixelinfo clipDPI; rct_drawpixelinfo clipDPI;
x = w->windowPos.x + widget->left + 1; screenPos = w->windowPos + ScreenCoordsXY{ widget->left + 1, widget->top + 1 };
y = w->windowPos.y + widget->top + 1;
width = widget->right - widget->left - 1; width = widget->right - widget->left - 1;
int32_t height = widget->bottom - widget->top - 1; int32_t height = widget->bottom - widget->top - 1;
if (clip_drawpixelinfo(&clipDPI, dpi, x, y, width, height)) if (clip_drawpixelinfo(&clipDPI, dpi, screenPos.x, screenPos.y, width, height))
{ {
object_draw_preview(_loadedObject, &clipDPI, width, height); object_draw_preview(_loadedObject, &clipDPI, width, height);
} }
} }
// Draw name of object // Draw name of object
x = w->windowPos.x + (widget->left + widget->right) / 2 + 1; screenPos = w->windowPos + ScreenCoordsXY{ (widget->left + widget->right) / 2 + 1, widget->bottom + 3 };
y = w->windowPos.y + widget->bottom + 3;
width = w->width - w->widgets[WIDX_LIST].right - 6; width = w->width - w->widgets[WIDX_LIST].right - 6;
auto ft = Formatter::Common(); auto ft = Formatter::Common();
ft.Add<rct_string_id>(STR_STRING); ft.Add<rct_string_id>(STR_STRING);
ft.Add<const char*>(listItem->repositoryItem->Name.c_str()); ft.Add<const char*>(listItem->repositoryItem->Name.c_str());
gfx_draw_string_centred_clipped(dpi, STR_WINDOW_COLOUR_2_STRINGID, gCommonFormatArgs, COLOUR_BLACK, x, y, width); gfx_draw_string_centred_clipped(
dpi, STR_WINDOW_COLOUR_2_STRINGID, gCommonFormatArgs, COLOUR_BLACK, screenPos.x, screenPos.y, width);
// Draw description of object // Draw description of object
auto description = object_get_description(_loadedObject); auto description = object_get_description(_loadedObject);
@ -1079,28 +1077,28 @@ static void window_editor_object_selection_paint(rct_window* w, rct_drawpixelinf
ft.Add<rct_string_id>(STR_STRING); ft.Add<rct_string_id>(STR_STRING);
ft.Add<const char*>(description.c_str()); ft.Add<const char*>(description.c_str());
x = w->windowPos.x + w->widgets[WIDX_LIST].right + 4; screenPos = { w->windowPos.x + w->widgets[WIDX_LIST].right + 4, screenPos.y + 15 };
y += 15; width = w->windowPos.x + w->width - screenPos.x - 4;
width = w->windowPos.x + w->width - x - 4;
gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y + 5, width, STR_WINDOW_COLOUR_2_STRINGID, COLOUR_BLACK); gfx_draw_string_left_wrapped(
dpi, gCommonFormatArgs, screenPos.x, screenPos.y + 5, width, STR_WINDOW_COLOUR_2_STRINGID, COLOUR_BLACK);
} }
y = w->windowPos.y + w->height - (12 * 4); screenPos.y = w->windowPos.y + w->height - (12 * 4);
// Draw ride type. // Draw ride type.
if (get_selected_object_type(w) == OBJECT_TYPE_RIDE) if (get_selected_object_type(w) == OBJECT_TYPE_RIDE)
{ {
stringId = get_ride_type_string_id(listItem->repositoryItem); stringId = get_ride_type_string_id(listItem->repositoryItem);
gfx_draw_string_right(dpi, stringId, nullptr, COLOUR_WHITE, { w->windowPos.x + w->width - 5, y }); gfx_draw_string_right(dpi, stringId, nullptr, COLOUR_WHITE, { w->windowPos.x + w->width - 5, screenPos.y });
} }
y += 12; screenPos.y += 12;
// Draw object source // Draw object source
stringId = object_manager_get_source_game_string(listItem->repositoryItem->GetFirstSourceGame()); stringId = object_manager_get_source_game_string(listItem->repositoryItem->GetFirstSourceGame());
gfx_draw_string_right(dpi, stringId, nullptr, COLOUR_WHITE, { w->windowPos.x + w->width - 5, y }); gfx_draw_string_right(dpi, stringId, nullptr, COLOUR_WHITE, { w->windowPos.x + w->width - 5, screenPos.y });
y += 12; screenPos.y += 12;
// Draw object dat name // Draw object dat name
const char* path = path_get_filename(listItem->repositoryItem->Path.c_str()); const char* path = path_get_filename(listItem->repositoryItem->Path.c_str());
@ -1108,7 +1106,7 @@ static void window_editor_object_selection_paint(rct_window* w, rct_drawpixelinf
ft.Add<rct_string_id>(STR_STRING); ft.Add<rct_string_id>(STR_STRING);
ft.Add<const char*>(path); ft.Add<const char*>(path);
gfx_draw_string_right( gfx_draw_string_right(
dpi, STR_WINDOW_COLOUR_2_STRINGID, gCommonFormatArgs, COLOUR_BLACK, { w->windowPos.x + w->width - 5, y }); dpi, STR_WINDOW_COLOUR_2_STRINGID, gCommonFormatArgs, COLOUR_BLACK, { w->windowPos.x + w->width - 5, screenPos.y });
} }
/** /**

19
src/openrct2-ui/windows/Finances.cpp
View File

@ -1050,7 +1050,7 @@ static void window_finances_profit_graph_invalidate(rct_window* w)
*/ */
static void window_finances_profit_graph_paint(rct_window* w, rct_drawpixelinfo* dpi) static void window_finances_profit_graph_paint(rct_window* w, rct_drawpixelinfo* dpi)
{ {
int32_t i, x, y, graphLeft, graphTop, graphRight, graphBottom; int32_t i, graphLeft, graphTop, graphRight, graphBottom;
window_draw_widgets(w, dpi); window_draw_widgets(w, dpi);
window_finances_draw_tab_images(dpi, w); window_finances_draw_tab_images(dpi, w);
@ -1088,21 +1088,22 @@ static void window_finances_profit_graph_paint(rct_window* w, rct_drawpixelinfo*
} }
// Y axis labels // Y axis labels
x = graphLeft + 18; auto screenPos = ScreenCoordsXY{ graphLeft + 18, graphTop + 14 };
y = graphTop + 14;
money32 axisBase; money32 axisBase;
for (axisBase = MONEY(12, 00); axisBase >= MONEY(-12, 00); axisBase -= MONEY(6, 00)) for (axisBase = MONEY(12, 00); axisBase >= MONEY(-12, 00); axisBase -= MONEY(6, 00))
{ {
money32 axisValue = axisBase << yAxisScale; money32 axisValue = axisBase << yAxisScale;
gfx_draw_string_right(dpi, STR_FINANCES_FINANCIAL_GRAPH_CASH_VALUE, &axisValue, COLOUR_BLACK, { x + 70, y }); gfx_draw_string_right(
gfx_fill_rect_inset(dpi, x + 70, y + 5, graphLeft + 482, y + 5, w->colours[2], INSET_RECT_FLAG_BORDER_INSET); dpi, STR_FINANCES_FINANCIAL_GRAPH_CASH_VALUE, &axisValue, COLOUR_BLACK, screenPos + ScreenCoordsXY{ 70, 0 });
y += 39; gfx_fill_rect_inset(
dpi, screenPos.x + 70, screenPos.y + 5, graphLeft + 482, screenPos.y + 5, w->colours[2],
INSET_RECT_FLAG_BORDER_INSET);
screenPos.y += 39;
} }
// X axis labels and values // X axis labels and values
x = graphLeft + 98; screenPos = { graphLeft + 98, graphTop + 17 };
y = graphTop + 17; graph_draw_money32(dpi, gWeeklyProfitHistory, 64, screenPos.x, screenPos.y, yAxisScale, 128);
graph_draw_money32(dpi, gWeeklyProfitHistory, 64, x, y, yAxisScale, 128);
} }
#pragma endregion #pragma endregion

15
src/openrct2-ui/windows/NewRide.cpp
View File

@ -266,7 +266,7 @@ static void window_new_ride_set_page(rct_window* w, int32_t page);
static void window_new_ride_refresh_widget_sizing(rct_window* w); static void window_new_ride_refresh_widget_sizing(rct_window* w);
static RideSelection window_new_ride_scroll_get_ride_list_item_at(rct_window* w, const ScreenCoordsXY& screenCoords); static RideSelection window_new_ride_scroll_get_ride_list_item_at(rct_window* w, const ScreenCoordsXY& screenCoords);
static void window_new_ride_paint_ride_information( static void window_new_ride_paint_ride_information(
rct_window* w, rct_drawpixelinfo* dpi, RideSelection item, int32_t x, int32_t y, int32_t width); rct_window* w, rct_drawpixelinfo* dpi, RideSelection item, const ScreenCoordsXY& screenPos, int32_t width);
static void window_new_ride_select(rct_window* w); static void window_new_ride_select(rct_window* w);
static RideSelection* window_new_ride_iterate_over_ride_group( static RideSelection* window_new_ride_iterate_over_ride_group(
uint8_t rideType, uint8_t rideGroupIndex, RideSelection* nextListItem); uint8_t rideType, uint8_t rideGroupIndex, RideSelection* nextListItem);
@ -842,7 +842,7 @@ static void window_new_ride_paint(rct_window* w, rct_drawpixelinfo* dpi)
item = w->new_ride.HighlightedRide; item = w->new_ride.HighlightedRide;
if (item.Type != RIDE_TYPE_NULL || item.EntryIndex != RIDE_ENTRY_INDEX_NULL) if (item.Type != RIDE_TYPE_NULL || item.EntryIndex != RIDE_ENTRY_INDEX_NULL)
window_new_ride_paint_ride_information( window_new_ride_paint_ride_information(
w, dpi, item, w->windowPos.x + 3, w->windowPos.y + w->height - 64, w->width - 6); w, dpi, item, w->windowPos + ScreenCoordsXY{ 3, w->height - 64 }, w->width - 6);
} }
else else
{ {
@ -963,7 +963,7 @@ static int32_t get_num_track_designs(RideSelection item)
* rct2: 0x006B701C * rct2: 0x006B701C
*/ */
static void window_new_ride_paint_ride_information( static void window_new_ride_paint_ride_information(
rct_window* w, rct_drawpixelinfo* dpi, RideSelection item, int32_t x, int32_t y, int32_t width) rct_window* w, rct_drawpixelinfo* dpi, RideSelection item, const ScreenCoordsXY& screenPos, int32_t width)
{ {
rct_ride_entry* rideEntry = get_ride_entry(item.EntryIndex); rct_ride_entry* rideEntry = get_ride_entry(item.EntryIndex);
rct_ride_name rideNaming; rct_ride_name rideNaming;
@ -973,7 +973,7 @@ static void window_new_ride_paint_ride_information(
auto ft = Formatter::Common(); auto ft = Formatter::Common();
ft.Add<rct_string_id>(rideNaming.name); ft.Add<rct_string_id>(rideNaming.name);
ft.Add<rct_string_id>(rideNaming.description); ft.Add<rct_string_id>(rideNaming.description);
gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, { x, y }, width, STR_NEW_RIDE_NAME_AND_DESCRIPTION, COLOUR_BLACK); gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, screenPos, width, STR_NEW_RIDE_NAME_AND_DESCRIPTION, COLOUR_BLACK);
char availabilityString[AVAILABILITY_STRING_SIZE]; char availabilityString[AVAILABILITY_STRING_SIZE];
window_new_ride_list_vehicles_for(item.Type, rideEntry, availabilityString, sizeof(availabilityString)); window_new_ride_list_vehicles_for(item.Type, rideEntry, availabilityString, sizeof(availabilityString));
@ -981,7 +981,8 @@ static void window_new_ride_paint_ride_information(
if (availabilityString[0] != 0) if (availabilityString[0] != 0)
{ {
const char* drawString = availabilityString; const char* drawString = availabilityString;
gfx_draw_string_left_clipped(dpi, STR_AVAILABLE_VEHICLES, &drawString, COLOUR_BLACK, { x, y + 39 }, WW - 2); gfx_draw_string_left_clipped(
dpi, STR_AVAILABLE_VEHICLES, &drawString, COLOUR_BLACK, screenPos + ScreenCoordsXY{ 0, 39 }, WW - 2);
} }
if (item.Type != _lastTrackDesignCountRideType.Type || item.EntryIndex != _lastTrackDesignCountRideType.EntryIndex) if (item.Type != _lastTrackDesignCountRideType.Type || item.EntryIndex != _lastTrackDesignCountRideType.EntryIndex)
@ -1004,7 +1005,7 @@ static void window_new_ride_paint_ride_information(
break; break;
} }
gfx_draw_string_left(dpi, designCountStringId, &_lastTrackDesignCount, COLOUR_BLACK, x, y + 51); gfx_draw_string_left(dpi, designCountStringId, &_lastTrackDesignCount, COLOUR_BLACK, screenPos.x, screenPos.y + 51);
// Price // Price
if (!(gParkFlags & PARK_FLAGS_NO_MONEY)) if (!(gParkFlags & PARK_FLAGS_NO_MONEY))
@ -1027,7 +1028,7 @@ static void window_new_ride_paint_ride_information(
if (!ride_type_has_flag(item.Type, RIDE_TYPE_FLAG_HAS_NO_TRACK)) if (!ride_type_has_flag(item.Type, RIDE_TYPE_FLAG_HAS_NO_TRACK))
stringId = STR_NEW_RIDE_COST_FROM; stringId = STR_NEW_RIDE_COST_FROM;
gfx_draw_string_right(dpi, stringId, &price, COLOUR_BLACK, { x + width, y + 51 }); gfx_draw_string_right(dpi, stringId, &price, COLOUR_BLACK, screenPos + ScreenCoordsXY{ width, 51 });
} }
} }

52
src/openrct2-ui/windows/Park.cpp
View File

@ -1046,34 +1046,34 @@ static void window_park_rating_paint(rct_window* w, rct_drawpixelinfo* dpi)
window_draw_widgets(w, dpi); window_draw_widgets(w, dpi);
window_park_draw_tab_images(dpi, w); window_park_draw_tab_images(dpi, w);
int32_t x = w->windowPos.x; auto screenPos = ScreenCoordsXY{ w->windowPos.x, w->windowPos.y };
int32_t y = w->windowPos.y;
rct_widget* widget = &window_park_rating_widgets[WIDX_PAGE_BACKGROUND]; rct_widget* widget = &window_park_rating_widgets[WIDX_PAGE_BACKGROUND];
// Current value // Current value
gfx_draw_string_left(dpi, STR_PARK_RATING_LABEL, &gParkRating, COLOUR_BLACK, x + widget->left + 3, y + widget->top + 2); gfx_draw_string_left(
dpi, STR_PARK_RATING_LABEL, &gParkRating, COLOUR_BLACK, screenPos.x + widget->left + 3, screenPos.y + widget->top + 2);
// Graph border // Graph border
gfx_fill_rect_inset( gfx_fill_rect_inset(
dpi, x + widget->left + 4, y + widget->top + 15, x + widget->right - 4, y + widget->bottom - 4, w->colours[1], dpi, screenPos.x + widget->left + 4, screenPos.y + widget->top + 15, screenPos.x + widget->right - 4,
INSET_RECT_F_30); screenPos.y + widget->bottom - 4, w->colours[1], INSET_RECT_F_30);
// Y axis labels // Y axis labels
x = x + widget->left + 27; screenPos = screenPos + ScreenCoordsXY{ widget->left + 27, widget->top + 23 };
y = y + widget->top + 23;
for (int i = 5; i >= 0; i--) for (int i = 5; i >= 0; i--)
{ {
uint32_t axisValue = i * 200; uint32_t axisValue = i * 200;
gfx_draw_string_right(dpi, STR_GRAPH_AXIS_LABEL, &axisValue, COLOUR_BLACK, { x + 10, y }); gfx_draw_string_right(dpi, STR_GRAPH_AXIS_LABEL, &axisValue, COLOUR_BLACK, screenPos + ScreenCoordsXY{ 10, 0 });
gfx_fill_rect_inset(dpi, x + 15, y + 5, x + w->width - 32, y + 5, w->colours[2], INSET_RECT_FLAG_BORDER_INSET); gfx_fill_rect_inset(
y += 20; dpi, screenPos.x + 15, screenPos.y + 5, screenPos.x + w->width - 32, screenPos.y + 5, w->colours[2],
INSET_RECT_FLAG_BORDER_INSET);
screenPos.y += 20;
} }
// Graph // Graph
x = w->windowPos.x + widget->left + 47; screenPos = w->windowPos + ScreenCoordsXY{ widget->left + 47, widget->top + 26 };
y = w->windowPos.y + widget->top + 26;
graph_draw_uint8_t(dpi, gParkRatingHistory, 32, x, y); graph_draw_uint8_t(dpi, gParkRatingHistory, 32, screenPos.x, screenPos.y);
} }
#pragma endregion #pragma endregion
@ -1176,35 +1176,35 @@ static void window_park_guests_paint(rct_window* w, rct_drawpixelinfo* dpi)
window_draw_widgets(w, dpi); window_draw_widgets(w, dpi);
window_park_draw_tab_images(dpi, w); window_park_draw_tab_images(dpi, w);
int32_t x = w->windowPos.x; auto screenPos = ScreenCoordsXY{ w->windowPos.x, w->windowPos.y };
int32_t y = w->windowPos.y;
rct_widget* widget = &window_park_guests_widgets[WIDX_PAGE_BACKGROUND]; rct_widget* widget = &window_park_guests_widgets[WIDX_PAGE_BACKGROUND];
// Current value // Current value
gfx_draw_string_left( gfx_draw_string_left(
dpi, STR_GUESTS_IN_PARK_LABEL, &gNumGuestsInPark, COLOUR_BLACK, x + widget->left + 3, y + widget->top + 2); dpi, STR_GUESTS_IN_PARK_LABEL, &gNumGuestsInPark, COLOUR_BLACK, screenPos.x + widget->left + 3,
screenPos.y + widget->top + 2);
// Graph border // Graph border
gfx_fill_rect_inset( gfx_fill_rect_inset(
dpi, x + widget->left + 4, y + widget->top + 15, x + widget->right - 4, y + widget->bottom - 4, w->colours[1], dpi, screenPos.x + widget->left + 4, screenPos.y + widget->top + 15, screenPos.x + widget->right - 4,
INSET_RECT_F_30); screenPos.y + widget->bottom - 4, w->colours[1], INSET_RECT_F_30);
// Y axis labels // Y axis labels
x = x + widget->left + 27; screenPos = screenPos + ScreenCoordsXY{ widget->left + 27, widget->top + 23 };
y = y + widget->top + 23;
for (int i = 5; i >= 0; i--) for (int i = 5; i >= 0; i--)
{ {
uint32_t axisValue = i * 1000; uint32_t axisValue = i * 1000;
gfx_draw_string_right(dpi, STR_GRAPH_AXIS_LABEL, &axisValue, COLOUR_BLACK, { x + 10, y }); gfx_draw_string_right(dpi, STR_GRAPH_AXIS_LABEL, &axisValue, COLOUR_BLACK, screenPos + ScreenCoordsXY{ 10, 0 });
gfx_fill_rect_inset(dpi, x + 15, y + 5, x + w->width - 32, y + 5, w->colours[2], INSET_RECT_FLAG_BORDER_INSET); gfx_fill_rect_inset(
y += 20; dpi, screenPos.x + 15, screenPos.y + 5, screenPos.x + w->width - 32, screenPos.y + 5, w->colours[2],
INSET_RECT_FLAG_BORDER_INSET);
screenPos.y += 20;
} }
// Graph // Graph
x = w->windowPos.x + widget->left + 47; screenPos = w->windowPos + ScreenCoordsXY{ widget->left + 47, widget->top + 26 };
y = w->windowPos.y + widget->top + 26;
graph_draw_uint8_t(dpi, gGuestsInParkHistory, 32, x, y); graph_draw_uint8_t(dpi, gGuestsInParkHistory, 32, screenPos.x, screenPos.y);
} }
#pragma endregion #pragma endregion

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

@ -1181,7 +1181,7 @@ void window_scenery_paint(rct_window* w, rct_drawpixelinfo* dpi)
// -14 // -14
gfx_draw_string_right( gfx_draw_string_right(
dpi, STR_COST_LABEL, gCommonFormatArgs, COLOUR_BLACK, dpi, STR_COST_LABEL, gCommonFormatArgs, COLOUR_BLACK,
{ w->windowPos.x + w->width - 0x1A, w->windowPos.y + w->height - 13 }); w->windowPos + ScreenCoordsXY{ w->width - 0x1A, w->height - 13 });
} }
auto ft = Formatter::Common(); auto ft = Formatter::Common();

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

@ -1790,10 +1790,8 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi)
if (windowTileInspectorTileSelected) if (windowTileInspectorTileSelected)
{ {
auto tileCoords = TileCoordsXY{ windowTileInspectorToolMap }; auto tileCoords = TileCoordsXY{ windowTileInspectorToolMap };
gfx_draw_string_right( gfx_draw_string_right(dpi, STR_FORMAT_INTEGER, &tileCoords.x, COLOUR_WHITE, screenCoords + ScreenCoordsXY{ 43, 24 });
dpi, STR_FORMAT_INTEGER, &tileCoords.x, COLOUR_WHITE, { w->windowPos.x + 43, w->windowPos.y + 24 }); gfx_draw_string_right(dpi, STR_FORMAT_INTEGER, &tileCoords.y, COLOUR_WHITE, screenCoords + ScreenCoordsXY{ 113, 24 });
gfx_draw_string_right(
dpi, STR_FORMAT_INTEGER, &tileCoords.y, COLOUR_WHITE, { w->windowPos.x + 113, w->windowPos.y + 24 });
} }
else else
{ {

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

@ -842,132 +842,134 @@ static void window_top_toolbar_invalidate(rct_window* w)
*/ */
static void window_top_toolbar_paint(rct_window* w, rct_drawpixelinfo* dpi) static void window_top_toolbar_paint(rct_window* w, rct_drawpixelinfo* dpi)
{ {
int32_t x, y, imgId; int32_t imgId;
window_draw_widgets(w, dpi); window_draw_widgets(w, dpi);
ScreenCoordsXY screenPos{};
// Draw staff button image (setting masks to the staff colours) // Draw staff button image (setting masks to the staff colours)
if (window_top_toolbar_widgets[WIDX_STAFF].type != WWT_EMPTY) if (window_top_toolbar_widgets[WIDX_STAFF].type != WWT_EMPTY)
{ {
x = w->windowPos.x + window_top_toolbar_widgets[WIDX_STAFF].left; screenPos = { w->windowPos.x + window_top_toolbar_widgets[WIDX_STAFF].left,
y = w->windowPos.y + window_top_toolbar_widgets[WIDX_STAFF].top; w->windowPos.y + window_top_toolbar_widgets[WIDX_STAFF].top };
imgId = SPR_TOOLBAR_STAFF; imgId = SPR_TOOLBAR_STAFF;
if (widget_is_pressed(w, WIDX_STAFF)) if (widget_is_pressed(w, WIDX_STAFF))
imgId++; imgId++;
imgId |= SPRITE_ID_PALETTE_COLOUR_2(gStaffHandymanColour, gStaffMechanicColour); imgId |= SPRITE_ID_PALETTE_COLOUR_2(gStaffHandymanColour, gStaffMechanicColour);
gfx_draw_sprite(dpi, imgId, x, y, 0); gfx_draw_sprite(dpi, imgId, screenPos.x, screenPos.y, 0);
} }
// Draw fast forward button // Draw fast forward button
if (window_top_toolbar_widgets[WIDX_FASTFORWARD].type != WWT_EMPTY) if (window_top_toolbar_widgets[WIDX_FASTFORWARD].type != WWT_EMPTY)
{ {
x = w->windowPos.x + window_top_toolbar_widgets[WIDX_FASTFORWARD].left + 0; screenPos = { w->windowPos.x + window_top_toolbar_widgets[WIDX_FASTFORWARD].left + 0,
y = w->windowPos.y + window_top_toolbar_widgets[WIDX_FASTFORWARD].top + 0; w->windowPos.y + window_top_toolbar_widgets[WIDX_FASTFORWARD].top + 0 };
if (widget_is_pressed(w, WIDX_FASTFORWARD)) if (widget_is_pressed(w, WIDX_FASTFORWARD))
y++; screenPos.y++;
imgId = SPR_G2_FASTFORWARD; imgId = SPR_G2_FASTFORWARD;
gfx_draw_sprite(dpi, imgId, x + 6, y + 3, 0); gfx_draw_sprite(dpi, imgId, screenPos.x + 6, screenPos.y + 3, 0);
for (int32_t i = 0; i < gGameSpeed && gGameSpeed <= 4; i++) for (int32_t i = 0; i < gGameSpeed && gGameSpeed <= 4; i++)
{ {
gfx_draw_sprite(dpi, SPR_G2_SPEED_ARROW, x + 5 + i * 5, y + 15, 0); gfx_draw_sprite(dpi, SPR_G2_SPEED_ARROW, screenPos.x + 5 + i * 5, screenPos.y + 15, 0);
} }
for (int32_t i = 0; i < 3 && i < gGameSpeed - 4 && gGameSpeed >= 5; i++) for (int32_t i = 0; i < 3 && i < gGameSpeed - 4 && gGameSpeed >= 5; i++)
{ {
gfx_draw_sprite(dpi, SPR_G2_HYPER_ARROW, x + 5 + i * 6, y + 15, 0); gfx_draw_sprite(dpi, SPR_G2_HYPER_ARROW, screenPos.x + 5 + i * 6, screenPos.y + 15, 0);
} }
} }
// Draw cheats button // Draw cheats button
if (window_top_toolbar_widgets[WIDX_CHEATS].type != WWT_EMPTY) if (window_top_toolbar_widgets[WIDX_CHEATS].type != WWT_EMPTY)
{ {
x = w->windowPos.x + window_top_toolbar_widgets[WIDX_CHEATS].left - 1; screenPos = { w->windowPos.x + window_top_toolbar_widgets[WIDX_CHEATS].left - 1,
y = w->windowPos.y + window_top_toolbar_widgets[WIDX_CHEATS].top - 1; w->windowPos.y + window_top_toolbar_widgets[WIDX_CHEATS].top - 1 };
if (widget_is_pressed(w, WIDX_CHEATS)) if (widget_is_pressed(w, WIDX_CHEATS))
y++; screenPos.y++;
imgId = SPR_G2_SANDBOX; imgId = SPR_G2_SANDBOX;
gfx_draw_sprite(dpi, imgId, x, y, 3); gfx_draw_sprite(dpi, imgId, screenPos.x, screenPos.y, 3);
// Draw an overlay if clearance checks are disabled // Draw an overlay if clearance checks are disabled
if (gCheatsDisableClearanceChecks) if (gCheatsDisableClearanceChecks)
{ {
gfx_draw_string_right( gfx_draw_string_right(
dpi, STR_OVERLAY_CLEARANCE_CHECKS_DISABLED, nullptr, COLOUR_DARK_ORANGE | COLOUR_FLAG_OUTLINE, dpi, STR_OVERLAY_CLEARANCE_CHECKS_DISABLED, nullptr, COLOUR_DARK_ORANGE | COLOUR_FLAG_OUTLINE,
{ x + 26, y + 2 }); screenPos + ScreenCoordsXY{ 26, 2 });
} }
} }
// Draw chat button // Draw chat button
if (window_top_toolbar_widgets[WIDX_CHAT].type != WWT_EMPTY) if (window_top_toolbar_widgets[WIDX_CHAT].type != WWT_EMPTY)
{ {
x = w->windowPos.x + window_top_toolbar_widgets[WIDX_CHAT].left; screenPos = { w->windowPos.x + window_top_toolbar_widgets[WIDX_CHAT].left,
y = w->windowPos.y + window_top_toolbar_widgets[WIDX_CHAT].top - 2; w->windowPos.y + window_top_toolbar_widgets[WIDX_CHAT].top - 2 };
if (widget_is_pressed(w, WIDX_CHAT)) if (widget_is_pressed(w, WIDX_CHAT))
y++; screenPos.y++;
imgId = SPR_G2_CHAT; imgId = SPR_G2_CHAT;
gfx_draw_sprite(dpi, imgId, x, y, 3); gfx_draw_sprite(dpi, imgId, screenPos.x, screenPos.y, 3);
} }
// Draw debug button // Draw debug button
if (window_top_toolbar_widgets[WIDX_DEBUG].type != WWT_EMPTY) if (window_top_toolbar_widgets[WIDX_DEBUG].type != WWT_EMPTY)
{ {
x = w->windowPos.x + window_top_toolbar_widgets[WIDX_DEBUG].left; screenPos = { w->windowPos.x + window_top_toolbar_widgets[WIDX_DEBUG].left,
y = w->windowPos.y + window_top_toolbar_widgets[WIDX_DEBUG].top - 1; w->windowPos.y + window_top_toolbar_widgets[WIDX_DEBUG].top - 1 };
if (widget_is_pressed(w, WIDX_DEBUG)) if (widget_is_pressed(w, WIDX_DEBUG))
y++; screenPos.y++;
imgId = SPR_TAB_GEARS_0; imgId = SPR_TAB_GEARS_0;
gfx_draw_sprite(dpi, imgId, x, y, 3); gfx_draw_sprite(dpi, imgId, screenPos.x, screenPos.y, 3);
} }
// Draw research button // Draw research button
if (window_top_toolbar_widgets[WIDX_RESEARCH].type != WWT_EMPTY) if (window_top_toolbar_widgets[WIDX_RESEARCH].type != WWT_EMPTY)
{ {
x = w->windowPos.x + window_top_toolbar_widgets[WIDX_RESEARCH].left - 1; screenPos = { w->windowPos.x + window_top_toolbar_widgets[WIDX_RESEARCH].left - 1,
y = w->windowPos.y + window_top_toolbar_widgets[WIDX_RESEARCH].top; w->windowPos.y + window_top_toolbar_widgets[WIDX_RESEARCH].top };
if (widget_is_pressed(w, WIDX_RESEARCH)) if (widget_is_pressed(w, WIDX_RESEARCH))
y++; screenPos.y++;
imgId = SPR_TAB_FINANCES_RESEARCH_0; imgId = SPR_TAB_FINANCES_RESEARCH_0;
gfx_draw_sprite(dpi, imgId, x, y, 0); gfx_draw_sprite(dpi, imgId, screenPos.x, screenPos.y, 0);
} }
// Draw finances button // Draw finances button
if (window_top_toolbar_widgets[WIDX_FINANCES].type != WWT_EMPTY) if (window_top_toolbar_widgets[WIDX_FINANCES].type != WWT_EMPTY)
{ {
x = w->windowPos.x + window_top_toolbar_widgets[WIDX_FINANCES].left + 3; screenPos = { w->windowPos.x + window_top_toolbar_widgets[WIDX_FINANCES].left + 3,
y = w->windowPos.y + window_top_toolbar_widgets[WIDX_FINANCES].top + 1; w->windowPos.y + window_top_toolbar_widgets[WIDX_FINANCES].top + 1 };
if (widget_is_pressed(w, WIDX_FINANCES)) if (widget_is_pressed(w, WIDX_FINANCES))
y++; screenPos.y++;
imgId = SPR_FINANCE; imgId = SPR_FINANCE;
gfx_draw_sprite(dpi, imgId, x, y, 0); gfx_draw_sprite(dpi, imgId, screenPos.x, screenPos.y, 0);
} }
// Draw news button // Draw news button
if (window_top_toolbar_widgets[WIDX_NEWS].type != WWT_EMPTY) if (window_top_toolbar_widgets[WIDX_NEWS].type != WWT_EMPTY)
{ {
x = w->windowPos.x + window_top_toolbar_widgets[WIDX_NEWS].left + 3; screenPos = { w->windowPos.x + window_top_toolbar_widgets[WIDX_NEWS].left + 3,
y = w->windowPos.y + window_top_toolbar_widgets[WIDX_NEWS].top + 0; w->windowPos.y + window_top_toolbar_widgets[WIDX_NEWS].top + 0 };
if (widget_is_pressed(w, WIDX_NEWS)) if (widget_is_pressed(w, WIDX_NEWS))
y++; screenPos.y++;
imgId = SPR_G2_TAB_NEWS; imgId = SPR_G2_TAB_NEWS;
gfx_draw_sprite(dpi, imgId, x, y, 0); gfx_draw_sprite(dpi, imgId, screenPos.x, screenPos.y, 0);
} }
// Draw network button // Draw network button
if (window_top_toolbar_widgets[WIDX_NETWORK].type != WWT_EMPTY) if (window_top_toolbar_widgets[WIDX_NETWORK].type != WWT_EMPTY)
{ {
x = w->windowPos.x + window_top_toolbar_widgets[WIDX_NETWORK].left + 3; screenPos = { w->windowPos.x + window_top_toolbar_widgets[WIDX_NETWORK].left + 3,
y = w->windowPos.y + window_top_toolbar_widgets[WIDX_NETWORK].top + 0; w->windowPos.y + window_top_toolbar_widgets[WIDX_NETWORK].top + 0 };
if (widget_is_pressed(w, WIDX_NETWORK)) if (widget_is_pressed(w, WIDX_NETWORK))
y++; screenPos.y++;
// Draw (de)sync icon. // Draw (de)sync icon.
imgId = (network_is_desynchronised() ? SPR_G2_MULTIPLAYER_DESYNC : SPR_G2_MULTIPLAYER_SYNC); imgId = (network_is_desynchronised() ? SPR_G2_MULTIPLAYER_DESYNC : SPR_G2_MULTIPLAYER_SYNC);
gfx_draw_sprite(dpi, imgId, x + 3, y + 11, 0); gfx_draw_sprite(dpi, imgId, screenPos.x + 3, screenPos.y + 11, 0);
// Draw number of players. // Draw number of players.
int32_t player_count = network_get_num_players(); int32_t player_count = network_get_num_players();
gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;
gfx_draw_string_right(dpi, STR_COMMA16, &player_count, COLOUR_WHITE | COLOUR_FLAG_OUTLINE, { x + 23, y + 1 }); gfx_draw_string_right(
dpi, STR_COMMA16, &player_count, COLOUR_WHITE | COLOUR_FLAG_OUTLINE, screenPos + ScreenCoordsXY{ 23, 1 });
} }
} }