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

Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy

Browse Source
This commit is contained in:
Simon Robertshaw 2012-12-14 19:44:30 +00:00
commit ceee0b6dc5
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/simulation/Simulation.cpp
View File

@ -4638,13 +4638,12 @@ void Simulation::update_particles()//doesn't update the particles themselves, bu
gravy = grav->gravy; gravy = grav->gravy;
gravp = grav->gravp; gravp = grav->gravp;
gravmap = grav->gravmap; gravmap = grav->gravmap;
}
if(gravWallChanged) if(gravWallChanged)
{ {
grav->gravity_mask(); grav->gravity_mask();
gravWallChanged = false; gravWallChanged = false;
} }
}
if(emp_decor>0) if(emp_decor>0)
emp_decor -= emp_decor/25+2; emp_decor -= emp_decor/25+2;
if(emp_decor < 0) if(emp_decor < 0)