mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-22 00:23:53 +00:00
Code Issues Releases Wiki Activity

Stop combat when adding an AI package to an actor

Browse source 
(Fixes #3722)
This commit is contained in:
Allofich 2017-01-12 00:32:36 +09:00
parent b87abb0456
commit a46c4de918
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwmechanics/aisequence.cpp
View file

@ -281,6 +281,10 @@ void AiSequence::stack (const AiPackage& package, const MWWorld::Ptr& actor)
} }
} }
// Stop combat when a non-combat AI package is added
if (isActualAiPackage(package.getTypeId()))
stopCombat();
// remove previous packages if required // remove previous packages if required
if (package.shouldCancelPreviousAi()) if (package.shouldCancelPreviousAi())
{ {