*Merge.

--HG-- branch : trunk
2009-02-26 20:43:35 -06:00
parent 39c513776c bc54e91aff
commit d3a6900667
24 changed files with 415 additions and 204 deletions
@@ -58,7 +58,7 @@ m_declinedname(NULL)
    else if(type == GUARDIAN_PET)                           // always aggressive
        charmInfo->SetReactState(REACT_AGGRESSIVE);

-    m_isActive = true;
+    //m_isActive = true;
 }

 Pet::~Pet()