From 13bac539d6c19b366be714c712c1acbcd4d1fb16 Mon Sep 17 00:00:00 2001 From: SnapperRy Date: Tue, 19 Jul 2016 09:02:01 +0200 Subject: Core/Mail: implement a way to specify NPC sender for mails when they should be different from the quest ender (#17601) (cherry picked from commit d4e15f1aac3159bb5e17808ee06efb847fdd4789) # Conflicts: # src/server/game/Quests/QuestDef.cpp # src/server/game/Quests/QuestDef.h Rename 9999_99_99_99_world.sql to sql/updates/world/3.3.5/2016_07_19_00_world.sql (cherry picked from commit 3a77dec6e6fac47fedeb0aeddd09dfe12c3817a2) --- src/server/game/Mails/Mail.cpp | 7 +++++++ src/server/game/Mails/Mail.h | 1 + 2 files changed, 8 insertions(+) (limited to 'src/server/game/Mails') diff --git a/src/server/game/Mails/Mail.cpp b/src/server/game/Mails/Mail.cpp index 47c02f4b5a0..5b796042369 100644 --- a/src/server/game/Mails/Mail.cpp +++ b/src/server/game/Mails/Mail.cpp @@ -73,6 +73,13 @@ MailSender::MailSender(Player* sender) m_senderId = sender->GetGUID().GetCounter(); } +MailSender::MailSender(uint32 senderEntry) +{ + m_messageType = MAIL_CREATURE; + m_senderId = senderEntry; + m_stationery = MAIL_STATIONERY_DEFAULT; +} + MailReceiver::MailReceiver(Player* receiver) : m_receiver(receiver), m_receiver_lowguid(receiver->GetGUID().GetCounter()) { } MailReceiver::MailReceiver(Player* receiver, ObjectGuid::LowType receiver_lowguid) : m_receiver(receiver), m_receiver_lowguid(receiver_lowguid) diff --git a/src/server/game/Mails/Mail.h b/src/server/game/Mails/Mail.h index 8b0d4a1c024..71f9e25f915 100644 --- a/src/server/game/Mails/Mail.h +++ b/src/server/game/Mails/Mail.h @@ -94,6 +94,7 @@ class TC_GAME_API MailSender MailSender(AuctionEntry* sender); MailSender(BlackMarketEntry* sender); MailSender(Player* sender); + MailSender(uint32 senderEntry); public: // Accessors MailMessageType GetMailMessageType() const { return m_messageType; } ObjectGuid::LowType GetSenderId() const { return m_senderId; } -- cgit v1.2.3