teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Workaround for some AI functions being incorrectly handled as AI packages (Bug #3378)

Browse source
This commit is contained in:
scrawl 2016-04-29 17:50:33 +02:00
parent 9959b2553d
commit 93b2f09224
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/openmw/mwmechanics/aipackage.hpp
View file

@ -41,6 +41,7 @@ namespace MWMechanics
TypeIdActivate = 4, TypeIdActivate = 4,
// These 3 are not really handled as Ai Packages in the MW engine // These 3 are not really handled as Ai Packages in the MW engine
// For compatibility do *not* return these in the getCurrentAiPackage script function..
TypeIdCombat = 5, TypeIdCombat = 5,
TypeIdPursue = 6, TypeIdPursue = 6,
TypeIdAvoidDoor = 7 TypeIdAvoidDoor = 7

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

@ -166,10 +166,15 @@ void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& charac
} }
MWMechanics::AiPackage* package = mPackages.front(); MWMechanics::AiPackage* package = mPackages.front();
mLastAiPackage = package->getTypeId(); int packageTypeId = package->getTypeId();
// workaround ai packages not being handled as in the vanilla engine
if (packageTypeId != AiPackage::TypeIdCombat
&& packageTypeId != AiPackage::TypeIdPursue
&& packageTypeId != AiPackage::TypeIdAvoidDoor)
mLastAiPackage = packageTypeId;
// if active package is combat one, choose nearest target // if active package is combat one, choose nearest target
if (mLastAiPackage == AiPackage::TypeIdCombat) if (packageTypeId == AiPackage::TypeIdCombat)
{ {
std::list<AiPackage *>::iterator itActualCombat; std::list<AiPackage *>::iterator itActualCombat;
@ -216,7 +221,6 @@ void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& charac
} }
package = mPackages.front(); package = mPackages.front();
mLastAiPackage = package->getTypeId();
} }
else else
{ {