summaryrefslogtreecommitdiffstats
path: root/source/Simulator/SimulatorManager.h
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-10-27 09:51:01 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-10-27 09:51:01 +0200
commit1cd213fa608cb2d27b1c8f2ae9d47e02d8cb18f1 (patch)
treef826495ab542932e2f7e7af2463568186f5c219e /source/Simulator/SimulatorManager.h
parentCritical sections aren't heap-allocated in linux anymore. (diff)
downloadcuberite-1cd213fa608cb2d27b1c8f2ae9d47e02d8cb18f1.tar
cuberite-1cd213fa608cb2d27b1c8f2ae9d47e02d8cb18f1.tar.gz
cuberite-1cd213fa608cb2d27b1c8f2ae9d47e02d8cb18f1.tar.bz2
cuberite-1cd213fa608cb2d27b1c8f2ae9d47e02d8cb18f1.tar.lz
cuberite-1cd213fa608cb2d27b1c8f2ae9d47e02d8cb18f1.tar.xz
cuberite-1cd213fa608cb2d27b1c8f2ae9d47e02d8cb18f1.tar.zst
cuberite-1cd213fa608cb2d27b1c8f2ae9d47e02d8cb18f1.zip
Diffstat (limited to 'source/Simulator/SimulatorManager.h')
-rw-r--r--source/Simulator/SimulatorManager.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/Simulator/SimulatorManager.h b/source/Simulator/SimulatorManager.h
index e90acffab..fbd97b8fa 100644
--- a/source/Simulator/SimulatorManager.h
+++ b/source/Simulator/SimulatorManager.h
@@ -18,17 +18,17 @@
class cSimulatorManager
{
public:
- cSimulatorManager();
+ cSimulatorManager(void);
~cSimulatorManager();
- void Simulate( float a_Dt );
- void WakeUp(int a_X, int a_Y, int a_Z);
+ void Simulate(float a_Dt);
+ void WakeUp(int a_BlockX, int a_BlockY, int a_BlockZ);
- void RegisterSimulator(cSimulator * a_Simulator, short a_Rate); // Takes ownership of the simulator object!
+ void RegisterSimulator(cSimulator * a_Simulator, int a_Rate); // Takes ownership of the simulator object!
protected:
- typedef std::vector <std::pair<cSimulator *, short> *> cSimulators;
+ typedef std::vector <std::pair<cSimulator *, int> > cSimulators;
cSimulators m_Simulators;
long long m_Ticks;