diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-07-25 17:02:38 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-07-25 17:02:38 (GMT) |
| commit | 38e2eec80853b3a4e30315ccba23c551859df7d4 (patch) | |
| tree | 5f6d81e498b53cabaafbc5eb041e3222ed4c18a5 /src/simulation/elements | |
| parent | 0b77f1b2edfd0bc5fa998bc195f9ce7243ef76e7 (diff) | |
| download | powder-38e2eec80853b3a4e30315ccba23c551859df7d4.zip powder-38e2eec80853b3a4e30315ccba23c551859df7d4.tar.gz | |
TPT: Completely remove SING formation from fusion 81771d8672
Diffstat (limited to 'src/simulation/elements')
| -rw-r--r-- | src/simulation/elements/CO2.cpp | 1 | ||||
| -rw-r--r-- | src/simulation/elements/O2.cpp | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/src/simulation/elements/CO2.cpp b/src/simulation/elements/CO2.cpp index 6b33795..4e29286 100644 --- a/src/simulation/elements/CO2.cpp +++ b/src/simulation/elements/CO2.cpp @@ -87,7 +87,6 @@ int Element_CO2::update(UPDATE_FUNC_ARGS) j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NEUT); if (j != -1) parts[j].temp = 15000; 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; sim->pv[y/CELL][x/CELL] += 100; diff --git a/src/simulation/elements/O2.cpp b/src/simulation/elements/O2.cpp index 4a48512..e4eefdf 100644 --- a/src/simulation/elements/O2.cpp +++ b/src/simulation/elements/O2.cpp @@ -86,12 +86,6 @@ int Element_O2::update(UPDATE_FUNC_ARGS) 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_PHOT); if (j != -1) parts[j].temp = 15000; j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PLSM); if (j != -1) parts[j].temp = 15000; - if (rand()%5 < 2) { - 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 = rand()%25+50; - } - } parts[i].temp = 15000; sim->pv[y/CELL][x/CELL] += 300; |