3 files changed, 67 insertions, 0 deletions

diff --git a/src/map/clif.c b/src/map/clif.c
index afe8aac40..942600a26 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -9232,6 +9232,56 @@ void clif_msgtable_skill(struct map_session_data* sd, uint16 skill_id, int msg_i
 }
 
 /**
+* Displays a format string from msgstringtable.txt with a %s value (ZC_FORMATSTRING_MSG).
+*
+* @param sd     The target character.
+* @param msg_id msgstringtable message index, 0-based (@see enum clif_messages)
+* @param value  The value to fill %s.
+*/
+void clif_msgtable_str(struct map_session_data *sd, uint16 msg_id, const char *value)
+{
+	int message_len;
+	int len;
+	struct PACKET_ZC_FORMATSTRING_MSG *p;
+
+	nullpo_retv(sd);
+	nullpo_retv(value);
+
+	message_len = (int)strlen(value) + 1;
+	len = sizeof(*p) + message_len + 1;
+
+	p = (struct PACKET_ZC_FORMATSTRING_MSG *)aMalloc(len);
+	p->PacketType = 0x2c2;
+	p->PacketLength = len;
+	p->MessageId = msg_id;
+	safestrncpy(p->MessageString, value, message_len);
+	p->MessageString[message_len] = 0;
+
+	clif->send(p, p->PacketLength, &sd->bl, SELF);
+	aFree(p);
+}
+
+/**
+* Displays a format string from msgstringtable.txt with a color (ZC_MSG_COLOR).
+*
+* @param sd     The target character.
+* @param msg_id msgstringtable message index, 0-based (@see enum clif_messages)
+* @param color  The color to use
+*/
+void clif_msgtable_color(struct map_session_data *sd, uint16 msg_id, uint32 color)
+{
+	struct PACKET_ZC_MSG_COLOR p;
+
+	nullpo_retv(sd);
+
+	p.PacketType = 0x9cd;
+	p.MessageId = msg_id;
+	p.MessageColor = RGB2BGR(color);
+
+	clif->send(&p, sizeof(p), &sd->bl, SELF);
+}
+
+/**
  * Validates and processes a global/guild/party message packet.
  *
  * @param[in]  sd         The source character.
@@ -20923,6 +20973,8 @@ void clif_defaults(void) {
 	clif->msgtable_skill = clif_msgtable_skill;
 	clif->msgtable = clif_msgtable;
 	clif->msgtable_num = clif_msgtable_num;
+	clif->msgtable_str = clif_msgtable_str;
+	clif->msgtable_color = clif_msgtable_color;
 	clif->message = clif_displaymessage;
 	clif->messageln = clif_displaymessage2;
 	clif->messages = clif_displaymessage_sprintf;
diff --git a/src/map/clif.h b/src/map/clif.h
index 873188f84..eee978aac 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -886,6 +886,8 @@ struct clif_interface {
 	void (*msgtable) (struct map_session_data* sd, unsigned short msg_id);
 	void (*msgtable_num) (struct map_session_data *sd, unsigned short msg_id, int value);
 	void (*msgtable_skill) (struct map_session_data *sd, uint16 skill_id, int msg_id);
+	void (*msgtable_str) (struct map_session_data *sd, uint16 msg_id, const char *value);
+	void (*msgtable_color) (struct map_session_data *sd, uint16 msg_id, uint32 color);
 	void (*message) (const int fd, const char* mes);
 	void (*messageln) (const int fd, const char* mes);
 	/* message+s(printf) */
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h
index d8a2c6b31..7e154c12c 100644
--- a/src/map/packets_struct.h
+++ b/src/map/packets_struct.h
@@ -1699,6 +1699,19 @@ struct packet_quest_hunt_info {
 	struct packet_quest_hunt_info_sub info[];
 } __attribute__((packed));
 
+struct PACKET_ZC_FORMATSTRING_MSG {
+	uint16 PacketType;
+	uint16 PacketLength;
+	uint16 MessageId;
+	char MessageString[];
+} __attribute__((packed));
+
+struct PACKET_ZC_MSG_COLOR {
+	uint16 PacketType;
+	uint16 MessageId;
+	uint32 MessageColor;
+} __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