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

This commit is contained in:
Simon Robertshaw 2012-12-14 19:44:30 +00:00
commit ceee0b6dc5

View File

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