Merge pull request #1831 from Asheraf/cmd

Add hide name option to npctalk() and unittalk()

6 files changed, 104 insertions, 32 deletions

diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index ae0c776c6..a9b8fb7b0 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -6228,7 +6228,7 @@ ACMD(npctalk)
 	snprintf(temp, sizeof(temp), "%s : %s", name, mes);
 
 	if(ifcolor) clif->messagecolor(&nd->bl,color,temp);
-	else clif->disp_overhead(&nd->bl, temp);
+	else clif->disp_overhead(&nd->bl, temp, AREA_CHAT_WOC, NULL);
 
 	return true;
 }
@@ -6288,7 +6288,7 @@ ACMD(pettalk)
 	}
 
 	snprintf(temp, sizeof temp ,"%s : %s", pd->pet.name, mes);
-	clif->disp_overhead(&pd->bl, temp);
+	clif->disp_overhead(&pd->bl, temp, AREA_CHAT_WOC, NULL);
 
 	return true;
 }
@@ -7063,7 +7063,7 @@ ACMD(homtalk)
 	}
 
 	snprintf(temp, sizeof temp ,"%s : %s", sd->hd->homunculus.name, mes);
-	clif->disp_overhead(&sd->hd->bl, temp);
+	clif->disp_overhead(&sd->hd->bl, temp, AREA_CHAT_WOC, NULL);
 
 	return true;
 }
@@ -7423,7 +7423,7 @@ ACMD(me)
 	}
 
 	safesnprintf(atcmd_output, sizeof(atcmd_output), msg_fd(fd,270), sd->status.name, tempmes); // *%s %s*
-	clif->disp_overhead(&sd->bl, atcmd_output);
+	clif->disp_overhead(&sd->bl, atcmd_output, AREA_CHAT_WOC, NULL);
 
 	return true;
 }
diff --git a/src/map/clif.c b/src/map/clif.c
index 820a219f6..18fb063ef 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -8965,35 +8965,60 @@ void clif_slide(struct block_list *bl, int x, int y)
 
 /// Public chat message (ZC_NOTIFY_CHAT). lordalfa/Skotlex - used by @me as well
 /// 008d <packet len>.W <id>.L <message>.?B
-void clif_disp_overhead(struct block_list *bl, const char *mes)
+void clif_disp_overhead(struct block_list *bl, const char *mes, enum send_target target, struct block_list *target_bl)
 {
-	unsigned char buf[256]; //This should be more than sufficient, the theoretical max is CHAT_SIZE + 8 (pads and extra inserted crap)
+	char buf[CHAT_SIZE_MAX + (int)sizeof(struct PACKET_ZC_NOTIFY_CHAT)];
+	uint32 max_len = CHAT_SIZE_MAX - (int)sizeof(struct PACKET_ZC_NOTIFY_CHAT);
+	struct PACKET_ZC_NOTIFY_CHAT *p = (struct PACKET_ZC_NOTIFY_CHAT *)&buf;
 	int mes_len;
 
 	nullpo_retv(bl);
 	nullpo_retv(mes);
-	mes_len = (int)strlen(mes)+1; //Account for \0
 
-	if (mes_len > (int)sizeof(buf)-8) {
-		ShowError("clif_disp_overhead: Message too long (length %d)\n", mes_len);
-		mes_len = sizeof(buf)-8; //Trunk it to avoid problems.
+	mes_len = (int)strlen(mes) + 1; //Account for \0
+	if (mes_len > max_len) {
+		ShowError("clif_disp_overhead: Truncated message '%s' (len=%d, max=%u).\n", mes, mes_len, max_len);
+		mes_len = max_len; //Trunk it to avoid problems.
 	}
+
 	// send message to others
-	WBUFW(buf,0) = 0x8d;
-	WBUFW(buf,2) = mes_len + 8; // len of message + 8 (command+len+id)
-	WBUFL(buf,4) = bl->id;
-	safestrncpy(WBUFP(buf,8), mes, mes_len);
-	clif->send(buf, WBUFW(buf,2), bl, AREA_CHAT_WOC);
+	p->PacketType = 0x8d;
+	p->PacketLength = mes_len + (int)sizeof(struct PACKET_ZC_NOTIFY_CHAT); // len of message + 8 (command+len+id)
+	p->GID = bl->id;
+	safestrncpy(p->Message, mes, mes_len);
+	if (target == SELF && target_bl != NULL) {
+		clif->send(p, p->PacketLength, target_bl, SELF);
+	} else {
+		clif->send(p, p->PacketLength, bl, AREA_CHAT_WOC);
 
-	// send back message to the speaker
-	if (bl->type == BL_PC) {
-		WBUFW(buf,0) = 0x8e;
-		WBUFW(buf, 2) = mes_len + 4;
-		safestrncpy(WBUFP(buf,4), mes, mes_len);
-		clif->send(buf, WBUFW(buf,2), bl, SELF);
+		// send back message to the speaker
+		if (bl->type == BL_PC)
+			clif->notify_playerchat(bl, mes);
 	}
 }
 
+void clif_notify_playerchat(struct block_list *bl, const char *mes)
+{
+	char buf[CHAT_SIZE_MAX + (int)sizeof(struct PACKET_ZC_NOTIFY_PLAYERCHAT)];
+	uint32 max_len = CHAT_SIZE_MAX - (int)sizeof(struct PACKET_ZC_NOTIFY_PLAYERCHAT);
+	struct PACKET_ZC_NOTIFY_PLAYERCHAT *p = (struct PACKET_ZC_NOTIFY_PLAYERCHAT *)&buf;
+	int mes_len;
+
+	nullpo_retv(bl);
+	nullpo_retv(mes);
+
+	mes_len = (int)strlen(mes) + 1; // Account for \0
+	if (mes_len > max_len) {
+		ShowError("clif_notify_playerchat: Truncated message '%s' (len=%d, max=%u).\n", mes, mes_len, max_len);
+		mes_len = max_len; // Truncate to avoid problems.
+	}
+
+	p->PacketType = 0x8e;
+	p->PacketLength = mes_len + (int)sizeof(struct PACKET_ZC_NOTIFY_PLAYERCHAT);
+	safestrncpy(p->Message, mes, mes_len);
+	clif->send(p, p->PacketLength, bl, SELF);
+}
+
 /*==========================
  * Minimap fix [Kevin]
  * Remove dot from minimap
@@ -21624,6 +21649,7 @@ void clif_defaults(void) {
 	clif->messagecolor_self = clif_messagecolor_self;
 	clif->messagecolor = clif_messagecolor;
 	clif->disp_overhead = clif_disp_overhead;
+	clif->notify_playerchat = clif_notify_playerchat;
 	clif->msgtable_skill = clif_msgtable_skill;
 	clif->msgtable = clif_msgtable;
 	clif->msgtable_num = clif_msgtable_num;
diff --git a/src/map/clif.h b/src/map/clif.h
index 63eaeff49..1dffc2711 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -939,7 +939,8 @@ struct clif_interface {
 	void (*broadcast2) (struct block_list *bl, const char *mes, int len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY, enum send_target target);
 	void (*messagecolor_self) (int fd, uint32 color, const char *msg);
 	void (*messagecolor) (struct block_list* bl, uint32 color, const char* msg);
-	void (*disp_overhead) (struct block_list *bl, const char* mes);
+	void (*disp_overhead) (struct block_list *bl, const char *mes, enum send_target target, struct block_list *target_bl);
+	void (*notify_playerchat) (struct block_list *bl, const char *mes);
 	void (*msgtable) (struct map_session_data* sd, enum clif_messages msg_id);
 	void (*msgtable_num) (struct map_session_data *sd, enum clif_messages msg_id, int value);
 	void (*msgtable_skill) (struct map_session_data *sd, uint16 skill_id, enum clif_messages msg_id);
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h
index 665ef78cc..18e787ed5 100644
--- a/src/map/packets_struct.h
+++ b/src/map/packets_struct.h
@@ -1797,6 +1797,19 @@ struct packet_ZC_REFUSE_LOGIN {
 	char block_date[20];
 } __attribute__((packed));
 
+struct PACKET_ZC_NOTIFY_CHAT {
+	int16 PacketType;
+	int16 PacketLength;
+	uint32 GID;
+	char Message[];
+} __attribute__((packed));
+
+struct PACKET_ZC_NOTIFY_PLAYERCHAT {
+	int16 PacketType;
+	int16 PacketLength;
+	char Message[];
+} __attribute__((packed));
+
 #if !defined(sun) && (!defined(__NETBSD__) || __NetBSD_Version__ >= 600000000) // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute
 #pragma pack(pop)
 #endif // not NetBSD < 6 / Solaris
diff --git a/src/map/script.c b/src/map/script.c
index 5252c0ff0..e1d26e731 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -15567,12 +15567,13 @@ BUILDIN(message)
 
 /*==========================================
  * npctalk (sends message to surrounding area)
- * usage: npctalk "<message>"{,"<npc name>"};
+ * usage: npctalk("<message>"{, "<npc name>"{, <show_name>}});
  *------------------------------------------*/
 BUILDIN(npctalk)
 {
 	struct npc_data* nd;
 	const char *str = script_getstr(st,2);
+	bool show_name = true;
 
 	if (script_hasdata(st, 3)) {
 		nd = npc->name2id(script_getstr(st, 3));
@@ -15580,12 +15581,20 @@ BUILDIN(npctalk)
 		nd = map->id2nd(st->oid);
 	}
 
+	if (script_hasdata(st, 4)) {
+		show_name = (script_getnum(st, 4) != 0) ? true : false;
+	}
+
 	if (nd != NULL) {
 		char name[NAME_LENGTH], message[256];
 		safestrncpy(name, nd->name, sizeof(name));
 		strtok(name, "#"); // discard extra name identifier if present
-		safesnprintf(message, sizeof(message), "%s : %s", name, str);
-		clif->disp_overhead(&nd->bl, message);
+		if (show_name) {
+			safesnprintf(message, sizeof(message), "%s : %s", name, str);
+		} else {
+			safesnprintf(message, sizeof(message), "%s", str);
+		}
+		clif->disp_overhead(&nd->bl, message, AREA_CHAT_WOC, NULL);
 	}
 
 	return true;
@@ -20108,15 +20117,29 @@ BUILDIN(unitstop) {
 
 /// Makes the unit say the message
 ///
-/// unittalk <unit_id>,"<message>";
+/// unittalk(<unit_id>,"<message>"{, show_name{, <send_target>{, <target_id>}}});
 BUILDIN(unittalk) {
 	int unit_id;
 	const char* message;
-	struct block_list* bl;
+	struct block_list *bl, *target_bl = NULL;
+	bool show_name = true;
+	enum send_target target = AREA_CHAT_WOC;
 
 	unit_id = script_getnum(st,2);
 	message = script_getstr(st, 3);
 
+	if (script_hasdata(st, 4)) {
+		show_name = (script_getnum(st, 4) != 0) ? true : false;
+	}
+
+	if (script_hasdata(st, 5)) {
+		target = script_getnum(st, 5);
+	}
+
+	if (script_hasdata(st, 6)) {
+		target_bl = map->id2bl(script_getnum(st, 6));
+	}
+
 	bl = map->id2bl(unit_id);
 	if( bl != NULL ) {
 		struct StringBuf sbuf;
@@ -20125,8 +20148,17 @@ BUILDIN(unittalk) {
 		safestrncpy(blname, clif->get_bl_name(bl), sizeof(blname));
 		if(bl->type == BL_NPC)
 			strtok(blname, "#");
-		StrBuf->Printf(&sbuf, "%s : %s", blname, message);
-		clif->disp_overhead(bl, StrBuf->Value(&sbuf));
+		if (show_name) {
+			StrBuf->Printf(&sbuf, "%s : %s", blname, message);
+		} else {
+			StrBuf->Printf(&sbuf, "%s", message);
+		}
+
+		if (bl->type == BL_PC && target == SELF && (target_bl == NULL || bl == target_bl)) {
+			clif->notify_playerchat(bl, StrBuf->Value(&sbuf));
+		} else {
+			clif->disp_overhead(bl, StrBuf->Value(&sbuf), target, target_bl);
+		}
 		StrBuf->Destroy(&sbuf);
 	}
 
@@ -24642,7 +24674,7 @@ void script_parse_builtin(void) {
 		BUILDIN_DEF2(atcommand,"charcommand","s"), // [MouseJstr]
 		BUILDIN_DEF(movenpc,"sii?"), // [MouseJstr]
 		BUILDIN_DEF(message,"vs"), // [MouseJstr]
-		BUILDIN_DEF(npctalk,"s?"), // [Valaris]
+		BUILDIN_DEF(npctalk,"s??"), // [Valaris][Murilo BiO]
 		BUILDIN_DEF(mobcount,"ss"),
 		BUILDIN_DEF(getlook,"i"),
 		BUILDIN_DEF(getsavepoint,"i"),
@@ -24771,7 +24803,7 @@ void script_parse_builtin(void) {
 		BUILDIN_DEF(unitwarp,"isii"),
 		BUILDIN_DEF(unitattack,"iv?"),
 		BUILDIN_DEF(unitstop,"i"),
-		BUILDIN_DEF(unittalk,"is"),
+		BUILDIN_DEF(unittalk,"is???"),
 		BUILDIN_DEF(unitemote,"ii"),
 		BUILDIN_DEF(unitskilluseid,"ivi?"), // originally by Qamera [Celest]
 		BUILDIN_DEF(unitskillusepos,"iviii"), // [Celest]
diff --git a/src/map/skill.c b/src/map/skill.c
index 34c36d7f3..f437ce66c 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -7168,7 +7168,7 @@ int skill_castend_nodamage_id(struct block_list *src, struct block_list *bl, uin
 				//NOTE: mobs don't have the sprite animation that is used when performing this skill (will cause glitches)
 				char temp[70];
 				snprintf(temp, sizeof(temp), "%s : %s !!", md->name, skill->get_desc(skill_id));
-				clif->disp_overhead(&md->bl,temp);
+				clif->disp_overhead(&md->bl, temp, AREA_CHAT_WOC, NULL);
 			}
 			break;