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

Fix messed up revert

Browse Source
This commit is contained in:
Simon Robertshaw 2012-08-25 16:41:34 +01:00
parent 59a78621d9
commit 5c293ba9bf
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/simulation/Simulation.cpp
View File

@ -3922,13 +3922,10 @@ void Simulation::update_particles_i(int start, int inc)
y = (int)(parts[i].y+0.5f); y = (int)(parts[i].y+0.5f);
} }
#endif #endif
<<<<<<< HEAD
if(legacy_enable)//if heat sim is off if(legacy_enable)//if heat sim is off
Element::legacyUpdate(this, i,x,y,surround_space,nt, parts, pmap); Element::legacyUpdate(this, i,x,y,surround_space,nt, parts, pmap);
=======
//if (legacy_enable)//if heat sim is off
//update_legacy_all(this, i,x,y,surround_space,nt, parts, pmap); //TODO:pop
>>>>>>> parent of d6fe7fa... Basic realistic heat and latent heat support.
killed: killed:
if (parts[i].type == PT_NONE)//if its dead, skip to next particle if (parts[i].type == PT_NONE)//if its dead, skip to next particle