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

9 years ago · 14b143231c
parent 3a81bed001
commit 14b143231c
2 changed files with 2 additions and 2 deletions
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@ -72,7 +72,7 @@ bool AiSequence::getCombatTarget(MWWorld::Ptr &targetActor) const
    
    targetActor = combat->getTarget();

-    return true;
+    return !targetActor.isEmpty();
 }

 std::list<AiPackage*>::const_iterator AiSequence::begin() const
--- a/apps/openmw/mwscript/aiextensions.cpp
+++ b/apps/openmw/mwscript/aiextensions.cpp
@ -424,7 +424,7 @@ namespace MWScript
                    MWWorld::Ptr targetPtr;
                    if (creatureStats.getAiSequence().getCombatTarget (targetPtr))
                    {
-                        if (targetPtr.getCellRef().getRefId() == testedTargetId)
+                        if (!targetPtr.isEmpty() && targetPtr.getCellRef().getRefId() == testedTargetId)
                            targetsAreEqual = true;
                    }
                    runtime.push(int(targetsAreEqual));