summaryrefslogtreecommitdiff
path: root/src/elements/stor.c
diff options
context:
space:
mode:
authorjacksonmj <mj-pt@jacksonmj.co.uk>2012-02-03 23:35:44 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-02-05 14:45:29 (GMT)
commit6bdc05cc40a89b6454fdbaca7a2315a07f085bf9 (patch)
treeddda52ecac10186b524f397983ebcb2c116fba02 /src/elements/stor.c
parenta4ad6ee428759346604437f416e27606b6ce09a1 (diff)
downloadpowder-6bdc05cc40a89b6454fdbaca7a2315a07f085bf9.zip
powder-6bdc05cc40a89b6454fdbaca7a2315a07f085bf9.tar.gz
Separate loop for updating life, and add SPRK life checks to most electronics
Diffstat (limited to 'src/elements/stor.c')
-rw-r--r--src/elements/stor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/elements/stor.c b/src/elements/stor.c
index 42802a4..b84f54f 100644
--- a/src/elements/stor.c
+++ b/src/elements/stor.c
@@ -20,7 +20,7 @@ int update_STOR(UPDATE_FUNC_ARGS) {
parts[i].pavg[1] = parts[r>>8].ctype;
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)