1
0

Fixed multiple inheritance in ToLua++.

This fixes #422.
This commit is contained in:
madmaxoft
2013-12-16 22:02:28 +01:00
parent 3e6fd5c6e5
commit daade8ddee
8 changed files with 127 additions and 36 deletions

View File

@@ -21,10 +21,10 @@ class cNBTData;
class cChestEntity : // tolua_export
public cBlockEntityWindowOwner,
// tolua_begin
public cBlockEntityWithItems
// tolua_begin
class cChestEntity :
public cBlockEntityWithItems,
public cBlockEntityWindowOwner
{
typedef cBlockEntityWithItems super;

View File

@@ -29,10 +29,10 @@ class cServer;
class cDropSpenserEntity : // tolua_export
public cBlockEntityWindowOwner,
// tolua_begin
public cBlockEntityWithItems
// tolua_begin
class cDropSpenserEntity :
public cBlockEntityWithItems,
public cBlockEntityWindowOwner
{
typedef cBlockEntityWithItems super;

View File

@@ -21,10 +21,10 @@ class cNBTData;
class cEnderChestEntity : // tolua_export
public cBlockEntityWindowOwner,
// tolua_begin
public cBlockEntityWithItems
// tolua_begin
class cEnderChestEntity :
public cBlockEntityWithItems,
public cBlockEntityWindowOwner
{
typedef cBlockEntityWithItems super;

View File

@@ -21,10 +21,10 @@ class cServer;
class cFurnaceEntity : // tolua_export
public cBlockEntityWindowOwner,
// tolua_begin
public cBlockEntityWithItems
// tolua_begin
class cFurnaceEntity :
public cBlockEntityWithItems,
public cBlockEntityWindowOwner
{
typedef cBlockEntityWithItems super;

View File

@@ -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;