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

Allow some telekinesis on teleport doors

Browse source
This commit is contained in:
Allofich 2016-07-09 00:31:39 +09:00
parent 4e54338ce0
commit 53ceefa46a
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
apps/openmw/mwclass/door.cpp
View file

@ -146,11 +146,18 @@ namespace MWClass
if (ptr.getCellRef().getTeleport()) if (ptr.getCellRef().getTeleport())
{ {
boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTeleport (ptr.getCellRef().getDestCell(), ptr.getCellRef().getDoorDest(), true)); if (actor == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->getDistanceToFacedObject() > MWBase::Environment::get().getWorld()->getMaxActivationDistance())
{
action->setSound(openSound); // player activated teleport door with telekinesis
boost::shared_ptr<MWWorld::Action> action(new MWWorld::FailedAction);
return action; return action;
}
else
{
boost::shared_ptr<MWWorld::Action> action(new MWWorld::ActionTeleport (ptr.getCellRef().getDestCell(), ptr.getCellRef().getDoorDest(), true));
action->setSound(openSound);
return action;
}
} }
else else
{ {
@ -215,7 +222,7 @@ namespace MWClass
bool Door::allowTelekinesis(const MWWorld::ConstPtr &ptr) const bool Door::allowTelekinesis(const MWWorld::ConstPtr &ptr) const
{ {
if (ptr.getCellRef().getTeleport()) if (ptr.getCellRef().getTeleport() && ptr.getCellRef().getLockLevel() <= 0 && ptr.getCellRef().getTrap().empty())
return false; return false;
else else
return true; return true;