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

Added cNoteEntity to Lua API.

Browse Source 
Ref. #228.
This commit is contained in:
madmaxoft
2013-11-14 17:14:54 +01:00
parent efb6f598bc
commit 4533fc34ec
4 changed files with 171 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/BlockEntities/NoteEntity.cpp
View File

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