aboutsummaryrefslogtreecommitdiff
path: root/src/game/Player.cpp
diff options
context:
space:
mode:
authorclick <none@none>2010-04-14 19:06:37 +0200
committerclick <none@none>2010-04-14 19:06:37 +0200
commit34a70d3e46e6b4947df0c4d3cfaa3faabae6e738 (patch)
tree66622c7cc77e545308dc386e7404403595b75a7e /src/game/Player.cpp
parent1e573cf11c4d8ccc0537865236439ce0088f09c6 (diff)
Port some mailsending-fixes from MaNGOS - prevents copying maildata/text into new mails
Original fix by Vladimir --HG-- branch : trunk
Diffstat (limited to 'src/game/Player.cpp')
-rw-r--r--src/game/Player.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 8441dd31fa5..10aac3aa60b 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -14118,7 +14118,7 @@ void Player::RewardQuest(Quest const *pQuest, uint32 reward, Object* questGiver,
// Send reward mail
if (uint32 mail_template_id = pQuest->GetRewMailTemplateId())
- MailDraft(mail_template_id).SendMailTo(MailReceiver(this), MailSender(questGiver), MAIL_CHECK_MASK_HAS_BODY, pQuest->GetRewMailDelaySecs());
+ MailDraft(mail_template_id).SendMailTo(this, questGiver, MAIL_CHECK_MASK_HAS_BODY, pQuest->GetRewMailDelaySecs());
if (pQuest->IsDaily())
{
@@ -16548,7 +16548,7 @@ void Player::_LoadInventory(QueryResult_AutoPtr result, uint32 timediff)
draft.AddItem(item);
}
- draft.SendMailTo(this, MailSender(this, MAIL_STATIONERY_GM));
+ draft.SendMailTo(this, MailSender(this, MAIL_STATIONERY_GM), MAIL_CHECK_MASK_COPIED);
}
}
//if (isAlive())
@@ -21139,7 +21139,7 @@ void Player::AutoUnequipOffhandIfNeed(bool force /*= false*/)
CharacterDatabase.CommitTransaction();
std::string subject = GetSession()->GetTrinityString(LANG_NOT_EQUIPPED_ITEM);
- MailDraft(subject, "There's were problems with equipping this item.").AddItem(offItem).SendMailTo(this, MailSender(this, MAIL_STATIONERY_GM));
+ MailDraft(subject, "There were problems with equipping one or several items").AddItem(offItem).SendMailTo(this, MailSender(this, MAIL_STATIONERY_GM), MAIL_CHECK_MASK_COPIED);
}
}