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/swch.c | |
| parent | 56a3ad373c126da22be05e4c5b64a446c7d7dff0 (diff) | |
| download | powder-144e4bdb6991a042f9b985a9719299f612420dd0.zip powder-144e4bdb6991a042f9b985a9719299f612420dd0.tar.gz | |
Begin cleanup of update functions
Diffstat (limited to 'src/elements/swch.c')
| -rw-r--r-- | src/elements/swch.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/elements/swch.c b/src/elements/swch.c index a57f70c..2c538cc 100644 --- a/src/elements/swch.c +++ b/src/elements/swch.c @@ -1,17 +1,16 @@ #include <powder.h> int update_SWCH(UPDATE_FUNC_ARGS) { - int r, rt; - 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, rt, 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 (parts_avg(i,r>>8,PT_INSL)!=PT_INSL) { - rt = parts[r>>8].type; // not r&0xFF because pmap is not yet always updated (TODO) + rt = r&0xFF; if (rt==PT_SWCH) { if (parts[i].life==10&&parts[r>>8].life<10&&parts[r>>8].life>0) @@ -20,7 +19,7 @@ int update_SWCH(UPDATE_FUNC_ARGS) { parts[i].life = 10; } else if (rt==PT_SPRK&&parts[i].life==10&&parts[r>>8].ctype!=PT_PSCN&&parts[r>>8].ctype!=PT_NSCN) { - parts[i].type = PT_SPRK; + part_change_type(i,x,y,PT_SPRK); parts[i].ctype = PT_SWCH; parts[i].life = 4; } |