diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-27 09:48:27 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-27 09:48:27 +0000 |
| commit | c5887c263b96f9a3bf128b3b53e63d68ff6b9392 (patch) | |
| tree | a767807a4b7a4bf5878523bb8f196d6fb6a32d94 /src/common | |
| parent | 4ecca0e292aafef33fe168d59c1a4e013cc0cda6 (diff) | |
| download | hercules-c5887c263b96f9a3bf128b3b53e63d68ff6b9392.tar.gz hercules-c5887c263b96f9a3bf128b3b53e63d68ff6b9392.tar.bz2 hercules-c5887c263b96f9a3bf128b3b53e63d68ff6b9392.tar.xz hercules-c5887c263b96f9a3bf128b3b53e63d68ff6b9392.zip | |
Followup fixes to r11583:
* fixed wrong sql upgrade file name, added svn:eol-style native
* made 'status' variable directly use the mail_status enum
* replaced some hardcoded numbers in mail queries with references to the enum
* fixed a query which still used 'read_flag'
* fixed all new mails being displayed as 'already read'
* removed sd nullpo checks from parse_ functions as that can never happen
* fixed mapserver sending (and charserver saving) junk item fields when there is no item attached to a mail
* fixed wrong mail send packet interpretation saving random memory after message body ('body_len' doesn't include the terminating zero)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11584 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/mmo.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/common/mmo.h b/src/common/mmo.h index d455e9124..ce0ddab25 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -241,6 +241,7 @@ struct mmo_charstatus { #endif }; +enum mail_status; struct mail_message { unsigned int id; int send_id; @@ -250,7 +251,7 @@ struct mail_message { char title[MAIL_TITLE_LENGTH]; char body[MAIL_BODY_LENGTH]; - short status; + enum mail_status status; unsigned int timestamp; // marks when the message was sent int zeny; @@ -408,24 +409,24 @@ struct fame_list { char name[NAME_LENGTH]; }; -enum { - GBI_EXP =1, // ギルドのEXP - GBI_GUILDLV, // ギルドのLv - GBI_SKILLPOINT, // ギルドのスキルポイント - GBI_SKILLLV, // ギルドスキルLv -}; - -enum { +enum mail_status { MAIL_UNVERIFIED = -1, MAIL_NEW, MAIL_UNREAD, - MAIL_READED, + MAIL_READ, MAIL_DELETED, MAIL_RETURNED, MAIL_INVALID, }; enum { + GBI_EXP =1, // ギルドのEXP + GBI_GUILDLV, // ギルドのLv + GBI_SKILLPOINT, // ギルドのスキルポイント + GBI_SKILLLV, // ギルドスキルLv +}; + +enum { GMI_POSITION =0, // メンバーの役職変更 GMI_EXP, GMI_HAIR, |