From dae2adde6563bec4b614230992cae6b1ca965b4f Mon Sep 17 00:00:00 2001 From: mathiascode Date: Wed, 15 Feb 2017 07:05:24 +0200 Subject: Updated sounds and effect IDs (#3422) --- src/Simulator/FloodyFluidSimulator.cpp | 4 ++-- src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h | 2 +- src/Simulator/IncrementalRedstoneSimulator/TNTHandler.h | 2 +- src/Simulator/VaporizeFluidSimulator.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/Simulator') diff --git a/src/Simulator/FloodyFluidSimulator.cpp b/src/Simulator/FloodyFluidSimulator.cpp index afa54b2ad..8d712824f 100644 --- a/src/Simulator/FloodyFluidSimulator.cpp +++ b/src/Simulator/FloodyFluidSimulator.cpp @@ -259,7 +259,7 @@ void cFloodyFluidSimulator::SpreadToNeighbor(cChunk * a_NearChunk, int a_RelX, i a_NearChunk->SetBlock(a_RelX, a_RelY, a_RelZ, NewBlock, 0); a_NearChunk->BroadcastSoundEffect( - "random.fizz", + "block.lava.extinguish", static_cast(BlockX), static_cast(a_RelY), static_cast(BlockZ), @@ -281,7 +281,7 @@ void cFloodyFluidSimulator::SpreadToNeighbor(cChunk * a_NearChunk, int a_RelX, i a_NearChunk->SetBlock(a_RelX, a_RelY, a_RelZ, NewBlock, 0); a_NearChunk->BroadcastSoundEffect( - "random.fizz", + "block.lava.extinguish", static_cast(BlockX), static_cast(a_RelY), static_cast(BlockZ), diff --git a/src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h b/src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h index 70da1c54d..702c79fee 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h @@ -44,7 +44,7 @@ public: { cChunkInterface ChunkInterface(m_World.GetChunkMap()); cBlockDoorHandler::SetOpen(ChunkInterface, a_Position.x, a_Position.y, a_Position.z, (a_PoweringData.PowerLevel != 0)); - m_World.BroadcastSoundParticleEffect(EffectID::SFX_RANDOM_DOOR_OPEN_CLOSE, a_Position.x, a_Position.y, a_Position.z, 0); + m_World.BroadcastSoundParticleEffect(EffectID::SFX_RANDOM_WOODEN_DOOR_OPEN, a_Position.x, a_Position.y, a_Position.z, 0); } return {}; diff --git a/src/Simulator/IncrementalRedstoneSimulator/TNTHandler.h b/src/Simulator/IncrementalRedstoneSimulator/TNTHandler.h index 21dd7e898..c313bd07d 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/TNTHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/TNTHandler.h @@ -42,7 +42,7 @@ public: // LOGD("Evaluating explodinator the trinitrotoluene (%d %d %d)", a_Position.x, a_Position.y, a_Position.z); if (a_PoweringData.PowerLevel != 0) { - m_World.BroadcastSoundEffect("game.tnt.primed", static_cast(a_Position.x), static_cast(a_Position.y), static_cast(a_Position.z), 0.5f, 0.6f); + m_World.BroadcastSoundEffect("entity.tnt.primed", static_cast(a_Position.x), static_cast(a_Position.y), static_cast(a_Position.z), 0.5f, 0.6f); m_World.SetBlock(a_Position.x, a_Position.y, a_Position.z, E_BLOCK_AIR, 0); m_World.SpawnPrimedTNT(a_Position.x + 0.5, a_Position.y + 0.5, a_Position.z + 0.5); // 80 ticks to boom } diff --git a/src/Simulator/VaporizeFluidSimulator.cpp b/src/Simulator/VaporizeFluidSimulator.cpp index d766b069f..1d2db58fb 100644 --- a/src/Simulator/VaporizeFluidSimulator.cpp +++ b/src/Simulator/VaporizeFluidSimulator.cpp @@ -36,7 +36,7 @@ void cVaporizeFluidSimulator::AddBlock(int a_BlockX, int a_BlockY, int a_BlockZ, { a_Chunk->SetBlock(RelX, a_BlockY, RelZ, E_BLOCK_AIR, 0); a_Chunk->BroadcastSoundEffect( - "random.fizz", + "block.fire.extinguish", static_cast(a_BlockX), static_cast(a_BlockY), static_cast(a_BlockZ), -- cgit v1.2.3