summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/messages.conf7
-rw-r--r--src/map/clif.c2
2 files changed, 4 insertions, 5 deletions
diff --git a/conf/messages.conf b/conf/messages.conf
index d90f0ff22..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,7 +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
-1500: You're not allowed to talk on this channel
+1294: You're not allowed to talk on this channel
// @channel
1404: %s failed
@@ -1538,7 +1539,5 @@
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 db1f1af73..8a9d4beb6 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -10131,7 +10131,7 @@ void clif_parse_WisMessage(int fd, struct map_session_data* sd)
}
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
+ clif->message(fd, msg_fd(fd,1294)); // You're not allowed to talk on this channel
return;
}
}