AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-28 07:32:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't crash OpGetTarget when the target disappeared (Fixes #3048)

Browse Source
This commit is contained in:
scrawl 2015-11-30 15:26:43 +01:00
parent 3a81bed001
commit 14b143231c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwmechanics/aisequence.cpp
View File

@ -72,7 +72,7 @@ bool AiSequence::getCombatTarget(MWWorld::Ptr &targetActor) const
targetActor = combat->getTarget(); targetActor = combat->getTarget();
return true; return !targetActor.isEmpty();
} }
std::list<AiPackage*>::const_iterator AiSequence::begin() const std::list<AiPackage*>::const_iterator AiSequence::begin() const

2
apps/openmw/mwscript/aiextensions.cpp
View File

@ -424,7 +424,7 @@ namespace MWScript
MWWorld::Ptr targetPtr; MWWorld::Ptr targetPtr;
if (creatureStats.getAiSequence().getCombatTarget (targetPtr)) if (creatureStats.getAiSequence().getCombatTarget (targetPtr))
{ {
if (targetPtr.getCellRef().getRefId() == testedTargetId) if (!targetPtr.isEmpty() && targetPtr.getCellRef().getRefId() == testedTargetId)
targetsAreEqual = true; targetsAreEqual = true;
} }
runtime.push(int(targetsAreEqual)); runtime.push(int(targetsAreEqual));