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

[Client] Make aggressive actors initiate combat with DedicatedPlayers

Browse source 
Previously, they were only attacking DedicatedPlayers who had attacked them first.
This commit is contained in:
David Cernat 2017-04-25 16:08:14 +03:00
parent a4165325fa
commit 11605bd19a
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/actors.cpp
View file

@ -406,6 +406,18 @@ namespace MWMechanics
if (std::find(playerAllies.begin(), playerAllies.end(), actor1) == playerAllies.end()) if (std::find(playerAllies.begin(), playerAllies.end(), actor1) == playerAllies.end())
aggressive = MWBase::Environment::get().getMechanicsManager()->isAggressive(actor1, actor2); aggressive = MWBase::Environment::get().getMechanicsManager()->isAggressive(actor1, actor2);
} }
/*
Start of tes3mp addition
Make aggressive actors initiate combat with DedicatedPlayers
*/
else if (mwmp::PlayerList::isDedicatedPlayer(actor2))
{
aggressive = MWBase::Environment::get().getMechanicsManager()->isAggressive(actor1, actor2);
}
/*
End of tes3mp addition
*/
} }
// Make guards go aggressive with creatures that are in combat, unless the creature is a follower or escorter // Make guards go aggressive with creatures that are in combat, unless the creature is a follower or escorter
@ -882,7 +894,7 @@ namespace MWMechanics
/* /*
Start of tes3mp change (major) Start of tes3mp change (major)
We need player-controlled NPCs to not automatically unequip We need DedicatedPlayers to not automatically unequip
their light-emitting items, so a 2nd condition has been added their light-emitting items, so a 2nd condition has been added
for them for them
*/ */