From 38e2eec80853b3a4e30315ccba23c551859df7d4 Mon Sep 17 00:00:00 2001 From: Simon Robertshaw Date: Wed, 25 Jul 2012 18:02:38 +0100 Subject: [PATCH] TPT: Completely remove SING formation from fusion 81771d8672 --- src/simulation/elements/CO2.cpp | 1 - src/simulation/elements/O2.cpp | 6 ------ 2 files changed, 7 deletions(-) diff --git a/src/simulation/elements/CO2.cpp b/src/simulation/elements/CO2.cpp index 6b33795f7..4e2928649 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 4a48512b5..e4eefdf86 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;