diff options
Diffstat (limited to 'src/elements/h2.cpp')
| -rw-r--r-- | src/elements/h2.cpp | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/src/elements/h2.cpp b/src/elements/h2.cpp index dba08e9..7298ebc 100644 --- a/src/elements/h2.cpp +++ b/src/elements/h2.cpp @@ -3,6 +3,8 @@ int update_H2(UPDATE_FUNC_ARGS) { int r,rx,ry,rt; + if (parts[i].temp > 2273.15 && sim->pv[y/CELL][x/CELL] > 50.0f) + parts[i].tmp = 1; 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)) @@ -16,24 +18,24 @@ int update_H2(UPDATE_FUNC_ARGS) sim->part_change_type(r>>8,x+rx,y+ry,PT_WATR); sim->part_change_type(i,x,y,PT_OIL); } + if (parts[r>>8].temp > 2273.15)// && pv[y/CELL][x/CELL] > 50.0f) + continue; if (parts[i].tmp != 1) { - if ((r&0xFF)==PT_FIRE) + if (rt==PT_FIRE) { parts[r>>8].temp=2473.15; if(parts[r>>8].tmp&0x02) parts[r>>8].temp=3473; parts[r>>8].tmp |= 1; } - if ((r&0xFF)==PT_FIRE || (r&0xFF)==PT_PLSM || (r&0xFF)==PT_LAVA) + if (rt==PT_FIRE || rt==PT_PLSM || rt==PT_LAVA) { sim->create_part(i,x,y,PT_FIRE); parts[i].temp+=(rand()/(RAND_MAX/100)); parts[i].tmp |= 1; } } - if (parts[i].temp > 2273.15 && sim->pv[y/CELL][x/CELL] > 50.0f && (r&0xFF) == PT_H2) - parts[r>>8].tmp = 1; } if (parts[i].temp > 2273.15 && sim->pv[y/CELL][x/CELL] > 50.0f) { @@ -42,14 +44,19 @@ int update_H2(UPDATE_FUNC_ARGS) { int j; sim->part_change_type(i,x,y,PT_PLSM); + parts[i].life = rand()%150+50; sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NEUT); sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_ELEC); j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PHOT); - if (j) - parts[j].ctype = 0xFFFF00; - sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NBLE); + if (j) parts[j].ctype = 0xFFFF00; + + j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NBLE); + if (j) parts[j].tmp = 1; if (rand()%2) - sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NBLE); + { + j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NBLE); + if (j) parts[j].tmp = 1; + } if (parts[i].temp < 4273.15) parts[i].temp = 4273.15; sim->pv[y/CELL][x/CELL] += 50; |