summaryrefslogtreecommitdiff
path: root/src/map/clif.c
diff options
context:
space:
mode:
authorMadCamel <madcamel@gmail.com>2009-10-06 19:35:25 -0400
committerMadCamel <madcamel@gmail.com>2009-10-06 19:35:25 -0400
commit29844ce5e2cd043551b46c1cd7bf3a36e357e3c6 (patch)
treebf42e1c857c08fce52ff5bcda8f74e27bdcd9638 /src/map/clif.c
parent592170e732fd5b75cf1447ed33e8999541048db8 (diff)
parent40792ad45c1929f999602dd386483ce99b0ed30a (diff)
downloadtmwa-29844ce5e2cd043551b46c1cd7bf3a36e357e3c6.tar.gz
tmwa-29844ce5e2cd043551b46c1cd7bf3a36e357e3c6.tar.bz2
tmwa-29844ce5e2cd043551b46c1cd7bf3a36e357e3c6.tar.xz
tmwa-29844ce5e2cd043551b46c1cd7bf3a36e357e3c6.zip
Merge branch 'master' of git://gitorious.org/tmw-eathena/mainline
Diffstat (limited to 'src/map/clif.c')
-rw-r--r--src/map/clif.c7
1 files changed, 6 insertions, 1 deletions
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);
}
}