diff options
| author | Bryan Hoyle <starfoxprime@gmail.com> | 2012-08-20 21:46:51 (GMT) |
|---|---|---|
| committer | Bryan Hoyle <starfoxprime@gmail.com> | 2012-08-20 21:46:51 (GMT) |
| commit | add4226f316b2e7abd0b988ef27cb4a7ca143c31 (patch) | |
| tree | 219cab914f5d4c5d3b8e97a9550608da96c388c6 /src/simulation/elements/O2.cpp | |
| parent | a403be989090b3eada9c06b1a68c9b58bd5c1b1b (diff) | |
| download | powder-add4226f316b2e7abd0b988ef27cb4a7ca143c31.zip powder-add4226f316b2e7abd0b988ef27cb4a7ca143c31.tar.gz | |
final fusion fixes
Diffstat (limited to 'src/simulation/elements/O2.cpp')
| -rw-r--r-- | src/simulation/elements/O2.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/simulation/elements/O2.cpp b/src/simulation/elements/O2.cpp index e4eefdf..a39dcdf 100644 --- a/src/simulation/elements/O2.cpp +++ b/src/simulation/elements/O2.cpp @@ -69,6 +69,8 @@ int Element_O2::update(UPDATE_FUNC_ARGS) } if ((r&0xFF)==PT_FIRE || (r&0xFF)==PT_PLSM) { + if((r&0xFF)==PT_PLSM && parts[r>>8].tmp&8) + continue; sim->create_part(i,x,y,PT_FIRE); parts[i].temp+=(rand()/(RAND_MAX/100)); parts[i].tmp |= 2; @@ -83,9 +85,18 @@ int Element_O2::update(UPDATE_FUNC_ARGS) int j; sim->create_part(i,x,y,PT_BRMT); - 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; + 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; + parts[j].tmp |= 8; + } parts[i].temp = 15000; sim->pv[y/CELL][x/CELL] += 300; |