summaryrefslogtreecommitdiff
path: root/src/elements/dlay.c
diff options
context:
space:
mode:
authorjacksonmj <mj-pt@jacksonmj.co.uk>2012-02-04 01:34:22 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-02-05 14:45:30 (GMT)
commit68ab3ca3ca846ac5911cbfaa7c511b8f13108a54 (patch)
tree05de2af20a5756a2018532a26be65c1c4bb39f05 /src/elements/dlay.c
parent1a5cd45eb8949fd8e81019337e4a92278e83d19b (diff)
downloadpowder-68ab3ca3ca846ac5911cbfaa7c511b8f13108a54.zip
powder-68ab3ca3ca846ac5911cbfaa7c511b8f13108a54.tar.gz
More SPRK life checks for electronic elements
Check life>0, because SPRK changes back to its ctype when life==0. This could result in SPRK being found/not found depending on particle order, so pretend SPRK is not there if life==0 (it will disappear during the current frame).
Diffstat (limited to 'src/elements/dlay.c')
-rw-r--r--src/elements/dlay.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/elements/dlay.c b/src/elements/dlay.c
index 9fa32d5..cb2e2d8 100644
--- a/src/elements/dlay.c
+++ b/src/elements/dlay.c
@@ -19,7 +19,7 @@ int update_DLAY(UPDATE_FUNC_ARGS) {
r = pmap[y+ry][x+rx];
if (!r)
continue;
- if ((r&0xFF)==PT_SPRK && parts[i].life==0 && parts[r>>8].life<4 && parts[r>>8].ctype==PT_PSCN)
+ if ((r&0xFF)==PT_SPRK && parts[i].life==0 && parts[r>>8].life>0 && parts[r>>8].life<4 && parts[r>>8].ctype==PT_PSCN)
{
parts[i].life = (int)(parts[i].temp-273.15);
}