*Merge.

--HG-- branch : trunk
2009-03-31 18:21:45 -06:00
parent 84f3bf8b71 7f209249a2
commit 8408fb7cd3
270 changed files with 509 additions and 566 deletions
@@ -159,6 +159,8 @@ struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI

    void DoTeleportTo(float x, float y, float z, uint32 time = 0);

+    void DoAction(const int32 param) {}
+
    //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);