From 730195c47e39792c2dba57e3f5d4f929cc237bd4 Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Wed, 23 Oct 2013 11:12:04 +0200 Subject: Exported cHopperEntity to API. This allows hoppers to be created by plugins during chunk generation. --- source/BlockEntities/HopperEntity.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/BlockEntities') diff --git a/source/BlockEntities/HopperEntity.h b/source/BlockEntities/HopperEntity.h index a49868660..9e69f15c3 100644 --- a/source/BlockEntities/HopperEntity.h +++ b/source/BlockEntities/HopperEntity.h @@ -95,7 +95,7 @@ protected: /// Moves one piece to the specified entity's contents' slot. Returns true if contents have changed. bool MoveItemsToSlot(cBlockEntityWithItems & a_Entity, int a_DstSlotNum); -} ; +} ; // tolua_export -- cgit v1.2.3 From 90bea6a9147f14a974ea51128bff40bcd1ec1592 Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Wed, 23 Oct 2013 11:17:16 +0200 Subject: Fixed cDropSpenserEntity bindings generating an extra var. Caused by inadvertently exporting multiple-inheritance from a class that is not Lua-exported. --- source/BlockEntities/DropSpenserEntity.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/BlockEntities') diff --git a/source/BlockEntities/DropSpenserEntity.h b/source/BlockEntities/DropSpenserEntity.h index f2f1eba36..0e9039915 100644 --- a/source/BlockEntities/DropSpenserEntity.h +++ b/source/BlockEntities/DropSpenserEntity.h @@ -29,10 +29,10 @@ class cServer; -// tolua_begin -class cDropSpenserEntity : - public cBlockEntityWithItems, - public cBlockEntityWindowOwner +class cDropSpenserEntity : // tolua_export + public cBlockEntityWindowOwner, + // tolua_begin + public cBlockEntityWithItems { typedef cBlockEntityWithItems super; -- cgit v1.2.3 From b8a27932286a4626b1b202a7f521d609073c1ea9 Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Wed, 23 Oct 2013 12:09:11 +0200 Subject: Fixed bindings for cHopperEntity:GetOutputBlockPos(). --- source/BlockEntities/HopperEntity.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'source/BlockEntities') diff --git a/source/BlockEntities/HopperEntity.h b/source/BlockEntities/HopperEntity.h index 9e69f15c3..1a7650581 100644 --- a/source/BlockEntities/HopperEntity.h +++ b/source/BlockEntities/HopperEntity.h @@ -38,15 +38,12 @@ public: /// Constructor used for normal operation cHopperEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World); - // tolua_begin - /** Returns the block coords of the block receiving the output items, based on the meta - Returns false if unattached + Returns false if unattached. + Exported in ManualBindings.cpp */ bool GetOutputBlockPos(NIBBLETYPE a_BlockMeta, int & a_OutputX, int & a_OutputY, int & a_OutputZ); - // tolua_end - static const char * GetClassStatic(void) { return "cHopperEntity"; } protected: -- cgit v1.2.3