flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed crashes and use std::swap.

Browse Source
This commit is contained in:
Hownaer
2014-08-28 14:58:03 +02:00
parent 0f1fd33123
commit 6c3b80f04c
4 changed files with 43 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/UI/SlotArea.cpp
View File

@@ -1423,7 +1423,7 @@ void cSlotAreaEnchanting::Clicked(cPlayer & a_Player, int a_SlotNum, eClickActio
}
case caDblClick:
{
// DblClicked(a_Player, a_SlotNum);
DblClicked(a_Player, a_SlotNum);
return;
}
case caMiddleClick:
@@ -1470,8 +1470,7 @@ void cSlotAreaEnchanting::Clicked(cPlayer & a_Player, int a_SlotNum, eClickActio
{
if (!Slot.IsEmpty())
{
DraggingItem = Slot;
Slot.Empty();
std::swap(DraggingItem, Slot);
}
}
else if (Slot.IsEmpty())
@@ -1487,9 +1486,7 @@ void cSlotAreaEnchanting::Clicked(cPlayer & a_Player, int a_SlotNum, eClickActio
else if ((DraggingItem.m_ItemCount == 1) && !DraggingItem.IsEqual(Slot))
{
// Switch contents
cItem tmp(DraggingItem);
DraggingItem = Slot;
Slot = tmp;
std::swap(DraggingItem, Slot);
}
SetSlot(a_SlotNum, a_Player, Slot);