From f9dab57d8b4b98ec0f624212452c48769c8441d1 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Mon, 15 Oct 2012 20:16:43 +0000 Subject: Fixed DelayedFluidSimulator. Floody fluid simulator is now woken up properly across chunk borders. git-svn-id: http://mc-server.googlecode.com/svn/trunk@966 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Simulator/DelayedFluidSimulator.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'source/Simulator/DelayedFluidSimulator.cpp') diff --git a/source/Simulator/DelayedFluidSimulator.cpp b/source/Simulator/DelayedFluidSimulator.cpp index 3ace286ed..317452c57 100644 --- a/source/Simulator/DelayedFluidSimulator.cpp +++ b/source/Simulator/DelayedFluidSimulator.cpp @@ -17,7 +17,7 @@ cDelayedFluidSimulator::cDelayedFluidSimulator(cWorld * a_World, BLOCKTYPE a_Flu super(a_World, a_Fluid, a_StationaryFluid), m_TickDelay(a_TickDelay), m_Slots(NULL), - m_CurrentSlotNum(a_TickDelay - 1) + m_CurrentSlotNum(0) { m_Slots = new CoordsArray[a_TickDelay]; } @@ -70,21 +70,22 @@ void cDelayedFluidSimulator::AddBlock(int a_BlockX, int a_BlockY, int a_BlockZ) void cDelayedFluidSimulator::Simulate(float a_Dt) { - CoordsArray & Blocks = m_Slots[m_CurrentSlotNum]; - - // First move to the next slot, so that simulated blocks can write another batch of scheduled blocks: - m_CurrentSlotNum += 1; - if (m_CurrentSlotNum >= m_TickDelay) + int SlotNum = m_CurrentSlotNum + 1; + if (SlotNum >= m_TickDelay) { - m_CurrentSlotNum = 0; + SlotNum = 0; } + CoordsArray & Blocks = m_Slots[SlotNum]; + // Simulate the blocks in the scheduled slot: for (CoordsArray::iterator itr = Blocks.begin(), end = Blocks.end(); itr != end; ++itr) { SimulateBlock(itr->x, itr->y, itr->z); } Blocks.clear(); + + m_CurrentSlotNum = SlotNum; } -- cgit v1.2.3