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

Fix bug where actors in combat with multiple other actors where not regarded as in combat with a specific actor

Browse source
This commit is contained in:
scrawl 2014-07-20 22:34:20 +02:00
parent 1636fd66db
commit 90a96cd7d8
3 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/openmw/mwmechanics/actors.cpp
View file

@ -1281,12 +1281,8 @@ namespace MWMechanics
{ {
const MWWorld::Class &cls = iter->getClass(); const MWWorld::Class &cls = iter->getClass();
CreatureStats &stats = cls.getCreatureStats(*iter); CreatureStats &stats = cls.getCreatureStats(*iter);
if(!stats.isDead() && stats.getAiSequence().getTypeId() == AiPackage::TypeIdCombat) if (!stats.isDead() && stats.getAiSequence().isInCombat(actor))
{ list.push_front(*iter);
MWMechanics::AiCombat* package = static_cast<MWMechanics::AiCombat*>(stats.getAiSequence().getActivePackage());
if(package->getTarget() == actor)
list.push_front(*iter);
}
} }
return list; return list;
} }

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

@ -72,6 +72,30 @@ bool AiSequence::getCombatTarget(MWWorld::Ptr &targetActor) const
return true; return true;
} }
bool AiSequence::isInCombat() const
{
for(std::list<AiPackage*>::const_iterator it = mPackages.begin(); it != mPackages.end(); ++it)
{
if ((*it)->getTypeId() == AiPackage::TypeIdCombat)
return true;
}
return false;
}
bool AiSequence::isInCombat(const MWWorld::Ptr &actor) const
{
for(std::list<AiPackage*>::const_iterator it = mPackages.begin(); it != mPackages.end(); ++it)
{
if ((*it)->getTypeId() == AiPackage::TypeIdCombat)
{
const AiCombat *combat = static_cast<const AiCombat *>(*it);
if (combat->getTarget() == actor)
return true;
}
}
return false;
}
bool AiSequence::canAddTarget(const ESM::Position& actorPos, float distToTarget) const bool AiSequence::canAddTarget(const ESM::Position& actorPos, float distToTarget) const
{ {
bool firstCombatFound = false; bool firstCombatFound = false;

6
apps/openmw/mwmechanics/aisequence.hpp
View file

@ -63,6 +63,12 @@ namespace MWMechanics
/// Return true and assign target if combat package is currently active, return false otherwise /// Return true and assign target if combat package is currently active, return false otherwise
bool getCombatTarget (MWWorld::Ptr &targetActor) const; bool getCombatTarget (MWWorld::Ptr &targetActor) const;
/// Is there any combat package?
bool isInCombat () const;
/// Are we in combat with this particular actor?
bool isInCombat (const MWWorld::Ptr& actor) const;
bool canAddTarget(const ESM::Position& actorPos, float distToTarget) const; bool canAddTarget(const ESM::Position& actorPos, float distToTarget) const;
///< Function assumes that actor can have only 1 target apart player ///< Function assumes that actor can have only 1 target apart player