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/wtrv.c | |
| parent | 56a3ad373c126da22be05e4c5b64a446c7d7dff0 (diff) | |
| download | powder-144e4bdb6991a042f9b985a9719299f612420dd0.zip powder-144e4bdb6991a042f9b985a9719299f612420dd0.tar.gz | |
Begin cleanup of update functions
Diffstat (limited to 'src/elements/wtrv.c')
| -rw-r--r-- | src/elements/wtrv.c | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/src/elements/wtrv.c b/src/elements/wtrv.c index ff7b869..45ffb30 100644 --- a/src/elements/wtrv.c +++ b/src/elements/wtrv.c @@ -1,32 +1,18 @@ #include <powder.h> int update_WTRV(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 (((r&0xFF)==PT_WATR||(r&0xFF)==PT_DSTW||(r&0xFF)==PT_SLTW) && 1>(rand()%1000) && legacy_enable) - { - parts[i].type = PT_WATR; - parts[r>>8].type = PT_WATR; - } - - if (((r&0xFF)==PT_RBDM||(r&0xFF)==PT_LRBD) && parts[i].temp>12.0f && 1>(rand()%500)) + if (((r&0xFF)==PT_RBDM||(r&0xFF)==PT_LRBD) && !legacy_enable && parts[i].temp>(273.15f+12.0f) && 1>(rand()%500)) { + part_change_type(i,x,y,PT_FIRE); parts[i].life = 4; - parts[i].type = PT_FIRE; - - } - if (((r&0xFF)==PT_ICEI || (r&0xFF)==PT_SNOW) && 1>(rand()%1000) && legacy_enable) - { - parts[i].type = PT_WATR; - if (1>(rand()%1000)) - parts[r>>8].type = PT_WATR; } } return 0; |