diff options
| author | LogicParrot <LogicParrot@users.noreply.github.com> | 2016-02-05 22:45:45 +0100 |
|---|---|---|
| committer | LogicParrot <LogicParrot@users.noreply.github.com> | 2016-02-05 22:50:18 +0100 |
| commit | ca6ef58b1ee8521e4b940ee4883dee714960e413 (patch) | |
| tree | 8532add455224b07c07a759e3d906f50c0695888 /src/BlockEntities/NoteEntity.cpp | |
| parent | Merge pull request #2972 from marvinkopf/PlayerAutoComplete (diff) | |
| download | cuberite-ca6ef58b1ee8521e4b940ee4883dee714960e413.tar cuberite-ca6ef58b1ee8521e4b940ee4883dee714960e413.tar.gz cuberite-ca6ef58b1ee8521e4b940ee4883dee714960e413.tar.bz2 cuberite-ca6ef58b1ee8521e4b940ee4883dee714960e413.tar.lz cuberite-ca6ef58b1ee8521e4b940ee4883dee714960e413.tar.xz cuberite-ca6ef58b1ee8521e4b940ee4883dee714960e413.tar.zst cuberite-ca6ef58b1ee8521e4b940ee4883dee714960e413.zip | |
Diffstat (limited to 'src/BlockEntities/NoteEntity.cpp')
| -rw-r--r-- | src/BlockEntities/NoteEntity.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/BlockEntities/NoteEntity.cpp b/src/BlockEntities/NoteEntity.cpp index 0eef633dc..a1e1d931d 100644 --- a/src/BlockEntities/NoteEntity.cpp +++ b/src/BlockEntities/NoteEntity.cpp @@ -35,7 +35,7 @@ void cNoteEntity::MakeSound(void) { char instrument; AString sampleName; - + switch (m_World->GetBlock(m_PosX, m_PosY - 1, m_PosZ)) { case E_BLOCK_PLANKS: @@ -47,7 +47,7 @@ void cNoteEntity::MakeSound(void) sampleName = "note.bassattack"; break; } - + case E_BLOCK_SAND: case E_BLOCK_GRAVEL: case E_BLOCK_SOULSAND: @@ -56,7 +56,7 @@ void cNoteEntity::MakeSound(void) sampleName = "note.snare"; break; } - + case E_BLOCK_GLASS: case E_BLOCK_GLASS_PANE: case E_BLOCK_GLOWSTONE: @@ -89,7 +89,7 @@ void cNoteEntity::MakeSound(void) } m_World->BroadcastBlockAction(m_PosX, m_PosY, m_PosZ, static_cast<Byte>(instrument), static_cast<Byte>(m_Pitch), E_BLOCK_NOTE_BLOCK); - + // TODO: instead of calculating the power function over and over, make a precalculated table - there's only 24 pitches after all float calcPitch = static_cast<float>(pow(2.0f, static_cast<float>(m_Pitch - 12.0f) / 12.0f)); m_World->BroadcastSoundEffect( |