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

Core/PacketIO: Fixed typo in SMSG_QUEST_GIVER_QUEST_LIST_MESSAGE structure

Browse Source
This commit is contained in:
vincent-michael
2017-07-08 20:06:47 +02:00
parent 0b5c545e57
commit 23ab9be910
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Creature/GossipDef.cpp
+3 -3
View File
@@ -331,9 +331,9 @@ void QuestMenu::ClearMenu()
_questMenuItems.clear();
}
void PlayerMenu::SendQuestGiverQuestList(ObjectGuid guid)
void PlayerMenu::SendQuestGiverQuestListMessage(ObjectGuid guid)
{
WorldPackets::Quest::QuestGiverQuestList questList;
WorldPackets::Quest::QuestGiverQuestListMessage questList;
questList.QuestGiverGUID = guid;
if (QuestGreeting const* questGreeting = sObjectMgr->GetQuestGreeting(guid))
@@ -368,7 +368,7 @@ void PlayerMenu::SendQuestGiverQuestList(ObjectGuid guid)
bool repeatable = false; // NYI
questList.GossipTexts.emplace_back(questID, questMenuItem.QuestIcon, quest->GetQuestLevel(), quest->GetFlags(), quest->GetFlagsEx(), repeatable, title);
questList.QuestDataText.emplace_back(questID, questMenuItem.QuestIcon, quest->GetQuestLevel(), quest->GetFlags(), quest->GetFlagsEx(), repeatable, title);
}
}
src/server/game/Entities/Creature/GossipDef.h
+1 -1
View File
@@ -259,7 +259,7 @@ class TC_GAME_API PlayerMenu
/*********************************************************/
void SendQuestGiverStatus(uint32 questStatus, ObjectGuid npcGUID) const;
void SendQuestGiverQuestList(ObjectGuid npcGUID);
void SendQuestGiverQuestListMessage(ObjectGuid npcGUID);
void SendQuestQueryResponse(Quest const* quest) const;
void SendQuestGiverQuestDetails(Quest const* quest, ObjectGuid npcGUID, bool activateAccept) const;
src/server/game/Entities/Player/Player.cpp
+1 -1
View File
@@ -14605,7 +14605,7 @@ void Player::SendPreparedQuest(ObjectGuid guid)
}
}
PlayerTalkClass->SendQuestGiverQuestList(guid);
PlayerTalkClass->SendQuestGiverQuestListMessage(guid);
}
bool Player::IsActiveQuest(uint32 quest_id) const
src/server/game/Server/Packets/QuestPackets.cpp
+4 -4
View File
@@ -475,20 +475,20 @@ void WorldPackets::Quest::QuestLogRemoveQuest::Read()
_worldPacket >> Entry;
}
WorldPacket const* WorldPackets::Quest::QuestGiverQuestList::Write()
WorldPacket const* WorldPackets::Quest::QuestGiverQuestListMessage::Write()
{
_worldPacket << QuestGiverGUID;
_worldPacket << uint32(GreetEmoteDelay);
_worldPacket << uint32(GreetEmoteType);
_worldPacket << uint32(GossipTexts.size());
_worldPacket << uint32(QuestDataText.size());
_worldPacket.WriteBits(Greeting.size(), 11);
_worldPacket.FlushBits();
for (GossipTextData const& gossip : GossipTexts)
for (GossipText const& gossip : QuestDataText)
{
_worldPacket << uint32(gossip.QuestID);
_worldPacket << uint32(gossip.QuestType);
_worldPacket << uint32(gossip.QuestLevel);
_worldPacket << int32(gossip.QuestLevel);
_worldPacket << uint32(gossip.QuestFlags);
_worldPacket << uint32(gossip.QuestFlagsEx);
_worldPacket.WriteBit(gossip.Repeatable);
src/server/game/Server/Packets/QuestPackets.h
+6 -6
View File
@@ -460,30 +460,30 @@ namespace WorldPackets
uint8 Entry = 0;
};
struct GossipTextData
struct GossipText
{
GossipTextData(uint32 questID, uint32 questType, uint32 questLevel, uint32 questFlags, uint32 questFlagsEx, bool repeatable, std::string questTitle) :
GossipText(uint32 questID, uint32 questType, int32 questLevel, uint32 questFlags, uint32 questFlagsEx, bool repeatable, std::string questTitle) :
QuestID(questID), QuestType(questType), QuestLevel(questLevel), QuestFlags(questFlags), QuestFlagsEx(questFlagsEx), Repeatable(repeatable), QuestTitle(questTitle) { }
uint32 QuestID;
uint32 QuestType;
uint32 QuestLevel;
int32 QuestLevel;
uint32 QuestFlags;
uint32 QuestFlagsEx;
bool Repeatable;
std::string QuestTitle;
};
class QuestGiverQuestList final : public ServerPacket
class QuestGiverQuestListMessage final : public ServerPacket
{
public:
QuestGiverQuestList() : ServerPacket(SMSG_QUEST_GIVER_QUEST_LIST_MESSAGE, 100) { }
QuestGiverQuestListMessage() : ServerPacket(SMSG_QUEST_GIVER_QUEST_LIST_MESSAGE, 100) { }
WorldPacket const* Write() override;
ObjectGuid QuestGiverGUID;
uint32 GreetEmoteDelay = 0;
uint32 GreetEmoteType = 0;
std::vector<GossipTextData> GossipTexts;
std::vector<GossipText> QuestDataText;
std::string Greeting;
};