summaryrefslogtreecommitdiffstats
path: root/src/BlockEntities/NoteEntity.cpp
diff options
context:
space:
mode:
authorBond-009 <bond.009@outlook.com>2017-06-30 10:46:58 +0200
committerMattes D <github@xoft.cz>2017-06-30 10:46:58 +0200
commit7fd3899796fbea45c5ff0a9bd45ce0a1feb73c2b (patch)
tree734e7d5ea9d6ac8565752df9a3bba5873f636947 /src/BlockEntities/NoteEntity.cpp
parentUpdate tolua and export EffectID (diff)
downloadcuberite-7fd3899796fbea45c5ff0a9bd45ce0a1feb73c2b.tar
cuberite-7fd3899796fbea45c5ff0a9bd45ce0a1feb73c2b.tar.gz
cuberite-7fd3899796fbea45c5ff0a9bd45ce0a1feb73c2b.tar.bz2
cuberite-7fd3899796fbea45c5ff0a9bd45ce0a1feb73c2b.tar.lz
cuberite-7fd3899796fbea45c5ff0a9bd45ce0a1feb73c2b.tar.xz
cuberite-7fd3899796fbea45c5ff0a9bd45ce0a1feb73c2b.tar.zst
cuberite-7fd3899796fbea45c5ff0a9bd45ce0a1feb73c2b.zip
Diffstat (limited to 'src/BlockEntities/NoteEntity.cpp')
-rw-r--r--src/BlockEntities/NoteEntity.cpp37
1 files changed, 35 insertions, 2 deletions
diff --git a/src/BlockEntities/NoteEntity.cpp b/src/BlockEntities/NoteEntity.cpp
index 54b04e15a..a3638164d 100644
--- a/src/BlockEntities/NoteEntity.cpp
+++ b/src/BlockEntities/NoteEntity.cpp
@@ -127,11 +127,9 @@ void cNoteEntity::MakeSound(void)
case E_BLOCK_BLACK_SHULKER_BOX:
case E_BLOCK_BLOCK_OF_COAL:
case E_BLOCK_BLUE_SHULKER_BOX:
- case E_BLOCK_BONE_BLOCK:
case E_BLOCK_BRICK:
case E_BLOCK_BRICK_STAIRS:
case E_BLOCK_BROWN_SHULKER_BOX:
- case E_BLOCK_CLAY:
case E_BLOCK_COAL_ORE:
case E_BLOCK_COBBLESTONE:
case E_BLOCK_COBBLESTONE_STAIRS:
@@ -202,6 +200,41 @@ void cNoteEntity::MakeSound(void)
break;
}
+ case E_BLOCK_CLAY:
+ {
+ instrument = E_INST_FLUTE;
+ sampleName = "block.note.flute";
+ break;
+ }
+
+ case E_BLOCK_GOLD_BLOCK:
+ {
+ instrument = E_INST_BELL;
+ sampleName = "block.note.bell";
+ break;
+ }
+
+ case E_BLOCK_WOOL:
+ {
+ instrument = E_INST_GUITAR;
+ sampleName = "block.note.guitar";
+ break;
+ }
+
+ case E_BLOCK_PACKED_ICE:
+ {
+ instrument = E_INST_CHIME;
+ sampleName = "block.note.chime";
+ break;
+ }
+
+ case E_BLOCK_BONE_BLOCK:
+ {
+ instrument = E_INST_XYLOPHONE;
+ sampleName = "block.note.xylophone";
+ break;
+ }
+
default:
{
instrument = E_INST_HARP_PIANO;