Skip to content

Commit

Permalink
Fix guest inventories crashing on particular items (#23469)
Browse files Browse the repository at this point in the history 
* InventoryFormatItem: adjust formatter increments for lack of ImageIds

* OnDrawInventory: adjust itemNameWidth to account for icon offset

* OnDrawInventory: Improve icon/label vertical alignment
  • Loading branch information
@AaronVanGeffen
AaronVanGeffen authored Dec 23, 2024
1 parent 6f1d8be commit fb91cef
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions src/openrct2-ui/windows/Guest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1634,7 1634,7 @@ namespace OpenRCT2::Ui::Windows
if (invRide != nullptr)
{
ft.Rewind();
ft.Increment(6);
ft.Increment(2);
invRide->FormatNameTo(ft);
}

Expand All @@ -1647,7 1647,7 @@ namespace OpenRCT2::Ui::Windows
{
case VOUCHER_TYPE_PARK_ENTRY_FREE:
ft.Rewind();
ft.Increment(6);
ft.Increment(2);
ft.Add<StringId>(STR_PEEP_INVENTORY_VOUCHER_PARK_ENTRY_FREE);
ft.Add<StringId>(STR_STRING);
ft.Add<const char*>(parkName);
Expand All @@ -1657,21 1657,21 @@ namespace OpenRCT2::Ui::Windows
if (invRide != nullptr)
{
ft.Rewind();
ft.Increment(6);
ft.Increment(2);
ft.Add<StringId>(STR_PEEP_INVENTORY_VOUCHER_RIDE_FREE);
invRide->FormatNameTo(ft);
}
break;
case VOUCHER_TYPE_PARK_ENTRY_HALF_PRICE:
ft.Rewind();
ft.Increment(6);
ft.Increment(2);
ft.Add<StringId>(STR_PEEP_INVENTORY_VOUCHER_PARK_ENTRY_HALF_PRICE);
ft.Add<StringId>(STR_STRING);
ft.Add<const char*>(parkName);
break;
case VOUCHER_TYPE_FOOD_OR_DRINK_FREE:
ft.Rewind();
ft.Increment(6);
ft.Increment(2);
ft.Add<StringId>(STR_PEEP_INVENTORY_VOUCHER_FOOD_OR_DRINK_FREE);
ft.Add<StringId>(GetShopItemDescriptor(guest.VoucherShopItem).Naming.Singular);
break;
Expand All @@ -1688,7 1688,7 @@ namespace OpenRCT2::Ui::Windows
if (invRide != nullptr)
{
ft.Rewind();
ft.Increment(6);
ft.Increment(2);
invRide->FormatNameTo(ft);
}
break;
Expand All @@ -1697,7 1697,7 @@ namespace OpenRCT2::Ui::Windows
if (invRide != nullptr)
{
ft.Rewind();
ft.Increment(6);
ft.Increment(2);
invRide->FormatNameTo(ft);
}
break;
Expand All @@ -1706,7 1706,7 @@ namespace OpenRCT2::Ui::Windows
if (invRide != nullptr)
{
ft.Rewind();
ft.Increment(6);
ft.Increment(2);
invRide->FormatNameTo(ft);
}
break;
Expand Down Expand Up @@ -1737,7 1737,7 @@ namespace OpenRCT2::Ui::Windows

auto& widget = widgets[WIDX_PAGE_BACKGROUND];
auto screenCoords = windowPos ScreenCoordsXY{ widget.left 4, widget.top 2 };
int32_t itemNameWidth = widget.width() - 8;
int32_t itemNameWidth = widget.width() - 24;

int32_t maxY = windowPos.y height - 22;
int32_t numItems = 0;
Expand All @@ -1756,6 1756,7 @@ namespace OpenRCT2::Ui::Windows
GfxDrawSprite(dpi, imageId, screenCoords);

screenCoords.x = 16;
screenCoords.y = 1;
screenCoords.y = DrawTextWrapped(dpi, screenCoords, itemNameWidth, STR_BLACK_STRING, ft);

screenCoords.x -= 16;
Expand Down

0 comments on commit fb91cef

Please sign in to comment.