diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-21 00:09:37 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-21 00:09:37 (GMT) |
| commit | c9997f8aeaacf3c823c56a66835552d2b4c0372e (patch) | |
| tree | 591badfddeeffe0a173f460c5136ca2124c971b4 /src/simulation/elements/O2.cpp | |
| parent | ba1ce66968c4e8c016e463cb52d928f0b018b005 (diff) | |
| parent | add4226f316b2e7abd0b988ef27cb4a7ca143c31 (diff) | |
| download | powder-c9997f8aeaacf3c823c56a66835552d2b4c0372e.zip powder-c9997f8aeaacf3c823c56a66835552d2b4c0372e.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/PowderToypp
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; |