diff options
| author | jacksonmj <jacksonmj@jacksonmj.none> | 2011-01-09 19:23:05 (GMT) |
|---|---|---|
| committer | jacksonmj <jacksonmj@jacksonmj.none> | 2011-01-09 19:23:05 (GMT) |
| commit | 144e4bdb6991a042f9b985a9719299f612420dd0 (patch) | |
| tree | 3da5132fc731dea1334048c707f4c074e390a86c /src/elements/thdr.c | |
| parent | 56a3ad373c126da22be05e4c5b64a446c7d7dff0 (diff) | |
| download | powder-144e4bdb6991a042f9b985a9719299f612420dd0.zip powder-144e4bdb6991a042f9b985a9719299f612420dd0.tar.gz | |
Begin cleanup of update functions
Diffstat (limited to 'src/elements/thdr.c')
| -rw-r--r-- | src/elements/thdr.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/elements/thdr.c b/src/elements/thdr.c index 3d46f9d..0f25ccd 100644 --- a/src/elements/thdr.c +++ b/src/elements/thdr.c @@ -1,20 +1,19 @@ #include <powder.h> int update_THDR(UPDATE_FUNC_ARGS) { - int r; - 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)) + int r, rx, ry; + 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 ((ptypes[r&0xFF].properties&PROP_CONDUCTS) && parts[r>>8].life==0 && !((r&0xFF)==PT_WATR||(r&0xFF)==PT_SLTW) && parts[r>>8].ctype!=PT_SPRK) { parts[i].type = PT_NONE; parts[r>>8].ctype = parts[r>>8].type; - parts[r>>8].type = PT_SPRK; + part_change_type(r>>8,x+rx,y+ry,PT_SPRK); parts[r>>8].life = 4; } else if ((r&0xFF)!=PT_CLNE&&(r&0xFF)!=PT_THDR&&(r&0xFF)!=PT_SPRK&&(r&0xFF)!=PT_DMND&&(r&0xFF)!=PT_FIRE&&(r&0xFF)!=PT_NEUT&&(r&0xFF)!=PT_PHOT&&(r&0xFF)) @@ -23,7 +22,7 @@ int update_THDR(UPDATE_FUNC_ARGS) { if (legacy_enable&&1>(rand()%200)) { parts[i].life = rand()%50+120; - parts[i].type = PT_FIRE; + part_change_type(i,x,y,PT_FIRE); } else { @@ -31,5 +30,9 @@ int update_THDR(UPDATE_FUNC_ARGS) { } } } + if (parts[i].type==PT_NONE) { + kill_part(i); + return 1; + } return 0; } |