summaryrefslogtreecommitdiffstats
path: root/src/Simulator/RedstoneSimulator.h
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2013-12-14 15:41:00 +0100
committerMattes D <github@xoft.cz>2013-12-14 15:41:00 +0100
commit8a6c28b8f0234d839c83f2c61b4b82945d383897 (patch)
treede559158d89df0e5714c7f97f7da4f05e0e89c2f /src/Simulator/RedstoneSimulator.h
parentMerge branch 'master' of https://github.com/mc-server/MCServer (diff)
parentUpdate Core (diff)
downloadcuberite-8a6c28b8f0234d839c83f2c61b4b82945d383897.tar
cuberite-8a6c28b8f0234d839c83f2c61b4b82945d383897.tar.gz
cuberite-8a6c28b8f0234d839c83f2c61b4b82945d383897.tar.bz2
cuberite-8a6c28b8f0234d839c83f2c61b4b82945d383897.tar.lz
cuberite-8a6c28b8f0234d839c83f2c61b4b82945d383897.tar.xz
cuberite-8a6c28b8f0234d839c83f2c61b4b82945d383897.tar.zst
cuberite-8a6c28b8f0234d839c83f2c61b4b82945d383897.zip
Diffstat (limited to 'src/Simulator/RedstoneSimulator.h')
-rw-r--r--src/Simulator/RedstoneSimulator.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/Simulator/RedstoneSimulator.h b/src/Simulator/RedstoneSimulator.h
index 7c1fd62e8..23ac510fc 100644
--- a/src/Simulator/RedstoneSimulator.h
+++ b/src/Simulator/RedstoneSimulator.h
@@ -127,7 +127,11 @@ private:
void SetAllDirsAsPowered(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_SourceBlock);
/// <summary>Returns if a coordinate is powered or linked powered</summary>
- bool AreCoordsPowered(int a_BlockX, int a_BlockY, int a_BlockZ);
+ bool AreCoordsPowered(int a_BlockX, int a_BlockY, int a_BlockZ) { return AreCoordsDirectlyPowered(a_BlockX, a_BlockY, a_BlockZ) || AreCoordsLinkedPowered(a_BlockX, a_BlockY, a_BlockZ); }
+ /// <summary>Returns if a coordinate is in the directly powered blocks list</summary>
+ bool AreCoordsDirectlyPowered(int a_BlockX, int a_BlockY, int a_BlockZ);
+ /// <summary>Returns if a coordinate is in the indirectly powered blocks list</summary>
+ bool AreCoordsLinkedPowered(int a_BlockX, int a_BlockY, int a_BlockZ);
/// <summary>Returns if a coordinate was marked as simulated (for blocks toggleable by players)</summary>
bool AreCoordsSimulated(int a_BlockX, int a_BlockY, int a_BlockZ, bool IsCurrentStatePowered);
/// <summary>Returns if a repeater is powered</summary>