diff options
| author | Simon <simon@hardwired.org.uk> | 2011-04-04 15:26:29 (GMT) |
|---|---|---|
| committer | Simon <simon@hardwired.org.uk> | 2011-04-04 15:26:29 (GMT) |
| commit | 050f71fbabba071a804d4c5a191999517c2e04ef (patch) | |
| tree | f3a439d4ddadb808cc26d17749fec79c7767efc5 /src/elements/O2.c | |
| parent | a1b13080391d95db588fe90a1813d60bd6d00d50 (diff) | |
| parent | db406494bd32d46cfff71cf387c682c1e32d9601 (diff) | |
| download | powder-050f71fbabba071a804d4c5a191999517c2e04ef.zip powder-050f71fbabba071a804d4c5a191999517c2e04ef.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src/elements/O2.c')
| -rw-r--r-- | src/elements/O2.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/src/elements/O2.c b/src/elements/O2.c index 1413d0a..4c019d3 100644 --- a/src/elements/O2.c +++ b/src/elements/O2.c @@ -2,7 +2,7 @@ int update_O2(UPDATE_FUNC_ARGS) { - int r,rx,ry; + int r,rx,ry,n,nx,ny; 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)) @@ -17,7 +17,26 @@ int update_O2(UPDATE_FUNC_ARGS) parts[r>>8].temp+=(rand()/(RAND_MAX/100)); parts[i].tmp++; } + } + + if(pv[y\CELL][x\CELL] > 8.0f) + { + 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+ry][x+rx]; + if ((r>>8)>=NPART || !r) + continue; + if((r&0xFF)==PT_H2) + if(50<(rand()/(RAND_MAX/100))) + part_change_type(i,x,y,PT_WATR) + part_change_type(r,rx,rx,PT_WATR) + } + } + + if(parts[i].tmp>=50) { create_part(i,x,y,PT_FIRE); |