summaryrefslogtreecommitdiffstats
path: root/src/UI
diff options
context:
space:
mode:
authordaniel0916 <theschokolps@gmail.com>2014-01-24 20:01:21 +0100
committerdaniel0916 <theschokolps@gmail.com>2014-01-24 20:01:21 +0100
commitbfac00f2807a6740e876adebd689cc3ae6e075ed (patch)
treeb1492533d127d49d92b7667eabc404f33c36fc65 /src/UI
parentfirst changes for enchanting (not finished) (diff)
downloadcuberite-bfac00f2807a6740e876adebd689cc3ae6e075ed.tar
cuberite-bfac00f2807a6740e876adebd689cc3ae6e075ed.tar.gz
cuberite-bfac00f2807a6740e876adebd689cc3ae6e075ed.tar.bz2
cuberite-bfac00f2807a6740e876adebd689cc3ae6e075ed.tar.lz
cuberite-bfac00f2807a6740e876adebd689cc3ae6e075ed.tar.xz
cuberite-bfac00f2807a6740e876adebd689cc3ae6e075ed.tar.zst
cuberite-bfac00f2807a6740e876adebd689cc3ae6e075ed.zip
Diffstat (limited to '')
-rw-r--r--src/UI/SlotArea.cpp24
-rw-r--r--src/UI/Window.cpp2
2 files changed, 13 insertions, 13 deletions
diff --git a/src/UI/SlotArea.cpp b/src/UI/SlotArea.cpp
index ae6bfccb5..a226d027b 100644
--- a/src/UI/SlotArea.cpp
+++ b/src/UI/SlotArea.cpp
@@ -576,7 +576,7 @@ cSlotAreaTemporary(a_NumSlots, a_ParentWindow)
void cSlotAreaEnchanting::Clicked(cPlayer & a_Player, int a_SlotNum, eClickAction a_ClickAction, const cItem & a_ClickedItem)
{
- LOG("Clicked");
+ LOGWARN("Clicked");
// Check if Slot is in the Enchantment Table
if (a_SlotNum == 0)
{
@@ -610,28 +610,28 @@ void cSlotAreaEnchanting::OnPlayerRemoved(cPlayer & a_Player)
void cSlotAreaEnchanting::ClickedResult(cPlayer & a_Player)
{
- LOG("Click!");
+ LOGWARN("Click!");
if (a_Player.GetDraggingItem().IsEmpty())
{
- LOG("EMPTY");
- this->m_ParentWindow.SetProperty(0, NULL);
- this->m_ParentWindow.SetProperty(1, NULL);
- this->m_ParentWindow.SetProperty(2, NULL);
+ LOGWARN("EMPTY");
+ this->m_ParentWindow.SetProperty(0, 0);
+ this->m_ParentWindow.SetProperty(1, 0);
+ this->m_ParentWindow.SetProperty(2, 0);
}
else if (a_Player.GetDraggingItem().IsEnchantable)
{
- LOG("Enchantable");
+ LOGWARN("Enchantable");
this->m_ParentWindow.SetProperty(0, 30);
this->m_ParentWindow.SetProperty(1, 20);
this->m_ParentWindow.SetProperty(2, 10);
}
else
{
- LOG("Not Enchantable");
- this->m_ParentWindow.SetProperty(0, NULL);
- this->m_ParentWindow.SetProperty(1, NULL);
- this->m_ParentWindow.SetProperty(2, NULL);
+ LOGWARN("Not Enchantable");
+ this->m_ParentWindow.SetProperty(0, 0);
+ this->m_ParentWindow.SetProperty(1, 0);
+ this->m_ParentWindow.SetProperty(2, 0);
}
}
@@ -641,7 +641,7 @@ void cSlotAreaEnchanting::ClickedResult(cPlayer & a_Player)
void cSlotAreaEnchanting::ShiftClickedResult(cPlayer & a_Player)
{
- LOG("Shift Click!");
+ LOGWARN("Shift Click!");
}
diff --git a/src/UI/Window.cpp b/src/UI/Window.cpp
index fcfe6faf3..9188b47a7 100644
--- a/src/UI/Window.cpp
+++ b/src/UI/Window.cpp
@@ -785,7 +785,7 @@ cCraftingWindow::cCraftingWindow(int a_BlockX, int a_BlockY, int a_BlockZ) :
// cEnchantingWindow:
cEnchantingWindow::cEnchantingWindow(int a_BlockX, int a_BlockY, int a_BlockZ) :
-cWindow(wtEnchantment, "Enchantment Table")
+cWindow(wtEnchantment, "Enchant")
{
m_SlotAreas.push_back(new cSlotAreaEnchanting(1, *this));
m_SlotAreas.push_back(new cSlotAreaInventory(*this));