diff options
Diffstat (limited to 'src/map/channel.c')
| -rw-r--r-- | src/map/channel.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/map/channel.c b/src/map/channel.c index 3bb2016d8..3ba56b100 100644 --- a/src/map/channel.c +++ b/src/map/channel.c @@ -276,7 +276,9 @@ static void channel_send(struct channel_data *chan, struct map_session_data *sd, if (sd && chan->msg_delay != 0 && DIFF_TICK(sd->hchsysch_tick + chan->msg_delay*1000, timer->gettick()) > 0 && !pc_has_permission(sd, PC_PERM_HCHSYS_ADMIN)) { - clif->messagecolor_self(sd->fd, COLOR_RED, msg_sd(sd,1455)); + char output[CHAT_SIZE_MAX]; + sprintf(output, msg_sd(sd, 1455), DIFF_TICK(sd->hchsysch_tick + chan->msg_delay * 1000, timer->gettick()) / 1000); // "You cannot send a message to this channel for another %d seconds." + clif->messagecolor_self(sd->fd, COLOR_RED, output); return; } else if (sd) { int i; @@ -290,7 +292,7 @@ static void channel_send(struct channel_data *chan, struct map_session_data *sd, for (i = 0; i < MAX_EVENTQUEUE; i++) { if (chan->handlers[i][0] != '\0') { - pc->setregstr(sd, script->add_str("@channelmes$"), msg); + pc->setregstr(sd, script->add_variable("@channelmes$"), msg); npc->event(sd, chan->handlers[i], 0); } } @@ -622,7 +624,8 @@ static void read_channels_config(void) irc_autojoin = 0, irc_flood_protection_rate = 0, irc_flood_protection_burst = 0, - irc_flood_protection_enabled = 0; + irc_flood_protection_enabled = 0, + channel_opt_msg_delay = 10; if( !libconfig->setting_lookup_string(settings, "map_local_channel_name", &local_name) ) local_name = "map"; @@ -818,6 +821,16 @@ static void read_channels_config(void) } } + libconfig->setting_lookup_int(settings, "channel_opt_msg_delay", &channel_opt_msg_delay); + if (channel_opt_msg_delay < 0) { + ShowWarning("channels.conf: channel_opt_msg_delay value '%d' must be from 0-255. Defaulting to 0...\n", channel_opt_msg_delay); + channel_opt_msg_delay = 0; + } else if (channel_opt_msg_delay > 255) { + ShowWarning("channels.conf: channel_opt_msg_delay value '%d' must be from 0-255. Defaulting to 255...\n", channel_opt_msg_delay); + channel_opt_msg_delay = 255; + } + channel->config->channel_opt_msg_delay = channel_opt_msg_delay; + ShowStatus("Done reading '"CL_WHITE"%u"CL_RESET"' channels in '"CL_WHITE"%s"CL_RESET"'.\n", db_size(channel->db), config_filename); } libconfig->destroy(&channels_conf); |