matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "HYGN now combusts and fuses properly"

Browse Source 
This reverts commit ede6876a82.
This commit is contained in:
Simon Robertshaw 2012-08-25 16:33:12 +01:00
parent 9b10f0c390
commit 1987efd6e5
1 changed files with 46 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/simulation/elements/H2.cpp
View File

@ -66,9 +66,9 @@ int Element_H2::update(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 && sim->pv[y/CELL][x/CELL] > 45)// && pv[y/CELL][x/CELL] > 50.0f)
if (parts[r>>8].temp > 2273.15)// && pv[y/CELL][x/CELL] > 50.0f)
continue;
if (sim->pv[x/CELL][y/CELL]<45)
if (parts[i].temp < 2273.15)
{
if (rt==PT_FIRE)
{
@ -80,9 +80,8 @@ int Element_H2::update(UPDATE_FUNC_ARGS)
if (rt==PT_FIRE || rt==PT_PLSM || rt==PT_LAVA)
{
sim->create_part(i,x,y,PT_FIRE);
parts[i].temp+=(rand()%250);
parts[i].temp+=(rand()/(RAND_MAX/100));
parts[i].tmp |= 1;
sim->pv[y/CELL][x/CELL] +=0.1f;
}
}
}