diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-04-04 17:36:48 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-04-04 17:36:48 +0300 |
| commit | 8fe364817c3e670f1d36d9fa09a8be5a2668a150 (patch) | |
| tree | 4bfd0cc83ad7e8551d85c75eecfe4bebce59a6ad | |
| parent | 6b14df3a15ecced9b792c1e3a65803ee8d93735c (diff) | |
| download | evol-hercules-8fe364817c3e670f1d36d9fa09a8be5a2668a150.tar.gz evol-hercules-8fe364817c3e670f1d36d9fa09a8be5a2668a150.tar.bz2 evol-hercules-8fe364817c3e670f1d36d9fa09a8be5a2668a150.tar.xz evol-hercules-8fe364817c3e670f1d36d9fa09a8be5a2668a150.zip | |
Update for latest hercules changes.
| -rw-r--r-- | src/echar/char.c | 3 | ||||
| -rw-r--r-- | src/emap/clif.c | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/echar/char.c b/src/echar/char.c index 91d7356..6d16e56 100644 --- a/src/echar/char.c +++ b/src/echar/char.c @@ -64,7 +64,8 @@ void echar_parse_char_create_new_char(int *fdPtr, struct char_session_data **sdP } } - const int result = chr->make_new_char_sql(sd, RFIFOP(fd, 2), 1, 1, 1, 1, 1, 1, RFIFOB(fd, 26), RFIFOW(fd, 27), RFIFOW(fd, 29), JOB_NOVICE); + // +++ need remove addition sql query after this line for set sex + const int result = chr->make_new_char_sql(sd, RFIFOP(fd, 2), 1, 1, 1, 1, 1, 1, RFIFOB(fd, 26), RFIFOW(fd, 27), RFIFOW(fd, 29), JOB_NOVICE, 'U'); if (result < 0) { chr->creation_failed(fd, result); diff --git a/src/emap/clif.c b/src/emap/clif.c index 54df930..a5e3ecd 100644 --- a/src/emap/clif.c +++ b/src/emap/clif.c @@ -1816,7 +1816,12 @@ void eclif_party_info_post(struct party_data *p, void eclif_parse_NpcStringInput(int fd, struct map_session_data* sd) { - int message_len = RFIFOW(fd, 2) - 8; +// [4144] can't confirm exact client version. At least >= correct for 20150513 +#if PACKETVER >= 20151029 + int message_len = RFIFOW(fd, 2) - 7; +#else + int message_len = RFIFOW(fd, 2) - 8; +#endif int npcid = RFIFOL(fd, 4); const char *message = RFIFOP(fd, 8); |