diff options
author | Howaner <franzi.moos@googlemail.com> | 2014-12-17 17:33:30 +0100 |
---|---|---|
committer | Howaner <franzi.moos@googlemail.com> | 2014-12-17 17:33:30 +0100 |
commit | 6ee7fd3c6792235c873e24b16331e3a8278021cc (patch) | |
tree | 707fb63ebda192bad5603c5c280d99746b510cc4 /src/World.h | |
parent | Implemented vanilla-like shift click. (diff) | |
parent | Merge pull request #1674 from gushromp/master (diff) | |
download | cuberite-6ee7fd3c6792235c873e24b16331e3a8278021cc.tar cuberite-6ee7fd3c6792235c873e24b16331e3a8278021cc.tar.gz cuberite-6ee7fd3c6792235c873e24b16331e3a8278021cc.tar.bz2 cuberite-6ee7fd3c6792235c873e24b16331e3a8278021cc.tar.lz cuberite-6ee7fd3c6792235c873e24b16331e3a8278021cc.tar.xz cuberite-6ee7fd3c6792235c873e24b16331e3a8278021cc.tar.zst cuberite-6ee7fd3c6792235c873e24b16331e3a8278021cc.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 6f28ba534..4f24280a4 100644 --- a/src/World.h +++ b/src/World.h @@ -34,7 +34,6 @@ class cFireSimulator; class cFluidSimulator; class cSandSimulator; -template <class ChunkType, class WorldType> class cRedstoneSimulator; class cItem; class cPlayer; @@ -518,7 +517,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 @@ -935,7 +934,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; @@ -1079,7 +1078,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. */ |