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

Make an actor fly when it has a levitate effect

Browse source
This commit is contained in:
Chris Robinson 2013-02-20 01:55:12 -08:00
parent 6ae00be8a3
commit cfdc820a1f
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
apps/openmw/mwworld/worldimp.cpp
View file

@ -12,6 +12,8 @@
#include "../mwbase/windowmanager.hpp"
#include "../mwbase/scriptmanager.hpp"
#include "../mwmechanics/creaturestats.hpp"
#include "../mwrender/sky.hpp"
#include "../mwrender/player.hpp"
@ -886,12 +888,14 @@ namespace MWWorld
player = iter;
continue;
}
Ogre::Vector3 vec = mPhysics->move(iter->first, iter->second, duration, !isSwimming(iter->first));
Ogre::Vector3 vec = mPhysics->move(iter->first, iter->second, duration,
!isSwimming(iter->first) && !isFlying(iter->first));
moveObjectImp(iter->first, vec.x, vec.y, vec.z);
}
if(player != actors.end())
{
Ogre::Vector3 vec = mPhysics->move(player->first, player->second, duration, !isSwimming(player->first));
Ogre::Vector3 vec = mPhysics->move(player->first, player->second, duration,
!isSwimming(player->first) && !isFlying(player->first));
moveObjectImp(player->first, vec.x, vec.y, vec.z);
}
// the only purpose this has currently is to update the debug drawer
@ -1386,11 +1390,15 @@ namespace MWWorld
World::isFlying(const MWWorld::Ptr &ptr) const
{
RefData &refdata = ptr.getRefData();
/// \todo check for levitation effects
const OEngine::Physic::PhysicActor *physactor = mPhysEngine->getCharacter(refdata.getHandle());
if(physactor && physactor->getCollisionMode())
return false;
return true;
if(!physactor || !physactor->getCollisionMode())
return true;
const MWWorld::Class &cls = MWWorld::Class::get(ptr);
if(cls.isActor() && cls.getCreatureStats(ptr).getMagicEffects().get(MWMechanics::EffectKey(10/*levitate*/)).mMagnitude > 0)
return true;
return false;
}
bool