summaryrefslogtreecommitdiffstats
path: root/src/UI/SlotArea.cpp
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-12-13 15:06:55 +0100
committerHowaner <franzi.moos@googlemail.com>2014-12-13 15:06:55 +0100
commitb6fd4002769b3a1d1f2ee875f7ebba99ee1446d0 (patch)
tree11fcc800b589a7a46a30b6346f6d87d407ce5dc0 /src/UI/SlotArea.cpp
parentMerge pull request #1660 from Seadragon91/master (diff)
downloadcuberite-b6fd4002769b3a1d1f2ee875f7ebba99ee1446d0.tar
cuberite-b6fd4002769b3a1d1f2ee875f7ebba99ee1446d0.tar.gz
cuberite-b6fd4002769b3a1d1f2ee875f7ebba99ee1446d0.tar.bz2
cuberite-b6fd4002769b3a1d1f2ee875f7ebba99ee1446d0.tar.lz
cuberite-b6fd4002769b3a1d1f2ee875f7ebba99ee1446d0.tar.xz
cuberite-b6fd4002769b3a1d1f2ee875f7ebba99ee1446d0.tar.zst
cuberite-b6fd4002769b3a1d1f2ee875f7ebba99ee1446d0.zip
Diffstat (limited to '')
-rw-r--r--src/UI/SlotArea.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/UI/SlotArea.cpp b/src/UI/SlotArea.cpp
index e784569d9..6d810ce9b 100644
--- a/src/UI/SlotArea.cpp
+++ b/src/UI/SlotArea.cpp
@@ -1,3 +1,4 @@
+
// SlotArea.cpp
// Implements the cSlotArea class and its descendants
@@ -12,6 +13,7 @@
#include "../BlockEntities/FurnaceEntity.h"
#include "../Entities/Minecart.h"
#include "../Items/ItemHandler.h"
+#include "AnvilWindow.h"
#include "Window.h"
#include "../CraftingRecipes.h"
#include "../Root.h"
@@ -769,7 +771,7 @@ void cSlotAreaCrafting::HandleCraftItem(const cItem & a_Result, cPlayer & a_Play
////////////////////////////////////////////////////////////////////////////////
// cSlotAreaAnvil:
-cSlotAreaAnvil::cSlotAreaAnvil(cAnvilWindow & a_ParentWindow) :
+cSlotAreaAnvil::cSlotAreaAnvil(cWindow & a_ParentWindow) :
cSlotAreaTemporary(3, a_ParentWindow),
m_MaximumCost(0),
m_StackSizeToBeUsedInRepair(0)
@@ -1390,13 +1392,12 @@ void cSlotAreaBeacon::OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum)
////////////////////////////////////////////////////////////////////////////////
// cSlotAreaEnchanting:
-cSlotAreaEnchanting::cSlotAreaEnchanting(cEnchantingWindow & a_ParentWindow, int a_BlockX, int a_BlockY, int a_BlockZ) :
+cSlotAreaEnchanting::cSlotAreaEnchanting(cWindow & a_ParentWindow, int a_BlockX, int a_BlockY, int a_BlockZ) :
cSlotAreaTemporary(1, a_ParentWindow),
m_BlockX(a_BlockX),
m_BlockY(a_BlockY),
m_BlockZ(a_BlockZ)
{
- a_ParentWindow.m_SlotArea = this;
}