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

Check for world AI disable

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

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

@ -1647,12 +1647,13 @@ namespace MWMechanics
std::string stopKey = "stop"; std::string stopKey = "stop";
MWBase::LuaManager::ActorControls* actorControls MWBase::LuaManager::ActorControls* actorControls
= MWBase::Environment::get().getLuaManager()->getActorControls(mPtr); = MWBase::Environment::get().getLuaManager()->getActorControls(mPtr);
const bool aiInactive
= actorControls->mDisableAI || !MWBase::Environment::get().getMechanicsManager()->isAIActive();
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() || actorControls->mDisableAI) else if (mPtr == getPlayer() || aiInactive)
{ {
if (Settings::game().mBestAttack) if (Settings::game().mBestAttack)
{ {