diff options
author | Kudlaty <none@none> | 2009-07-25 22:16:21 +0200 |
---|---|---|
committer | Kudlaty <none@none> | 2009-07-25 22:16:21 +0200 |
commit | d62da4cc16c3498674450d5751d18bbe9f9b4f6f (patch) | |
tree | 71be3f8b7359fcb7618bdea73687f5c8e1ed3a4e /src/bindings/scripts/ScriptMgr.cpp | |
parent | 96f814ea20b6ba5932bf635e6a78b5e7a2e68597 (diff) |
Merge [SD2]
r1106 Prevent abuse of item 44222. Apply some SD2 code style
r1107 Add health modification for phase and correct phase value for kael(TK)
r1108 Remove scripted function SetSheathState() and use mangos function instead. Fix one typo and apply sd2 code style for one script.
r1109 Remove old makefile* files not needed.
r1110 Some minor adjustments to sharkkis, add one spell and also add distance to MoveChase. Not kill boss' advisors on Reset when not needed.
r1111 Check pointers and avoid possible crash
r1112 Added script for friendly Kael in MgT (movement to orb-platform, transform and gossip)
r1113 Correct misunderstanding added in 1112, and use timer for transformation instead (creature are expected to spawn/fly down once player use orb).
--HG--
branch : trunk
Diffstat (limited to 'src/bindings/scripts/ScriptMgr.cpp')
-rw-r--r-- | src/bindings/scripts/ScriptMgr.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/bindings/scripts/ScriptMgr.cpp b/src/bindings/scripts/ScriptMgr.cpp index a7a57818df7..f81edfdfb01 100644 --- a/src/bindings/scripts/ScriptMgr.cpp +++ b/src/bindings/scripts/ScriptMgr.cpp @@ -356,6 +356,7 @@ extern void AddSC_boss_selin_fireheart(); extern void AddSC_boss_vexallus(); extern void AddSC_boss_priestess_delrissa(); extern void AddSC_instance_magisters_terrace(); +extern void AddSC_magisters_terrace(); //Maraudon extern void AddSC_boss_celebras_the_cursed(); @@ -1260,6 +1261,7 @@ void ScriptsInit(char const* cfg_file = "trinitycore.conf") AddSC_boss_vexallus(); AddSC_boss_priestess_delrissa(); AddSC_instance_magisters_terrace(); + AddSC_magisters_terrace(); //Maraudon AddSC_boss_celebras_the_cursed(); |