flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed DelayedFluidSimulator.

Browse Source 
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
This commit is contained in:
madmaxoft@gmail.com
2012-10-15 20:16:43 +00:00
parent 164f0e7de9
commit f9dab57d8b
4 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/Simulator/DelayedFluidSimulator.cpp
View File

@@ -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;
}