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

Make spells cast by scripts always succeed (Fixes #1993)

Browse source
This commit is contained in:
scrawl 2014-10-09 01:39:35 +02:00
parent aefe8cd4ae
commit 8cb09e89ed
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/mwmechanics/spellcasting.cpp
View file

@ -292,6 +292,7 @@ namespace MWMechanics
, mTarget(target) , mTarget(target)
, mStack(false) , mStack(false)
, mHitPosition(0,0,0) , mHitPosition(0,0,0)
, mAlwaysSucceed(false)
{ {
} }
@ -761,7 +762,7 @@ namespace MWMechanics
int school = 0; int school = 0;
if (mCaster.getClass().isActor()) if (mCaster.getClass().isActor() && !mAlwaysSucceed)
{ {
school = getSpellSchool(spell, mCaster); school = getSpellSchool(spell, mCaster);

1
apps/openmw/mwmechanics/spellcasting.hpp
View file

@ -68,6 +68,7 @@ namespace MWMechanics
std::string mId; // ID of spell, potion, item etc std::string mId; // ID of spell, potion, item etc
std::string mSourceName; // Display name for spell, potion, etc std::string mSourceName; // Display name for spell, potion, etc
Ogre::Vector3 mHitPosition; // Used for spawning area orb Ogre::Vector3 mHitPosition; // Used for spawning area orb
bool mAlwaysSucceed; // Always succeed spells casted by NPCs/creatures regardless of their chance (default: false)
public: public:
CastSpell(const MWWorld::Ptr& caster, const MWWorld::Ptr& target); CastSpell(const MWWorld::Ptr& caster, const MWWorld::Ptr& target);

2
apps/openmw/mwscript/miscextensions.cpp
View file

@ -854,6 +854,7 @@ namespace MWScript
MWMechanics::CastSpell cast(ptr, target); MWMechanics::CastSpell cast(ptr, target);
cast.mHitPosition = Ogre::Vector3(target.getRefData().getPosition().pos); cast.mHitPosition = Ogre::Vector3(target.getRefData().getPosition().pos);
cast.mAlwaysSucceed = true;
cast.cast(spell); cast.cast(spell);
} }
}; };
@ -871,6 +872,7 @@ namespace MWScript
MWMechanics::CastSpell cast(ptr, ptr); MWMechanics::CastSpell cast(ptr, ptr);
cast.mHitPosition = Ogre::Vector3(ptr.getRefData().getPosition().pos); cast.mHitPosition = Ogre::Vector3(ptr.getRefData().getPosition().pos);
cast.mAlwaysSucceed = true;
cast.cast(spell); cast.cast(spell);
} }
}; };