Merge remote branch 'gus/collisions' into collision

14 years ago · 8788dcebcf
parent 647e88003e 8aeefd2af8
commit 8788dcebcf
1 changed files with 4 additions and 2 deletions
--- a/apps/openmw/mwrender/mwscene.cpp
+++ b/apps/openmw/mwrender/mwscene.cpp
@ -175,12 +175,14 @@ void MWScene::toggleCollisionMode()
        if(cmode)
        {
            act->enableCollisions(false);
-            act->setGravity(0);
+            act->setGravity(0.);
+            act->setVerticalVelocity(0);
        }
        else
        {
            act->enableCollisions(true);
-            act->setGravity(10);
+            act->setGravity(10.);
+            act->setVerticalVelocity(0);
        }
    }
 }