Fix The Dwarven Spy text. Thanks zthoreen.

Fixes issue #616.

--HG--
branch : trunk

3 files changed, 11 insertions, 8 deletions

diff --git a/sql/FULL/world_script_texts.sql b/sql/FULL/world_script_texts.sql
index 4c21fccc28c..ef02e0fcd58 100644
--- a/sql/FULL/world_script_texts.sql
+++ b/sql/FULL/world_script_texts.sql
@@ -151,8 +151,8 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
    (23139,-1000206,'%s starts pecking at the feed.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,2,0,0,'cluck EMOTE_CLUCK_TEXT2'),
    (23139,-1000207,'You have my blessing',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'ashyen_and_keleth SAY_REWARD_BLESS'),
    (28315,-1000208,'Frenzyheart kill you if you come back. You no welcome here no more!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'vekjik SAY_TEXTID_VEKJIK1'),
-   (23139,-1000209,'Very well. Let''s see what you have to show me, $N.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,'anvilward SAY_ANVIL1'),
-   (23139,-1000210,'What manner of trick is this, $R? If you seek to ambush me, I warn you I will not go down quietly!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,'anvilward SAY_ANVIL2'),
+   (15420,-1000209,'Very well. Let''s see what you have to show me, $N.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,'anvilward SAY_ANVIL1'),
+   (15420,-1000210,'What manner of trick is this, $R? If you seek to ambush me, I warn you I will not go down quietly!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,'anvilward SAY_ANVIL2'),
    (23139,-1000211,'Warning! %s emergency shutdown process initiated by $N. Shutdown will complete in two minutes.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,2,0,0,'manaforge_control EMOTE_START'),
    (23139,-1000212,'Emergency shutdown will complete in one minute.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,2,0,0,'manaforge_control EMOTE_60'),
    (23139,-1000213,'Emergency shutdown will complete in thirty seconds.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,2,0,0,'manaforge_control EMOTE_30'),
diff --git a/sql/updates/7312_world_script_texts.sql b/sql/updates/7312_world_script_texts.sql
new file mode 100644
index 00000000000..893f6954c01
--- /dev/null
+++ b/sql/updates/7312_world_script_texts.sql
@@ -0,0 +1 @@
+UPDATE `script_texts` SET `npc_entry`=15420 WHERE `entry` IN (-1000209,-1000210);
diff --git a/src/scripts/eastern_kingdoms/eversong_woods.cpp b/src/scripts/eastern_kingdoms/eversong_woods.cpp
index 0a6b725f7c6..b8e81fd95f3 100644
--- a/src/scripts/eastern_kingdoms/eversong_woods.cpp
+++ b/src/scripts/eastern_kingdoms/eversong_woods.cpp
@@ -39,10 +39,12 @@ EndContentData */
 #define GOSSIP_HELLO    "I need a moment of your time, sir."
 #define GOSSIP_SELECT   "Why... yes, of course. I've something to show you right inside this building, Mr. Anvilward."
 
-#define SAY_PR_1 -1000281
-#define SAY_PR_2 -1000282
-
-#define QUEST_THE_DWARVEN_SPY 8483
+enum eProspectorAnvilward
+{
+    SAY_ANVIL1                                  = -1000209,
+    SAY_ANVIL2                                  = -1000210,
+    QUEST_THE_DWARVEN_SPY                       = 8483,
+};
 
 struct npc_prospector_anvilwardAI : public npc_escortAI
 {
@@ -59,8 +61,8 @@ struct npc_prospector_anvilwardAI : public npc_escortAI
 
         switch (i)
         {
-            case 0: DoScriptText(SAY_PR_1, m_creature, pPlayer); break;
-            case 5: DoScriptText(SAY_PR_2, m_creature, pPlayer); break;
+            case 0: DoScriptText(SAY_ANVIL1, m_creature, pPlayer); break;
+            case 5: DoScriptText(SAY_ANVIL2, m_creature, pPlayer); break;
             case 6: m_creature->setFaction(24); break;
         }
     }