diff options
| author | Liberate <none@none> | 2010-08-29 00:57:51 +0200 |
|---|---|---|
| committer | Liberate <none@none> | 2010-08-29 00:57:51 +0200 |
| commit | f67441b863ae449c2e9e7fab767531e7637d6753 (patch) | |
| tree | 6bf0fae28da98a10b8c907baf55f30ef68b2523c /src/server/scripts/Outland/zangarmarsh.cpp | |
| parent | 7ad5e2ad875e7488175f6c59b68f548372489e4b (diff) | |
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
Diffstat (limited to 'src/server/scripts/Outland/zangarmarsh.cpp')
| -rw-r--r-- | src/server/scripts/Outland/zangarmarsh.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/server/scripts/Outland/zangarmarsh.cpp b/src/server/scripts/Outland/zangarmarsh.cpp index 65aafc7a5df..5425a34b378 100644 --- a/src/server/scripts/Outland/zangarmarsh.cpp +++ b/src/server/scripts/Outland/zangarmarsh.cpp @@ -66,6 +66,7 @@ public: bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { + pPlayer->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pCreature->setPowerType(POWER_MANA); @@ -196,6 +197,7 @@ public: bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { + pPlayer->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_INFO_DEF) { pPlayer->CLOSE_GOSSIP_MENU(); @@ -231,6 +233,7 @@ public: bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { + pPlayer->PlayerTalkClass->ClearMenus(); switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: @@ -283,6 +286,7 @@ public: bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { + pPlayer->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_TRADE) { pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); @@ -404,6 +408,7 @@ public: bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction) { + pPlayer->PlayerTalkClass->ClearMenus(); switch(uiAction) { case GOSSIP_ACTION_INFO_DEF+1: |