Merge branch 'master' into 4.3.4

Conflicts:
	src/server/game/Chat/ChatLink.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/ChannelHandler.cpp
	src/server/scripts/EasternKingdoms/hinterlands.cpp

2 files changed, 21 insertions, 20 deletions

diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
index 509fcdd845e..5d9df239870 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
@@ -23,6 +23,7 @@ SDComment:
 SDCategory: Shadowfang Keep
 EndScriptData */
 
+#include "ScriptedCreature.h"
 #include "ScriptMgr.h"
 #include "InstanceScript.h"
 #include "shadowfang_keep.h"
@@ -32,9 +33,9 @@ EndScriptData */
 
 enum eEnums
 {
-    SAY_BOSS_DIE_AD         = -1033007,
-    SAY_BOSS_DIE_AS         = -1033008,
-    SAY_ARCHMAGE            = -1033009,
+    SAY_BOSS_DIE_AD         = 0,
+    SAY_BOSS_DIE_AS         = 0,
+    SAY_ARCHMAGE            = 0,
 
     NPC_ASH                 = 3850,
     NPC_ADA                 = 3849,
@@ -139,8 +140,8 @@ public:
 
             if (pAda && pAda->isAlive() && pAsh && pAsh->isAlive())
             {
-                DoScriptText(SAY_BOSS_DIE_AD, pAda);
-                DoScriptText(SAY_BOSS_DIE_AS, pAsh);
+                pAda->AI()->Talk(SAY_BOSS_DIE_AD);
+                pAsh->AI()->Talk(SAY_BOSS_DIE_AS);
             }
         }
 
@@ -257,7 +258,7 @@ public:
                             summon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
                             summon->SetReactState(REACT_DEFENSIVE);
                             summon->CastSpell(summon, SPELL_ASHCROMBE_TELEPORT, true);
-                            DoScriptText(SAY_ARCHMAGE, summon);
+                            summon->AI()->Talk(SAY_ARCHMAGE);
                             uiTimer = 2000;
                             uiPhase = 2;
                             break;
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
index 5fc41b3b267..c98148e645b 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
@@ -42,13 +42,13 @@ EndContentData */
 
 enum eEnums
 {
-    SAY_FREE_AS             = -1033000,
-    SAY_OPEN_DOOR_AS        = -1033001,
-    SAY_POST_DOOR_AS        = -1033002,
-    SAY_FREE_AD             = -1033003,
-    SAY_OPEN_DOOR_AD        = -1033004,
-    SAY_POST1_DOOR_AD       = -1033005,
-    SAY_POST2_DOOR_AD       = -1033006,
+    SAY_FREE_AS             = 0,
+    SAY_OPEN_DOOR_AS        = 1,
+    SAY_POST_DOOR_AS        = 2,
+    SAY_FREE_AD             = 0,
+    SAY_OPEN_DOOR_AD        = 1,
+    SAY_POST1_DOOR_AD       = 2,
+    SAY_POST2_DOOR_AD       = 3,
 
     SPELL_UNLOCK            = 6421,
     NPC_ASH                 = 3850,
@@ -110,15 +110,15 @@ public:
             {
                 case 0:
                     if (uiNpcEntry == NPC_ASH)
-                        DoScriptText(SAY_FREE_AS, me);
+                        Talk(SAY_FREE_AS);
                     else
-                        DoScriptText(SAY_FREE_AD, me);
+                        Talk(SAY_FREE_AD);
                     break;
                 case 10:
                     if (uiNpcEntry == NPC_ASH)
-                        DoScriptText(SAY_OPEN_DOOR_AS, me);
+                        Talk(SAY_OPEN_DOOR_AS);
                     else
-                        DoScriptText(SAY_OPEN_DOOR_AD, me);
+                        Talk(SAY_OPEN_DOOR_AD);
                     break;
                 case 11:
                     if (uiNpcEntry == NPC_ASH)
@@ -126,16 +126,16 @@ public:
                     break;
                 case 12:
                     if (uiNpcEntry == NPC_ASH)
-                        DoScriptText(SAY_POST_DOOR_AS, me);
+                        Talk(SAY_POST_DOOR_AS);
                     else
-                        DoScriptText(SAY_POST1_DOOR_AD, me);
+                        Talk(SAY_POST1_DOOR_AD);
 
                     if (instance)
                         instance->SetData(TYPE_FREE_NPC, DONE);
                     break;
                 case 13:
                     if (uiNpcEntry != NPC_ASH)
-                        DoScriptText(SAY_POST2_DOOR_AD, me);
+                        Talk(SAY_POST2_DOOR_AD);
                     break;
             }
         }