diff options
| author | Haru <haru@dotalux.com> | 2018-03-11 15:38:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-11 15:38:44 +0100 |
| commit | f7ca209c044d4c08e932beac8580ddc2c2d7a924 (patch) | |
| tree | ba45501645cde4e56a20ca0674232d58f132c189 /src/map/clif.c | |
| parent | c46b6d59644675c7c037238afb609f42230a9977 (diff) | |
| parent | 442162e0baf6d085ffde26fb7fafd9877338f868 (diff) | |
| download | hercules-f7ca209c044d4c08e932beac8580ddc2c2d7a924.tar.gz hercules-f7ca209c044d4c08e932beac8580ddc2c2d7a924.tar.bz2 hercules-f7ca209c044d4c08e932beac8580ddc2c2d7a924.tar.xz hercules-f7ca209c044d4c08e932beac8580ddc2c2d7a924.zip | |
Merge pull request #1987 from guilherme-gm/rodexfixes
Some rodex fixes
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index d2dc12377..546247c3c 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -19831,7 +19831,7 @@ void clif_rodex_send_maillist(int fd, struct map_session_data *sd, int8 open_typ continue; inner->MailID = msg->id; - inner->Isread = msg->is_read == true ? 1 : 0; + inner->Isread = (msg->is_read == true || msg->sender_read == true) ? 1 : 0; inner->type = msg->type; #if PACKETVER >= 20170419 inner->openType = msg->opentype; @@ -19863,7 +19863,7 @@ void clif_rodex_send_maillist(int fd, struct map_session_data *sd, int8 open_typ #endif } -void clif_rodex_send_mails_all(int fd, struct map_session_data *sd) +void clif_rodex_send_mails_all(int fd, struct map_session_data *sd, int64 mail_id) { #if PACKETVER >= 20170419 struct PACKET_ZC_MAIL_LIST *packet; @@ -19871,18 +19871,24 @@ void clif_rodex_send_mails_all(int fd, struct map_session_data *sd) int16 size = sizeof(*packet); int packetMailCount = 0; int mailListCount = 0; - int mailsSize = VECTOR_LENGTH(sd->rodex.messages); - int i; + int mailsSize, i; + int j = -1; nullpo_retv(sd); + mailsSize = VECTOR_LENGTH(sd->rodex.messages); + + if (mail_id > 0) + ARR_FIND(0, VECTOR_LENGTH(sd->rodex.messages), j, (VECTOR_INDEX(sd->rodex.messages, j)).id == mail_id); + WFIFOHEAD(fd, sizeof(*packet) + (sizeof(*inner) + RODEX_TITLE_LENGTH) * RODEX_MAIL_PER_PAGE); packet = WFIFOP(fd, 0); packet->PacketType = rodexmailList; inner = WFIFOP(fd, size); i = mailsSize - 1; - while (i >= 0) { + mailsSize -= (j + 1); + while (i > j) { struct rodex_message *msg = &VECTOR_INDEX(sd->rodex.messages, i); --i; @@ -19890,7 +19896,7 @@ void clif_rodex_send_mails_all(int fd, struct map_session_data *sd) continue; inner->MailID = msg->id; - inner->Isread = msg->is_read == true ? 1 : 0; + inner->Isread = (msg->is_read == true || msg->sender_read == true) ? 1 : 0; inner->type = msg->type; inner->openType = msg->opentype; inner->expireDateTime = msg->expire_date - (int)time(NULL); @@ -19957,7 +19963,7 @@ void clif_rodex_send_refresh(int fd, struct map_session_data *sd, int8 open_type continue; inner->MailID = msg->id; - inner->Isread = msg->is_read == true ? 1 : 0; + inner->Isread = (msg->is_read == true || msg->sender_read == true) ? 1 : 0; inner->type = msg->type; #if PACKETVER >= 20170419 inner->openType = msg->opentype; |