mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 23:53:52 +00:00
Code Issues Releases Wiki Activity

[Client] Make NPCs react to DedicatedPlayer & DedicatedActor attacks

Browse source
This commit is contained in:
David Cernat 2017-04-20 17:00:40 +03:00
parent edb155869b
commit 10d554af5b
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
View file

@ -14,7 +14,9 @@
Include additional headers for multiplayer purposes Include additional headers for multiplayer purposes
*/ */
#include "../mwmp/Main.hpp"
#include "../mwmp/DedicatedPlayer.hpp" #include "../mwmp/DedicatedPlayer.hpp"
#include "../mwmp/CellController.hpp"
/* /*
End of tes3mp addition End of tes3mp addition
*/ */
@ -1280,9 +1282,19 @@ namespace MWMechanics
&& !isAggressive(target, attacker) && !isFightingNpc) && !isAggressive(target, attacker) && !isFightingNpc)
commitCrime(attacker, target, MWBase::MechanicsManager::OT_Assault); commitCrime(attacker, target, MWBase::MechanicsManager::OT_Assault);
/*
Start of tes3mp change (major)
Make it possible to start combat with DedicatedPlayers and DedicatedActors by
adding additional conditions for them
*/
if (!attacker.isEmpty() && (attacker.getClass().getCreatureStats(attacker).getAiSequence().isInCombat(target) if (!attacker.isEmpty() && (attacker.getClass().getCreatureStats(attacker).getAiSequence().isInCombat(target)
|| attacker == getPlayer()) || attacker == getPlayer() || mwmp::PlayerList::isDedicatedPlayer(attacker)
|| mwmp::Main::get().getCellController()->isDedicatedActor(attacker))
&& !seq.isInCombat(attacker)) && !seq.isInCombat(attacker))
/*
End of tes3mp change (major)
*/
{ {
// Attacker is in combat with us, but we are not in combat with the attacker yet. Time to fight back. // Attacker is in combat with us, but we are not in combat with the attacker yet. Time to fight back.
// Note: accidental or collateral damage attacks are ignored. // Note: accidental or collateral damage attacks are ignored.