matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make damp sponge much less flammable

Browse Source 
Also make evaporation cool the sponge better
This commit is contained in:
jacksonmj 2011-04-28 16:52:13 +01:00 committed by Simon Robertshaw
parent 0aa4970b33
commit 59d9071e87
1 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/elements/spng.c
View File

@ -1,7 +1,7 @@
#include <element.h> #include <element.h>
int update_SPNG(UPDATE_FUNC_ARGS) { int update_SPNG(UPDATE_FUNC_ARGS) {
int r, trade, rx, ry, tmp; int r, trade, rx, ry, tmp, np;
if (pv[y/CELL][x/CELL]<=3&&pv[y/CELL][x/CELL]>=-3&&parts[i].temp<=374.0f) if (pv[y/CELL][x/CELL]<=3&&pv[y/CELL][x/CELL]>=-3&&parts[i].temp<=374.0f)
{ {
for (rx=-1; rx<2; rx++) for (rx=-1; rx<2; rx++)
@ -62,6 +62,9 @@ int update_SPNG(UPDATE_FUNC_ARGS) {
} }
} }
} }
tmp = 0;
if (parts[i].life>0)
{
for (rx=-1; rx<2; rx++) for (rx=-1; rx<2; rx++)
for (ry=-1; ry<2; ry++) for (ry=-1; ry<2; ry++)
if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry)) if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
@ -69,14 +72,21 @@ int update_SPNG(UPDATE_FUNC_ARGS) {
r = pmap[y+ry][x+rx]; r = pmap[y+ry][x+rx];
if ((r>>8)>=NPART || !r) if ((r>>8)>=NPART || !r)
continue; continue;
if ((r&0xFF)==PT_FIRE&&parts[i].life>0) if ((r&0xFF)==PT_FIRE)
{ {
if (parts[i].life<=2) tmp++;
parts[i].life --; if (parts[r>>8].life>60)
parts[r>>8].life -= parts[r>>8].life/60;
else if (parts[r>>8].life>2)
parts[r>>8].life--;
}
}
}
if (tmp && parts[i].life>3)
parts[i].life -= parts[i].life/3; parts[i].life -= parts[i].life/3;
} if (tmp>1)
} tmp = tmp/2;
if (parts[i].temp>=374) if (tmp || parts[i].temp>=374)
for (rx=-1; rx<2; rx++) for (rx=-1; rx<2; rx++)
for (ry=-1; ry<2; ry++) for (ry=-1; ry<2; ry++)
if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry)) if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
@ -88,10 +98,22 @@ int update_SPNG(UPDATE_FUNC_ARGS) {
continue; continue;
if ((!r)&&parts[i].life>=1)//if nothing then create steam if ((!r)&&parts[i].life>=1)//if nothing then create steam
{ {
create_part(-1,x+rx,y+ry,PT_WTRV); np = create_part(-1,x+rx,y+ry,PT_WTRV);
parts[i].life--; if (np>-1)
parts[i].temp -= 40.0f; {
parts[np].temp = parts[i].temp;
tmp--;
} }
parts[i].life--;
parts[i].temp -= 20.0f;
}
}
if (tmp>0)
{
if (parts[i].life>tmp)
parts[i].life -= tmp;
else
parts[i].life = 0;
} }
return 0; return 0;
} }