mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-30 07:21:12 +00:00
Code Issues Projects Releases Wiki Activity

Stop combat between AI when canFight is false

Browse Source
This commit is contained in:
Allofich 2016-12-26 00:18:52 +09:00
parent e8c7ad2f4b
commit e10c4d8814
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/openmw/mwmechanics/aicombat.cpp
View File

@ -19,6 +19,7 @@
#include "aicombataction.hpp"
#include "combat.hpp"
#include "coordinateconverter.hpp"
#include "actorutil.hpp"
namespace
{
@ -210,13 +211,14 @@ namespace MWMechanics
else
{
timerReact = 0;
attack(actor, target, storage, characterController);
if (attack(actor, target, storage, characterController))
return true;
}
return false;
}
void AiCombat::attack(const MWWorld::Ptr& actor, const MWWorld::Ptr& target, AiCombatStorage& storage, CharacterController& characterController)
bool AiCombat::attack(const MWWorld::Ptr& actor, const MWWorld::Ptr& target, AiCombatStorage& storage, CharacterController& characterController)
{
const MWWorld::CellStore*& currentCell = storage.mCell;
bool cellChange = currentCell && (actor.getCell() != currentCell);
@ -231,7 +233,10 @@ namespace MWMechanics
storage.stopAttack();
characterController.setAttackingOrSpell(false);
storage.mActionCooldown = 0.f;
forceFlee = true;
if (target == MWMechanics::getPlayer())
forceFlee = true;
else
return true;
}
const MWWorld::Class& actorClass = actor.getClass();
@ -243,7 +248,7 @@ namespace MWMechanics
if (!forceFlee)
{
if (actionCooldown > 0)
return;
return false;
if (characterController.readyToPrepareAttack())
{
@ -258,7 +263,7 @@ namespace MWMechanics
}
if (!currentAction)
return;
return false;
if (storage.isFleeing() != currentAction->isFleeing())
{
@ -266,7 +271,7 @@ namespace MWMechanics
{
storage.startFleeing();
MWBase::Environment::get().getDialogueManager()->say(actor, "flee");
return;
return false;
}
else
storage.stopFleeing();
@ -311,6 +316,7 @@ namespace MWMechanics
storage.mMovement.mRotation[2] = getZAngleToDir((vTargetPos-vActorPos)); // using vAimDir results in spastic movements since the head is animated
}
}
return false;
}
void MWMechanics::AiCombat::updateLOS(const MWWorld::Ptr& actor, const MWWorld::Ptr& target, float duration, MWMechanics::AiCombatStorage& storage)

3
apps/openmw/mwmechanics/aicombat.hpp
View File

@ -59,7 +59,8 @@ namespace MWMechanics
int mTargetActorId;
void attack(const MWWorld::Ptr& actor, const MWWorld::Ptr& target, AiCombatStorage& storage, CharacterController& characterController);
/// Returns true if combat should end
bool attack(const MWWorld::Ptr& actor, const MWWorld::Ptr& target, AiCombatStorage& storage, CharacterController& characterController);
void updateLOS(const MWWorld::Ptr& actor, const MWWorld::Ptr& target, float duration, AiCombatStorage& storage);