From 40792ad45c1929f999602dd386483ce99b0ed30a Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Sat, 3 Oct 2009 12:08:30 -0600
Subject: Make sure the announce packet includes the nick

Also remove @kamib, as it's difference doesn't affect our client.
---
 src/map/clif.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/map/clif.c')

diff --git a/src/map/clif.c b/src/map/clif.c
index 76c38e5..f168ae5 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -6833,15 +6833,20 @@ void clif_parse_Wis(int fd, struct map_session_data *sd) { // S 0096 <len>.w <ni
  */
 void clif_parse_GMmessage(int fd, struct map_session_data *sd) {
 	char m[512];
+	char output[200];
 	nullpo_retv(sd);
 
 	if ((battle_config.atc_gmonly == 0 || pc_isGM(sd)) &&
 	    (pc_isGM(sd) >= get_atcommand_level(AtCommand_Broadcast)))
 	{
-		intif_GMmessage(RFIFOP(fd,4), RFIFOW(fd,2)-4, 0);
 		strncpy(m, RFIFOP(fd,4), RFIFOW(fd,2) - 4);
 		m[RFIFOW(fd,2) - 4] = 0;
 		log_atcommand(sd, "/announce %s", m);
+
+		memset(output, '\0', sizeof(output));
+		snprintf(output, 199, "%s : %s", sd->status.name, m);
+
+		intif_GMmessage(output, strlen(output) + 1, 0);
 	}
 }
 
-- 
cgit v1.2.3-60-g2f50