*Merge.

--HG-- branch : trunk
2009-02-23 17:04:15 -06:00
parent befa36f8b9 de947abd06
commit 5fe7b48037
26 changed files with 1868 additions and 1813 deletions
@@ -150,6 +150,8 @@ struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI
    float DoGetThreat(Unit *u);
    void DoModifyThreatPercent(Unit *pUnit, int32 pct);

+    void DoTeleportTo(float x, float y, float z, uint32 time = 0);
+
    //Teleports a player without dropping threat (only teleports to same map)
    void DoTeleportPlayer(Unit* pUnit, float x, float y, float z, float o);
    void DoTeleportAll(float x, float y, float z, float o);