diff options
| author | Andrei Karas <akaras@inbox.ru> | 2018-03-29 21:29:47 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-29 21:29:47 +0300 |
| commit | 112c34e0e1b92397f0df7eea459fcbac946d340b (patch) | |
| tree | caec65bd03eeeea5aa9e0a4d6608b5796709b94b /src/map/clif.c | |
| parent | 584e8de359412091cb05f98b83a25fac47b5c9f2 (diff) | |
| parent | 2802489c1851c1725f44fb01cd76ff8d4a7e4bba (diff) | |
| download | hercules-112c34e0e1b92397f0df7eea459fcbac946d340b.tar.gz hercules-112c34e0e1b92397f0df7eea459fcbac946d340b.tar.bz2 hercules-112c34e0e1b92397f0df7eea459fcbac946d340b.tar.xz hercules-112c34e0e1b92397f0df7eea459fcbac946d340b.zip | |
Merge pull request #1994 from 4144/updatepackets
Update shuffle packets and keys up to 2018-03-28. Add new defines with packet versions.
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index cf5edd0e0..f5adde873 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -6092,7 +6092,7 @@ void clif_wis_end(int fd, int flag) { void clif_solved_charname(int fd, int charid, const char* name) { nullpo_retv(name); -#if !defined(PACKETVER_ZERO) && (PACKETVER >= 20180307 || (defined(PACKETVER_RE) && PACKETVER >= 20180221)) +#if PACKETVER_MAIN_NUM >= 20180307 || PACKETVER_RE_NUM >= 20180221 WFIFOHEAD(fd, packet_len(0x0af7)); WFIFOW(fd, 0) = 0xaf7; if (*name == 0) { @@ -14218,10 +14218,8 @@ void clif_friendslist_toggle(struct map_session_data *sd,int account_id, int cha 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... -#ifndef PACKETVER_ZERO -#if PACKETVER >= 20180307 || (defined(PACKETVER_RE) && PACKETVER >= 20180221) +#if PACKETVER_MAIN_NUM >= 20180307 || PACKETVER_RE_NUM >= 20180221 memcpy(WFIFOP(fd, 11), sd->status.friends[i].name, NAME_LENGTH); -#endif #endif // PACKETVER_ZERO WFIFOSET(fd, packet_len(0x206)); @@ -14245,7 +14243,7 @@ void clif_friendslist_send(struct map_session_data *sd) { int i = 0, n, fd = sd->fd; -#if !defined(PACKETVER_ZERO) && (PACKETVER >= 20180307 || (defined(PACKETVER_RE) && PACKETVER >= 20180221)) +#if PACKETVER_MAIN_NUM >= 20180307 || PACKETVER_RE_NUM >= 20180221 const int offset = 8; #else const int offset = 32; @@ -14257,7 +14255,7 @@ 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 !(!defined(PACKETVER_ZERO) && (PACKETVER >= 20180307 || (defined(PACKETVER_RE) && PACKETVER >= 20180221))) +#if !(PACKETVER_MAIN_NUM >= 20180307 || PACKETVER_RE_NUM >= 20180221) memcpy(WFIFOP(fd, 4 + offset * i + 8), &sd->status.friends[i].name, NAME_LENGTH); #endif } |