summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHaruna <haru@dotalux.com>2015-10-21 23:53:19 +0200
committerHaruna <haru@dotalux.com>2015-10-21 23:53:19 +0200
commite4c30aeb788c34865325df7189ddc21b9542e86e (patch)
tree84df335dd0ad350c20f8c2a018b2a7096907b636 /src
parent8b198db1e0ccc8209b7bcf54b4df62d4747f75b2 (diff)
parent198aef7133713b47a4c4fadaac6811c9d3812d19 (diff)
downloadhercules-e4c30aeb788c34865325df7189ddc21b9542e86e.tar.gz
hercules-e4c30aeb788c34865325df7189ddc21b9542e86e.tar.bz2
hercules-e4c30aeb788c34865325df7189ddc21b9542e86e.tar.xz
hercules-e4c30aeb788c34865325df7189ddc21b9542e86e.zip
Merge pull request #790 from ErMaqui/master
Error message when talking to a pre-defined channel and you aren't on channel
Diffstat (limited to 'src')
-rw-r--r--src/map/clif.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index bbd2f8c7f..d499cf67f 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,1294)); // You're not allowed to talk on this channel
+ return;
}
}