mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-27 12:35:46 +00:00
Code Issues Projects Releases Wiki Activity

Do not allow soul trapping the same creature more than once (Fixes #3102)

Browse Source
This commit is contained in:
scrawl 2015-12-26 18:47:03 +01:00
parent 0bec6e5fbe
commit 63b9b075aa
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/openmw/mwmechanics/actors.cpp
View File

@ -149,14 +149,20 @@ namespace MWMechanics
{ {
MWWorld::Ptr mCreature; MWWorld::Ptr mCreature;
MWWorld::Ptr mActor; MWWorld::Ptr mActor;
bool mTrapped;
public: public:
SoulTrap(MWWorld::Ptr trappedCreature) SoulTrap(MWWorld::Ptr trappedCreature)
: mCreature(trappedCreature) {} : mCreature(trappedCreature)
, mTrapped(false)
{
}
virtual void visit (MWMechanics::EffectKey key, virtual void visit (MWMechanics::EffectKey key,
const std::string& sourceName, const std::string& sourceId, int casterActorId, const std::string& sourceName, const std::string& sourceId, int casterActorId,
float magnitude, float remainingTime = -1, float totalTime = -1) float magnitude, float remainingTime = -1, float totalTime = -1)
{ {
if (mTrapped)
return;
if (key.mId != ESM::MagicEffect::Soultrap) if (key.mId != ESM::MagicEffect::Soultrap)
return; return;
if (magnitude <= 0) if (magnitude <= 0)
@ -203,6 +209,8 @@ namespace MWMechanics
gem->getContainerStore()->unstack(*gem, caster); gem->getContainerStore()->unstack(*gem, caster);
gem->getCellRef().setSoul(mCreature.getCellRef().getRefId()); gem->getCellRef().setSoul(mCreature.getCellRef().getRefId());
mTrapped = true;
if (caster == getPlayer()) if (caster == getPlayer())
MWBase::Environment::get().getWindowManager()->messageBox("#{sSoultrapSuccess}"); MWBase::Environment::get().getWindowManager()->messageBox("#{sSoultrapSuccess}");