summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-08-06 14:17:05 +0200
committerTycho <work.tycho+git@gmail.com>2014-08-06 14:17:05 +0200
commita0ba7426c6bc2059d5db6d248ef8e582e40ce4b3 (patch)
tree363892c3e85a02259fc2ba12be114df234a1d909
parentRemoved dependecy of redstone simulator on NoteBlock (diff)
downloadcuberite-a0ba7426c6bc2059d5db6d248ef8e582e40ce4b3.tar
cuberite-a0ba7426c6bc2059d5db6d248ef8e582e40ce4b3.tar.gz
cuberite-a0ba7426c6bc2059d5db6d248ef8e582e40ce4b3.tar.bz2
cuberite-a0ba7426c6bc2059d5db6d248ef8e582e40ce4b3.tar.lz
cuberite-a0ba7426c6bc2059d5db6d248ef8e582e40ce4b3.tar.xz
cuberite-a0ba7426c6bc2059d5db6d248ef8e582e40ce4b3.tar.zst
cuberite-a0ba7426c6bc2059d5db6d248ef8e582e40ce4b3.zip
Diffstat (limited to '')
-rw-r--r--src/BlockEntities/DropSpenserEntity.h10
-rw-r--r--src/BlockEntities/NoteEntity.h6
2 files changed, 10 insertions, 6 deletions
diff --git a/src/BlockEntities/DropSpenserEntity.h b/src/BlockEntities/DropSpenserEntity.h
index dabe9a27b..be56447aa 100644
--- a/src/BlockEntities/DropSpenserEntity.h
+++ b/src/BlockEntities/DropSpenserEntity.h
@@ -30,8 +30,10 @@ class cServer;
// tolua_begin
class cDropSpenserEntity :
- public cBlockEntityWithItems,
- public cRedstonePoweredEntity
+ public cBlockEntityWithItems
+ // tolua_end
+ , public cRedstonePoweredEntity
+ // tolua_begin
{
typedef cBlockEntityWithItems super;
@@ -65,10 +67,10 @@ public:
/// Sets the dropspenser to dropspense an item in the next tick
void Activate(void);
+ // tolua_end
+
/// 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;
-
- // tolua_end
protected:
bool m_ShouldDropSpense; ///< If true, the dropspenser will dropspense an item in the next tick
diff --git a/src/BlockEntities/NoteEntity.h b/src/BlockEntities/NoteEntity.h
index f9db6cbe6..dd201e0a9 100644
--- a/src/BlockEntities/NoteEntity.h
+++ b/src/BlockEntities/NoteEntity.h
@@ -30,8 +30,10 @@ enum ENUM_NOTE_INSTRUMENTS
// tolua_begin
class cNoteEntity :
- public cBlockEntity,
- public cRedstonePoweredEntity
+ public cBlockEntity
+ // tolua_end
+ , public cRedstonePoweredEntity
+ // tolua_begin
{
typedef cBlockEntity super;
public: