aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorgvcoman <none@none>2008-11-08 17:46:34 -0600
committergvcoman <none@none>2008-11-08 17:46:34 -0600
commit78647da51dffb64bbd21fbba063edcb99a422297 (patch)
tree338457afca1e04c640227cd77998299122c5aa2d /src
parente94ec9fa715bed1b4dba60a66a049918396d47dd (diff)
[svn] Fixed charmer or possessor not being entered in the threat lists of creatures who are being attacked by the charmed or possessed unit.
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/ThreatManager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/ThreatManager.cpp b/src/game/ThreatManager.cpp
index 253bc2a936c..c85959b561f 100644
--- a/src/game/ThreatManager.cpp
+++ b/src/game/ThreatManager.cpp
@@ -103,7 +103,7 @@ void HostilReference::addThreat(float pMod)
fireStatusChanged(ThreatRefStatusChangeEvent(UEV_THREAT_REF_THREAT_CHANGE, this, pMod));
if(isValid() && pMod >= 0)
{
- Unit* victim_owner = getTarget()->GetOwner();
+ Unit* victim_owner = getTarget()->GetCharmerOrOwner();
if(victim_owner && victim_owner->isAlive())
getSource()->addThreat(victim_owner, 0.0f); // create a threat to the owner of a pet, if the pet attacks
}