summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEr_Maqui <er_maqui@darkbolt.net>2015-10-12 16:37:43 +0200
committerEr_Maqui <er_maqui@darkbolt.net>2015-10-12 16:37:43 +0200
commitc5568987878e2cb429d720e489a010ba501334ce (patch)
treec07a5a33838a624fb2e420adae689625b3a6244f
parent3ca033652637cb529b8ca4d8a4f7fb3f37080fb2 (diff)
downloadhercules-c5568987878e2cb429d720e489a010ba501334ce.tar.gz
hercules-c5568987878e2cb429d720e489a010ba501334ce.tar.bz2
hercules-c5568987878e2cb429d720e489a010ba501334ce.tar.xz
hercules-c5568987878e2cb429d720e489a010ba501334ce.zip
- Error message when talking to a pre-defined channel and you aren't on the channel.
-rw-r--r--conf/messages.conf3
-rw-r--r--src/map/clif.c3
2 files changed, 6 insertions, 0 deletions
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;
}
}