From e33e9111abe5bb7968f48bd2801bf182754e554c Mon Sep 17 00:00:00 2001 From: "sebi.noreply@gmail.com" Date: Wed, 24 Oct 2012 12:48:25 +0000 Subject: Fixed issues with pickups. * Now when picking up max. stack amount is checked. * Added cInventory::AddItemAnyAmount() which will not fail if it cannot add all items (it will just modify amount) * If there is no space in inventory and picking up stacked items, it will try to fill stacks already in inventory, partially picking up the item. * When closing inventory player will drop any items it's currently 'dragging' git-svn-id: http://mc-server.googlecode.com/svn/trunk@1008 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/UI/SlotArea.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/UI') diff --git a/source/UI/SlotArea.cpp b/source/UI/SlotArea.cpp index ec1192f2c..4b6d237ba 100644 --- a/source/UI/SlotArea.cpp +++ b/source/UI/SlotArea.cpp @@ -138,11 +138,12 @@ void cSlotArea::Clicked(cPlayer & a_Player, int a_SlotNum, bool a_IsRightClick, } } + SetSlot(a_SlotNum, a_Player, Slot); if (bAsync) { m_ParentWindow.BroadcastWholeWindow(); } - SetSlot(a_SlotNum, a_Player, Slot); + } -- cgit v1.2.3