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

*Fix: Only show quests in the first page of gossip, instead of every page.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Liberate
2010-05-24 21:10:48 +02:00
parent 89aebd40c9
commit 09a455dcd1
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/NPCHandler.cpp
+1 -1
View File
@@ -333,7 +333,7 @@ void WorldSession::HandleGossipHelloOpcode(WorldPacket & recv_data)
if (!sScriptMgr.GossipHello(_player, unit)) if (!sScriptMgr.GossipHello(_player, unit))
{ {
// _player->TalkedToCreature(unit->GetEntry(), unit->GetGUID()); // _player->TalkedToCreature(unit->GetEntry(), unit->GetGUID());
_player->PrepareGossipMenu(unit, unit->GetCreatureInfo()->GossipMenuId); _player->PrepareGossipMenu(unit, unit->GetCreatureInfo()->GossipMenuId, true);
_player->SendPreparedGossip(unit); _player->SendPreparedGossip(unit);
} }
} }
src/game/Player.cpp
+2 -2
View File
@@ -13257,7 +13257,7 @@ void Player::SendNewItem(Item *item, uint32 count, bool received, bool created,
/*** GOSSIP SYSTEM ***/ /*** GOSSIP SYSTEM ***/
/*********************************************************/ /*********************************************************/
void Player::PrepareGossipMenu(WorldObject *pSource, uint32 menuId) void Player::PrepareGossipMenu(WorldObject *pSource, uint32 menuId, bool showQuests)
{ {
PlayerMenu* pMenu = PlayerTalkClass; PlayerMenu* pMenu = PlayerTalkClass;
pMenu->ClearMenus(); pMenu->ClearMenus();
@@ -13278,7 +13278,7 @@ void Player::PrepareGossipMenu(WorldObject *pSource, uint32 menuId)
{ {
pCreature = pSource->ToCreature(); pCreature = pSource->ToCreature();
npcflags = pCreature->GetUInt32Value(UNIT_NPC_FLAGS); npcflags = pCreature->GetUInt32Value(UNIT_NPC_FLAGS);
if (npcflags & UNIT_NPC_FLAG_QUESTGIVER) if (npcflags & UNIT_NPC_FLAG_QUESTGIVER && showQuests)
PrepareQuestMenu(pSource->GetGUID()); PrepareQuestMenu(pSource->GetGUID());
} }
else if (pSource->GetTypeId() == TYPEID_GAMEOBJECT) else if (pSource->GetTypeId() == TYPEID_GAMEOBJECT)
src/game/Player.h
+1 -1
View File
@@ -1223,7 +1223,7 @@ class Player : public Unit, public GridObject<Player>
/*** GOSSIP SYSTEM ***/ /*** GOSSIP SYSTEM ***/
/*********************************************************/ /*********************************************************/
void PrepareGossipMenu(WorldObject *pSource, uint32 menuId = 0); void PrepareGossipMenu(WorldObject *pSource, uint32 menuId = 0, bool showQuests = false);
void SendPreparedGossip(WorldObject *pSource); void SendPreparedGossip(WorldObject *pSource);
void OnGossipSelect(WorldObject *pSource, uint32 gossipListId, uint32 menuId); void OnGossipSelect(WorldObject *pSource, uint32 gossipListId, uint32 menuId);
src/game/QuestHandler.cpp
+1 -1
View File
@@ -104,7 +104,7 @@ void WorldSession::HandleQuestgiverHelloOpcode(WorldPacket & recv_data)
if (sScriptMgr.GossipHello(_player, pCreature)) if (sScriptMgr.GossipHello(_player, pCreature))
return; return;
_player->PrepareGossipMenu(pCreature, pCreature->GetCreatureInfo()->GossipMenuId); _player->PrepareGossipMenu(pCreature, pCreature->GetCreatureInfo()->GossipMenuId, true);
_player->SendPreparedGossip(pCreature); _player->SendPreparedGossip(pCreature);
} }