summaryrefslogtreecommitdiffstats
path: root/src/World.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/World.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 '')
-rw-r--r--src/World.h7
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. */