Changeset 149 for trunk/src/game/SpellEffects.cpp

Timestamp:

11/19/08 13:40:46 (17 years ago)

Author:

yumileroy

Message:

[svn] *Implement new player conditions CONDITION_NO_AURA, CONDITION_ACTIVE_EVENT
* Default behaviour of pets for creatures changed to REACT_DEFENSIVE
* Disallowed sending wrapped items as COD
* Prevent loading and saving single target auras for pet in same way as already implemented for player
* Correctly limit use some flask types to zones.
* Fixed extracting common.MPQ under *nix
* Many small xleanups and fixes.
** mangos merge rev.

TEST REV so be careful of creepy crawly bugs!

Original author: KingPin?
Date: 2008-11-02 16:53:46-06:00

Files:

• trunk/src/game/SpellEffects.cpp (modified) (1 diff)

trunk/src/game/SpellEffects.cpp

@@ -4074 +4074 @@
 
     uint32 faction = m_caster->getFaction();
-    if(m_caster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_caster)->isTotem())
-    {
-        Unit* owner = ((Totem*)m_caster)->GetOwner();
-        if(owner)
-            faction = owner->getFaction();
-        NewSummon->GetCharmInfo()->SetReactState(REACT_AGGRESSIVE);
+    if(m_caster->GetTypeId() == TYPEID_UNIT)
+    {
+                if ( ((Creature*)m_caster)->isTotem() )
+                        NewSummon->GetCharmInfo()->SetReactState(REACT_AGGRESSIVE);
+                else
+                        NewSummon->GetCharmInfo()->SetReactState(REACT_DEFENSIVE);
     }