mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-01 10:36:42 +00:00
Code Issues Releases Wiki Activity

Don't add combat AI to player

Browse source
This commit is contained in:
scrawl 2014-07-28 15:40:52 +02:00
parent 3067082534
commit d69ed78ccd
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/mwclass/npc.cpp
View file

@ -675,6 +675,8 @@ namespace MWClass
// NOTE: 'object' and/or 'attacker' may be empty. // NOTE: 'object' and/or 'attacker' may be empty.
if (ptr != MWBase::Environment::get().getWorld()->getPlayerPtr())
{
// Attacking peaceful NPCs is a crime // Attacking peaceful NPCs is a crime
if (!attacker.isEmpty() && !ptr.getClass().getCreatureStats(ptr).isHostile() && if (!attacker.isEmpty() && !ptr.getClass().getCreatureStats(ptr).isHostile() &&
!MWBase::Environment::get().getMechanicsManager()->isAggressive(ptr, attacker)) !MWBase::Environment::get().getMechanicsManager()->isAggressive(ptr, attacker))
@ -687,6 +689,7 @@ namespace MWClass
// Note: accidental or collateral damage attacks are ignored. // Note: accidental or collateral damage attacks are ignored.
MWBase::Environment::get().getMechanicsManager()->startCombat(ptr, attacker); MWBase::Environment::get().getMechanicsManager()->startCombat(ptr, attacker);
} }
}
bool wasDead = getCreatureStats(ptr).isDead(); bool wasDead = getCreatureStats(ptr).isDead();