summaryrefslogtreecommitdiff
path: root/src/elements/stor.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-04-17 16:24:51 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-04-17 16:24:51 (GMT)
commitb88a2f680e638d7fbf396482b567ca5b6a7314f6 (patch)
tree480f60ba51e634ff2abc96ca76417d48958c7127 /src/elements/stor.cpp
parent8ea1e41d8737cbd2cc5f7ca6779cc0a8031dac85 (diff)
downloadpowder-b88a2f680e638d7fbf396482b567ca5b6a7314f6.zip
powder-b88a2f680e638d7fbf396482b567ca5b6a7314f6.tar.gz
TPT: More SPRK life checks for electronic elements 68ab3ca3ca
Diffstat (limited to 'src/elements/stor.cpp')
-rw-r--r--src/elements/stor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/elements/stor.cpp b/src/elements/stor.cpp
index 555122c..cf64255 100644
--- a/src/elements/stor.cpp
+++ b/src/elements/stor.cpp
@@ -20,7 +20,7 @@ int update_STOR(UPDATE_FUNC_ARGS) {
parts[i].pavg[1] = parts[r>>8].ctype;
sim->kill_part(r>>8);
}
- if(parts[i].tmp && (r&0xFF)==PT_SPRK && parts[r>>8].ctype==PT_PSCN && parts[r>>8].life<4)
+ if(parts[i].tmp && (r&0xFF)==PT_SPRK && parts[r>>8].ctype==PT_PSCN && parts[r>>8].life>0 && parts[r>>8].life<4)
{
for(ry1 = 1; ry1 >= -1; ry1--){
for(rx1 = 0; rx1 >= -1 && rx1 <= 1; rx1 = -rx1-rx1+1){ // Oscilate the X starting at 0, 1, -1, 3, -5, etc (Though stop at -1)