summaryrefslogtreecommitdiffstats
path: root/src/World.h
diff options
context:
space:
mode:
authorSTRWarrior <niels.breuker@hotmail.nl>2014-02-07 22:13:55 +0100
committerSTRWarrior <niels.breuker@hotmail.nl>2014-02-07 22:13:55 +0100
commit176664810b43a839d92418b2558359e61b700935 (patch)
tree4da6ba38d7d55346611186922f58cb2e7bdd607f /src/World.h
parentWebAdmin is stopped properly on server shutdown / restart. (diff)
downloadcuberite-176664810b43a839d92418b2558359e61b700935.tar
cuberite-176664810b43a839d92418b2558359e61b700935.tar.gz
cuberite-176664810b43a839d92418b2558359e61b700935.tar.bz2
cuberite-176664810b43a839d92418b2558359e61b700935.tar.lz
cuberite-176664810b43a839d92418b2558359e61b700935.tar.xz
cuberite-176664810b43a839d92418b2558359e61b700935.tar.zst
cuberite-176664810b43a839d92418b2558359e61b700935.zip
Diffstat (limited to '')
-rw-r--r--src/World.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/World.h b/src/World.h
index 8cf860ff5..bc4e411cc 100644
--- a/src/World.h
+++ b/src/World.h
@@ -33,7 +33,7 @@
class cFireSimulator;
class cFluidSimulator;
class cSandSimulator;
-class cRedstoneSimulator;
+class cRedstoneManager;
class cItem;
class cPlayer;
class cClientHandle;
@@ -432,7 +432,7 @@ public:
inline cFluidSimulator * GetWaterSimulator(void) { return m_WaterSimulator; }
inline cFluidSimulator * GetLavaSimulator (void) { return m_LavaSimulator; }
- inline cRedstoneSimulator * GetRedstoneSimulator(void) { return m_RedstoneSimulator; }
+ inline cRedstoneManager * 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
@@ -759,7 +759,7 @@ private:
cFluidSimulator * m_WaterSimulator;
cFluidSimulator * m_LavaSimulator;
cFireSimulator * m_FireSimulator;
- cRedstoneSimulator * m_RedstoneSimulator;
+ cRedstoneManager * m_RedstoneSimulator;
cCriticalSection m_CSPlayers;
cPlayerList m_Players;
@@ -858,6 +858,9 @@ private:
/** Creates a new fluid simulator, loads its settings from the inifile (a_FluidName section) */
cFluidSimulator * InitializeFluidSimulator(cIniFile & a_IniFile, const char * a_FluidName, BLOCKTYPE a_SimulateBlock, BLOCKTYPE a_StationaryBlock);
+
+ /** Creates a new redstone simulator.*/
+ cRedstoneManager * InitializeRedstoneSimulator(cIniFile & a_IniFile);
}; // tolua_export