mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 15:15:31 +00:00
Code Issues Releases Wiki Activity

Cleanups

Browse source
This commit is contained in:
Allofich 2016-07-07 21:46:58 +09:00
parent cb621939fd
commit 7de3afaa7d
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,7 +21,7 @@ namespace MWWorld
{
MWMechanics::CastSpell cast(mTrapSource, mTrapSource);
cast.mHitPosition = trapPosition;
cast.cast(mSpellId);
cast.cast(mSpellId);
}
else // actor activated object within range of trap
{

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, float distanceToObject = -1);
virtual void executeImp (const Ptr& actor, float distanceToObject);
public:

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

@ -150,7 +150,7 @@ namespace MWWorld
mSky (true), mCells (mStore, mEsm),
mGodMode(false), mScriptsEnabled(true), mContentFiles (contentFiles),
mActivationDistanceOverride (activationDistanceOverride), mStartupScript(startupScript),
mStartCell (startCell), mDistanceToFacedObject(0), mTeleportEnabled(true),
mStartCell (startCell), mDistanceToFacedObject(-1), mTeleportEnabled(true),
mLevitationEnabled(true), mGoToJail(false), mDaysInPrison(0)
{
mPhysics = new MWPhysics::PhysicsSystem(resourceSystem, rootNode);
@ -1011,11 +1011,10 @@ namespace MWWorld
MWWorld::Ptr World::getFacedObject()
{
MWWorld::Ptr facedObject;
float distanceToObject;
if (MWBase::Environment::get().getWindowManager()->isGuiMode() &&
MWBase::Environment::get().getWindowManager()->isConsoleMode())
facedObject = getFacedObject(getMaxActivationDistance() * 50, distanceToObject, false);
facedObject = getFacedObject(getMaxActivationDistance() * 50, mDistanceToFacedObject, false);
else
{
float telekinesisRangeBonus =
@ -1025,14 +1024,12 @@ namespace MWWorld
float activationDistance = getMaxActivationDistance() + telekinesisRangeBonus;
facedObject = getFacedObject(activationDistance, distanceToObject, true);
facedObject = getFacedObject(activationDistance, mDistanceToFacedObject, true);
if (!facedObject.isEmpty() && !facedObject.getClass().allowTelekinesis(facedObject)
&& distanceToObject > getMaxActivationDistance())
&& mDistanceToFacedObject > getMaxActivationDistance())
return 0;
}
mDistanceToFacedObject = distanceToObject;
return facedObject;
}
@ -1733,6 +1730,8 @@ namespace MWWorld
facedObject = rayToObject.mHitObject;
if (!facedObject.isEmpty())
distance = rayToObject.mRatio * maxDistance;
else
distance = -1;
return facedObject;
}