krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Merge pull request #328 from OpenMW/master

Browse source 
Add OpenMW commits up to 31 Oct 2017
This commit is contained in:
David Cernat 2017-10-31 06:22:57 +02:00 committed by GitHub
commit a31d43965f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwgui/inventorywindow.cpp
View file

@ -768,7 +768,7 @@ namespace MWGui
} }
} }
if (!found) if (!found || selected == cycled)
return; return;
useItem(model.getItem(cycled).mBase); useItem(model.getItem(cycled).mBase);

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);