diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-10-03 12:08:30 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-10-03 12:08:30 -0600 |
| commit | 40792ad45c1929f999602dd386483ce99b0ed30a (patch) | |
| tree | f55bb52814dc963c40f7e7791d93ead2647dccea | |
| parent | 565bad1041b46f40c843121f1db915d95c76a9ad (diff) | |
| download | tmwa-40792ad45c1929f999602dd386483ce99b0ed30a.tar.gz tmwa-40792ad45c1929f999602dd386483ce99b0ed30a.tar.bz2 tmwa-40792ad45c1929f999602dd386483ce99b0ed30a.tar.xz tmwa-40792ad45c1929f999602dd386483ce99b0ed30a.zip | |
Make sure the announce packet includes the nick
Also remove @kamib, as it's difference doesn't affect our client.
| -rw-r--r-- | src/map/atcommand.c | 3 | ||||
| -rw-r--r-- | src/map/clif.c | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 510026b..3668d98 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -241,7 +241,6 @@ static AtCommandInfo atcommand_info[] = { { AtCommand_Kill, "@kill", 60, atcommand_kill }, { AtCommand_Alive, "@alive", 60, atcommand_alive }, { AtCommand_Kami, "@kami", 40, atcommand_kami }, - { AtCommand_KamiB, "@kamib", 40, atcommand_kami }, { AtCommand_Heal, "@heal", 40, atcommand_heal }, { AtCommand_Item, "@item", 60, atcommand_item }, { AtCommand_ItemReset, "@itemreset", 40, atcommand_itemreset }, @@ -1732,7 +1731,7 @@ int atcommand_kami( } sscanf(message, "%199[^\n]", output); - intif_GMmessage(output, strlen(output) + 1, (*(command + 5) == 'b') ? 0x10 : 0); + intif_GMmessage(output, strlen(output) + 1, 0); return 0; } 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); } } |