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

Add HandleSmeltItem() call for achievements.

Browse Source
This commit is contained in:
Howaner 2014-06-01 00:43:09 +02:00
parent 5368e66486
commit a18b6c2311
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/UI/SlotArea.cpp
View File

@ -1397,12 +1397,6 @@ void cSlotAreaFurnace::Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a
return; return;
} }
if ((a_ClickAction == caShiftLeftClick) || (a_ClickAction == caShiftRightClick))
{
ShiftClicked(a_Player, a_SlotNum, a_ClickedItem);
return;
}
cItem Slot(*GetSlot(a_SlotNum, a_Player)); cItem Slot(*GetSlot(a_SlotNum, a_Player));
if (!Slot.IsSameType(a_ClickedItem)) if (!Slot.IsSameType(a_ClickedItem))
{ {
@ -1411,8 +1405,15 @@ void cSlotAreaFurnace::Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a
LOGWARNING("Their item: %s", ItemToFullString(a_ClickedItem).c_str()); LOGWARNING("Their item: %s", ItemToFullString(a_ClickedItem).c_str());
bAsync = true; bAsync = true;
} }
cItem & DraggingItem = a_Player.GetDraggingItem();
if ((a_ClickAction == caShiftLeftClick) || (a_ClickAction == caShiftRightClick))
{
HandleSmeltItem(Slot, a_Player);
ShiftClicked(a_Player, a_SlotNum, Slot);
return;
}
cItem & DraggingItem = a_Player.GetDraggingItem();
if (!DraggingItem.IsEmpty()) if (!DraggingItem.IsEmpty())
{ {
if (a_ClickAction == caDblClick) if (a_ClickAction == caDblClick)
@ -1429,6 +1430,7 @@ void cSlotAreaFurnace::Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a
} }
DraggingItem.m_ItemCount += Slot.m_ItemCount; DraggingItem.m_ItemCount += Slot.m_ItemCount;
HandleSmeltItem(Slot, a_Player);
Slot.Empty(); Slot.Empty();
} }
else else
@ -1443,6 +1445,7 @@ void cSlotAreaFurnace::Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a
case caLeftClick: case caLeftClick:
{ {
DraggingItem = Slot; DraggingItem = Slot;
HandleSmeltItem(Slot, a_Player);
Slot.Empty(); Slot.Empty();
break; break;
} }
@ -1456,6 +1459,7 @@ void cSlotAreaFurnace::Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a
{ {
Slot.Empty(); Slot.Empty();
} }
HandleSmeltItem(DraggingItem, a_Player);
break; break;
} }
default: default: