diff options
| author | Shauren <shauren.trinity@gmail.com> | 2017-06-11 19:53:22 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2017-06-11 19:53:22 +0200 |
| commit | 677b2fba42f995cafa7754a4dfd7de5b73d83ed2 (patch) | |
| tree | 8f1b401cb6049bb06c053bfabe2498e31115ae43 /src/server/game/Server | |
| parent | 636c9c420af2e18e745818973f1e55efe84875c3 (diff) | |
Core/Quests: Fixed structures of QuestGiverOfferRewardMessage and QuestGiverQuestDetails
Diffstat (limited to 'src/server/game/Server')
| -rw-r--r-- | src/server/game/Server/Packets/QuestPackets.cpp | 14 | ||||
| -rw-r--r-- | src/server/game/Server/WorldSession.h | 1 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/server/game/Server/Packets/QuestPackets.cpp b/src/server/game/Server/Packets/QuestPackets.cpp index 5ccb0e9b745..1492dc7e35e 100644 --- a/src/server/game/Server/Packets/QuestPackets.cpp +++ b/src/server/game/Server/Packets/QuestPackets.cpp @@ -300,8 +300,8 @@ WorldPacket const* WorldPackets::Quest::QuestGiverOfferRewardMessage::Write() { _worldPacket << QuestData; // WorldPackets::Quest::QuestGiverOfferReward _worldPacket << int32(QuestPackageID); - _worldPacket << int32(PortraitTurnIn); _worldPacket << int32(PortraitGiver); + _worldPacket << int32(PortraitTurnIn); _worldPacket.WriteBits(QuestTitle.size(), 9); _worldPacket.WriteBits(RewardText.size(), 12); @@ -359,13 +359,13 @@ WorldPacket const* WorldPackets::Quest::QuestGiverQuestDetails::Write() _worldPacket << int32(QuestID); _worldPacket << int32(QuestPackageID); _worldPacket << int32(PortraitGiver); - _worldPacket << int32(SuggestedPartyMembers); + _worldPacket << int32(PortraitTurnIn); _worldPacket << uint32(QuestFlags[0]); // Flags _worldPacket << uint32(QuestFlags[1]); // FlagsEx - _worldPacket << int32(PortraitTurnIn); + _worldPacket << int32(SuggestedPartyMembers); _worldPacket << uint32(LearnSpells.size()); - _worldPacket << int32(DescEmotes.size()); - _worldPacket << int32(Objectives.size()); + _worldPacket << uint32(DescEmotes.size()); + _worldPacket << uint32(Objectives.size()); _worldPacket << int32(QuestStartItemID); for (int32 spell : LearnSpells) @@ -392,9 +392,9 @@ WorldPacket const* WorldPackets::Quest::QuestGiverQuestDetails::Write() _worldPacket.WriteBits(PortraitGiverName.size(), 8); _worldPacket.WriteBits(PortraitTurnInText.size(), 10); _worldPacket.WriteBits(PortraitTurnInName.size(), 8); - _worldPacket.WriteBit(DisplayPopup); - _worldPacket.WriteBit(StartCheat); _worldPacket.WriteBit(AutoLaunched); + _worldPacket.WriteBit(StartCheat); + _worldPacket.WriteBit(DisplayPopup); _worldPacket.FlushBits(); _worldPacket << Rewards; // WorldPackets::Quest::QuestRewards diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index 3680636ab02..ec535eee114 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -1433,7 +1433,6 @@ class TC_GAME_API WorldSession void HandleQuestLogRemoveQuest(WorldPackets::Quest::QuestLogRemoveQuest& packet); void HandleQuestConfirmAccept(WorldPackets::Quest::QuestConfirmAccept& packet); void HandleQuestgiverCompleteQuest(WorldPackets::Quest::QuestGiverCompleteQuest& packet); - void HandleQuestgiverQuestAutoLaunch(WorldPacket& recvPacket); void HandlePushQuestToParty(WorldPackets::Quest::PushQuestToParty& packet); void HandleQuestPushResult(WorldPackets::Quest::QuestPushResult& packet); void HandleRequestWorldQuestUpdate(WorldPackets::Quest::RequestWorldQuestUpdate& packet); |