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

Soap freezing temp is -25C now

Browse Source
This commit is contained in:
Saveliy Skresanov 2013-08-15 22:02:24 +07:00
parent ce43a28983
commit 12c471f257
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/simulation/elements/SOAP.cpp
View File

@ -68,6 +68,8 @@ void Element_SOAP::attach(Particle * parts, int i1, int i2)
} }
} }
#define FREEZING 248.15f
//#TPT-Directive ElementHeader Element_SOAP static int update(UPDATE_FUNC_ARGS) //#TPT-Directive ElementHeader Element_SOAP static int update(UPDATE_FUNC_ARGS)
int Element_SOAP::update(UPDATE_FUNC_ARGS) int Element_SOAP::update(UPDATE_FUNC_ARGS)
@ -82,7 +84,7 @@ int Element_SOAP::update(UPDATE_FUNC_ARGS)
if (parts[i].ctype&1) if (parts[i].ctype&1)
{ {
if (parts[i].temp>0) if (parts[i].temp>FREEZING)
{ {
if (parts[i].life<=0) if (parts[i].life<=0)
{ {
@ -135,7 +137,7 @@ int Element_SOAP::update(UPDATE_FUNC_ARGS)
r = pmap[y+ry][x+rx]; r = pmap[y+ry][x+rx];
if (!r && !sim->bmap[(y+ry)/CELL][(x+rx)/CELL]) if (!r && !sim->bmap[(y+ry)/CELL][(x+rx)/CELL])
continue; continue;
if (parts[i].temp>0) if (parts[i].temp>FREEZING)
{ {
if (sim->bmap[(y+ry)/CELL][(x+rx)/CELL] if (sim->bmap[(y+ry)/CELL][(x+rx)/CELL]
|| (r && sim->elements[r&0xFF].State != ST_GAS || (r && sim->elements[r&0xFF].State != ST_GAS