*Merge.

--HG-- branch : trunk
2009-03-06 18:09:01 -06:00
parent 13fc3dcd7e b49732c04d
commit 7915fd768a
33 changed files with 533 additions and 261 deletions
@@ -901,7 +901,7 @@ struct TRINITY_DLL_DECL npc_steam_tonkAI : public ScriptedAI
        if (apply)
        {
            // Initialize the action bar without the melee attack command
-            m_creature->InitCharmInfo(m_creature);
+            m_creature->InitCharmInfo();
            m_creature->GetCharmInfo()->InitEmptyActionBar(false);

            m_creature->SetReactState(REACT_PASSIVE);