summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/map/clif.c50
-rw-r--r--src/map/packets_struct.h18
2 files changed, 39 insertions, 29 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index e060b8d11..1fa9c4093 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -9323,13 +9323,12 @@ static void clif_homname_ack(int fd, struct block_list *bl)
nullpo_retv(bl);
Assert_retv(bl->type == BL_HOM);
- struct PACKET_ZC_ACK_REQNAMEALL packet = { 0 };
- int len = sizeof(struct packet_reqname_ack);
- packet.packet_id = reqName;
+ struct PACKET_ZC_ACK_REQNAME_TITLE packet = { 0 };
+ packet.packet_id = HEADER_ZC_ACK_REQNAME_TITLE;
packet.gid = bl->id;
memcpy(packet.name, BL_UCCAST(BL_HOM, bl)->homunculus.name, NAME_LENGTH);
- clif->send_selforarea(fd, bl, &packet, len);
+ clif->send_selforarea(fd, bl, &packet, sizeof(struct PACKET_ZC_ACK_REQNAME_TITLE));
}
/// Updates the object's (bl) name on client.
@@ -9341,13 +9340,12 @@ static void clif_mername_ack(int fd, struct block_list *bl)
nullpo_retv(bl);
Assert_retv(bl->type == BL_MER);
- struct PACKET_ZC_ACK_REQNAMEALL packet = { 0 };
- int len = sizeof(struct packet_reqname_ack);
- packet.packet_id = reqName;
+ struct PACKET_ZC_ACK_REQNAME_TITLE packet = { 0 };
+ packet.packet_id = HEADER_ZC_ACK_REQNAME_TITLE;
packet.gid = bl->id;
memcpy(packet.name, BL_UCCAST(BL_MER, bl)->db->name, NAME_LENGTH);
- clif->send_selforarea(fd, bl, &packet, len);
+ clif->send_selforarea(fd, bl, &packet, sizeof(struct PACKET_ZC_ACK_REQNAME_TITLE));
}
/// Updates the object's (bl) name on client.
@@ -9359,13 +9357,12 @@ static void clif_petname_ack(int fd, struct block_list *bl)
nullpo_retv(bl);
Assert_retv(bl->type == BL_PET);
- struct PACKET_ZC_ACK_REQNAMEALL packet = { 0 };
- int len = sizeof(struct packet_reqname_ack);
- packet.packet_id = reqName;
+ struct PACKET_ZC_ACK_REQNAME_TITLE packet = { 0 };
+ packet.packet_id = HEADER_ZC_ACK_REQNAME_TITLE;
packet.gid = bl->id;
memcpy(packet.name, BL_UCCAST(BL_PET, bl)->pet.name, NAME_LENGTH);
- clif->send_selforarea(fd, bl, &packet, len);
+ clif->send_selforarea(fd, bl, &packet, sizeof(struct PACKET_ZC_ACK_REQNAME_TITLE));
}
/// Updates the object's (bl) name on client.
@@ -9377,13 +9374,12 @@ static void clif_npcname_ack(int fd, struct block_list *bl)
nullpo_retv(bl);
Assert_retv(bl->type == BL_NPC);
- struct PACKET_ZC_ACK_REQNAMEALL packet = { 0 };
- int len = sizeof(struct packet_reqname_ack);
- packet.packet_id = reqName;
+ struct PACKET_ZC_ACK_REQNAME_TITLE packet = { 0 };
+ packet.packet_id = HEADER_ZC_ACK_REQNAME_TITLE;
packet.gid = bl->id;
memcpy(packet.name, BL_UCCAST(BL_NPC, bl)->name, NAME_LENGTH);
- clif->send_selforarea(fd, bl, &packet, len);
+ clif->send_selforarea(fd, bl, &packet, sizeof(struct PACKET_ZC_ACK_REQNAME_TITLE));
}
/// Updates the object's (bl) name on client.
@@ -9395,21 +9391,19 @@ static void clif_mobname_ack(int fd, struct block_list *bl)
nullpo_retv(bl);
Assert_retv(bl->type == BL_MOB);
+ // probably need switch to packet ZC_ACK_REQNAME_TITLE [4144]
struct PACKET_ZC_ACK_REQNAMEALL packet = { 0 };
- int len = sizeof(struct PACKET_ZC_ACK_REQNAMEALL);
- packet.packet_id = reqName;
+ packet.packet_id = HEADER_ZC_ACK_REQNAMEALL;
packet.gid = bl->id;
const struct mob_data *md = BL_UCCAST(BL_MOB, bl);
memcpy(packet.name, md->name, NAME_LENGTH);
if (md->guardian_data && md->guardian_data->g) {
- packet.packet_id = HEADER_ZC_ACK_REQNAMEALL;
memcpy(packet.guild_name, md->guardian_data->g->name, NAME_LENGTH);
memcpy(packet.position_name, md->guardian_data->castle->castle_name, NAME_LENGTH);
} else if (battle_config.show_mob_info) {
char mobhp[50], *str_p = mobhp;
- packet.packet_id = HEADER_ZC_ACK_REQNAMEALL;
if (battle_config.show_mob_info&4)
str_p += sprintf(str_p, "Lv. %d | ", md->level);
if (battle_config.show_mob_info&1)
@@ -9424,7 +9418,7 @@ static void clif_mobname_ack(int fd, struct block_list *bl)
}
}
- clif->send_selforarea(fd, bl, &packet, len);
+ clif->send_selforarea(fd, bl, &packet, sizeof(struct PACKET_ZC_ACK_REQNAMEALL));
}
/// Updates the object's (bl) name on client.
@@ -9436,16 +9430,15 @@ static void clif_chatname_ack(int fd, struct block_list *bl)
nullpo_retv(bl);
Assert_retv(bl->type == BL_CHAT);
- struct PACKET_ZC_ACK_REQNAMEALL packet = { 0 };
- int len = sizeof(struct packet_reqname_ack);
- packet.packet_id = reqName;
+ struct PACKET_ZC_ACK_REQNAME_TITLE packet = { 0 };
+ packet.packet_id = HEADER_ZC_ACK_REQNAME_TITLE;
packet.gid = bl->id;
#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);
#endif
- clif->send_selforarea(fd, bl, &packet, len);
+ clif->send_selforarea(fd, bl, &packet, sizeof(struct PACKET_ZC_ACK_REQNAME_TITLE));
}
/// Updates the object's (bl) name on client.
@@ -9457,13 +9450,12 @@ static void clif_elemname_ack(int fd, struct block_list *bl)
nullpo_retv(bl);
Assert_retv(bl->type == BL_ELEM);
- struct PACKET_ZC_ACK_REQNAMEALL packet = { 0 };
- int len = sizeof(struct packet_reqname_ack);
- packet.packet_id = reqName;
+ struct PACKET_ZC_ACK_REQNAME_TITLE packet = { 0 };
+ packet.packet_id = HEADER_ZC_ACK_REQNAME_TITLE;
packet.gid = bl->id;
memcpy(packet.name, BL_UCCAST(BL_ELEM, bl)->db->name, NAME_LENGTH);
- clif->send_selforarea(fd, bl, &packet, len);
+ clif->send_selforarea(fd, bl, &packet, sizeof(struct PACKET_ZC_ACK_REQNAME_TITLE));
}
static void clif_unknownname_ack(int fd, struct block_list *bl)
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h
index 875c7ccbd..e898d414e 100644
--- a/src/map/packets_struct.h
+++ b/src/map/packets_struct.h
@@ -2805,6 +2805,24 @@ struct PACKET_ZC_ACK_REQNAMEALL {
DEFINE_PACKET_HEADER(ZC_ACK_REQNAMEALL, 0x0195);
#endif
+#if PACKETVER_MAIN_NUM >= 20180207 || PACKETVER_RE_NUM >= 20171129 || PACKETVER_ZERO_NUM >= 20171130
+struct PACKET_ZC_ACK_REQNAME_TITLE {
+ uint16 packet_id;
+ int32 gid;
+ int32 groupId;
+ char name[NAME_LENGTH];
+ char title[NAME_LENGTH];
+} __attribute__((packed));
+DEFINE_PACKET_HEADER(ZC_ACK_REQNAME_TITLE, 0x0adf);
+#else
+struct PACKET_ZC_ACK_REQNAME_TITLE {
+ uint16 packet_id;
+ int32 gid;
+ char name[NAME_LENGTH];
+} __attribute__((packed));
+DEFINE_PACKET_HEADER(ZC_ACK_REQNAME_TITLE, 0x0095);
+#endif
+
struct PACKET_ZC_OVERWEIGHT_PERCENT {
int16 packetType;
uint32 percent;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-02 11:08:18 +0000