summaryrefslogtreecommitdiffstats
path: root/src/BlockEntities
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/BlockEntities/NoteEntity.cpp37
-rw-r--r--src/BlockEntities/NoteEntity.h7
2 files changed, 41 insertions, 3 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;
diff --git a/src/BlockEntities/NoteEntity.h b/src/BlockEntities/NoteEntity.h
index 87305b087..8798759a7 100644
--- a/src/BlockEntities/NoteEntity.h
+++ b/src/BlockEntities/NoteEntity.h
@@ -13,7 +13,12 @@ enum ENUM_NOTE_INSTRUMENTS
E_INST_DOUBLE_BASS = 1,
E_INST_SNARE_DRUM = 2,
E_INST_CLICKS = 3,
- E_INST_BASS_DRUM = 4
+ E_INST_BASS_DRUM = 4,
+ E_INST_FLUTE = 5,
+ E_INST_BELL = 6,
+ E_INST_GUITAR = 7,
+ E_INST_CHIME = 8,
+ E_INST_XYLOPHONE = 9
};