summaryrefslogtreecommitdiffstats
path: root/src/BlockEntities
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-09-27 20:19:28 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-09-27 20:19:28 +0200
commit7ce09a9113d693b85fdda13b3c04a8b8eb900153 (patch)
tree49c3c3742cff4c38a33bd5014dd9c57c0dcea71c /src/BlockEntities
parentMerge remote-tracking branch 'origin/master' into chestcarts (diff)
downloadcuberite-7ce09a9113d693b85fdda13b3c04a8b8eb900153.tar
cuberite-7ce09a9113d693b85fdda13b3c04a8b8eb900153.tar.gz
cuberite-7ce09a9113d693b85fdda13b3c04a8b8eb900153.tar.bz2
cuberite-7ce09a9113d693b85fdda13b3c04a8b8eb900153.tar.lz
cuberite-7ce09a9113d693b85fdda13b3c04a8b8eb900153.tar.xz
cuberite-7ce09a9113d693b85fdda13b3c04a8b8eb900153.tar.zst
cuberite-7ce09a9113d693b85fdda13b3c04a8b8eb900153.zip
Diffstat (limited to 'src/BlockEntities')
-rw-r--r--src/BlockEntities/BlockEntityWithItems.h12
-rw-r--r--src/BlockEntities/EnderChestEntity.cpp3
-rw-r--r--src/BlockEntities/EnderChestEntity.h2
3 files changed, 8 insertions, 9 deletions
diff --git a/src/BlockEntities/BlockEntityWithItems.h b/src/BlockEntities/BlockEntityWithItems.h
index ca6758e7a..f26ef07dd 100644
--- a/src/BlockEntities/BlockEntityWithItems.h
+++ b/src/BlockEntities/BlockEntityWithItems.h
@@ -20,12 +20,9 @@
// tolua_begin
class cBlockEntityWithItems :
- public cBlockEntity
- // tolua_end
- // tolua doesn't seem to support multiple inheritance?
- , public cItemGrid::cListener
- , public cWindowOwner
- // tolua_begin
+ public cBlockEntity,
+ public cItemGrid::cListener,
+ public cBlockEntityWindowOwner
{
typedef cBlockEntity super;
@@ -39,7 +36,8 @@ public:
cWorld * a_World // Optional world to assign to the entity
) :
super(a_BlockType, a_BlockX, a_BlockY, a_BlockZ, a_World),
- m_Contents(a_ItemGridWidth, a_ItemGridHeight)
+ m_Contents(a_ItemGridWidth, a_ItemGridHeight),
+ cBlockEntityWindowOwner(this)
{
m_Contents.AddListener(*this);
}
diff --git a/src/BlockEntities/EnderChestEntity.cpp b/src/BlockEntities/EnderChestEntity.cpp
index b870f9e50..0654d97dd 100644
--- a/src/BlockEntities/EnderChestEntity.cpp
+++ b/src/BlockEntities/EnderChestEntity.cpp
@@ -11,7 +11,8 @@
cEnderChestEntity::cEnderChestEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World) :
- super(E_BLOCK_ENDER_CHEST, a_BlockX, a_BlockY, a_BlockZ, a_World)
+ super(E_BLOCK_ENDER_CHEST, a_BlockX, a_BlockY, a_BlockZ, a_World),
+ cBlockEntityWindowOwner(this)
{
}
diff --git a/src/BlockEntities/EnderChestEntity.h b/src/BlockEntities/EnderChestEntity.h
index ccfb2690b..311af8d76 100644
--- a/src/BlockEntities/EnderChestEntity.h
+++ b/src/BlockEntities/EnderChestEntity.h
@@ -11,7 +11,7 @@
// tolua_begin
class cEnderChestEntity :
public cBlockEntity,
- public cWindowOwner
+ public cBlockEntityWindowOwner
{
typedef cBlockEntity super;