summaryrefslogtreecommitdiff
path: root/src/simulation/elements/CO2.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-07-25 17:01:15 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-07-25 17:01:15 (GMT)
commit971fbc71f94a85298e3a688ca772e7bb5de90ed6 (patch)
tree5648a18159a484dce6d2ba398b5c9984db42e3b8 /src/simulation/elements/CO2.cpp
parent2135d886442f6d44a07ca8b34ec410e9ed0a4126 (diff)
downloadpowder-971fbc71f94a85298e3a688ca772e7bb5de90ed6.zip
powder-971fbc71f94a85298e3a688ca772e7bb5de90ed6.tar.gz
TPT: fix compression during fusion 287822229f
Diffstat (limited to 'src/simulation/elements/CO2.cpp')
-rw-r--r--src/simulation/elements/CO2.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/simulation/elements/CO2.cpp b/src/simulation/elements/CO2.cpp
index 745dedd..6b33795 100644
--- a/src/simulation/elements/CO2.cpp
+++ b/src/simulation/elements/CO2.cpp
@@ -83,15 +83,14 @@ int Element_CO2::update(UPDATE_FUNC_ARGS)
if (rand()%5 < 1)
{
int j;
- sim->kill_part(i);
+ sim->create_part(i,x,y,PT_O2);
+
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NEUT); if (j != -1) parts[j].temp = 15000;
- j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_ELEC); if (j != -1) parts[j].temp = 15000;
- j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_O2); if (j != -1) parts[j].temp = 15000;
- if (rand()%1000 < 1) { j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_SING); if (j != -1) { parts[j].temp = 15000; parts[i].life = 3; } }
+ if (!(rand()%50)) { j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_ELEC); if (j != -1) parts[j].temp = 15000; }
+ //if (rand()%1000 < 1) { j = create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_SING); if (j != -1) { parts[j].temp = 15000; parts[i].life = 3; } }
- parts[i].temp += 15000;
+ parts[i].temp = 15000;
sim->pv[y/CELL][x/CELL] += 100;
- return 1;
}
}
return 0;