summaryrefslogtreecommitdiffstats
path: root/src/Simulator/IncrementalRedstoneSimulator.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2015-05-09 09:25:09 +0200
committerMattes D <github@xoft.cz>2015-05-09 12:58:54 +0200
commitc13b1931ff26a5643c9fe68ab32b1e362cfacd70 (patch)
tree0c19db714a5dd08eb2775b39487e96cf317cf867 /src/Simulator/IncrementalRedstoneSimulator.cpp
parentRabbit and cooked rabbit now stackable (diff)
downloadcuberite-c13b1931ff26a5643c9fe68ab32b1e362cfacd70.tar
cuberite-c13b1931ff26a5643c9fe68ab32b1e362cfacd70.tar.gz
cuberite-c13b1931ff26a5643c9fe68ab32b1e362cfacd70.tar.bz2
cuberite-c13b1931ff26a5643c9fe68ab32b1e362cfacd70.tar.lz
cuberite-c13b1931ff26a5643c9fe68ab32b1e362cfacd70.tar.xz
cuberite-c13b1931ff26a5643c9fe68ab32b1e362cfacd70.tar.zst
cuberite-c13b1931ff26a5643c9fe68ab32b1e362cfacd70.zip
Diffstat (limited to 'src/Simulator/IncrementalRedstoneSimulator.cpp')
-rw-r--r--src/Simulator/IncrementalRedstoneSimulator.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Simulator/IncrementalRedstoneSimulator.cpp b/src/Simulator/IncrementalRedstoneSimulator.cpp
index 40be9c582..7f320af0d 100644
--- a/src/Simulator/IncrementalRedstoneSimulator.cpp
+++ b/src/Simulator/IncrementalRedstoneSimulator.cpp
@@ -366,7 +366,7 @@ void cIncrementalRedstoneSimulator::HandleRedstoneTorch(int a_RelBlockX, int a_R
if (i + 1 < ARRAYCOUNT(gCrossCoords)) // Sides of torch, not top (top is last)
{
if (
- IsMechanism(Type) && // Is it a mechanism? Not block/other torch etc.
+ IsMechanism(Type) && // Is it a mechanism? Not block / other torch etc.
(!Vector3i(a_RelBlockX + gCrossCoords[i].x, a_RelBlockY + gCrossCoords[i].y, a_RelBlockZ + gCrossCoords[i].z).Equals(Vector3i(X, Y, Z))) // CAN'T power block is that it is on
)
{
@@ -1600,7 +1600,7 @@ bool cIncrementalRedstoneSimulator::IsRepeaterLocked(int a_RelBlockX, int a_RelB
if ((OtherRepeaterDir & 0x03) == 0x3)
{
return true;
- } // If so, I am latched/locked
+ } // If so, I am latched / locked
}
// Check if western(left) neighbor is a powered on repeater who is facing us
@@ -1612,7 +1612,7 @@ bool cIncrementalRedstoneSimulator::IsRepeaterLocked(int a_RelBlockX, int a_RelB
if ((OtherRepeaterDir & 0x03) == 0x1)
{
return true;
- } // If so, I am latched/locked
+ } // If so, I am latched / locked
}
break;
@@ -1634,7 +1634,7 @@ bool cIncrementalRedstoneSimulator::IsRepeaterLocked(int a_RelBlockX, int a_RelB
if ((OtherRepeaterDir & 0x30) == 0x00)
{
return true;
- } // If so, am latched/locked
+ } // If so, I am latched / locked
}
// Check if northern(up) neighbor is a powered on repeater who is facing us
@@ -1646,7 +1646,7 @@ bool cIncrementalRedstoneSimulator::IsRepeaterLocked(int a_RelBlockX, int a_RelB
if ((OtherRepeaterDir & 0x03) == 0x02)
{
return true;
- } // If so, I am latched/locked
+ } // If so, I am latched / locked
}
break;