summaryrefslogtreecommitdiffstats
path: root/src/UI
diff options
context:
space:
mode:
authordaniel0916 <theschokolps@gmail.com>2014-04-19 15:10:50 +0200
committerdaniel0916 <theschokolps@gmail.com>2014-04-19 15:10:50 +0200
commita6de7bf1cd80847abed22e3b962a5b8650b2911c (patch)
tree9d117e42fb0b7aef9271688c6735ae65b7578c20 /src/UI
parentMerge branch 'master' into Enchanting (diff)
downloadcuberite-a6de7bf1cd80847abed22e3b962a5b8650b2911c.tar
cuberite-a6de7bf1cd80847abed22e3b962a5b8650b2911c.tar.gz
cuberite-a6de7bf1cd80847abed22e3b962a5b8650b2911c.tar.bz2
cuberite-a6de7bf1cd80847abed22e3b962a5b8650b2911c.tar.lz
cuberite-a6de7bf1cd80847abed22e3b962a5b8650b2911c.tar.xz
cuberite-a6de7bf1cd80847abed22e3b962a5b8650b2911c.tar.zst
cuberite-a6de7bf1cd80847abed22e3b962a5b8650b2911c.zip
Diffstat (limited to '')
-rw-r--r--src/UI/SlotArea.cpp5
-rw-r--r--src/UI/Window.cpp8
2 files changed, 5 insertions, 8 deletions
diff --git a/src/UI/SlotArea.cpp b/src/UI/SlotArea.cpp
index 26fdfe928..5f74b4fa3 100644
--- a/src/UI/SlotArea.cpp
+++ b/src/UI/SlotArea.cpp
@@ -783,7 +783,8 @@ void cSlotAreaEnchanting::OnPlayerRemoved(cPlayer & a_Player)
{
// Toss the item in the enchanting slot
TossItems(a_Player, 0, 1);
- // Player not found - that is acceptable
+
+ super::OnPlayerRemoved(a_Player);
}
@@ -838,7 +839,7 @@ int cSlotAreaEnchanting::GetBookshelvesCount(cWorld * a_World)
static const struct
{
int m_BookX, m_BookY, m_BookZ; // Coords to check for bookcases
- int m_AirX, m_AirY, m_AirZ; // Coords to check for air; if not air, the bookcase won\'t be counted
+ int m_AirX, m_AirY, m_AirZ; // Coords to check for air; if not air, the bookcase won't be counted
} CheckCoords[] =
{
{ 0, 0, 0, 1, 0, 1 }, // Bookcase at {0, 0, 0}, air at {1, 0, 1}
diff --git a/src/UI/Window.cpp b/src/UI/Window.cpp
index fffe0e3fd..0a78578fc 100644
--- a/src/UI/Window.cpp
+++ b/src/UI/Window.cpp
@@ -826,11 +826,7 @@ void cEnchantingWindow::SetProperty(int a_Property, int a_Value)
{
m_PropertyValue[a_Property] = a_Value;
- cCSLock Lock(m_CS);
- for (cPlayerList::iterator itr = m_OpenedBy.begin(), end = m_OpenedBy.end(); itr != end; ++itr)
- {
- (*itr)->GetClientHandle()->SendWindowProperty(*this, a_Property, a_Value);
- } // for itr - m_OpenedBy[]
+ super::SetProperty(a_Property, a_Value);
}
@@ -841,7 +837,7 @@ void cEnchantingWindow::SetProperty(int a_Property, int a_Value, cPlayer & a_Pla
{
m_PropertyValue[a_Property] = a_Value;
- a_Player.GetClientHandle()->SendWindowProperty(*this, a_Property, a_Value);
+ super::SetProperty(a_Property, a_Value, a_Player);
}