diff --git a/src/simulation/elements/FIRE.cpp b/src/simulation/elements/FIRE.cpp index 2fcf1674a..b813857fc 100644 --- a/src/simulation/elements/FIRE.cpp +++ b/src/simulation/elements/FIRE.cpp @@ -163,42 +163,6 @@ int Element_FIRE::updateLegacy(UPDATE_FUNC_ARGS) { continue; rt = r&0xFF; - //THRM burning - if (rt==PT_THRM && (t==PT_FIRE || t==PT_PLSM || t==PT_LAVA)) - { - if (!(rand()%500)) { - sim->part_change_type(r>>8,x+rx,y+ry,PT_LAVA); - parts[r>>8].ctype = PT_BMTL; - parts[r>>8].temp = 3500.0f; - sim->pv[(y+ry)/CELL][(x+rx)/CELL] += 50.0f; - } else { - sim->part_change_type(r>>8,x+rx,y+ry,PT_LAVA); - parts[r>>8].life = 400; - parts[r>>8].ctype = PT_THRM; - parts[r>>8].temp = 3500.0f; - parts[r>>8].tmp = 20; - } - continue; - } - - if ((rt==PT_COAL) || (rt==PT_BCOL)) - { - if ((t==PT_FIRE || t==PT_PLSM)) - { - if (parts[r>>8].life>100 && !(rand()%500)) { - parts[r>>8].life = 99; - } - } - else if (t==PT_LAVA) - { - if (parts[i].ctype == PT_IRON && !(rand()%500)) { - parts[i].ctype = PT_METL; - sim->kill_part(r>>8); - } - } - } - - lpv = (int)sim->pv[(y+ry)/CELL][(x+rx)/CELL]; if (lpv < 1) lpv = 1; if (t!=PT_SPRK && sim->elements[rt].Meltable && ((rt!=PT_RBDM && rt!=PT_LRBD) || t!=PT_SPRK) && ((t!=PT_FIRE&&t!=PT_PLSM) || (rt!=PT_METL && rt!=PT_IRON && rt!=PT_ETRD && rt!=PT_PSCN && rt!=PT_NSCN && rt!=PT_NTCT && rt!=PT_PTCT && rt!=PT_BMTL && rt!=PT_BRMT && rt!=PT_SALT && rt!=PT_INWR)) &&sim->elements[rt].Meltable*lpv>(rand()%1000))