mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00
Code Issues Projects Releases Wiki Activity

Fix merge mistake

Browse Source
This commit is contained in:
scrawl 2014-06-14 02:31:01 +02:00
parent 0637cde267
commit 832f1a4857
1 changed files with 11 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

@ -88,12 +88,23 @@ namespace MWMechanics
AiCombat::AiCombat(const MWWorld::Ptr& actor) :
mTargetActorId(actor.getClass().getCreatureStats(actor).getActorId())
, mMinMaxAttackDuration()
, mMovement()
{
init();
mLastTargetPos = Ogre::Vector3(actor.getRefData().getPosition().pos);
}
AiCombat::AiCombat(const ESM::AiSequence::AiCombat *combat)
: mMinMaxAttackDuration()
, mMovement()
{
mTargetActorId = combat->mTargetActorId;
init();
}
void AiCombat::init()
{
mTimerAttack = 0;
@ -638,13 +649,6 @@ namespace MWMechanics
return new AiCombat(*this);
}
AiCombat::AiCombat(const ESM::AiSequence::AiCombat *combat)
{
mTargetActorId = combat->mTargetActorId;
init();
}
void AiCombat::writeState(ESM::AiSequence::AiSequence &sequence) const
{
std::auto_ptr<ESM::AiSequence::AiCombat> combat(new ESM::AiSequence::AiCombat());