Fixes gossip scripts or points of interests of npc's with a Scriptname assigned to them.

This fixes guards in Major cities.
Thanks to Aokromes for testing.
Thanks to click for converting all the scripts to work with this change.

--HG--
branch : trunk

3 files changed, 5 insertions, 0 deletions

diff --git a/src/server/scripts/Custom/custom_example.cpp b/src/server/scripts/Custom/custom_example.cpp
index c0de8cc5475..e9c43cfbc6a 100644
--- a/src/server/scripts/Custom/custom_example.cpp
+++ b/src/server/scripts/Custom/custom_example.cpp
@@ -80,6 +80,7 @@ public:
 
     bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction)
     {
+        pPlayer->PlayerTalkClass->ClearMenus();
         if (uiSender == GOSSIP_SENDER_MAIN)
             SendDefaultMenu(pPlayer, pCreature, uiAction);
 
diff --git a/src/server/scripts/Custom/npc_acherus_taxi.cpp b/src/server/scripts/Custom/npc_acherus_taxi.cpp
index 86530ac2094..059b69fe0cc 100644
--- a/src/server/scripts/Custom/npc_acherus_taxi.cpp
+++ b/src/server/scripts/Custom/npc_acherus_taxi.cpp
@@ -35,6 +35,7 @@ public:
 
     bool OnGossipSelect(Player *pPlayer, Creature * /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction)
     {
+        pPlayer->PlayerTalkClass->ClearMenus();
         if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
         {
             if (pPlayer->GetPositionZ() >= 316)
diff --git a/src/server/scripts/Custom/npc_wyrmresttempel_taxi.cpp b/src/server/scripts/Custom/npc_wyrmresttempel_taxi.cpp
index ac72117da1a..301be4b7baf 100644
--- a/src/server/scripts/Custom/npc_wyrmresttempel_taxi.cpp
+++ b/src/server/scripts/Custom/npc_wyrmresttempel_taxi.cpp
@@ -43,6 +43,7 @@ public:
 
     bool OnGossipSelect(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction)
     {
+        pPlayer->PlayerTalkClass->ClearMenus();
         if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
             pPlayer->GetSession()->SendDoFlight(6376, 881);
 
@@ -70,6 +71,7 @@ public:
 
     bool OnGossipSelect(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction)
     {
+        pPlayer->PlayerTalkClass->ClearMenus();
         if (uiAction == GOSSIP_ACTION_INFO_DEF + 4)
             pPlayer->GetSession()->SendDoFlight(6376, 878);
 
@@ -96,6 +98,7 @@ public:
 
     bool OnGossipSelect(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction)
     {
+        pPlayer->PlayerTalkClass->ClearMenus();
         if (uiAction == GOSSIP_ACTION_INFO_DEF + 5)
             pPlayer->GetSession()->SendDoFlight(6376, 879);