From adb86a75dac91a210149fc28b1dbf5225896f66c Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Wed, 29 Jul 2020 20:15:09 +0100 Subject: Do not GetBlock individually in simulators * Have the simulator manager get the block and pass it on + Add new overload for WakeUp, called when the manager wakes face positions --- src/Simulator/DelayedFluidSimulator.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/Simulator/DelayedFluidSimulator.h') diff --git a/src/Simulator/DelayedFluidSimulator.h b/src/Simulator/DelayedFluidSimulator.h index e307e4ad7..3022c9753 100644 --- a/src/Simulator/DelayedFluidSimulator.h +++ b/src/Simulator/DelayedFluidSimulator.h @@ -54,13 +54,12 @@ public: cDelayedFluidSimulator(cWorld & a_World, BLOCKTYPE a_Fluid, BLOCKTYPE a_StationaryFluid, int a_TickDelay); - virtual void WakeUp(cChunk & a_Chunk, Vector3i a_Position, BLOCKTYPE a_Block) override; - protected: virtual void Simulate(float a_Dt) override; virtual void SimulateChunk(std::chrono::milliseconds a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) override; virtual void AddBlock(cChunk & a_Chunk, Vector3i a_Position, BLOCKTYPE a_Block) override; + virtual void WakeUp(cChunk & a_Chunk, Vector3i a_Position, BLOCKTYPE a_Block) override; virtual cFluidSimulatorData * CreateChunkData(void) override { return new cDelayedFluidSimulatorChunkData(m_TickDelay); } int m_TickDelay; // Count of the m_Slots array in each ChunkData -- cgit v1.2.3