diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-09-11 18:48:21 +0200 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-09-11 18:48:21 +0200 |
| commit | 0b044e1c83a62c266afaf0852ccbd5e7b01cec5e (patch) | |
| tree | d847314a2ee95b1a766dbb57a06b5ea7e42e687c /src/Simulator/SimulatorManager.h | |
| parent | Merge branch 'master' of https://github.com/mc-server/MCServer (diff) | |
| download | cuberite-0b044e1c83a62c266afaf0852ccbd5e7b01cec5e.tar cuberite-0b044e1c83a62c266afaf0852ccbd5e7b01cec5e.tar.gz cuberite-0b044e1c83a62c266afaf0852ccbd5e7b01cec5e.tar.bz2 cuberite-0b044e1c83a62c266afaf0852ccbd5e7b01cec5e.tar.lz cuberite-0b044e1c83a62c266afaf0852ccbd5e7b01cec5e.tar.xz cuberite-0b044e1c83a62c266afaf0852ccbd5e7b01cec5e.tar.zst cuberite-0b044e1c83a62c266afaf0852ccbd5e7b01cec5e.zip | |
Diffstat (limited to 'src/Simulator/SimulatorManager.h')
| -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; |