mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-22 07:41:36 +00:00
Code Issues Releases Wiki Activity

Merge branch 'feet_stay_wet' into 'master'

Browse source 
Use the teleported Ptr to determine if water walking should be canceled

Closes #7227

See merge request OpenMW/openmw!2731
This commit is contained in:
psi29a 2023-02-13 17:51:42 +00:00
commit bf0da418f9
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
apps/openmw/mwworld/actionteleport.cpp
View file

@ -48,6 +48,7 @@ namespace MWWorld
MWWorld::WorldModel* worldModel = MWBase::Environment::get().getWorldModel(); MWWorld::WorldModel* worldModel = MWBase::Environment::get().getWorldModel();
actor.getClass().getCreatureStats(actor).land(actor == world->getPlayerPtr()); actor.getClass().getCreatureStats(actor).land(actor == world->getPlayerPtr());
Ptr teleported;
if (actor == world->getPlayerPtr()) if (actor == world->getPlayerPtr())
{ {
world->getPlayer().setTeleported(true); world->getPlayer().setTeleported(true);
@ -55,23 +56,31 @@ namespace MWWorld
world->changeToExteriorCell(mPosition, true); world->changeToExteriorCell(mPosition, true);
else else
world->changeToInteriorCell(mCellName, mPosition, true); world->changeToInteriorCell(mCellName, mPosition, true);
teleported = world->getPlayerPtr();
} }
else else
{ {
if (actor.getClass().getCreatureStats(actor).getAiSequence().isInCombat(world->getPlayerPtr())) if (actor.getClass().getCreatureStats(actor).getAiSequence().isInCombat(world->getPlayerPtr()))
{
actor.getClass().getCreatureStats(actor).getAiSequence().stopCombat(); actor.getClass().getCreatureStats(actor).getAiSequence().stopCombat();
return;
}
else if (mCellName.empty()) else if (mCellName.empty())
{ {
const osg::Vec2i index = positionToCellIndex(mPosition.pos[0], mPosition.pos[1]); const osg::Vec2i index = positionToCellIndex(mPosition.pos[0], mPosition.pos[1]);
world->moveObject(actor, worldModel->getExterior(index.x(), index.y()), mPosition.asVec3(), true, true); teleported = world->moveObject(
actor, worldModel->getExterior(index.x(), index.y()), mPosition.asVec3(), true, true);
} }
else else
world->moveObject(actor, worldModel->getInterior(mCellName), mPosition.asVec3(), true, true); teleported
= world->moveObject(actor, worldModel->getInterior(mCellName), mPosition.asVec3(), true, true);
} }
if (!world->isWaterWalkingCastableOnTarget(actor) && MWMechanics::hasWaterWalking(actor)) if (!world->isWaterWalkingCastableOnTarget(teleported) && MWMechanics::hasWaterWalking(teleported))
actor.getClass().getCreatureStats(actor).getActiveSpells().purgeEffect( teleported.getClass()
actor, ESM::MagicEffect::WaterWalking); .getCreatureStats(teleported)
.getActiveSpells()
.purgeEffect(actor, ESM::MagicEffect::WaterWalking);
} }
void ActionTeleport::getFollowers( void ActionTeleport::getFollowers(