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

Merge branch 'followthecrab' into 'master'

Browse source 
Stop combat when stacking a new AI package

Closes #7661

See merge request OpenMW/openmw!3665
This commit is contained in:
Alexei Kotov 2023-12-21 07:08:36 +00:00
commit 51cb3b08cb
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -103,6 +103,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

16
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"
@ -17,6 +19,7 @@
#include "aipursue.hpp"
#include "aitravel.hpp"
#include "aiwander.hpp"
#include "creaturestats.hpp"
namespace MWMechanics
{
@ -365,7 +368,20 @@ namespace MWMechanics
// Stop combat when a non-combat AI package is added
if (isActualAiPackage(package.getTypeId()))
{
if (package.getTypeId() == MWMechanics::AiPackageTypeId::Follow
|| package.getTypeId() == MWMechanics::AiPackageTypeId::Escort)
{
const auto& mechanicsManager = MWBase::Environment::get().getMechanicsManager();
std::vector<MWWorld::Ptr> newAllies = mechanicsManager->getActorsSidingWith(package.getTarget());
std::vector<MWWorld::Ptr> allies = mechanicsManager->getActorsSidingWith(actor);
for (const auto& ally : allies)
ally.getClass().getCreatureStats(ally).getAiSequence().stopCombat(newAllies);
for (const auto& ally : newAllies)
ally.getClass().getCreatureStats(ally).getAiSequence().stopCombat(allies);
}
stopCombat();
}
// We should return a wandering actor back after combat, casting or pursuit.
// The same thing for actors without AI packages.