2 files changed, 35 insertions, 0 deletions

diff --git a/src/UI/SlotArea.cpp b/src/UI/SlotArea.cpp
index eb528d7ca..9ea2e0021 100644
--- a/src/UI/SlotArea.cpp
+++ b/src/UI/SlotArea.cpp
@@ -135,6 +135,12 @@ void cSlotArea::Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickA
 				cItem tmp(DraggingItem);
 				DraggingItem = Slot;
 				Slot = tmp;
+				int ItemPlaceCount = GetItemPlaceCount(Slot);
+				if (Slot.m_ItemCount > ItemPlaceCount)
+				{
+					DraggingItem.m_ItemCount += Slot.m_ItemCount - ItemPlaceCount;
+					Slot.m_ItemCount = ItemPlaceCount;
+				}
 			}
 			else
 			{
@@ -147,6 +153,13 @@ void cSlotArea::Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickA
 					FreeSlots = 0;
 				}
 				int Filling = (FreeSlots > DraggingItem.m_ItemCount) ? DraggingItem.m_ItemCount : FreeSlots;
+
+				int ItemPlaceCount = GetItemPlaceCount(DraggingItem);
+				if (Filling > ItemPlaceCount)
+				{
+					Filling = ItemPlaceCount;
+				}
+
 				Slot.m_ItemCount += (char)Filling;
 				DraggingItem.m_ItemCount -= (char)Filling;
 				if (DraggingItem.m_ItemCount <= 0)
@@ -315,6 +328,16 @@ bool cSlotArea::CollectItemsToHand(cItem & a_Dragging, cPlayer & a_Player, bool
 
 
 
+int cSlotArea::GetItemPlaceCount(cItem & a_Item)
+{
+	cItemHandler * Handler = ItemHandler(a_Item.m_ItemType);
+	return Handler->GetMaxStackSize();
+}
+
+
+
+
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // cSlotAreaChest:
 
@@ -718,6 +741,15 @@ void cSlotAreaEnchanting::ShiftClickedSlot(cPlayer & a_Player)
 
 
 
+int cSlotAreaEnchanting::GetItemPlaceCount(cItem & a_Item)
+{
+	return 1;
+}
+
+
+
+
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // cSlotAreaEnderChest:
 
diff --git a/src/UI/SlotArea.h b/src/UI/SlotArea.h
index a6af72273..431ad753c 100644
--- a/src/UI/SlotArea.h
+++ b/src/UI/SlotArea.h
@@ -66,6 +66,8 @@ public:
 	/// If a_CollectFullStacks is false, slots with full stacks are skipped while collecting.
 	/// Returns true if full stack has been collected in a_Dragging, false if there's space remaining to fill.
 	virtual bool CollectItemsToHand(cItem & a_Dragging, cPlayer & a_Player, bool a_CollectFullStacks);
+
+	virtual int GetItemPlaceCount(cItem & a_Item);
 	
 protected:
 	int       m_NumSlots;
@@ -263,6 +265,7 @@ public:
 	// cSlotAreaTemporary overrides:
 	virtual void Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickAction, const cItem & a_ClickedItem) override;
 	virtual void OnPlayerRemoved(cPlayer & a_Player) override;
+	virtual int GetItemPlaceCount(cItem & a_Item) override;
 
 protected:
 	/// Handles a click in the item slot.