summaryrefslogtreecommitdiffstats
path: root/src/Simulator/SimulatorManager.h
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-12-17 08:38:23 +0100
committerMattes D <github@xoft.cz>2014-12-17 08:38:23 +0100
commit4947880a5d75d827b23f2ea359d9219043a32fcd (patch)
tree7167c17bec4ce486238575f7c158384e5776aa20 /src/Simulator/SimulatorManager.h
parentUpdated Core. (diff)
parentNULL -> nullptr (diff)
downloadcuberite-4947880a5d75d827b23f2ea359d9219043a32fcd.tar
cuberite-4947880a5d75d827b23f2ea359d9219043a32fcd.tar.gz
cuberite-4947880a5d75d827b23f2ea359d9219043a32fcd.tar.bz2
cuberite-4947880a5d75d827b23f2ea359d9219043a32fcd.tar.lz
cuberite-4947880a5d75d827b23f2ea359d9219043a32fcd.tar.xz
cuberite-4947880a5d75d827b23f2ea359d9219043a32fcd.tar.zst
cuberite-4947880a5d75d827b23f2ea359d9219043a32fcd.zip
Diffstat (limited to 'src/Simulator/SimulatorManager.h')
-rw-r--r--src/Simulator/SimulatorManager.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Simulator/SimulatorManager.h b/src/Simulator/SimulatorManager.h
index 185141764..31a709316 100644
--- a/src/Simulator/SimulatorManager.h
+++ b/src/Simulator/SimulatorManager.h
@@ -37,10 +37,10 @@ public:
void WakeUp(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk);
- void RegisterSimulator(cSimulator<cChunk, cWorld> * a_Simulator, int 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<cChunk, cWorld> *, int> > cSimulators;
+ typedef std::vector <std::pair<cSimulator *, int> > cSimulators;
cWorld & m_World;
cSimulators m_Simulators;