diff options
| author | jacob1 <jfu614@gmail.com> | 2012-10-12 18:47:46 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-10-26 14:12:13 (GMT) |
| commit | 947660fcd445be2e09fe52da912547a69c685ba7 (patch) | |
| tree | eefa62f38b206497b45d85ff5e888d4ed788c106 /src/simulation/elements/O2.cpp | |
| parent | ccd9284e61ee453e8f0541af671c3199548853a4 (diff) | |
| download | powder-947660fcd445be2e09fe52da912547a69c685ba7.zip powder-947660fcd445be2e09fe52da912547a69c685ba7.tar.gz | |
Fix hydrogen not burning right (with and without realistic heat), allow h2 to burn at all temps while still allowing fusion to work correctly
Diffstat (limited to 'src/simulation/elements/O2.cpp')
| -rw-r--r-- | src/simulation/elements/O2.cpp | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/src/simulation/elements/O2.cpp b/src/simulation/elements/O2.cpp index e4eefdf..20bd902 100644 --- a/src/simulation/elements/O2.cpp +++ b/src/simulation/elements/O2.cpp @@ -50,8 +50,6 @@ Element_O2::Element_O2() int Element_O2::update(UPDATE_FUNC_ARGS) { int r,rx,ry; - if (parts[i].temp < 9773.15) - { for (rx=-2; rx<3; rx++) for (ry=-2; ry<3; ry++) if (x+rx>=0 && y+ry>=0 && x+rx<XRES && y+ry<YRES && (rx || ry)) @@ -67,7 +65,7 @@ int Element_O2::update(UPDATE_FUNC_ARGS) parts[r>>8].temp=3473; parts[r>>8].tmp |= 2; } - if ((r&0xFF)==PT_FIRE || (r&0xFF)==PT_PLSM) + if ((r&0xFF)==PT_FIRE || ((r&0xFF)==PT_PLSM && !(parts[r>>8].tmp&4))) { sim->create_part(i,x,y,PT_FIRE); parts[i].temp+=(rand()/(RAND_MAX/100)); @@ -75,17 +73,25 @@ int Element_O2::update(UPDATE_FUNC_ARGS) } } - } - else if (parts[i].temp > 9973.15 && sim->pv[y/CELL][x/CELL] > 250.0f && abs(sim->gravx[((y/CELL)*(XRES/CELL))+(x/CELL)]) + abs(sim->gravy[((y/CELL)*(XRES/CELL))+(x/CELL)]) > 20) + if (parts[i].temp > 9973.15 && sim->pv[y/CELL][x/CELL] > 250.0f && abs(sim->gravx[((y/CELL)*(XRES/CELL))+(x/CELL)]) + abs(sim->gravy[((y/CELL)*(XRES/CELL))+(x/CELL)]) > 20) { if (rand()%5 < 1) { 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 |= 4; + } parts[i].temp = 15000; sim->pv[y/CELL][x/CELL] += 300; |