diff options
author | worktycho <work.tycho@gmail.com> | 2014-09-26 17:04:26 +0200 |
---|---|---|
committer | worktycho <work.tycho@gmail.com> | 2014-09-26 17:04:26 +0200 |
commit | 411c69b420acdc1e103a76a1a52e2c488aee5718 (patch) | |
tree | 06e33fb4b17d9c782ebb834a9821571f11ae103c /src/Chunk.h | |
parent | Improved searching for spawn. (diff) | |
parent | Merge branch 'master' into redstoneTests (diff) | |
download | cuberite-411c69b420acdc1e103a76a1a52e2c488aee5718.tar cuberite-411c69b420acdc1e103a76a1a52e2c488aee5718.tar.gz cuberite-411c69b420acdc1e103a76a1a52e2c488aee5718.tar.bz2 cuberite-411c69b420acdc1e103a76a1a52e2c488aee5718.tar.lz cuberite-411c69b420acdc1e103a76a1a52e2c488aee5718.tar.xz cuberite-411c69b420acdc1e103a76a1a52e2c488aee5718.tar.zst cuberite-411c69b420acdc1e103a76a1a52e2c488aee5718.zip |
Diffstat (limited to '')
-rw-r--r-- | src/Chunk.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/Chunk.h b/src/Chunk.h index e88e72bdc..a3de730dc 100644 --- a/src/Chunk.h +++ b/src/Chunk.h @@ -9,6 +9,8 @@ #include "Simulator/SandSimulator.h" #include "Simulator/IncrementalRedstoneSimulator.h" +#include "Blocks/GetHandlerCompileTimeTemplate.h" + @@ -415,11 +417,6 @@ public: cSandSimulatorChunkData & GetSandSimulatorData (void) { return m_SandSimulatorData; } cRedstoneSimulatorChunkData * GetRedstoneSimulatorData(void) { return &m_RedstoneSimulatorData; } - cRedstoneSimulatorChunkData * GetRedstoneSimulatorQueuedData(void) { return &m_RedstoneSimulatorQueuedData; } - cIncrementalRedstoneSimulator::PoweredBlocksList * GetRedstoneSimulatorPoweredBlocksList(void) { return &m_RedstoneSimulatorPoweredBlocksList; } - cIncrementalRedstoneSimulator::LinkedBlocksList * GetRedstoneSimulatorLinkedBlocksList(void) { return &m_RedstoneSimulatorLinkedBlocksList; } - cIncrementalRedstoneSimulator::SimulatedPlayerToggleableList * GetRedstoneSimulatorSimulatedPlayerToggleableList(void) { return &m_RedstoneSimulatorSimulatedPlayerToggleableList; } - cIncrementalRedstoneSimulator::RepeatersDelayList * GetRedstoneSimulatorRepeatersDelayList(void) { return &m_RedstoneSimulatorRepeatersDelayList; } bool IsRedstoneDirty(void) const { return m_IsRedstoneDirty; } void SetIsRedstoneDirty(bool a_Flag) { m_IsRedstoneDirty = a_Flag; } @@ -505,11 +502,7 @@ private: cSandSimulatorChunkData m_SandSimulatorData; cRedstoneSimulatorChunkData m_RedstoneSimulatorData; - cRedstoneSimulatorChunkData m_RedstoneSimulatorQueuedData; - cIncrementalRedstoneSimulator::PoweredBlocksList m_RedstoneSimulatorPoweredBlocksList; - cIncrementalRedstoneSimulator::LinkedBlocksList m_RedstoneSimulatorLinkedBlocksList; - cIncrementalRedstoneSimulator::SimulatedPlayerToggleableList m_RedstoneSimulatorSimulatedPlayerToggleableList; - cIncrementalRedstoneSimulator::RepeatersDelayList m_RedstoneSimulatorRepeatersDelayList; + /** Indicates if simulate-once blocks should be updated by the redstone simulator */ bool m_IsRedstoneDirty; |