aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormegamage <none@none>2009-05-02 22:58:36 -0500
committermegamage <none@none>2009-05-02 22:58:36 -0500
commit5fa99ed46c53411c5665f98e0489bc114528c9f1 (patch)
treedeec755f305001e414f064e9216043ab6b5e1290 /src
parent272697ede188cb98d75ae32b92f1d6abfb8bb02c (diff)
parentc96092e9b1005dfd8799610990df5965fdeff340 (diff)
*Merge.
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp2
-rw-r--r--src/bindings/scripts/scripts/zone/karazhan/boss_terestian_illhoof.cpp9
2 files changed, 6 insertions, 5 deletions
diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp
index 592e0aa52a4..dc8235f646e 100644
--- a/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp
+++ b/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp
@@ -1223,7 +1223,7 @@ void AddSC_blackrock_depths()
newscript->RegisterSelf();
newscript = new Script;
- newscript->Name="phalanx";
+ newscript->Name="mob_phalanx";
newscript->GetAI = &GetAI_mob_phalanx;
newscript->RegisterSelf();
diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_terestian_illhoof.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_terestian_illhoof.cpp
index b504844d924..29aebf37a34 100644
--- a/src/bindings/scripts/scripts/zone/karazhan/boss_terestian_illhoof.cpp
+++ b/src/bindings/scripts/scripts/zone/karazhan/boss_terestian_illhoof.cpp
@@ -415,10 +415,11 @@ void AddSC_boss_terestian_illhoof()
newscript->GetAI = &GetAI_boss_terestian_illhoof;
newscript->RegisterSelf();
- newscript = new Script;
- newscript->Name="mob_karazhan_imp";
- newscript->GetAI = &GetAI_mob_karazhan_imp;
- newscript->RegisterSelf();
+ //Who can find out what is this for
+ //newscript = new Script;
+ //newscript->Name="mob_karazhan_imp";
+ //newscript->GetAI = &GetAI_mob_karazhan_imp;
+ //newscript->RegisterSelf();
newscript = new Script;
newscript->Name="mob_kilrek";