*Merge.

--HG-- branch : trunk
2009-02-20 12:05:58 -06:00
parent 187cd928ea 956c828bf5
commit 1b587c0fe3
8 changed files with 111 additions and 67 deletions
@@ -53,7 +53,7 @@ m_declinedname(NULL)
    // pets always have a charminfo, even if they are not actually charmed
    CharmInfo* charmInfo = InitCharmInfo(this);

-    if(type == MINI_PET)                                    // always passive
+    if(type == MINI_PET || type == POSSESSED_PET)                                    // always passive
        charmInfo->SetReactState(REACT_PASSIVE);
    else if(type == GUARDIAN_PET)                           // always aggressive
        charmInfo->SetReactState(REACT_AGGRESSIVE);