diff options
| author | jacksonmj <jacksonmj@jacksonmj.none> | 2011-01-29 10:45:27 (GMT) |
|---|---|---|
| committer | jacksonmj <jacksonmj@jacksonmj.none> | 2011-01-29 10:50:43 (GMT) |
| commit | 9938378c0d7eed11dc3cf2db67dfd32d0c31dfd7 (patch) | |
| tree | d75a70b7ea481142563ac6d4d9799aee65c2e1e8 /src/elements/sprk.c | |
| parent | fe033ce859b1d5db91fa840e0353403ab19b0d3a (diff) | |
| parent | 4b5337c03a0a64a12e1d66829c14af73f1ff0398 (diff) | |
| download | powder-9938378c0d7eed11dc3cf2db67dfd32d0c31dfd7.zip powder-9938378c0d7eed11dc3cf2db67dfd32d0c31dfd7.tar.gz | |
Merge remote branch 'cracker64' into dev
Conflicts:
includes/element.h
includes/powder.h
src/elements/firw.c
src/elements/legacy.c
src/elements/phot.c
src/elements/sprk.c
src/graphics.c
src/main.c
src/powder.c
Diffstat (limited to 'src/elements/sprk.c')
| -rw-r--r-- | src/elements/sprk.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/elements/sprk.c b/src/elements/sprk.c index 58692ee..ddac968 100644 --- a/src/elements/sprk.c +++ b/src/elements/sprk.c @@ -1,8 +1,9 @@ #include <element.h> int update_SPRK(UPDATE_FUNC_ARGS) { - update_PYRO(UPDATE_FUNC_SUBCALL_ARGS); int r, rx, ry, rt, conduct_sprk, nearp, pavg, ct = parts[i].ctype; + update_PYRO(UPDATE_FUNC_SUBCALL_ARGS); + if (parts[i].life<=0) { if (ct==PT_WATR||ct==PT_SLTW||ct==PT_PSCN||ct==PT_NSCN||ct==PT_ETRD||ct==PT_INWR) |