From daade8ddee96eee7bfe74c75f2de1d2994258b74 Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Mon, 16 Dec 2013 22:02:28 +0100 Subject: Fixed multiple inheritance in ToLua++. This fixes #422. --- src/BlockEntities/HopperEntity.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/BlockEntities/HopperEntity.h') diff --git a/src/BlockEntities/HopperEntity.h b/src/BlockEntities/HopperEntity.h index 3eaa05b7c..2c8b301fe 100644 --- a/src/BlockEntities/HopperEntity.h +++ b/src/BlockEntities/HopperEntity.h @@ -16,10 +16,10 @@ -class cHopperEntity : // tolua_export - public cBlockEntityWindowOwner, - // tolua_begin - public cBlockEntityWithItems +// tolua_begin +class cHopperEntity : + public cBlockEntityWithItems, + public cBlockEntityWindowOwner { typedef cBlockEntityWithItems super; -- cgit v1.2.3