diff options
Diffstat (limited to 'src/char/char.c')
-rw-r--r-- | src/char/char.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/char/char.c b/src/char/char.c index 487bec763..069ccc481 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -288,16 +288,12 @@ void char_set_char_offline(int char_id, int account_id) else { struct mmo_charstatus* cp = (struct mmo_charstatus*) idb_get(chr->char_db_,char_id); - struct storage_data *stor = (struct storage_data *) idb_get(inter_storage->account_storage, account_id); inter_guild->CharOffline(char_id, cp?cp->guild_id:-1); if (cp) idb_remove(chr->char_db_,char_id); - if (stor) /* Remove inter-storage data. */ - idb_remove(inter_storage->account_storage, account_id); - if( SQL_ERROR == SQL->Query(inter->sql_handle, "UPDATE `%s` SET `online`='0' WHERE `char_id`='%d' LIMIT 1", char_db, char_id) ) Sql_ShowDebug(inter->sql_handle); } @@ -4436,14 +4432,21 @@ void char_parse_char_connect(int fd, struct char_session_data* sd, uint32 ipl) void char_send_map_info(int fd, int i, uint32 subnet_map_ip, struct mmo_charstatus *cd) { +#if PACKETVER < 20170329 + const int cmd = 0x71; + const int len = 28; +#else + const int cmd = 0xac5; + const int len = 156; +#endif nullpo_retv(cd); - WFIFOHEAD(fd,28); - WFIFOW(fd,0) = 0x71; - WFIFOL(fd,2) = cd->char_id; - mapindex->getmapname_ext(mapindex_id2name(cd->last_point.map), WFIFOP(fd,6)); - WFIFOL(fd,22) = htonl((subnet_map_ip) ? subnet_map_ip : chr->server[i].ip); - WFIFOW(fd,26) = sockt->ntows(htons(chr->server[i].port)); // [!] LE byte order here [!] - WFIFOSET(fd,28); + WFIFOHEAD(fd, len); + WFIFOW(fd, 0) = cmd; + WFIFOL(fd, 2) = cd->char_id; + mapindex->getmapname_ext(mapindex_id2name(cd->last_point.map), WFIFOP(fd, 6)); + WFIFOL(fd, 22) = htonl((subnet_map_ip) ? subnet_map_ip : chr->server[i].ip); + WFIFOW(fd, 26) = sockt->ntows(htons(chr->server[i].port)); // [!] LE byte order here [!] + WFIFOSET(fd, len); } void char_send_wait_char_server(int fd) |