[10802] Use ObjectGuid in Mail code.

Some catched bugs fixed in mixed uint32/guid values using cases.
This commit is contained in:
VladimirMangos 2010-12-01 15:03:49 +03:00
parent 3de8212e03
commit 938622bedc
9 changed files with 59 additions and 54 deletions

View file

@ -6545,7 +6545,7 @@ bool ChatHandler::HandleSendItemsCommand(char* args)
}
// from console show nonexistent sender
MailSender sender(MAIL_NORMAL,m_session ? m_session->GetPlayer()->GetGUIDLow() : 0, MAIL_STATIONERY_GM);
MailSender sender(m_session ? m_session->GetPlayer() : NULL, MAIL_STATIONERY_GM);
// fill mail
MailDraft draft(subject, text);
@ -6559,7 +6559,7 @@ bool ChatHandler::HandleSendItemsCommand(char* args)
}
}
draft.SendMailTo(MailReceiver(receiver,GUID_LOPART(receiver_guid)), sender);
draft.SendMailTo(MailReceiver(receiver, receiver_guid), sender);
std::string nameLink = playerLink(receiver_name);
PSendSysMessage(LANG_MAIL_SENT, nameLink.c_str());
@ -6597,11 +6597,11 @@ bool ChatHandler::HandleSendMoneyCommand(char* args)
std::string text = msgText;
// from console show nonexistent sender
MailSender sender(MAIL_NORMAL,m_session ? m_session->GetPlayer()->GetGUIDLow() : 0, MAIL_STATIONERY_GM);
MailSender sender(m_session ? m_session->GetPlayer() : NULL, MAIL_STATIONERY_GM);
MailDraft(subject, text)
.AddMoney(money)
.SendMailTo(MailReceiver(receiver,GUID_LOPART(receiver_guid)),sender);
.SendMailTo(MailReceiver(receiver, receiver_guid),sender);
std::string nameLink = playerLink(receiver_name);
PSendSysMessage(LANG_MAIL_SENT, nameLink.c_str());