Core/Misc: renamed sGossipSelect parameters

(cherry picked from commit ad38c2712460fe9d3ecb71959294655d2b88799d)

# Conflicts:
#	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
#	src/server/scripts/Kalimdor/zone_azshara.cpp

3 files changed, 4 insertions, 46 deletions

diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.cpp b/src/server/scripts/Outland/BlackTemple/black_temple.cpp
index 764cd9594ea..f044fcef5c7 100644
--- a/src/server/scripts/Outland/BlackTemple/black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/black_temple.cpp
@@ -15,22 +15,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/*
-Name:     Black_Temple
-Complete: 100%
-Comment:  Spirit of Olum: Player Teleporter to Seer Kanai Teleport after defeating Naj'entus and Supremus.
-*/
-
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
-#include "ScriptedGossip.h"
 #include "black_temple.h"
-#include "Player.h"
 
 enum Spells
 {
-    // Spirit of Olum
-    SPELL_TELEPORT                   = 41566,
     // Wrathbone Flayer
     SPELL_CLEAVE                     = 15496,
     SPELL_IGNORED                    = 39544,
@@ -53,36 +43,6 @@ enum Events
 };
 
 // ########################################################
-// Spirit of Olum
-// ########################################################
-
-class npc_spirit_of_olum : public CreatureScript
-{
-public:
-    npc_spirit_of_olum() : CreatureScript("npc_spirit_of_olum") { }
-
-    struct npc_spirit_of_olumAI : public ScriptedAI
-    {
-        npc_spirit_of_olumAI(Creature* creature) : ScriptedAI(creature) { }
-
-        void sGossipSelect(Player* player, uint32 /*sender*/, uint32 action) override
-        {
-            if (action == 1)
-            {
-                player->CLOSE_GOSSIP_MENU();
-                player->InterruptNonMeleeSpells(false);
-                player->CastSpell(player, SPELL_TELEPORT, false);
-            }
-        }
-    };
-
-    CreatureAI* GetAI(Creature* creature) const override
-    {
-        return new npc_spirit_of_olumAI(creature);
-    }
-};
-
-// ########################################################
 // Wrathbone Flayer
 // ########################################################
 
@@ -123,7 +83,6 @@ public:
 
         void UpdateAI(uint32 diff) override
         {
-
             if (!_enteredCombat)
             {
                 _events.Update(diff);
@@ -215,12 +174,11 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<npc_wrathbone_flayerAI>(creature);
+        return GetBlackTempleAI<npc_wrathbone_flayerAI>(creature);
     }
 };
 
 void AddSC_black_temple()
 {
-    new npc_spirit_of_olum();
     new npc_wrathbone_flayer();
 }
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
index 0227b60116d..da84b21d361 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
@@ -1779,7 +1779,7 @@ public:
             DoMeleeAttackIfReady();
         }
 
-        void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) override
+        void sGossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override
         {
             player->CLOSE_GOSSIP_MENU();
             EnterPhase(PHASE_CHANNEL);
diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
index e4369f0348d..25ff1bf9536 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
@@ -519,9 +519,9 @@ public:
             DoMeleeAttackIfReady();
         }
 
-        void sGossipSelect(Player* player, uint32 /*sender*/, uint32 action) override
+        void sGossipSelect(Player* player, uint32 /*menuId*/, uint32 gossipListId) override
         {
-            if (action == 0)
+            if (gossipListId == 0)
             {
                 player->CLOSE_GOSSIP_MENU();
                 StartChannel = true;