mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 13:37:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11706] Use proper text structure in auction mail subject/text

Browse source 
This for example will enable show random property suffix in item name
in auction mails.
This commit is contained in:
VladimirMangos 2011-07-02 07:10:03 +04:00
parent cda3a95fc2
commit 5e9854974b
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/AuctionHouseHandler.cpp
View file

@ -162,7 +162,7 @@ void WorldSession::SendAuctionOutbiddedMail(AuctionEntry *auction)
if (oldBidder || oldBidder_accId)
{
std::ostringstream msgAuctionOutbiddedSubject;
msgAuctionOutbiddedSubject << auction->itemTemplate << ":0:" << AUCTION_OUTBIDDED << ":0:0";
msgAuctionOutbiddedSubject << auction->itemTemplate << ":" << auction->itemRandomPropertyId << ":" << AUCTION_OUTBIDDED << ":" << auction->Id << ":" << auction->itemCount;
if (oldBidder)
oldBidder->GetSession()->SendAuctionBidderNotification(auction);
@ -187,7 +187,7 @@ void WorldSession::SendAuctionCancelledToBidderMail(AuctionEntry* auction)
if (bidder || bidder_accId)
{
std::ostringstream msgAuctionCancelledSubject;
msgAuctionCancelledSubject << auction->itemTemplate << ":0:" << AUCTION_CANCELLED_TO_BIDDER << ":0:0";
msgAuctionCancelledSubject << auction->itemTemplate << ":" << auction->itemRandomPropertyId << ":" << AUCTION_CANCELLED_TO_BIDDER << ":" << auction->Id << ":" << auction->itemCount;
if (bidder)
bidder->GetSession()->SendAuctionRemovedNotification(auction);
@ -505,7 +505,7 @@ void WorldSession::HandleAuctionRemoveItem(WorldPacket & recv_data)
}
// Return the item by mail
std::ostringstream msgAuctionCanceledOwner;
msgAuctionCanceledOwner << auction->itemTemplate << ":0:" << AUCTION_CANCELED << ":0:0";
msgAuctionCanceledOwner << auction->itemTemplate << ":" << auction->itemRandomPropertyId << ":" << AUCTION_CANCELED << ":" << auction->Id << ":" << auction->itemCount;
// item will deleted or added to received mail list
MailDraft(msgAuctionCanceledOwner.str(), "") // TODO: fix body

10
src/game/AuctionHouseMgr.cpp
View file

@ -138,7 +138,7 @@ void AuctionHouseMgr::SendAuctionWonMail(AuctionEntry *auction)
if (bidder || bidder_accId)
{
std::ostringstream msgAuctionWonSubject;
msgAuctionWonSubject << auction->itemTemplate << ":0:" << AUCTION_WON;
msgAuctionWonSubject << auction->itemTemplate << ":" << auction->itemRandomPropertyId << ":" << AUCTION_WON;
std::ostringstream msgAuctionWonBody;
msgAuctionWonBody.width(16);
@ -185,7 +185,7 @@ void AuctionHouseMgr::SendAuctionSalePendingMail(AuctionEntry * auction)
if (owner || owner_guid && sObjectMgr.GetPlayerAccountIdByGUID(owner_guid))
{
std::ostringstream msgAuctionSalePendingSubject;
msgAuctionSalePendingSubject << auction->itemTemplate << ":0:" << AUCTION_SALE_PENDING;
msgAuctionSalePendingSubject << auction->itemTemplate << ":" << auction->itemRandomPropertyId << ":" << AUCTION_SALE_PENDING;
std::ostringstream msgAuctionSalePendingBody;
uint32 auctionCut = auction->GetAuctionCut();
@ -219,7 +219,7 @@ void AuctionHouseMgr::SendAuctionSuccessfulMail(AuctionEntry * auction)
if (owner || owner_accId)
{
std::ostringstream msgAuctionSuccessfulSubject;
msgAuctionSuccessfulSubject << auction->itemTemplate << ":0:" << AUCTION_SUCCESSFUL;
msgAuctionSuccessfulSubject << auction->itemTemplate << ":" << auction->itemRandomPropertyId << ":" << AUCTION_SUCCESSFUL;
std::ostringstream auctionSuccessfulBody;
uint32 auctionCut = auction->GetAuctionCut();
@ -267,7 +267,7 @@ void AuctionHouseMgr::SendAuctionExpiredMail(AuctionEntry * auction)
if (owner || owner_accId)
{
std::ostringstream subject;
subject << auction->itemTemplate << ":0:" << AUCTION_EXPIRED << ":0:0";
subject << auction->itemTemplate << ":" << auction->itemRandomPropertyId << ":" << AUCTION_EXPIRED << ":" << auction->Id << ":" << auction->itemCount;
if (owner)
owner->GetSession()->SendAuctionOwnerNotification(auction);
@ -462,7 +462,7 @@ void AuctionHouseMgr::LoadAuctions()
// Attempt send item back to owner
std::ostringstream msgAuctionCanceledOwner;
msgAuctionCanceledOwner << auction->itemTemplate << ":0:" << AUCTION_CANCELED << ":0:0";
msgAuctionCanceledOwner << auction->itemTemplate << ":"<< auction->itemRandomPropertyId << ":" << AUCTION_CANCELED << ":" << auction->Id << ":" << auction->itemCount;
if (auction->itemGuidLow)
{

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "11705"
#define REVISION_NR "11706"
#endif // __REVISION_NR_H__