Vial/potions hotkey count fix (#2730)

Fix #2725 introduced in #2604. Getting subtype for stackables ex. mana potions will break the full count. The solution is to compare if subtype returns its count, if not then pass the subtype.
otland · Jan 3, 2020 · 071fee8 · 071fee8
1 parent 088ab53
commit 071fee8
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/actions.cpp b/src/actions.cpp
@@ -417,7 +417,8 @@ bool Actions::useItem(Player* player, const Position& pos, uint8_t index, Item*
 	player->stopWalk();
 
 	if (isHotkey) {
-		showUseHotkeyMessage(player, item, player->getItemTypeCount(item->getID(), item->getSubType()));
+		uint16_t subType = item->getSubType();
+		showUseHotkeyMessage(player, item, player->getItemTypeCount(item->getID(), subType != item->getItemCount() ? subType : -1));
 	}
 
 	ReturnValue ret = internalUseItem(player, pos, index, item, isHotkey);
@@ -447,7 +448,8 @@ bool Actions::useItemEx(Player* player, const Position& fromPos, const Position&
 	}
 
 	if (isHotkey) {
-		showUseHotkeyMessage(player, item, player->getItemTypeCount(item->getID(), item->getSubType()));
+		uint16_t subType = item->getSubType();
+		showUseHotkeyMessage(player, item, player->getItemTypeCount(item->getID(), subType != item->getItemCount() ? subType : -1));
 	}
 
 	if (!action->executeUse(player, item, fromPos, action->getTarget(player, creature, toPos, toStackPos), toPos, isHotkey)) {