flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed multiple inhertance being output by tolua

Browse Source
This commit is contained in:
Tycho 2014-08-06 13:17:05 +01:00
parent 9272bd627c
commit a0ba7426c6
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/BlockEntities/DropSpenserEntity.h
View File

@ -30,8 +30,10 @@ class cServer;
// tolua_begin // tolua_begin
class cDropSpenserEntity : class cDropSpenserEntity :
public cBlockEntityWithItems, public cBlockEntityWithItems
public cRedstonePoweredEntity // tolua_end
, public cRedstonePoweredEntity
// tolua_begin
{ {
typedef cBlockEntityWithItems super; typedef cBlockEntityWithItems super;
@ -65,11 +67,11 @@ public:
/// Sets the dropspenser to dropspense an item in the next tick /// Sets the dropspenser to dropspense an item in the next tick
void Activate(void); void Activate(void);
// tolua_end
/// Sets the internal redstone power flag to "on" or "off", depending on the parameter. Calls Activate() if appropriate /// Sets the internal redstone power flag to "on" or "off", depending on the parameter. Calls Activate() if appropriate
virtual void SetRedstonePower(bool a_IsPowered) override; virtual void SetRedstonePower(bool a_IsPowered) override;
// tolua_end
protected: protected:
bool m_ShouldDropSpense; ///< If true, the dropspenser will dropspense an item in the next tick bool m_ShouldDropSpense; ///< If true, the dropspenser will dropspense an item in the next tick
bool m_IsPowered; ///< Set to true when the dropspenser receives redstone power. bool m_IsPowered; ///< Set to true when the dropspenser receives redstone power.

6
src/BlockEntities/NoteEntity.h
View File

@ -30,8 +30,10 @@ enum ENUM_NOTE_INSTRUMENTS
// tolua_begin // tolua_begin
class cNoteEntity : class cNoteEntity :
public cBlockEntity, public cBlockEntity
public cRedstonePoweredEntity // tolua_end
, public cRedstonePoweredEntity
// tolua_begin
{ {
typedef cBlockEntity super; typedef cBlockEntity super;
public: public: