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/rime.c | |
| parent | 88d107f18a9c6d37493a953142a503d963ec37b1 (diff) | |
| download | powder-855281295fbc23366e8b84d7c8e55816d6f47a87.zip powder-855281295fbc23366e8b84d7c8e55816d6f47a87.tar.gz | |
More update functions cleanup.
Diffstat (limited to 'src/elements/rime.c')
| -rw-r--r-- | src/elements/rime.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/elements/rime.c b/src/elements/rime.c index d78e322..845d8a2 100644 --- a/src/elements/rime.c +++ b/src/elements/rime.c @@ -1,26 +1,24 @@ #include <powder.h> int update_RIME(UPDATE_FUNC_ARGS) { - int r, rt; + int r, rx, ry; parts[i].vx = 0; parts[i].vy = 0; - 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)) + 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 (rt==PT_SPRK) + if ((r&0xFF)==PT_SPRK) { - parts[i].type = PT_FOG; + part_change_type(i,x,y,PT_FOG); parts[i].life = rand()%50 + 60; } - else if (rt==PT_FOG&&parts[r>>8].life>0) + else if ((r&0xFF)==PT_FOG&&parts[r>>8].life>0) { - parts[i].type = PT_FOG; + part_change_type(i,x,y,PT_FOG); parts[i].life = parts[r>>8].life; } } |