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

Use raycast distance when player activates trapped object

Browse source
This commit is contained in:
Allofich 2016-07-04 02:23:04 +09:00
parent 64d53a2314
commit 64d298d2b5
5 changed files with 51 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
apps/openmw/mwworld/action.cpp
View file

@ -42,7 +42,35 @@ void MWWorld::Action::execute (const Ptr& actor)
}
}
executeImp (actor);
executeImp(actor);
}
void MWWorld::Action::execute (const Ptr& actor, float distanceToObject)
{
if(!mSoundId.empty())
{
if(mKeepSound && actor == MWMechanics::getPlayer())
MWBase::Environment::get().getSoundManager()->playSound(mSoundId, 1.0, 1.0,
MWBase::SoundManager::Play_TypeSfx, MWBase::SoundManager::Play_Normal, mSoundOffset
);
else
{
bool local = mTarget.isEmpty() || !mTarget.isInCell(); // no usable target
if(mKeepSound)
MWBase::Environment::get().getSoundManager()->playSound3D(
(local ? actor : mTarget).getRefData().getPosition().asVec3(),
mSoundId, 1.0, 1.0, MWBase::SoundManager::Play_TypeSfx,
MWBase::SoundManager::Play_Normal, mSoundOffset
);
else
MWBase::Environment::get().getSoundManager()->playSound3D(local ? actor : mTarget,
mSoundId, 1.0, 1.0, MWBase::SoundManager::Play_TypeSfx,
MWBase::SoundManager::Play_Normal, mSoundOffset
);
}
}
executeImp(actor, distanceToObject);
}
void MWWorld::Action::setSound (const std::string& id)

5
apps/openmw/mwworld/action.hpp
View file

@ -19,7 +19,9 @@ namespace MWWorld
Action (const Action& action);
Action& operator= (const Action& action);
virtual void executeImp (const Ptr& actor) = 0;
virtual void executeImp (const Ptr& actor) { return; }
virtual void executeImp (const Ptr& actor, float distanceToObject) { return; }
protected:
@ -36,6 +38,7 @@ namespace MWWorld
///< Is running this action a no-op? (default false)
void execute (const Ptr& actor);
void execute (const Ptr& actor, float distanceToObject);
void setSound (const std::string& id);
void setSoundOffset(float offset);

6
apps/openmw/mwworld/actiontrap.cpp
View file

@ -7,20 +7,20 @@
namespace MWWorld
{
void ActionTrap::executeImp(const Ptr &actor)
void ActionTrap::executeImp(const Ptr &actor, float distance)
{
osg::Vec3f actorPosition(actor.getRefData().getPosition().asVec3());
osg::Vec3f trapPosition(mTrapSource.getRefData().getPosition().asVec3());
float activationDistance = MWBase::Environment::get().getWorld()->getMaxActivationDistance();
// GUI calcs if object in activation distance include object and player geometry
const float fudgeFactor = 1.25f;
//const float fudgeFactor = 1.25f;
// Hack: if actor is beyond activation range, then assume actor is using telekinesis
// to open door/container.
// Note, can't just detonate the trap at the trapped object's location and use the blast
// radius, because for most trap spells this is 1 foot, much less than the activation distance.
if ((trapPosition - actorPosition).length() < (activationDistance * fudgeFactor))
if (distance < activationDistance)
{
// assume actor touched trap
MWMechanics::CastSpell cast(mTrapSource, actor);

2
apps/openmw/mwworld/actiontrap.hpp
View file

@ -13,7 +13,7 @@ namespace MWWorld
std::string mSpellId;
MWWorld::Ptr mTrapSource;
virtual void executeImp (const Ptr& actor);
virtual void executeImp (const Ptr& actor, float distance);
public:

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

@ -3228,6 +3228,19 @@ namespace MWWorld
if (object.getRefData().activate())
{
boost::shared_ptr<MWWorld::Action> action = (object.getClass().activate(object, actor));
if (object.getCellRef().getTrap() != "") // If the object is trapped, do a distance check to account for opening with telekinesis
{
float distanceToObject;
if (actor == getPlayerPtr()) // If the actor doing the activation is the player, get distance using the raycast in getFacedObject()
MWWorld::Ptr result = getFacedObject(1.0f, distanceToObject, true);
else // Otherwise do a position-based distance check
{
osg::Vec3f actorPosition(actor.getRefData().getPosition().asVec3());
osg::Vec3f objectPosition(object.getRefData().getPosition().asVec3());
distanceToObject = (objectPosition - actorPosition).length();
}
action->execute (actor, distanceToObject);
}
action->execute (actor);
}
}