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

[8442] Fixed displaying return button in mails

Browse source
This commit is contained in:
arrai 2009-08-30 19:34:02 +02:00
parent 8a7b77c088
commit f7963d1791
2 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/game/Mail.cpp
View file

@ -34,8 +34,8 @@ enum MailShowFlags
MAIL_SHOW_UNK0 = 0x0001, MAIL_SHOW_UNK0 = 0x0001,
MAIL_SHOW_DELETE = 0x0002, // forced show delete button instead return button MAIL_SHOW_DELETE = 0x0002, // forced show delete button instead return button
MAIL_SHOW_AUCTION = 0x0004, // from old comment MAIL_SHOW_AUCTION = 0x0004, // from old comment
MAIL_SHOW_COD = 0x0008, // show subject prefix MAIL_SHOW_UNK2 = 0x0008, // unknown, COD will be shown even without that flag
MAIL_SHOW_UNK4 = 0x0010, MAIL_SHOW_RETURN = 0x0010,
}; };
void MailItem::deleteItem( bool inDB ) void MailItem::deleteItem( bool inDB )
@ -319,7 +319,16 @@ void WorldSession::HandleMailDelete(WorldPacket & recv_data )
pl->m_mailsUpdated = true; pl->m_mailsUpdated = true;
Mail *m = pl->GetMail(mailId); Mail *m = pl->GetMail(mailId);
if(m) if(m)
{
// delete shouldn't show up for COD mails
if (m->COD)
{
pl->SendMailResult(mailId, MAIL_DELETED, MAIL_ERR_INTERNAL_ERROR);
return;
}
m->state = MAIL_STATE_DELETED; m->state = MAIL_STATE_DELETED;
}
pl->SendMailResult(mailId, MAIL_DELETED, MAIL_OK); pl->SendMailResult(mailId, MAIL_DELETED, MAIL_OK);
} }
@ -589,8 +598,8 @@ void WorldSession::HandleGetMailList(WorldPacket & recv_data )
show_flags |= MAIL_SHOW_DELETE; show_flags |= MAIL_SHOW_DELETE;
if ((*itr)->messageType == MAIL_AUCTION) if ((*itr)->messageType == MAIL_AUCTION)
show_flags |= MAIL_SHOW_AUCTION; show_flags |= MAIL_SHOW_AUCTION;
if ((*itr)->COD) if ((*itr)->HasItems() && (*itr)->messageType == MAIL_NORMAL)
show_flags |= MAIL_SHOW_COD; show_flags |= MAIL_SHOW_RETURN;
data << (uint16) 0x0040; // unknown 2.3.0, different values data << (uint16) 0x0040; // unknown 2.3.0, different values
data << (uint32) (*itr)->messageID; // Message ID data << (uint32) (*itr)->messageID; // Message ID

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "8441" #define REVISION_NR "8442"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__