diff options
| author | Haruna <haru@dotalux.com> | 2015-10-21 23:53:19 +0200 |
|---|---|---|
| committer | Haruna <haru@dotalux.com> | 2015-10-21 23:53:19 +0200 |
| commit | e4c30aeb788c34865325df7189ddc21b9542e86e (patch) | |
| tree | 84df335dd0ad350c20f8c2a018b2a7096907b636 | |
| parent | 8b198db1e0ccc8209b7bcf54b4df62d4747f75b2 (diff) | |
| parent | 198aef7133713b47a4c4fadaac6811c9d3812d19 (diff) | |
| download | hercules-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
| -rw-r--r-- | conf/messages.conf | 4 | ||||
| -rw-r--r-- | src/map/clif.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/conf/messages.conf b/conf/messages.conf index 2b5f8eb63..f4098ae30 100644 --- a/conf/messages.conf +++ b/conf/messages.conf @@ -1235,7 +1235,8 @@ // @mobinfo ... 1291: ATK:%d~%d MATK:%d~%d Range:%d~%d~%d Size:%s Race: %s Element: %s (Lv:%d) -//1292-1294 FREE +//1292-1293 FREE +//1294 used by hercules chat feature // @version 1295: %s revision '%s' (src) / '%s' (scripts) @@ -1416,6 +1417,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 +1294: You're not allowed to talk on this channel // @channel 1404: %s failed 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; } } |