1 files changed, 10 insertions, 10 deletions

diff --git a/src/BlockEntities/BlockEntityWithItems.h b/src/BlockEntities/BlockEntityWithItems.h
index e511ee8cb..8c7d4749b 100644
--- a/src/BlockEntities/BlockEntityWithItems.h
+++ b/src/BlockEntities/BlockEntityWithItems.h
@@ -20,18 +20,17 @@
 
 // tolua_begin
 class cBlockEntityWithItems :
-	public cBlockEntity
-	// tolua_end
-	// tolua doesn't seem to support multiple inheritance?
-	, public cItemGrid::cListener
-	, public cBlockEntityWindowOwner
-	// tolua_begin
+	public cBlockEntity,
+	public cItemGrid::cListener,
+	public cBlockEntityWindowOwner
 {
 	typedef cBlockEntity super;
-	
+
 public:
 	// tolua_end
 	
+	BLOCKENTITY_PROTODEF(cBlockEntityWithItems);
+	
 	cBlockEntityWithItems(
 		BLOCKTYPE a_BlockType,                      // Type of the block that the entity represents
 		int a_BlockX, int a_BlockY, int a_BlockZ,   // Position of the block entity
@@ -39,6 +38,7 @@ public:
 		cWorld * a_World                            // Optional world to assign to the entity
 	) :
 		super(a_BlockType, a_BlockX, a_BlockY, a_BlockZ, a_World),
+		cBlockEntityWindowOwner(this),
 		m_Contents(a_ItemGridWidth, a_ItemGridHeight)
 	{
 		m_Contents.AddListener(*this);
@@ -47,7 +47,7 @@ public:
 	virtual void Destroy(void) override
 	{
 		// Drop the contents as pickups:
-		ASSERT(m_World != NULL);
+		ASSERT(m_World != nullptr);
 		cItems Pickups;
 		m_Contents.CopyToItems(Pickups);
 		m_Contents.Clear();
@@ -78,9 +78,9 @@ protected:
 	{
 		UNUSED(a_SlotNum);
 		ASSERT(a_Grid == &m_Contents);
-		if (m_World != NULL)
+		if (m_World != nullptr)
 		{
-			if (GetWindow() != NULL)
+			if (GetWindow() != nullptr)
 			{
 				GetWindow()->BroadcastWholeWindow();
 			}