summaryrefslogtreecommitdiffstats
path: root/src/BlockEntities
diff options
context:
space:
mode:
authormathiascode <mathiascode@users.noreply.github.com>2017-02-15 06:05:24 +0100
committerMattes D <github@xoft.cz>2017-02-15 06:05:24 +0100
commitdae2adde6563bec4b614230992cae6b1ca965b4f (patch)
tree34149ac0340cc394019eb430247d03950b485555 /src/BlockEntities
parentAdded some blocks and items (#3503) (diff)
downloadcuberite-dae2adde6563bec4b614230992cae6b1ca965b4f.tar
cuberite-dae2adde6563bec4b614230992cae6b1ca965b4f.tar.gz
cuberite-dae2adde6563bec4b614230992cae6b1ca965b4f.tar.bz2
cuberite-dae2adde6563bec4b614230992cae6b1ca965b4f.tar.lz
cuberite-dae2adde6563bec4b614230992cae6b1ca965b4f.tar.xz
cuberite-dae2adde6563bec4b614230992cae6b1ca965b4f.tar.zst
cuberite-dae2adde6563bec4b614230992cae6b1ca965b4f.zip
Diffstat (limited to 'src/BlockEntities')
-rw-r--r--src/BlockEntities/DropSpenserEntity.cpp4
-rw-r--r--src/BlockEntities/JukeboxEntity.cpp4
-rw-r--r--src/BlockEntities/NoteEntity.cpp12
3 files changed, 10 insertions, 10 deletions
diff --git a/src/BlockEntities/DropSpenserEntity.cpp b/src/BlockEntities/DropSpenserEntity.cpp
index 3a43e1073..a7cea4256 100644
--- a/src/BlockEntities/DropSpenserEntity.cpp
+++ b/src/BlockEntities/DropSpenserEntity.cpp
@@ -75,7 +75,7 @@ void cDropSpenserEntity::DropSpense(cChunk & a_Chunk)
if (SlotsCnt == 0)
{
// Nothing in the dropspenser, play the click sound
- m_World->BroadcastSoundEffect("random.click", static_cast<double>(m_PosX), static_cast<double>(m_PosY), static_cast<double>(m_PosZ), 1.0f, 1.2f);
+ m_World->BroadcastSoundEffect("block.dispenser.fail", static_cast<double>(m_PosX), static_cast<double>(m_PosY), static_cast<double>(m_PosZ), 1.0f, 1.2f);
return;
}
@@ -97,7 +97,7 @@ void cDropSpenserEntity::DropSpense(cChunk & a_Chunk)
case E_META_DROPSPENSER_FACING_ZP: SmokeDir = static_cast<int>(SmokeDirection::NORTH); break;
}
m_World->BroadcastSoundParticleEffect(EffectID::PARTICLE_SMOKE, m_PosX, m_PosY, m_PosZ, SmokeDir);
- m_World->BroadcastSoundEffect("random.click", static_cast<double>(m_PosX), static_cast<double>(m_PosY), static_cast<double>(m_PosZ), 1.0f, 1.0f);
+ m_World->BroadcastSoundEffect("block.dispenser.dispense", static_cast<double>(m_PosX), static_cast<double>(m_PosY), static_cast<double>(m_PosZ), 1.0f, 1.0f);
}
diff --git a/src/BlockEntities/JukeboxEntity.cpp b/src/BlockEntities/JukeboxEntity.cpp
index 467a3a28a..f505a3030 100644
--- a/src/BlockEntities/JukeboxEntity.cpp
+++ b/src/BlockEntities/JukeboxEntity.cpp
@@ -64,7 +64,7 @@ bool cJukeboxEntity::PlayRecord(int a_Record)
EjectRecord();
}
m_Record = a_Record;
- m_World->BroadcastSoundParticleEffect(EffectID::SFX_PLAY_MUSIC_DISC, m_PosX, m_PosY, m_PosZ, m_Record);
+ m_World->BroadcastSoundParticleEffect(EffectID::SFX_RANDOM_PLAY_MUSIC_DISC, m_PosX, m_PosY, m_PosZ, m_Record);
m_World->SetBlockMeta(m_PosX, m_PosY, m_PosZ, E_META_JUKEBOX_ON);
return true;
}
@@ -85,7 +85,7 @@ bool cJukeboxEntity::EjectRecord(void)
Drops.push_back(cItem(static_cast<short>(m_Record), 1, 0));
m_Record = 0;
m_World->SpawnItemPickups(Drops, m_PosX + 0.5, m_PosY + 1, m_PosZ + 0.5, 8);
- m_World->BroadcastSoundParticleEffect(EffectID::SFX_PLAY_MUSIC_DISC, m_PosX, m_PosY, m_PosZ, 0);
+ m_World->BroadcastSoundParticleEffect(EffectID::SFX_RANDOM_PLAY_MUSIC_DISC, m_PosX, m_PosY, m_PosZ, 0);
m_World->SetBlockMeta(m_PosX, m_PosY, m_PosZ, E_META_JUKEBOX_OFF);
return true;
}
diff --git a/src/BlockEntities/NoteEntity.cpp b/src/BlockEntities/NoteEntity.cpp
index 7430cfba0..41559a8ad 100644
--- a/src/BlockEntities/NoteEntity.cpp
+++ b/src/BlockEntities/NoteEntity.cpp
@@ -85,16 +85,16 @@ void cNoteEntity::MakeSound(void)
case E_BLOCK_WOODEN_SLAB:
{
instrument = E_INST_DOUBLE_BASS;
- sampleName = "note.bassattack";
+ sampleName = "block.note.bass";
break;
}
- case E_BLOCK_SAND:
case E_BLOCK_GRAVEL:
+ case E_BLOCK_SAND:
case E_BLOCK_SOULSAND:
{
instrument = E_INST_SNARE_DRUM;
- sampleName = "note.snare";
+ sampleName = "block.note.snare";
break;
}
@@ -107,7 +107,7 @@ void cNoteEntity::MakeSound(void)
case E_BLOCK_STAINED_GLASS_PANE:
{
instrument = E_INST_CLICKS;
- sampleName = "note.hat";
+ sampleName = "block.note.hat";
break;
}
@@ -186,14 +186,14 @@ void cNoteEntity::MakeSound(void)
case E_BLOCK_YELLOW_SHULKER_BOX:
{
instrument = E_INST_BASS_DRUM;
- sampleName = "note.bd";
+ sampleName = "block.note.basedrum";
break;
}
default:
{
instrument = E_INST_HARP_PIANO;
- sampleName = "note.harp";
+ sampleName = "block.note.harp";
break;
}
}