From f67441b863ae449c2e9e7fab767531e7637d6753 Mon Sep 17 00:00:00 2001 From: Liberate Date: Sun, 29 Aug 2010 00:57:51 +0200 Subject: 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 --- src/server/game/Scripting/ScriptMgr.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/server/game/Scripting/ScriptMgr.cpp') diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index 9d0a4f871d2..bdff47bc74c 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -674,7 +674,6 @@ bool ScriptMgr::OnGossipSelect(Player* player, Creature* creature, uint32 sender ASSERT(creature); GET_SCRIPT_RET(CreatureScript, creature->GetScriptId(), tmpscript, false); - player->PlayerTalkClass->ClearMenus(); return tmpscript->OnGossipSelect(player, creature, sender, action); } @@ -685,7 +684,6 @@ bool ScriptMgr::OnGossipSelectCode(Player* player, Creature* creature, uint32 se ASSERT(code); GET_SCRIPT_RET(CreatureScript, creature->GetScriptId(), tmpscript, false); - player->PlayerTalkClass->ClearMenus(); return tmpscript->OnGossipSelectCode(player, creature, sender, action, code); } @@ -776,7 +774,6 @@ bool ScriptMgr::OnGossipSelect(Player* player, GameObject* go, uint32 sender, ui ASSERT(go); GET_SCRIPT_RET(GameObjectScript, go->GetScriptId(), tmpscript, false); - player->PlayerTalkClass->ClearMenus(); return tmpscript->OnGossipSelect(player, go, sender, action); } @@ -787,7 +784,6 @@ bool ScriptMgr::OnGossipSelectCode(Player* player, GameObject* go, uint32 sender ASSERT(code); GET_SCRIPT_RET(GameObjectScript, go->GetScriptId(), tmpscript, false); - player->PlayerTalkClass->ClearMenus(); return tmpscript->OnGossipSelectCode(player, go, sender, action, code); } -- cgit v1.2.3