diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-25 15:32:51 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-25 15:32:51 (GMT) |
| commit | 9b10f0c39042885a6969324959dcd1c680a9a4d9 (patch) | |
| tree | 8724a76f5743ca4c0273861e129b6c849a63ca83 /src/simulation/elements/O2.cpp | |
| parent | bd9829124b3da2b495efd642982fd8e3497c83e9 (diff) | |
| download | powder-9b10f0c39042885a6969324959dcd1c680a9a4d9.zip powder-9b10f0c39042885a6969324959dcd1c680a9a4d9.tar.gz | |
Revert "final fusion fixes"
This reverts commit add4226f316b2e7abd0b988ef27cb4a7ca143c31.
Diffstat (limited to 'src/simulation/elements/O2.cpp')
| -rw-r--r-- | src/simulation/elements/O2.cpp | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/simulation/elements/O2.cpp b/src/simulation/elements/O2.cpp index a39dcdf..e4eefdf 100644 --- a/src/simulation/elements/O2.cpp +++ b/src/simulation/elements/O2.cpp @@ -69,8 +69,6 @@ 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; @@ -85,18 +83,9 @@ 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; - parts[j].tmp |= 8; - } + 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[i].temp = 15000; sim->pv[y/CELL][x/CELL] += 300; |