diff options
| author | Jesusaves <cpntb1@ymail.com> | 2019-04-25 10:29:25 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2019-04-25 10:29:25 -0300 |
| commit | d9279ea7af00fc4426a7db5532a820f2b28b6b70 (patch) | |
| tree | 3bcd133e999682b95c3b34a1ccde925615004930 | |
| parent | 3c4293fa9a3fa00756d1993ec8e1f0a04ec063de (diff) | |
| parent | c4c178cc653c97338c2d4ba890713c728722bc01 (diff) | |
| download | evol-hercules-d9279ea7af00fc4426a7db5532a820f2b28b6b70.tar.gz evol-hercules-d9279ea7af00fc4426a7db5532a820f2b28b6b70.tar.bz2 evol-hercules-d9279ea7af00fc4426a7db5532a820f2b28b6b70.tar.xz evol-hercules-d9279ea7af00fc4426a7db5532a820f2b28b6b70.zip | |
Merge branch 'master' into tmw2
| -rw-r--r-- | src/elogin/parse.c | 4 | ||||
| -rw-r--r-- | src/emap/send.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/elogin/parse.c b/src/elogin/parse.c index d17434b..fffd532 100644 --- a/src/elogin/parse.c +++ b/src/elogin/parse.c @@ -35,7 +35,7 @@ void login_parse_version(int fd) clientVersion = RFIFOL(fd, 2); // check for minimal supported version - if (clientVersion < 20) + if (clientVersion < 21) { lclif->login_error(fd, 5); return; @@ -60,7 +60,7 @@ bool elogin_client_login_pre(int *fdPtr, safestrncpy(username, RFIFOP(fd, 6), NAME_LENGTH); int len = (int)safestrnlen(username, NAME_LENGTH); // check for minimal supported version - if (clientVersion < 20) + if (clientVersion < 21) { lclif->login_error(fd, 5); hookStop(); diff --git a/src/emap/send.c b/src/emap/send.c index dd9d7ac..82ba452 100644 --- a/src/emap/send.c +++ b/src/emap/send.c @@ -211,7 +211,7 @@ void send_pc_info(struct block_list* bl1, int len = 14; if (tdata->clientVersion >= 24) len = 20; - else if (bl1 == bl2 || tdata->clientVersion >= 21) + else if (bl1 == bl2) len = 16; char buf[len]; WBUFW (buf, 0) = 0xb0a + evolPacketOffset; @@ -222,7 +222,7 @@ void send_pc_info(struct block_list* bl1, else WBUFL (buf, 8) = 0; WBUFW (buf, 12) = data->mount; - if (bl1 == bl2 || tdata->clientVersion >= 21) + if (bl1 == bl2) WBUFW (buf, 14) = data->language; if (tdata->clientVersion >= 24) { @@ -388,7 +388,7 @@ void send_client_command(struct map_session_data *sd, const char *const command) const unsigned int len = (unsigned int)strlen(command); const int fd = sd->fd; - WFIFOHEAD (fd, len); + WFIFOHEAD (fd, len + 4); WFIFOW (fd, 0) = 0xb16 + evolPacketOffset; WFIFOW (fd, 2) = len + 4; memcpy (WFIFOP (fd, 4), command, len); |