2 files changed, 27 insertions, 30 deletions

diff --git a/source/BlockEntities/NoteEntity.cpp b/source/BlockEntities/NoteEntity.cpp
index f06c90927..1b0620299 100644
--- a/source/BlockEntities/NoteEntity.cpp
+++ b/source/BlockEntities/NoteEntity.cpp
@@ -9,16 +9,6 @@
 
 
 
-cNoteEntity::cNoteEntity(int a_BlockX, int a_BlockY, int a_BlockZ) :
-	super(E_BLOCK_NOTE_BLOCK, a_BlockX, a_BlockY, a_BlockZ, NULL),
-	m_Pitch(0)
-{
-}
-
-
-
-
-
 cNoteEntity::cNoteEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_World) :
 	super(E_BLOCK_NOTE_BLOCK, a_BlockX, a_BlockY, a_BlockZ, a_World),
 	m_Pitch(0)
@@ -29,7 +19,7 @@ cNoteEntity::cNoteEntity(int a_BlockX, int a_BlockY, int a_BlockZ, cWorld * a_Wo
 
 
 
-void cNoteEntity::UsedBy( cPlayer * a_Player )
+void cNoteEntity::UsedBy(cPlayer * a_Player)
 {
 	IncrementPitch();
 	MakeSound();
@@ -39,7 +29,7 @@ void cNoteEntity::UsedBy( cPlayer * a_Player )
 
 
 
-void cNoteEntity::MakeSound( void )
+void cNoteEntity::MakeSound(void)
 {
 	char instrument;
 	AString sampleName;
@@ -107,7 +97,7 @@ void cNoteEntity::MakeSound( void )
 
 
 
-char cNoteEntity::GetPitch( void )
+char cNoteEntity::GetPitch(void)
 {
 	return m_Pitch;
 }
@@ -116,7 +106,7 @@ char cNoteEntity::GetPitch( void )
 
 
 
-void cNoteEntity::SetPitch( char a_Pitch )
+void cNoteEntity::SetPitch(char a_Pitch)
 {
 	m_Pitch = a_Pitch % 25;
 }
@@ -125,16 +115,16 @@ void cNoteEntity::SetPitch( char a_Pitch )
 
 
 
-void cNoteEntity::IncrementPitch( void )
+void cNoteEntity::IncrementPitch(void)
 {
-	SetPitch( m_Pitch + 1 );
+	SetPitch(m_Pitch + 1);
 }
 
 
 
 
 
-bool cNoteEntity::LoadFromJson( const Json::Value & a_Value )
+bool cNoteEntity::LoadFromJson(const Json::Value & a_Value)
 {
 
 	m_PosX = a_Value.get("x", 0).asInt();
@@ -150,7 +140,7 @@ bool cNoteEntity::LoadFromJson( const Json::Value & a_Value )
 
 
 
-void cNoteEntity::SaveToJson( Json::Value & a_Value )
+void cNoteEntity::SaveToJson(Json::Value & a_Value)
 {
 	a_Value["x"] = m_PosX;
 	a_Value["y"] = m_PosY;
diff --git a/source/BlockEntities/NoteEntity.h b/source/BlockEntities/NoteEntity.h
index 84c4972de..e2d088f44 100644
--- a/source/BlockEntities/NoteEntity.h
+++ b/source/BlockEntities/NoteEntity.h
@@ -26,30 +26,37 @@ enum ENUM_NOTE_INSTRUMENTS
 
 
 
+// tolua_begin
+
 class cNoteEntity : 
 	public cBlockEntity
 {
 	typedef cBlockEntity super;
 public:
 
-	/// Creates a new note entity that is not assigned to a world
-	cNoteEntity(int a_BlockX, int a_BlockY, int a_BlockZ);
-	
+	// tolua_end
+
+	/// Creates a new note entity. a_World may be NULL
 	cNoteEntity(int a_X, int a_Y, int a_Z, cWorld * a_World);
 
-	bool LoadFromJson( const Json::Value& a_Value );
-	virtual void SaveToJson( Json::Value& a_Value ) override;
+	bool LoadFromJson(const Json::Value & a_Value);
+	virtual void SaveToJson(Json::Value & a_Value) override;
 
-	char GetPitch( void );
-	void SetPitch( char a_Pitch );
-	void IncrementPitch( void );
-	void MakeSound( void );
-	virtual void UsedBy( cPlayer * a_Player ) override;
+	// tolua_begin
+	
+	char GetPitch(void);
+	void SetPitch(char a_Pitch);
+	void IncrementPitch(void);
+	void MakeSound(void);
+	
+	// tolua_end
+	
+	virtual void UsedBy(cPlayer * a_Player) override;
 	virtual void SendTo(cClientHandle & a_Client) override { };
 
 private:
-	unsigned char m_Pitch;
-};
+	char m_Pitch;
+} ;  // tolua_export