josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Misc: renamed sGossipSelect parameters

Browse Source 
(cherry picked from commit ad38c2712460fe9d3ecb71959294655d2b88799d)

# Conflicts:
#	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
#	src/server/scripts/Kalimdor/zone_azshara.cpp
This commit is contained in:
joschiwald
2015-10-16 11:56:53 +02:00
committed by MitchesD
parent 3874178da8
commit 2bc4dea4da
18 changed files with 32 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/AI/CoreAI/UnitAI.h
+2 -2
View File
@@ -251,8 +251,8 @@ class UnitAI
static void FillAISpellInfo();
virtual void sGossipHello(Player* /*player*/) { }
virtual void sGossipSelect(Player* /*player*/, uint32 /*sender*/, uint32 /*action*/) { }
virtual void sGossipSelectCode(Player* /*player*/, uint32 /*sender*/, uint32 /*action*/, char const* /*code*/) { }
virtual void sGossipSelect(Player* /*player*/, uint32 /*menuId*/, uint32 /*gossipListId*/) { }
virtual void sGossipSelectCode(Player* /*player*/, uint32 /*menuId*/, uint32 /*gossipListId*/, char const* /*code*/) { }
virtual void sQuestAccept(Player* /*player*/, Quest const* /*quest*/) { }
virtual void sQuestSelect(Player* /*player*/, Quest const* /*quest*/) { }
virtual void sQuestReward(Player* /*player*/, Quest const* /*quest*/, uint32 /*opt*/) { }
src/server/game/AI/SmartScripts/SmartAI.cpp
+3 -3
View File
@@ -728,12 +728,12 @@ void SmartAI::sGossipHello(Player* player)
GetScript()->ProcessEventsFor(SMART_EVENT_GOSSIP_HELLO, player);
}
void SmartAI::sGossipSelect(Player* player, uint32 sender, uint32 action)
void SmartAI::sGossipSelect(Player* player, uint32 menuId, uint32 gossipListId)
{
GetScript()->ProcessEventsFor(SMART_EVENT_GOSSIP_SELECT, player, sender, action);
GetScript()->ProcessEventsFor(SMART_EVENT_GOSSIP_SELECT, player, menuId, gossipListId);
}
void SmartAI::sGossipSelectCode(Player* /*player*/, uint32 /*sender*/, uint32 /*action*/, const char* /*code*/) { }
void SmartAI::sGossipSelectCode(Player* /*player*/, uint32 /*menuId*/, uint32 /*gossipListId*/, const char* /*code*/) { }
void SmartAI::sQuestAccept(Player* player, Quest const* quest)
{
src/server/game/AI/SmartScripts/SmartAI.h
+2 -2
View File
@@ -175,8 +175,8 @@ class SmartAI : public CreatureAI
void SetInvincibilityHpLevel(uint32 level) { mInvincibilityHpLevel = level; }
void sGossipHello(Player* player) override;
void sGossipSelect(Player* player, uint32 sender, uint32 action) override;
void sGossipSelectCode(Player* player, uint32 sender, uint32 action, const char* code) override;
void sGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override;
void sGossipSelectCode(Player* player, uint32 menuId, uint32 gossipListId, const char* code) override;
void sQuestAccept(Player* player, Quest const* quest) override;
//void sQuestSelect(Player* player, Quest const* quest) override;
void sQuestReward(Player* player, Quest const* quest, uint32 opt) override;
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
+2 -2
View File
@@ -366,9 +366,9 @@ public:
}
}
void sGossipSelect(Player* player, uint32 sender, uint32 action) override
void sGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override
{
if (sender == GOSSIP_ID && action == GOSSIP_OPTION_ID)
if (menuId == GOSSIP_ID && gossipListId == GOSSIP_OPTION_ID)
{
player->CLOSE_GOSSIP_MENU();
Talk(SAY_GAMESBEGIN_1);
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
+2 -2
View File
@@ -221,9 +221,9 @@ public:
DoMeleeAttackIfReady();
}
void sGossipSelect(Player* player, uint32 sender, uint32 action) override
void sGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override
{
if (sender == GOSSIP_ID && action == 0)
if (menuId == GOSSIP_ID && gossipListId == 0)
{
player->CLOSE_GOSSIP_MENU();
BeginSpeech(player);
src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
-37
View File
@@ -25,7 +25,6 @@ EndScriptData */
/* ContentData
npc_barnes
npc_berthold
npc_image_of_medivh
EndContentData */
@@ -411,41 +410,6 @@ public:
}
};
/*###
# npc_berthold
####*/
#define GOSSIP_ITEM_TELEPORT "Teleport me to the Guardian's Library"
class npc_berthold : public CreatureScript
{
public:
npc_berthold() : CreatureScript("npc_berthold") { }
bool OnGossipSelect(Player* player, Creature* /*creature*/, uint32 /*sender*/, uint32 action) override
{
player->PlayerTalkClass->ClearMenus();
if (action == GOSSIP_ACTION_INFO_DEF + 1)
player->CastSpell(player, SPELL_TELEPORT, true);
player->CLOSE_GOSSIP_MENU();
return true;
}
bool OnGossipHello(Player* player, Creature* creature) override
{
if (InstanceScript* instance = creature->GetInstanceScript())
{
// Check if Shade of Aran event is done
if (instance->GetData(TYPE_ARAN) == DONE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TELEPORT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
}
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
return true;
}
};
/*###
# npc_image_of_medivh
####*/
@@ -662,6 +626,5 @@ public:
void AddSC_karazhan()
{
new npc_barnes();
new npc_berthold();
new npc_image_of_medivh();
}
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
+1 -1
View File
@@ -97,7 +97,7 @@ class npc_voljin_zulaman : public CreatureScript
_gongCount = 0;
}
void sGossipSelect(Player* player, uint32 sender, uint32 action) override
void sGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override
{
if (_instance->GetData(DATA_ZULAMAN_STATE) != NOT_STARTED)
return;
src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
+1 -1
View File
@@ -226,7 +226,7 @@ public:
}
}
void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) override
void sGossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override
{
DoCast(player, SPELL_TELEPORT_DARNASSUS);
}
src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
+1 -1
View File
@@ -229,7 +229,7 @@ public:
Talk(ATTACK_YELL, who);
}
void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) override
void sGossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override
{
player->CLOSE_GOSSIP_MENU();
me->setFaction(FACTION_HOSTILE);
src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
+3 -3
View File
@@ -956,7 +956,7 @@ class npc_high_overlord_saurfang_igb : public CreatureScript
}
}
void sGossipSelect(Player* /*player*/, uint32 /*sender*/, uint32 /*action*/) override
void sGossipSelect(Player* /*player*/, uint32 /*menuId*/, uint32 /*gossipListId*/) override
{
me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
me->GetTransport()->EnableMovement(true);
@@ -1224,7 +1224,7 @@ class npc_muradin_bronzebeard_igb : public CreatureScript
}
}
void sGossipSelect(Player* /*player*/, uint32 /*sender*/, uint32 /*action*/) override
void sGossipSelect(Player* /*player*/, uint32 /*menuId*/, uint32 /*gossipListId*/) override
{
me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
me->GetTransport()->EnableMovement(true);
@@ -1389,7 +1389,7 @@ class npc_zafod_boombox : public CreatureScript
me->SetReactState(REACT_PASSIVE);
}
void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) override
void sGossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override
{
player->AddItem(ITEM_GOBLIN_ROCKET_PACK, 1);
player->PlayerTalkClass->SendCloseGossip();
src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
+2 -2
View File
@@ -1178,9 +1178,9 @@ class npc_tirion_fordring_tft : public CreatureScript
SetEquipmentSlots(true); // remove glow on ashbringer
}
void sGossipSelect(Player* /*player*/, uint32 sender, uint32 action) override
void sGossipSelect(Player* /*player*/, uint32 menuId, uint32 gossipListId) override
{
if (me->GetCreatureTemplate()->GossipMenuId == sender && !action)
if (me->GetCreatureTemplate()->GossipMenuId == menuId && !gossipListId)
{
_events.SetPhase(PHASE_INTRO);
me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp
+2 -2
View File
@@ -1508,9 +1508,9 @@ class npc_observation_ring_keeper : public CreatureScript
DoCast(SPELL_KEEPER_ACTIVE);
}
void sGossipSelect(Player* player, uint32 sender, uint32 /*action*/) override
void sGossipSelect(Player* player, uint32 menuId, uint32 /*gossipListId*/) override
{
if (sender != 10333)
if (menuId != 10333)
return;
me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
src/server/scripts/Northrend/zone_grizzly_hills.cpp
+1 -1
View File
@@ -762,7 +762,7 @@ public:
}
}
void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) override
void sGossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override
{
DoCast(player, SPELL_SUMMON_ASHWOOD_BRAND);
}
src/server/scripts/Northrend/zone_storm_peaks.cpp
+4 -4
View File
@@ -84,13 +84,13 @@ public:
DoMeleeAttackIfReady();
}
void sGossipSelect(Player* player, uint32 sender, uint32 action) override
void sGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override
{
if (sender == GOSSIP_ID && action == GOSSIP_OPTION_ID)
if (menuId == GOSSIP_ID && gossipListId == GOSSIP_OPTION_ID)
{
player->CLOSE_GOSSIP_MENU();
me->setFaction(113);
npc_escortAI::Start(true, true, player->GetGUID());
Start(true, true, player->GetGUID());
}
}
};
@@ -475,7 +475,7 @@ public:
objectCounter = 0;
}
void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) override
void sGossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override
{
player->CLOSE_GOSSIP_MENU();
playerGUID = player->GetGUID();
src/server/scripts/Northrend/zone_zuldrak.cpp
+2 -2
View File
@@ -267,7 +267,7 @@ public:
return;
}
void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) override
void sGossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override
{
_events.ScheduleEvent(EVENT_RECRUIT_1, 100);
player->CLOSE_GOSSIP_MENU();
@@ -552,7 +552,7 @@ public:
}
}
void sGossipSelect(Player* player, uint32 /*sender*/, uint32 /*action*/) override
void sGossipSelect(Player* player, uint32 /*menuId*/, uint32 /*gossipListId*/) override
{
player->CLOSE_GOSSIP_MENU();
DoCast(player, SPELL_ALCHEMIST_APPRENTICE_INVISBUFF);
src/server/scripts/Outland/BlackTemple/black_temple.cpp
+1 -43
View File
@@ -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,
@@ -52,36 +42,6 @@ enum Events
EVENT_IGNORED = 4,
};
// ########################################################
// 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();
}
src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+1 -1
View File
@@ -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);
src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+2 -2
View File
@@ -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;