mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-25 03:40:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1527 from drummyfish/master

Browse Source 
Remove redundant condition
This commit is contained in:
scrawl 2017-10-28 15:59:35 +00:00 committed by GitHub
commit 9c9da7b49f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/openmw/mwphysics/physicssystem.cpp
View File

@ -357,10 +357,9 @@ namespace MWPhysics
osg::Vec3f nextpos = newPosition + velocity * remainingTime; osg::Vec3f nextpos = newPosition + velocity * remainingTime;
// If not able to fly, don't allow to swim up into the air // If not able to fly, don't allow to swim up into the air
if(newPosition.z() < swimlevel && if(!isFlying && // can't fly
!isFlying && // can't fly
nextpos.z() > swimlevel && // but about to go above water nextpos.z() > swimlevel && // but about to go above water
newPosition.z() <= swimlevel) newPosition.z() < swimlevel)
{ {
const osg::Vec3f down(0,0,-1); const osg::Vec3f down(0,0,-1);
velocity = slide(velocity, down); velocity = slide(velocity, down);