diff options
| author | jacksonmj <jacksonmj@jacksonmj.none> | 2011-01-10 00:46:34 (GMT) |
|---|---|---|
| committer | jacksonmj <jacksonmj@jacksonmj.none> | 2011-01-10 00:46:34 (GMT) |
| commit | 855281295fbc23366e8b84d7c8e55816d6f47a87 (patch) | |
| tree | 761d7cbaf37e3f10b1ee97f72d34f1da70d6732d /src/elements/amtr.c | |
| parent | 88d107f18a9c6d37493a953142a503d963ec37b1 (diff) | |
| download | powder-855281295fbc23366e8b84d7c8e55816d6f47a87.zip powder-855281295fbc23366e8b84d7c8e55816d6f47a87.tar.gz | |
More update functions cleanup.
Diffstat (limited to 'src/elements/amtr.c')
| -rw-r--r-- | src/elements/amtr.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/elements/amtr.c b/src/elements/amtr.c index 3f70daa..748254b 100644 --- a/src/elements/amtr.c +++ b/src/elements/amtr.c @@ -1,30 +1,26 @@ #include <powder.h> int update_AMTR(UPDATE_FUNC_ARGS) { - int r, rt; - for (nx=-1; nx<2; nx++) - for (ny=-1; ny<2; ny++) - if (x+nx>=0 && y+ny>0 && - x+nx<XRES && y+ny<YRES && (nx || ny)) + int r, rx, ry; + for (rx=-1; rx<2; rx++) + for (ry=-1; ry<2; 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; - rt = parts[r>>8].type; if ((r&0xFF)!=PT_AMTR && (r&0xFF)!=PT_DMND && (r&0xFF)!=PT_CLNE && (r&0xFF)!=PT_PCLN && (r&0xFF)!=PT_NONE && (r&0xFF)!=PT_PHOT && (r&0xFF)!=PT_VOID && (r&0xFF)!=PT_BHOL && (r&0xFF)!=PT_PRTI && (r&0xFF)!=PT_PRTO) { parts[i].life++; if (parts[i].life==3) { - parts[i].type = PT_NONE; kill_part(i); return 1; } - parts[r>>8].life = 0; - parts[r>>8].type = PT_NONE; - kill_part(r>>8); if (2>(rand()/(RAND_MAX/100))) - create_part(-1, x+nx, y+ny, PT_PHOT); + create_part(r>>8, x+rx, y+ry, PT_PHOT); + else + kill_part(r>>8); pv[y/CELL][x/CELL] -= 5.0f; } } |