summaryrefslogtreecommitdiff
path: root/src/elements/bcol.c
diff options
context:
space:
mode:
authorjacksonmj <jacksonmj@jacksonmj.none>2011-01-10 00:46:34 (GMT)
committer jacksonmj <jacksonmj@jacksonmj.none>2011-01-10 00:46:34 (GMT)
commit855281295fbc23366e8b84d7c8e55816d6f47a87 (patch)
tree761d7cbaf37e3f10b1ee97f72d34f1da70d6732d /src/elements/bcol.c
parent88d107f18a9c6d37493a953142a503d963ec37b1 (diff)
downloadpowder-855281295fbc23366e8b84d7c8e55816d6f47a87.zip
powder-855281295fbc23366e8b84d7c8e55816d6f47a87.tar.gz
More update functions cleanup.
Diffstat (limited to 'src/elements/bcol.c')
-rw-r--r--src/elements/bcol.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/elements/bcol.c b/src/elements/bcol.c
index 1054935..b7947bd 100644
--- a/src/elements/bcol.c
+++ b/src/elements/bcol.c
@@ -1,23 +1,20 @@
#include <powder.h>
int update_BCOL(UPDATE_FUNC_ARGS) {
- int r;
+ int r, rx, ry;
if (parts[i].life<=0) {
- parts[i].type = PT_NONE;
- kill_part(i);
- create_part(-1, x, y, PT_FIRE);
+ create_part(i, x, y, PT_FIRE);
return 1;
} else if (parts[i].life < 100) {
parts[i].life--;
create_part(-1, x+rand()%3-1, y+rand()%3-1, PT_FIRE);
}
- for (nx=-2; nx<3; nx++)
- for (ny=-2; ny<3; ny++)
- if (x+nx>=0 && y+ny>0 &&
- x+nx<XRES && y+ny<YRES && (nx || ny))
+ for (rx=-2; rx<3; rx++)
+ for (ry=-2; ry<3; ry++)
+ if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
{
- r = pmap[y+ny][x+nx];
+ r = pmap[y+ry][x+rx];
if ((r>>8)>=NPART || !r)
continue;
if (((r&0xFF)==PT_FIRE || (r&0xFF)==PT_PLSM) && 1>(rand()%500))