diff options
author | Lane Kolbly <lane@rscheme.org> | 2017-09-19 16:12:54 +0200 |
---|---|---|
committer | peterbell10 <peterbell10@live.co.uk> | 2017-09-19 16:12:54 +0200 |
commit | 30c8470a524f5d09f157d5c1c59eb72c205d5085 (patch) | |
tree | 38547152d6e7f4c3c9c2a5c1165f7d8bda52b8c8 /src/Simulator | |
parent | cRoot: Make PollPeriod representation 32 bit (#4030) (diff) | |
download | cuberite-30c8470a524f5d09f157d5c1c59eb72c205d5085.tar cuberite-30c8470a524f5d09f157d5c1c59eb72c205d5085.tar.gz cuberite-30c8470a524f5d09f157d5c1c59eb72c205d5085.tar.bz2 cuberite-30c8470a524f5d09f157d5c1c59eb72c205d5085.tar.lz cuberite-30c8470a524f5d09f157d5c1c59eb72c205d5085.tar.xz cuberite-30c8470a524f5d09f157d5c1c59eb72c205d5085.tar.zst cuberite-30c8470a524f5d09f157d5c1c59eb72c205d5085.zip |
Diffstat (limited to 'src/Simulator')
-rw-r--r-- | src/Simulator/FloodyFluidSimulator.cpp | 8 | ||||
-rw-r--r-- | src/Simulator/IncrementalRedstoneSimulator/TNTHandler.h | 2 | ||||
-rw-r--r-- | src/Simulator/VaporizeFluidSimulator.cpp | 8 |
3 files changed, 8 insertions, 10 deletions
diff --git a/src/Simulator/FloodyFluidSimulator.cpp b/src/Simulator/FloodyFluidSimulator.cpp index d24b6aa9b..05b00c639 100644 --- a/src/Simulator/FloodyFluidSimulator.cpp +++ b/src/Simulator/FloodyFluidSimulator.cpp @@ -260,9 +260,7 @@ void cFloodyFluidSimulator::SpreadToNeighbor(cChunk * a_NearChunk, int a_RelX, i a_NearChunk->BroadcastSoundEffect( "block.lava.extinguish", - static_cast<double>(BlockX), - static_cast<double>(a_RelY), - static_cast<double>(BlockZ), + Vector3d(BlockX, a_RelY, BlockZ), 0.5f, 1.5f ); @@ -282,9 +280,7 @@ void cFloodyFluidSimulator::SpreadToNeighbor(cChunk * a_NearChunk, int a_RelX, i a_NearChunk->BroadcastSoundEffect( "block.lava.extinguish", - static_cast<double>(BlockX), - static_cast<double>(a_RelY), - static_cast<double>(BlockZ), + Vector3d(BlockX, a_RelY, BlockZ), 0.5f, 1.5f ); diff --git a/src/Simulator/IncrementalRedstoneSimulator/TNTHandler.h b/src/Simulator/IncrementalRedstoneSimulator/TNTHandler.h index 6cea4501f..220d2537e 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/TNTHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/TNTHandler.h @@ -37,7 +37,7 @@ public: // LOGD("Evaluating explodinator the trinitrotoluene (%d %d %d)", a_Position.x, a_Position.y, a_Position.z); if (a_PoweringData.PowerLevel != 0) { - a_World.BroadcastSoundEffect("entity.tnt.primed", static_cast<double>(a_Position.x), static_cast<double>(a_Position.y), static_cast<double>(a_Position.z), 0.5f, 0.6f); + a_World.BroadcastSoundEffect("entity.tnt.primed", a_Position, 0.5f, 0.6f); a_World.SetBlock(a_Position.x, a_Position.y, a_Position.z, E_BLOCK_AIR, 0); a_World.SpawnPrimedTNT(a_Position + Vector3d(0.5, 0.5, 0.5)); // 80 ticks to boom } diff --git a/src/Simulator/VaporizeFluidSimulator.cpp b/src/Simulator/VaporizeFluidSimulator.cpp index c023f88c9..873dbe177 100644 --- a/src/Simulator/VaporizeFluidSimulator.cpp +++ b/src/Simulator/VaporizeFluidSimulator.cpp @@ -37,9 +37,11 @@ void cVaporizeFluidSimulator::AddBlock(Vector3i a_Block, cChunk * a_Chunk) a_Chunk->SetBlock(RelX, a_Block.y, RelZ, E_BLOCK_AIR, 0); a_Chunk->BroadcastSoundEffect( "block.fire.extinguish", - static_cast<double>(a_Block.x), - static_cast<double>(a_Block.y), - static_cast<double>(a_Block.z), + { + static_cast<double>(a_Block.x), + static_cast<double>(a_Block.y), + static_cast<double>(a_Block.z) + }, 1.0f, 0.6f ); |