mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-21 10:53:51 +00:00
Code Issues Releases Wiki Activity

Move actors out of the water if there's room for them. Fixes #1138

Browse source
This commit is contained in:
Assumeru 2016-10-25 19:26:17 +02:00
parent 8a8aa664e3
commit a72cd896ca
1 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
apps/openmw/mwphysics/physicssystem.cpp
View file

@ -1318,11 +1318,34 @@ namespace MWPhysics
const MWMechanics::MagicEffects& effects = iter->first.getClass().getCreatureStats(iter->first).getMagicEffects(); const MWMechanics::MagicEffects& effects = iter->first.getClass().getCreatureStats(iter->first).getMagicEffects();
bool waterCollision = false; bool waterCollision = false;
if (effects.get(ESM::MagicEffect::WaterWalking).getMagnitude() if (cell->getCell()->hasWater() && effects.get(ESM::MagicEffect::WaterWalking).getMagnitude())
&& cell->getCell()->hasWater() {
&& !world->isUnderwater(iter->first.getCell(), if (!world->isUnderwater(iter->first.getCell(), osg::Vec3f(iter->first.getRefData().getPosition().asVec3())))
osg::Vec3f(iter->first.getRefData().getPosition().asVec3())))
waterCollision = true; waterCollision = true;
else
{
Actor *actor = getActor(iter->first);
// Actor can collide
if (actor->getCollisionMode())
{
const osg::Vec3f actorPosition = actor->getPosition();
const osg::Vec3f destinationPosition(actorPosition.x(), actorPosition.y(), waterlevel);
ActorTracer tracer;
tracer.doTrace(actor->getCollisionObject(), actorPosition, destinationPosition, mCollisionWorld);
if (tracer.mFraction >= 1.0f)
{
waterCollision = true;
actor->setPosition(destinationPosition);
}
else
{
//Remove the effect to remove the performance hit of casting in a weird spot
//probably makes that Tribunal quest where the water rises a bit safer
iter->first.getClass().getCreatureStats(iter->first).getActiveSpells().purgeEffect(ESM::MagicEffect::WaterWalking);
}
}
}
}
ActorMap::iterator foundActor = mActors.find(iter->first); ActorMap::iterator foundActor = mActors.find(iter->first);
if (foundActor == mActors.end()) // actor was already removed from the scene if (foundActor == mActors.end()) // actor was already removed from the scene