From b1bd4feee7b8ac6d606ce7704e7e32f17ecdc3b4 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Tue, 18 Feb 2025 12:49:15 +0300 Subject: [PATCH] add 'number' uses display mode --- src/content/ContentLoader.cpp | 2 ++ src/graphics/ui/elements/InventoryView.cpp | 8 +++++--- src/items/ItemDef.hpp | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/content/ContentLoader.cpp b/src/content/ContentLoader.cpp index a9aa5b0a..6d25dfb4 100644 --- a/src/content/ContentLoader.cpp +++ b/src/content/ContentLoader.cpp @@ -442,6 +442,8 @@ void ContentLoader::loadItem( root.at("uses-display").get(usesDisplayStr); if (usesDisplayStr == "none") { def.usesDisplay = ItemUsesDisplay::NONE; + } else if (usesDisplayStr == "number") { + def.usesDisplay = ItemUsesDisplay::NUMBER; } else if (usesDisplayStr == "relation") { def.usesDisplay = ItemUsesDisplay::RELATION; } else if (usesDisplayStr == "vbar") { diff --git a/src/graphics/ui/elements/InventoryView.cpp b/src/graphics/ui/elements/InventoryView.cpp index 14b61d29..a5a2c8a5 100644 --- a/src/graphics/ui/elements/InventoryView.cpp +++ b/src/graphics/ui/elements/InventoryView.cpp @@ -248,12 +248,14 @@ void SlotView::drawItemInfo( case ItemUsesDisplay::NONE: break; case ItemUsesDisplay::RELATION: - draw_shaded_text( - batch, font, std::to_wstring(uses), pos.x - 3, pos.y - 3 - ); draw_shaded_text( batch, font, std::to_wstring(item.uses), pos.x - 3, pos.y + 9 ); + [[fallthrough]]; + case ItemUsesDisplay::NUMBER: + draw_shaded_text( + batch, font, std::to_wstring(uses), pos.x - 3, pos.y - 3 + ); break; case ItemUsesDisplay::VBAR: { batch.untexture(); diff --git a/src/items/ItemDef.hpp b/src/items/ItemDef.hpp index 59cf8256..db4ff9f3 100644 --- a/src/items/ItemDef.hpp +++ b/src/items/ItemDef.hpp @@ -21,6 +21,7 @@ enum class ItemIconType { enum class ItemUsesDisplay { NONE, // uses count is not displayed + NUMBER, // uses count is displayed as number RELATION, // uses count is displayed as `remain/default` relation VBAR, // uses count is displayed as vertical bar without counter DEFAULT = VBAR,