mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-30 07:15:34 +00:00
Code Issues Releases Wiki Activity

Stop combat when stacking a new AI package

Browse source
This commit is contained in:
Evil Eye 2023-12-18 22:18:26 +01:00
parent 7922f0e7f8
commit 94b129cc62
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -101,6 +101,7 @@
Bug #7647: NPC walk cycle bugs after greeting player
Bug #7654: Tooltips for enchantments with invalid effects cause crashes
Bug #7660: Some inconsistencies regarding Invisibility breaking
Bug #7661: Player followers should stop attacking newly recruited actors
Bug #7665: Alchemy menu is missing the ability to deselect and choose different qualities of an apparatus
Bug #7675: Successful lock spell doesn't produce a sound
Bug #7679: Scene luminance value flashes when toggling shaders

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

@ -6,6 +6,8 @@
#include <components/debug/debuglog.hpp>
#include <components/esm3/aisequence.hpp>
#include "../mwbase/environment.hpp"
#include "../mwbase/mechanicsmanager.hpp"
#include "../mwworld/class.hpp"
#include "actorutil.hpp"
#include "aiactivate.hpp"
@ -365,7 +367,7 @@ namespace MWMechanics
// Stop combat when a non-combat AI package is added
if (isActualAiPackage(package.getTypeId()))
stopCombat();
MWBase::Environment::get().getMechanicsManager()->stopCombat(actor);
// We should return a wandering actor back after combat, casting or pursuit.
// The same thing for actors without AI packages.