From a2db08ca3b8fa2392ef5d88d66303b64d6a41ec4 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 21 Nov 2014 11:21:53 +0300 Subject: map: translate also npc names. Also disable strict aliasing warnings in plugin. --- src/map/clif.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) (limited to 'src/map/clif.c') diff --git a/src/map/clif.c b/src/map/clif.c index ed83b52..66a7312 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -10,10 +10,13 @@ #include "../../../common/mmo.h" #include "../../../common/socket.h" #include "../../../common/strlib.h" +#include "../../../common/cbasetypes.h" +#include "../../../map/npc.h" #include "../../../map/pc.h" #include "../../../map/quest.h" #include "map/clif.h" +#include "map/lang.h" void eclif_quest_send_list(struct map_session_data *sd) { @@ -44,8 +47,6 @@ void eclif_quest_add(struct map_session_data *sd, struct quest *qd) { hookStop(); int fd = sd->fd; - int i; - struct mob_db *monster; struct quest_db *qi = quest->db(qd->quest_id); WFIFOHEAD(fd, packet_len(0x2b3)); @@ -58,3 +59,41 @@ void eclif_quest_add(struct map_session_data *sd, struct quest *qd) WFIFOSET(fd, 107); } + +void eclif_charnameack(int *fdPtr, struct block_list *bl) +{ + if (!bl) + { + hookStop(); + return; + } + if (bl->type == BL_NPC) + { + hookStop(); + int fd = *fdPtr; + struct map_session_data* sd = (struct map_session_data*)session[fd]->session_data; + const char *tr = lang_pctrans(((TBL_NPC*)bl)->name, sd); + const int len = 8 + strlen(tr) + 1; + // if no recipient specified just update nearby clients + if (fd == 0) + { + char *buf; + CREATE(buf, char, len); + WBUFW(buf, 0) = 0xB01; + WBUFW(buf, 2) = len; + WBUFL(buf, 4) = bl->id; + memcpy(WBUFP(buf, 8), tr, len); + clif->send(buf, len, bl, AREA); + aFree(buf); + } + else + { + WFIFOHEAD(fd, len); + WFIFOW(fd, 0) = 0xB01; + WFIFOW(fd, 2) = len; + WFIFOL(fd, 4) = bl->id; + memcpy(WFIFOP(fd, 8), tr, len); + WFIFOSET(fd, len); + } + } +} -- cgit v1.2.3-60-g2f50