diff options
| author | jacksonmj <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) |
| commit | 68ab3ca3ca846ac5911cbfaa7c511b8f13108a54 (patch) | |
| tree | 05de2af20a5756a2018532a26be65c1c4bb39f05 /src/elements/stor.c | |
| parent | 1a5cd45eb8949fd8e81019337e4a92278e83d19b (diff) | |
| download | powder-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/stor.c')
| -rw-r--r-- | src/elements/stor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/elements/stor.c b/src/elements/stor.c index b84f54f..16cd2c3 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 && 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) |