summaryrefslogtreecommitdiff
path: root/src/elements/aray.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-04-17 16:14:23 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-04-17 16:14:23 (GMT)
commitca1690efe14d5cbb1637e9114403afffc3f75984 (patch)
tree013bacc68a395bb1b24ca39622febedcb236faf8 /src/elements/aray.cpp
parent75f62127518895ae9acddfd2644a67ab8796253c (diff)
downloadpowder-ca1690efe14d5cbb1637e9114403afffc3f75984.zip
powder-ca1690efe14d5cbb1637e9114403afffc3f75984.tar.gz
TPT: Separate loop for updating life, and add SPRK life checks to most electronics 6bdc05cc40
Diffstat (limited to 'src/elements/aray.cpp')
-rw-r--r--src/elements/aray.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/elements/aray.cpp b/src/elements/aray.cpp
index 2ab9b40..939d3c1 100644
--- a/src/elements/aray.cpp
+++ b/src/elements/aray.cpp
@@ -11,7 +11,7 @@ int update_ARAY(UPDATE_FUNC_ARGS) {
r = pmap[y+ry][x+rx];
if (!r)
continue;
- if ((r&0xFF)==PT_SPRK) {
+ if ((r&0xFF)==PT_SPRK && parts[r>>8].life<4) {
int destroy = (parts[r>>8].ctype==PT_PSCN)?1:0;
int nostop = (parts[r>>8].ctype==PT_INST)?1:0;
for (docontinue = 1, nxx = 0, nyy = 0, nxi = rx*-1, nyi = ry*-1; docontinue; nyy+=nyi, nxx+=nxi) {