diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2015-08-08 16:15:37 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2015-08-08 16:15:37 +0200 |
| commit | 910944036737ab0fa1852ddb95c8cf8427097760 (patch) | |
| tree | f33d48ea6b4946d167f7ef6092770cbe6916bfb1 /src/server/game/Entities | |
| parent | 650dd53b84056d818a0f9344eb19d7c6b2468ef8 (diff) | |
Core/PacketIO: Updated and enabled SMSG_QUEST_GIVER_QUEST_FAILED opcode
Diffstat (limited to 'src/server/game/Entities')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 13 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.h | 4 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 8fadc6d8de5..187f02b15ed 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -16380,15 +16380,14 @@ void Player::SendQuestReward(Quest const* quest, uint32 XP) GetSession()->SendPacket(packet.Write()); } -void Player::SendQuestFailed(uint32 questId, InventoryResult reason) +void Player::SendQuestFailed(uint32 questID, InventoryResult reason) { - if (questId) + if (questID) { - WorldPacket data(SMSG_QUEST_GIVER_QUEST_FAILED, 4 + 4); - data << uint32(questId); - data << uint32(reason); // failed reason (valid reasons: 4, 16, 50, 17, 74, other values show default message) - GetSession()->SendPacket(&data); - TC_LOG_DEBUG("network", "WORLD: Sent SMSG_QUESTGIVER_QUEST_FAILED"); + WorldPackets::Quest::QuestGiverQuestFailed questGiverQuestFailed; + questGiverQuestFailed.QuestID = questID; + questGiverQuestFailed.Reason = reason; // failed reason (valid reasons: 4, 16, 50, 17, other values show default message) + GetSession()->SendPacket(questGiverQuestFailed.Write()); } } diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 4cc78771f1e..e6fee15ec9a 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1721,8 +1721,8 @@ class Player : public Unit, public GridObject<Player> void SetQuestObjectiveData(Quest const* quest, int8 storageIndex, int32 data); void SendQuestComplete(Quest const* quest); void SendQuestReward(Quest const* quest, uint32 XP); - void SendQuestFailed(uint32 questId, InventoryResult reason = EQUIP_ERR_OK); - void SendQuestTimerFailed(uint32 questId); + void SendQuestFailed(uint32 questID, InventoryResult reason = EQUIP_ERR_OK); + void SendQuestTimerFailed(uint32 questID); void SendCanTakeQuestResponse(QuestFailedReason reason, bool sendErrorMessage = true, std::string reasonText = "") const; void SendQuestConfirmAccept(Quest const* quest, Player* receiver); void SendPushToPartyResponse(Player* player, QuestPushReason reason); |