summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-12-14 19:44:30 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-12-14 19:44:30 (GMT)
commitceee0b6dc5eb2d8a0aa2e4d2849a22719546fcbd (patch)
tree69a28d8a8a14a42bc286bbe365c2653ac6ba026c /src
parent31c06669611fa3e4c3db51e1c25c99b466e6743f (diff)
parentf03fb976201e17b5512838963c0ed268944c90a3 (diff)
downloadpowder-ceee0b6dc5eb2d8a0aa2e4d2849a22719546fcbd.zip
powder-ceee0b6dc5eb2d8a0aa2e4d2849a22719546fcbd.tar.gz
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src')
-rw-r--r--src/simulation/Simulation.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp
index f95a451..9c8bffd 100644
--- a/src/simulation/Simulation.cpp
+++ b/src/simulation/Simulation.cpp
@@ -4638,12 +4638,11 @@ 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(gravWallChanged)
+ {
+ grav->gravity_mask();
+ gravWallChanged = false;
}
if(emp_decor>0)
emp_decor -= emp_decor/25+2;