From c94d7184ebaf7e8540f717c70c1e03ae62e5a7bd Mon Sep 17 00:00:00 2001 From: peterbell10 Date: Tue, 24 Jul 2018 22:30:49 +0100 Subject: Broadcast refactor (#4264) * Move Broadcast functions from cChunkMap to cBroadcaster - Remove cBroadcastInterface in favour of cBroadcaster. - cChunk: Remove broadcast functions. * resurect broadcast interface * Absorb cBroadcaster into cWorld. Removes the need for forwarding the function calls. * Improve const-correctness * Use Int8 instead of char + Comment `ForClients` functions * Improve comments * Broadcaster: Rename ForClients functions --- src/Simulator/FloodyFluidSimulator.cpp | 4 ++-- src/Simulator/VaporizeFluidSimulator.cpp | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'src/Simulator') diff --git a/src/Simulator/FloodyFluidSimulator.cpp b/src/Simulator/FloodyFluidSimulator.cpp index b5ded0c3e..76f1502ff 100644 --- a/src/Simulator/FloodyFluidSimulator.cpp +++ b/src/Simulator/FloodyFluidSimulator.cpp @@ -258,7 +258,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( + m_World.BroadcastSoundEffect( "block.lava.extinguish", Vector3d(BlockX, a_RelY, BlockZ), 0.5f, @@ -278,7 +278,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( + m_World.BroadcastSoundEffect( "block.lava.extinguish", Vector3d(BlockX, a_RelY, BlockZ), 0.5f, diff --git a/src/Simulator/VaporizeFluidSimulator.cpp b/src/Simulator/VaporizeFluidSimulator.cpp index 873dbe177..32a55794d 100644 --- a/src/Simulator/VaporizeFluidSimulator.cpp +++ b/src/Simulator/VaporizeFluidSimulator.cpp @@ -5,7 +5,9 @@ #include "Globals.h" #include "VaporizeFluidSimulator.h" +#include "../OpaqueWorld.h" #include "../Chunk.h" +#include "../Blocks/BroadcastInterface.h" @@ -35,13 +37,9 @@ void cVaporizeFluidSimulator::AddBlock(Vector3i a_Block, cChunk * a_Chunk) ) { a_Chunk->SetBlock(RelX, a_Block.y, RelZ, E_BLOCK_AIR, 0); - a_Chunk->BroadcastSoundEffect( + World::GetBroadcastInterface(m_World).BroadcastSoundEffect( "block.fire.extinguish", - { - static_cast(a_Block.x), - static_cast(a_Block.y), - static_cast(a_Block.z) - }, + Vector3d(a_Block), 1.0f, 0.6f ); -- cgit v1.2.3