From f089103c2b121f8128abfd6cdf0bd3cfbeca4465 Mon Sep 17 00:00:00 2001 From: Debucquoy Anthony tonitch Date: Sat, 18 Jun 2022 02:09:58 +0200 Subject: Additional Y height checks (#5405) For redstone wire, block area bindings, and fire simulator. Co-authored-by: Tiger Wang --- src/Simulator/Simulator.h | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'src/Simulator/Simulator.h') diff --git a/src/Simulator/Simulator.h b/src/Simulator/Simulator.h index e386c0bcf..5bb8376b0 100644 --- a/src/Simulator/Simulator.h +++ b/src/Simulator/Simulator.h @@ -50,14 +50,8 @@ protected: friend class cChunk; // Calls AddBlock() in its WakeUpSimulators() function, to speed things up friend class cSimulatorManager; // Class reponsible for dispatching calls to the various slave Simulators - virtual void Simulate(float a_Dt) = 0; - virtual void SimulateChunk(std::chrono::milliseconds a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) - { - UNUSED(a_Dt); - UNUSED(a_ChunkX); - UNUSED(a_ChunkZ); - UNUSED(a_Chunk); - } + virtual void Simulate(float a_Dt); + virtual void SimulateChunk(std::chrono::milliseconds a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) = 0; /** Called to simulate a new block. Unlike WakeUp this function will perform minimal checking. It queues the block to be simulated as fast as possible, suitable for area wakeups. */ @@ -74,8 +68,5 @@ protected: farther, extra-adjacents blocks to be updated. The simulator manager calls this overload after the 3-argument WakeUp. */ virtual void WakeUp(cChunk & a_Chunk, Vector3i a_Position, Vector3i a_Offset, BLOCKTYPE a_Block); - /** Called to simulate an area by the manager, delegated to cSimulator to avoid virtual calls in tight loops. */ - void WakeUp(const cCuboid & a_Area); - cWorld & m_World; } ; -- cgit v1.2.3