diff options
| author | Mattes D <github@xoft.cz> | 2014-02-16 21:44:15 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-02-16 21:44:15 +0100 |
| commit | b90c9936b80982d5c0112a2bad147eb3b0b03c02 (patch) | |
| tree | 3f25582f5ea6423a35bef5f7d2aa368abe13cc78 /src/Chunk.h | |
| parent | Merge pull request #691 from MuhammadWang/master (diff) | |
| parent | Fixed a glaring bug with chunk cross-simulating (diff) | |
| download | cuberite-b90c9936b80982d5c0112a2bad147eb3b0b03c02.tar cuberite-b90c9936b80982d5c0112a2bad147eb3b0b03c02.tar.gz cuberite-b90c9936b80982d5c0112a2bad147eb3b0b03c02.tar.bz2 cuberite-b90c9936b80982d5c0112a2bad147eb3b0b03c02.tar.lz cuberite-b90c9936b80982d5c0112a2bad147eb3b0b03c02.tar.xz cuberite-b90c9936b80982d5c0112a2bad147eb3b0b03c02.tar.zst cuberite-b90c9936b80982d5c0112a2bad147eb3b0b03c02.zip | |
Diffstat (limited to 'src/Chunk.h')
| -rw-r--r-- | src/Chunk.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/Chunk.h b/src/Chunk.h index 93eba217e..696690068 100644 --- a/src/Chunk.h +++ b/src/Chunk.h @@ -343,12 +343,17 @@ public: NIBBLETYPE GetTimeAlteredLight(NIBBLETYPE a_Skylight) const; - // Simulator data: + // Per-chunk simulator data: cFireSimulatorChunkData & GetFireSimulatorData (void) { return m_FireSimulatorData; } cFluidSimulatorData * GetWaterSimulatorData(void) { return m_WaterSimulatorData; } cFluidSimulatorData * GetLavaSimulatorData (void) { return m_LavaSimulatorData; } cSandSimulatorChunkData & GetSandSimulatorData (void) { return m_SandSimulatorData; } - cRedstoneSimulatorChunkData & GetRedstoneSimulatorData(void) { return m_RedstoneSimulatorData; } + + cRedstoneSimulatorChunkData * GetRedstoneSimulatorData(void) { return &m_RedstoneSimulatorData; } + 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; }; cBlockEntity * GetBlockEntity(int a_BlockX, int a_BlockY, int a_BlockZ); cBlockEntity * GetBlockEntity(const Vector3i & a_BlockPos) { return GetBlockEntity(a_BlockPos.x, a_BlockPos.y, a_BlockPos.z); } @@ -419,7 +424,12 @@ private: cFluidSimulatorData * m_WaterSimulatorData; cFluidSimulatorData * m_LavaSimulatorData; cSandSimulatorChunkData m_SandSimulatorData; + cRedstoneSimulatorChunkData m_RedstoneSimulatorData; + cIncrementalRedstoneSimulator::PoweredBlocksList m_RedstoneSimulatorPoweredBlocksList; + cIncrementalRedstoneSimulator::LinkedBlocksList m_RedstoneSimulatorLinkedBlocksList; + cIncrementalRedstoneSimulator::SimulatedPlayerToggleableList m_RedstoneSimulatorSimulatedPlayerToggleableList; + cIncrementalRedstoneSimulator::RepeatersDelayList m_RedstoneSimulatorRepeatersDelayList; // pick up a random block of this chunk |