diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-06-10 21:51:22 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-06-10 21:51:22 +0200 |
| commit | bfa8aaf41bd2e982e81ca1385efc9ec25ebd246c (patch) | |
| tree | 706bb3680c60cbc1f78e31f0ca2ac6d1e9422a6a /src/Simulator/IncrementalRedstoneSimulator.h | |
| parent | Portal improvements and suggestions (diff) | |
| parent | Fixed clang warnings about abs() in Noise.cpp. (diff) | |
| download | cuberite-bfa8aaf41bd2e982e81ca1385efc9ec25ebd246c.tar cuberite-bfa8aaf41bd2e982e81ca1385efc9ec25ebd246c.tar.gz cuberite-bfa8aaf41bd2e982e81ca1385efc9ec25ebd246c.tar.bz2 cuberite-bfa8aaf41bd2e982e81ca1385efc9ec25ebd246c.tar.lz cuberite-bfa8aaf41bd2e982e81ca1385efc9ec25ebd246c.tar.xz cuberite-bfa8aaf41bd2e982e81ca1385efc9ec25ebd246c.tar.zst cuberite-bfa8aaf41bd2e982e81ca1385efc9ec25ebd246c.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Simulator/IncrementalRedstoneSimulator.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Simulator/IncrementalRedstoneSimulator.h b/src/Simulator/IncrementalRedstoneSimulator.h index 233a3d408..83076311a 100644 --- a/src/Simulator/IncrementalRedstoneSimulator.h +++ b/src/Simulator/IncrementalRedstoneSimulator.h @@ -108,7 +108,7 @@ private: /** Handles redstone wire */ void HandleRedstoneWire(int a_RelBlockX, int a_RelBlockY, int a_RelBlockZ); /** Handles repeaters */ - void HandleRedstoneRepeater(int a_RelBlockX, int a_RelBlockY, int a_RelBlockZ, BLOCKTYPE a_MyState); + void HandleRedstoneRepeater(int a_RelBlockX, int a_RelBlockY, int a_RelBlockZ, BLOCKTYPE a_MyState, RepeatersDelayList::iterator a_Itr); /* ====================== */ /* ====== DEVICES ====== */ @@ -145,8 +145,8 @@ private: void SetDirectionLinkedPowered(int a_RelBlockX, int a_RelBlockY, int a_RelBlockZ, char a_Direction, unsigned char a_PowerLevel = MAX_POWER_LEVEL); /** Marks all blocks immediately surrounding a coordinate as powered */ void SetAllDirsAsPowered(int a_RelBlockX, int a_RelBlockY, int a_RelBlockZ, unsigned char a_PowerLevel = MAX_POWER_LEVEL); - /** Queues a repeater to be powered or unpowered */ - void QueueRepeaterPowerChange(int a_RelBlockX, int a_RelBlockY, int a_RelBlockZ, NIBBLETYPE a_Meta, bool ShouldPowerOn); + /** Queues a repeater to be powered or unpowered and returns if the m_RepeatersDelayList iterators were invalidated */ + bool QueueRepeaterPowerChange(int a_RelBlockX, int a_RelBlockY, int a_RelBlockZ, NIBBLETYPE a_Meta, bool ShouldPowerOn); /** Returns if a coordinate is powered or linked powered */ bool AreCoordsPowered(int a_RelBlockX, int a_RelBlockY, int a_RelBlockZ) { return AreCoordsDirectlyPowered(a_RelBlockX, a_RelBlockY, a_RelBlockZ) || AreCoordsLinkedPowered(a_RelBlockX, a_RelBlockY, a_RelBlockZ); } |