summaryrefslogtreecommitdiff
path: root/src/simulation/elements/CLST.cpp
diff options
context:
space:
mode:
authorcracker64 <cracker642@gmail.com>2013-02-28 17:37:16 (GMT)
committer cracker64 <cracker642@gmail.com>2013-02-28 17:37:16 (GMT)
commit5873d6958641af21b92fcb039d26c336331f19e7 (patch)
treea334e74d7cf79726f5c0a411515bed801ee0333f /src/simulation/elements/CLST.cpp
parentc65081d3ed44a97cea0f41a63e9ec07cf0feb5f2 (diff)
downloadpowder-5873d6958641af21b92fcb039d26c336331f19e7.zip
powder-5873d6958641af21b92fcb039d26c336331f19e7.tar.gz
Going through again.
Diffstat (limited to 'src/simulation/elements/CLST.cpp')
-rw-r--r--src/simulation/elements/CLST.cpp17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/simulation/elements/CLST.cpp b/src/simulation/elements/CLST.cpp
index 5a9d79f..c7b5627 100644
--- a/src/simulation/elements/CLST.cpp
+++ b/src/simulation/elements/CLST.cpp
@@ -58,23 +58,26 @@ int Element_CLST::update(UPDATE_FUNC_ARGS)
r = pmap[y+ry][x+rx];
if (!r)
continue;
- if ((r&0xFF)==PT_WATR && 1>(rand()%1500))
+ if ((r&0xFF)==PT_WATR)
{
- sim->part_change_type(i,x,y,PT_PSTS);
- sim->kill_part(r>>8);
+ if (!(rand()%1500))
+ {
+ sim->part_change_type(i,x,y,PT_PSTS);
+ sim->kill_part(r>>8);
+ }
}
- if ((r&0xFF)==PT_NITR)
+ else if ((r&0xFF)==PT_NITR)
{
sim->create_part(i, x, y, PT_BANG);
sim->create_part(r>>8, x+rx, y+ry, PT_BANG);
}
- if ((r&0xFF)==PT_CLST)
+ else if ((r&0xFF)==PT_CLST)
{
if(parts[i].temp <195)
cxy = 0.05;
- else if(parts[i].temp >= 195 && parts[i].temp <295)
+ else if(parts[i].temp <295)
cxy = 0.015;
- else if(parts[i].temp >= 295 && parts[i].temp <350)
+ else if(parts[i].temp <350)
cxy = 0.01;
else
cxy = 0.005;