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

Allow Actors to pick an attack type/animation when no AI applies

Browse Source
This commit is contained in:
Zackhasacat 2024-05-15 11:39:02 -05:00
parent 2bed7450b6
commit 1e05bb20bf
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/openmw/mwmechanics/character.cpp
View File

@ -1645,12 +1645,14 @@ namespace MWMechanics
{ {
std::string startKey = "start"; std::string startKey = "start";
std::string stopKey = "stop"; std::string stopKey = "stop";
MWBase::LuaManager::ActorControls* actorControls
= MWBase::Environment::get().getLuaManager()->getActorControls(mPtr);
if (mWeaponType != ESM::Weapon::PickProbe && !isRandomAttackAnimation(mCurrentWeapon)) if (mWeaponType != ESM::Weapon::PickProbe && !isRandomAttackAnimation(mCurrentWeapon))
{ {
if (weapclass == ESM::WeaponType::Ranged || weapclass == ESM::WeaponType::Thrown) if (weapclass == ESM::WeaponType::Ranged || weapclass == ESM::WeaponType::Thrown)
mAttackType = "shoot"; mAttackType = "shoot";
else if (mPtr == getPlayer()) else if (mPtr == getPlayer() || actorControls->mDisableAI)
{ {
if (Settings::game().mBestAttack) if (Settings::game().mBestAttack)
{ {