Inventory: Don't allow stacking non-interactive items

Fixes: issue #1522 (stacking items while they are cooking)
arx · Jun 8, 2021 · 1f8c631 · 1f8c631
1 parent 5e71589
commit 1f8c631
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/game/Inventory.cpp b/src/game/Inventory.cpp
@@ -534,6 +534,12 @@ class Inventory : private InventoryAccess {
 			return false;
 		}
 
+		// Don't allow stacking non-interactive items
+		// While non-interactive items can't be picked up, they can be made non-interactive while being dragged.
+		if(!(item->gameFlags & GFLAG_INTERACTIVITY) || !(oldItem->gameFlags & GFLAG_INTERACTIVITY)) {
+			return false;
+		}
+
 		if((oldItem->ioflags & IO_GOLD) && (item->ioflags & IO_GOLD)) {
 			oldItem->_itemdata->price += item->_itemdata->price;
 			item->destroy();