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

Blocked enchanting a item twice

Browse Source
This commit is contained in:
daniel0916 2014-04-14 13:39:44 +02:00
parent fb26d2ba87
commit a51a099c81
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/UI/SlotArea.cpp
View File

@ -628,11 +628,11 @@ void cSlotAreaEnchanting::Clicked(cPlayer & a_Player, int a_SlotNum, eClickActio
{ {
if ((a_ClickAction == caShiftLeftClick) || (a_ClickAction == caShiftRightClick)) if ((a_ClickAction == caShiftLeftClick) || (a_ClickAction == caShiftRightClick))
{ {
ShiftClickedResult(a_Player); ShiftClickedSlot(a_Player);
} }
else else
{ {
ClickedResult(a_Player); ClickedSlot(a_Player);
} }
} }
} }
@ -641,7 +641,7 @@ void cSlotAreaEnchanting::Clicked(cPlayer & a_Player, int a_SlotNum, eClickActio
void cSlotAreaEnchanting::ClickedResult(cPlayer & a_Player) void cSlotAreaEnchanting::ClickedSlot(cPlayer & a_Player)
{ {
cItem Item = *GetSlot(0, a_Player); cItem Item = *GetSlot(0, a_Player);
@ -651,7 +651,7 @@ void cSlotAreaEnchanting::ClickedResult(cPlayer & a_Player)
m_ParentWindow.SetProperty(1, 0, a_Player); m_ParentWindow.SetProperty(1, 0, a_Player);
m_ParentWindow.SetProperty(2, 0, a_Player); m_ParentWindow.SetProperty(2, 0, a_Player);
} }
else if (cItem::IsEnchantable(Item.m_ItemType)) else if (cItem::IsEnchantable(Item.m_ItemType) && Item.m_Enchantments.IsEmpty())
{ {
int PosX = 0; int PosX = 0;
int PosY = 0; int PosY = 0;
@ -707,9 +707,11 @@ void cSlotAreaEnchanting::ClickedResult(cPlayer & a_Player)
void cSlotAreaEnchanting::ShiftClickedResult(cPlayer & a_Player) void cSlotAreaEnchanting::ShiftClickedSlot(cPlayer & a_Player)
{ {
LOGWARN("Shift Click!"); m_ParentWindow.SetProperty(0, 0, a_Player);
m_ParentWindow.SetProperty(1, 0, a_Player);
m_ParentWindow.SetProperty(2, 0, a_Player);
} }

4
src/UI/SlotArea.h
View File

@ -266,10 +266,10 @@ public:
protected: protected:
/// Handles a click in the item slot. /// Handles a click in the item slot.
void ClickedResult(cPlayer & a_Player); void ClickedSlot(cPlayer & a_Player);
/// Handles a shift-click in the item slot. /// Handles a shift-click in the item slot.
void ShiftClickedResult(cPlayer & a_Player); void ShiftClickedSlot(cPlayer & a_Player);
}; };