*Merge.

--HG-- branch : trunk
2009-01-16 22:59:24 -06:00
parent 11239e9f5f 0a1c601a1c
commit fa2e6622ad
12 changed files with 146 additions and 67 deletions
@@ -372,10 +372,15 @@ void ThreatManager::addThreat(Unit* pVictim, float pThreat, SpellSchoolMask scho
    {
        float reducedThreat = threat * pVictim->GetReducedThreatPercent() / 100;
        threat -= reducedThreat;
-        if(pVictim->GetMisdirectionTarget())
-            iThreatContainer.addThreat(pVictim->GetMisdirectionTarget(), reducedThreat);
+        if(Unit *unit = pVictim->GetMisdirectionTarget())
+            _addThreat(unit, reducedThreat);
    }

+    _addThreat(pVictim, threat);
+}
+
+void ThreatManager::_addThreat(Unit *pVictim, float threat)
+{
    HostilReference* ref = iThreatContainer.addThreat(pVictim, threat);
    // Ref is not in the online refs, search the offline refs next
    if(!ref)