summaryrefslogtreecommitdiff
path: root/src/elements/stor.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/stor.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/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 414caad..555122c 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)
+ if(parts[i].tmp && (r&0xFF)==PT_SPRK && parts[r>>8].ctype==PT_PSCN && 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)