diff options
author | Howaner <franzi.moos@googlemail.com> | 2014-09-26 23:56:20 +0200 |
---|---|---|
committer | Howaner <franzi.moos@googlemail.com> | 2014-09-26 23:56:20 +0200 |
commit | 033d16babb9390cea463eea61739f0ca2b1d315a (patch) | |
tree | 02a2afded18f202c62d2f3a87dce88428f63cb8b /src/Simulator/SimulatorManager.h | |
parent | Implemented mob spawner. (diff) | |
parent | Merge pull request #1456 from Howaner/Fixes (diff) | |
download | cuberite-033d16babb9390cea463eea61739f0ca2b1d315a.tar cuberite-033d16babb9390cea463eea61739f0ca2b1d315a.tar.gz cuberite-033d16babb9390cea463eea61739f0ca2b1d315a.tar.bz2 cuberite-033d16babb9390cea463eea61739f0ca2b1d315a.tar.lz cuberite-033d16babb9390cea463eea61739f0ca2b1d315a.tar.xz cuberite-033d16babb9390cea463eea61739f0ca2b1d315a.tar.zst cuberite-033d16babb9390cea463eea61739f0ca2b1d315a.zip |
Diffstat (limited to '')
-rw-r--r-- | src/Simulator/SimulatorManager.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Simulator/SimulatorManager.h b/src/Simulator/SimulatorManager.h index 31a709316..185141764 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 * a_Simulator, int a_Rate); // Takes ownership of the simulator object! + void RegisterSimulator(cSimulator<cChunk, cWorld> * a_Simulator, int a_Rate); // Takes ownership of the simulator object! protected: - typedef std::vector <std::pair<cSimulator *, int> > cSimulators; + typedef std::vector <std::pair<cSimulator<cChunk, cWorld> *, int> > cSimulators; cWorld & m_World; cSimulators m_Simulators; |