summaryrefslogtreecommitdiff
path: root/src/simulation/elements/PSTN.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2013-05-04 20:43:43 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2013-05-04 20:43:43 (GMT)
commit3799d5ed86e7b508b39544cad3b3346655c804f1 (patch)
tree96ad9594f79b31b2ee7f4c5d37d0d2365ed2fd37 /src/simulation/elements/PSTN.cpp
parent2d8c5a77472159229d920041878e09c003c84ecd (diff)
parent36efb4864412537ff4a48a99337f220d601acc70 (diff)
downloadpowder-3799d5ed86e7b508b39544cad3b3346655c804f1.zip
powder-3799d5ed86e7b508b39544cad3b3346655c804f1.tar.gz
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src/simulation/elements/PSTN.cpp')
-rw-r--r--src/simulation/elements/PSTN.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/simulation/elements/PSTN.cpp b/src/simulation/elements/PSTN.cpp
index 4da1b73..35a470d 100644
--- a/src/simulation/elements/PSTN.cpp
+++ b/src/simulation/elements/PSTN.cpp
@@ -185,7 +185,7 @@ int Element_PSTN::CanMoveStack(Simulation * sim, int stackX, int stackY, int dir
if(spaces >= amount)
break;
} else {
- if(currentPos < maxSize && !retract)
+ if(spaces < maxSize && !retract)
tempParts[currentPos++] = r>>8;
else
return spaces;