diff options
author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-10-25 22:54:00 +0200 |
---|---|---|
committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-10-25 22:54:00 +0200 |
commit | 85c298d73e871daadf91671cdae9db83e30f9029 (patch) | |
tree | 2f9a2afcc0bb676454f332f78bffb7bd3e6ea380 /src/World.h | |
parent | Fixed some block checks (diff) | |
download | cuberite-85c298d73e871daadf91671cdae9db83e30f9029.tar cuberite-85c298d73e871daadf91671cdae9db83e30f9029.tar.gz cuberite-85c298d73e871daadf91671cdae9db83e30f9029.tar.bz2 cuberite-85c298d73e871daadf91671cdae9db83e30f9029.tar.lz cuberite-85c298d73e871daadf91671cdae9db83e30f9029.tar.xz cuberite-85c298d73e871daadf91671cdae9db83e30f9029.tar.zst cuberite-85c298d73e871daadf91671cdae9db83e30f9029.zip |
Diffstat (limited to 'src/World.h')
-rw-r--r-- | src/World.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/World.h b/src/World.h index ec6dcadde..e54ba263d 100644 --- a/src/World.h +++ b/src/World.h @@ -33,7 +33,6 @@ class cFireSimulator; class cFluidSimulator; class cSandSimulator; -template <class ChunkType, class WorldType> class cRedstoneSimulator; class cItem; class cPlayer; @@ -510,7 +509,7 @@ public: inline cFluidSimulator * GetWaterSimulator(void) { return m_WaterSimulator; } inline cFluidSimulator * GetLavaSimulator (void) { return m_LavaSimulator; } - inline cRedstoneSimulator<cChunk, cWorld> * GetRedstoneSimulator(void) { return m_RedstoneSimulator; } + inline cRedstoneSimulator * GetRedstoneSimulator(void) { return m_RedstoneSimulator; } /** Calls the callback for each block entity in the specified chunk; returns true if all block entities processed, false if the callback aborted by returning true */ bool ForEachBlockEntityInChunk(int a_ChunkX, int a_ChunkZ, cBlockEntityCallback & a_Callback); // Exported in ManualBindings.cpp @@ -919,7 +918,7 @@ private: cFluidSimulator * m_WaterSimulator; cFluidSimulator * m_LavaSimulator; std::unique_ptr<cFireSimulator> m_FireSimulator; - cRedstoneSimulator<cChunk, cWorld> * m_RedstoneSimulator; + cRedstoneSimulator * m_RedstoneSimulator; cCriticalSection m_CSPlayers; cPlayerList m_Players; @@ -1060,7 +1059,7 @@ private: cFluidSimulator * InitializeFluidSimulator(cIniFile & a_IniFile, const char * a_FluidName, BLOCKTYPE a_SimulateBlock, BLOCKTYPE a_StationaryBlock); /** Creates a new redstone simulator.*/ - cRedstoneSimulator<cChunk, cWorld> * InitializeRedstoneSimulator(cIniFile & a_IniFile); + cRedstoneSimulator * InitializeRedstoneSimulator(cIniFile & a_IniFile); /** Adds the players queued in the m_PlayersToAdd queue into the m_Players list. Assumes it is called from the Tick thread. */ |