summaryrefslogtreecommitdiffstats
path: root/src/World.h
diff options
context:
space:
mode:
authorSTRWarrior <niels.breuker@hotmail.nl>2014-02-07 22:59:08 +0100
committerSTRWarrior <niels.breuker@hotmail.nl>2014-02-07 22:59:08 +0100
commit3a897844a0796ce91e51e0154acbbce2d8e807e5 (patch)
tree395c3322c924d61d4cbf8b82d5c7cbb2f6357d1a /src/World.h
parentFixed some end of lines (diff)
downloadcuberite-3a897844a0796ce91e51e0154acbbce2d8e807e5.tar
cuberite-3a897844a0796ce91e51e0154acbbce2d8e807e5.tar.gz
cuberite-3a897844a0796ce91e51e0154acbbce2d8e807e5.tar.bz2
cuberite-3a897844a0796ce91e51e0154acbbce2d8e807e5.tar.lz
cuberite-3a897844a0796ce91e51e0154acbbce2d8e807e5.tar.xz
cuberite-3a897844a0796ce91e51e0154acbbce2d8e807e5.tar.zst
cuberite-3a897844a0796ce91e51e0154acbbce2d8e807e5.zip
Diffstat (limited to 'src/World.h')
-rw-r--r--src/World.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/World.h b/src/World.h
index bc4e411cc..d436e7adf 100644
--- a/src/World.h
+++ b/src/World.h
@@ -33,7 +33,7 @@
class cFireSimulator;
class cFluidSimulator;
class cSandSimulator;
-class cRedstoneManager;
+class cRedstoneSimulator;
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 cRedstoneManager * 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
@@ -759,7 +759,7 @@ private:
cFluidSimulator * m_WaterSimulator;
cFluidSimulator * m_LavaSimulator;
cFireSimulator * m_FireSimulator;
- cRedstoneManager * m_RedstoneSimulator;
+ cRedstoneSimulator * m_RedstoneSimulator;
cCriticalSection m_CSPlayers;
cPlayerList m_Players;
@@ -860,7 +860,7 @@ private:
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);
+ cRedstoneSimulator * InitializeRedstoneSimulator(cIniFile & a_IniFile);
}; // tolua_export