diff options
author | Andrei Karas <akaras@inbox.ru> | 2019-04-13 22:27:37 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2019-05-05 22:22:05 +0300 |
commit | cf28f0002c46e9c23e752b7e4b351de1e947f830 (patch) | |
tree | 5680ef188b43e35f4d05d45956d2b54bca2d3db4 /src/map/clif.c | |
parent | ad8be3bde3813992f00409e7f6f0a61778332ba5 (diff) | |
download | hercules-cf28f0002c46e9c23e752b7e4b351de1e947f830.tar.gz hercules-cf28f0002c46e9c23e752b7e4b351de1e947f830.tar.bz2 hercules-cf28f0002c46e9c23e752b7e4b351de1e947f830.tar.xz hercules-cf28f0002c46e9c23e752b7e4b351de1e947f830.zip |
Add into unit_data groupId and title
Send this fields in packet ZC_ACK_REQNAME_TITLE.
Diffstat (limited to 'src/map/clif.c')
-rw-r--r-- | src/map/clif.c | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 1fa9c4093..83d256e51 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -9327,6 +9327,13 @@ static void clif_homname_ack(int fd, struct block_list *bl) packet.packet_id = HEADER_ZC_ACK_REQNAME_TITLE; packet.gid = bl->id; memcpy(packet.name, BL_UCCAST(BL_HOM, bl)->homunculus.name, NAME_LENGTH); +#if PACKETVER_MAIN_NUM >= 20180207 || PACKETVER_RE_NUM >= 20171129 || PACKETVER_ZERO_NUM >= 20171130 + struct unit_data *ud = unit->bl2ud(bl); + if (ud != NULL) { + memcpy(packet.title, ud->title, NAME_LENGTH); + packet.groupId = ud->groupId; + } +#endif clif->send_selforarea(fd, bl, &packet, sizeof(struct PACKET_ZC_ACK_REQNAME_TITLE)); } @@ -9344,6 +9351,13 @@ static void clif_mername_ack(int fd, struct block_list *bl) packet.packet_id = HEADER_ZC_ACK_REQNAME_TITLE; packet.gid = bl->id; memcpy(packet.name, BL_UCCAST(BL_MER, bl)->db->name, NAME_LENGTH); +#if PACKETVER_MAIN_NUM >= 20180207 || PACKETVER_RE_NUM >= 20171129 || PACKETVER_ZERO_NUM >= 20171130 + struct unit_data *ud = unit->bl2ud(bl); + if (ud != NULL) { + memcpy(packet.title, ud->title, NAME_LENGTH); + packet.groupId = ud->groupId; + } +#endif clif->send_selforarea(fd, bl, &packet, sizeof(struct PACKET_ZC_ACK_REQNAME_TITLE)); } @@ -9361,6 +9375,13 @@ static void clif_petname_ack(int fd, struct block_list *bl) packet.packet_id = HEADER_ZC_ACK_REQNAME_TITLE; packet.gid = bl->id; memcpy(packet.name, BL_UCCAST(BL_PET, bl)->pet.name, NAME_LENGTH); +#if PACKETVER_MAIN_NUM >= 20180207 || PACKETVER_RE_NUM >= 20171129 || PACKETVER_ZERO_NUM >= 20171130 + struct unit_data *ud = unit->bl2ud(bl); + if (ud != NULL) { + memcpy(packet.title, ud->title, NAME_LENGTH); + packet.groupId = ud->groupId; + } +#endif clif->send_selforarea(fd, bl, &packet, sizeof(struct PACKET_ZC_ACK_REQNAME_TITLE)); } @@ -9378,6 +9399,13 @@ static void clif_npcname_ack(int fd, struct block_list *bl) packet.packet_id = HEADER_ZC_ACK_REQNAME_TITLE; packet.gid = bl->id; memcpy(packet.name, BL_UCCAST(BL_NPC, bl)->name, NAME_LENGTH); +#if PACKETVER_MAIN_NUM >= 20180207 || PACKETVER_RE_NUM >= 20171129 || PACKETVER_ZERO_NUM >= 20171130 + struct unit_data *ud = unit->bl2ud(bl); + if (ud != NULL) { + memcpy(packet.title, ud->title, NAME_LENGTH); + packet.groupId = ud->groupId; + } +#endif clif->send_selforarea(fd, bl, &packet, sizeof(struct PACKET_ZC_ACK_REQNAME_TITLE)); } @@ -9436,6 +9464,13 @@ static void clif_chatname_ack(int fd, struct block_list *bl) #if 0 //FIXME: Clients DO request this... what should be done about it? The chat's title may not fit... [Skotlex] memcpy(packet.name, BL_UCCAST(BL_CHAT, bl)->title, NAME_LENGTH); +#if PACKETVER_MAIN_NUM >= 20180207 || PACKETVER_RE_NUM >= 20171129 || PACKETVER_ZERO_NUM >= 20171130 + struct unit_data *ud = unit->bl2ud(bl); + if (ud != NULL) { + memcpy(packet.title, ud->title, NAME_LENGTH); + packet.groupId = ud->groupId; + } +#endif #endif clif->send_selforarea(fd, bl, &packet, sizeof(struct PACKET_ZC_ACK_REQNAME_TITLE)); @@ -9454,6 +9489,13 @@ static void clif_elemname_ack(int fd, struct block_list *bl) packet.packet_id = HEADER_ZC_ACK_REQNAME_TITLE; packet.gid = bl->id; memcpy(packet.name, BL_UCCAST(BL_ELEM, bl)->db->name, NAME_LENGTH); +#if PACKETVER_MAIN_NUM >= 20180207 || PACKETVER_RE_NUM >= 20171129 || PACKETVER_ZERO_NUM >= 20171130 + struct unit_data *ud = unit->bl2ud(bl); + if (ud != NULL) { + memcpy(packet.title, ud->title, NAME_LENGTH); + packet.groupId = ud->groupId; + } +#endif clif->send_selforarea(fd, bl, &packet, sizeof(struct PACKET_ZC_ACK_REQNAME_TITLE)); } |