summaryrefslogtreecommitdiff
path: root/src/simulation
diff options
context:
space:
mode:
authorSaveliy Skresanov <savask@yandex.ru>2013-08-15 15:02:24 (GMT)
committer Saveliy Skresanov <savask@yandex.ru>2013-08-15 15:02:24 (GMT)
commit12c471f25760aa8ec8b05ea7bf8d8defcff66059 (patch)
treebe9aec8c71f9aaddd394efd581c8ce89e4d82642 /src/simulation
parentce43a2898377c1c9fef5783470f038eeaa405d99 (diff)
downloadpowder-12c471f25760aa8ec8b05ea7bf8d8defcff66059.zip
powder-12c471f25760aa8ec8b05ea7bf8d8defcff66059.tar.gz
Soap freezing temp is -25C now
Diffstat (limited to 'src/simulation')
-rw-r--r--src/simulation/elements/SOAP.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/simulation/elements/SOAP.cpp b/src/simulation/elements/SOAP.cpp
index 79434e9..de7055d 100644
--- a/src/simulation/elements/SOAP.cpp
+++ b/src/simulation/elements/SOAP.cpp
@@ -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)
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].temp>0)
+ if (parts[i].temp>FREEZING)
{
if (parts[i].life<=0)
{
@@ -135,7 +137,7 @@ int Element_SOAP::update(UPDATE_FUNC_ARGS)
r = pmap[y+ry][x+rx];
if (!r && !sim->bmap[(y+ry)/CELL][(x+rx)/CELL])
continue;
- if (parts[i].temp>0)
+ if (parts[i].temp>FREEZING)
{
if (sim->bmap[(y+ry)/CELL][(x+rx)/CELL]
|| (r && sim->elements[r&0xFF].State != ST_GAS