diff options
author | Haru <haru@dotalux.com> | 2020-06-28 17:44:56 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-28 17:44:56 +0200 |
commit | a6d5893396ce96926b98ffd1cfe4d2a1f205fc0d (patch) | |
tree | d3495c06d7a6f6f0a989b9fea32e37f0d973c2fa /src/map/clif.c | |
parent | 6ef48d4b37390753a3957675a7e1ba0299b0c38f (diff) | |
parent | 61a403a8627f2e0b383aae327d5ccd56938267f8 (diff) | |
download | hercules-a6d5893396ce96926b98ffd1cfe4d2a1f205fc0d.tar.gz hercules-a6d5893396ce96926b98ffd1cfe4d2a1f205fc0d.tar.bz2 hercules-a6d5893396ce96926b98ffd1cfe4d2a1f205fc0d.tar.xz hercules-a6d5893396ce96926b98ffd1cfe4d2a1f205fc0d.zip |
Merge pull request #2763 from 4144/updatepackets
Update packets up to 2020-06-03
Diffstat (limited to 'src/map/clif.c')
-rw-r--r-- | src/map/clif.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index b2567d668..8e94686c4 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -16159,7 +16159,7 @@ static void clif_friendslist_toggle(struct map_session_data *sd, int account_id, WFIFOL(fd, 2) = sd->status.friends[i].account_id; WFIFOL(fd, 6) = sd->status.friends[i].char_id; WFIFOB(fd, 10) = !online; //Yeah, a 1 here means "logged off", go figure... -#if PACKETVER_MAIN_NUM >= 20180307 || PACKETVER_RE_NUM >= 20180221 +#if PACKETVER_MAIN_NUM >= 20180307 || PACKETVER_RE_NUM >= 20180221 || PACKETVER_ZERO_NUM >= 20180328 memcpy(WFIFOP(fd, 11), sd->status.friends[i].name, NAME_LENGTH); #endif // PACKETVER_ZERO @@ -16184,7 +16184,7 @@ static void clif_friendslist_send(struct map_session_data *sd) { int i = 0, n, fd = sd->fd; -#if PACKETVER_MAIN_NUM >= 20180307 || PACKETVER_RE_NUM >= 20180221 +#if PACKETVER_MAIN_NUM >= 20180307 || PACKETVER_RE_NUM >= 20180221 || PACKETVER_ZERO_NUM >= 20180328 const int offset = 8; #else const int offset = 32; @@ -16196,7 +16196,7 @@ static void clif_friendslist_send(struct map_session_data *sd) for(i = 0; i < MAX_FRIENDS && sd->status.friends[i].char_id; i++) { WFIFOL(fd, 4 + offset * i + 0) = sd->status.friends[i].account_id; WFIFOL(fd, 4 + offset * i + 4) = sd->status.friends[i].char_id; -#if !(PACKETVER_MAIN_NUM >= 20180307 || PACKETVER_RE_NUM >= 20180221) +#if !(PACKETVER_MAIN_NUM >= 20180307 || PACKETVER_RE_NUM >= 20180221 || PACKETVER_ZERO_NUM >= 20180328) memcpy(WFIFOP(fd, 4 + offset * i + 8), &sd->status.friends[i].name, NAME_LENGTH); #endif } |