From c5568987878e2cb429d720e489a010ba501334ce Mon Sep 17 00:00:00 2001 From: Er_Maqui Date: Mon, 12 Oct 2015 16:37:43 +0200 Subject: - Error message when talking to a pre-defined channel and you aren't on the channel. --- conf/messages.conf | 3 +++ src/map/clif.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/conf/messages.conf b/conf/messages.conf index 2b5f8eb63..d90f0ff22 100644 --- a/conf/messages.conf +++ b/conf/messages.conf @@ -1416,6 +1416,7 @@ 1402: You're not in that channel, type '@join <#channel_name>' 1435: You're now in the '#%s' channel for '%s' 1436: You're already in the '%s' channel +1500: You're not allowed to talk on this channel // @channel 1404: %s failed @@ -1537,5 +1538,7 @@ 1498: You can't add a party bound item to a character without party! 1499: You can't add a guild bound item to a character without guild! +//1500 used by hercules chat feature + //Custom translations import: conf/import/msg_conf.txt diff --git a/src/map/clif.c b/src/map/clif.c index 9c7d327e6..db1f1af73 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -10130,6 +10130,9 @@ void clif_parse_WisMessage(int fd, struct map_session_data* sd) clif->message(fd, msg_fd(fd,1402)); } return; + } else if (strcmpi(&chname[1], channel->config->ally_name) == 0) { + clif->message(fd, msg_fd(fd,1500)); // You're not allowed to talk on this channel + return; } } -- cgit v1.2.3-70-g09d2