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

Converted simulators to take cWorld reference instead of a pointer

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1228 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com
2013-02-28 13:39:20 +00:00
parent 2588f5a605
commit 619ec8b247
19 changed files with 166 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/Simulator/SimulatorManager.cpp
View File

@@ -2,12 +2,14 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "SimulatorManager.h"
#include "../World.h"
cSimulatorManager::cSimulatorManager(void) :
cSimulatorManager::cSimulatorManager(cWorld & a_World) :
m_World(a_World),
m_Ticks(0)
{
}
@@ -24,7 +26,7 @@ cSimulatorManager::~cSimulatorManager()
void cSimulatorManager::Simulate( float a_Dt )
void cSimulatorManager::Simulate(float a_Dt)
{
m_Ticks++;
for (cSimulators::iterator itr = m_Simulators.begin(); itr != m_Simulators.end(); ++itr )
@@ -40,6 +42,22 @@ void cSimulatorManager::Simulate( float a_Dt )
void cSimulatorManager::SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk)
{
// m_Ticks has already been increased in Simulate()
for (cSimulators::iterator itr = m_Simulators.begin(); itr != m_Simulators.end(); ++itr )
{
if ((m_Ticks % itr->second) == 0)
{
itr->first->SimulateChunk(a_Dt, a_ChunkX, a_ChunkZ, a_Chunk);
}
}
}
void cSimulatorManager::WakeUp(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk)
{
for (cSimulators::iterator itr = m_Simulators.begin(); itr != m_Simulators.end(); ++itr )