diff options
| -rw-r--r-- | conf/channels.conf | 1 | ||||
| -rw-r--r-- | src/map/channel.c | 20 | ||||
| -rw-r--r-- | src/map/channel.h | 3 | ||||
| -rw-r--r-- | src/map/clif.c | 3 |
4 files changed, 24 insertions, 3 deletions
diff --git a/conf/channels.conf b/conf/channels.conf index 9700f626c..a3eee122d 100644 --- a/conf/channels.conf +++ b/conf/channels.conf @@ -60,5 +60,6 @@ chsys: ( irc_channel_nick: "Hercules_chSysBot" /* nick the bot will use */ irc_channel_nick_pw: "" /* password to this nick (if any) to identify to nick server on the irc network */ irc_channel_use_ghost: false /* whether to send a GHOST command to the nick server (requires irc_channel_nick_pw to be defined) */ + irc_channel_autojoin: false } ) diff --git a/src/map/channel.c b/src/map/channel.c index 0704bf706..15dcce82e 100644 --- a/src/map/channel.c +++ b/src/map/channel.c @@ -477,6 +477,17 @@ void channel_map_join(struct map_session_data *sd) channel->join(map->list[sd->bl.m].channel, sd, NULL, false); } +void channel_irc_join(struct map_session_data *sd) +{ + if (sd->state.autotrade || sd->state.standalone) + return; + if (!channel->config->irc_name) + return; + struct channel_data *chan = ircbot->channel; + if (chan) + channel->join(chan, sd, NULL, false); +} + /** * Lets a guild's members join a newly allied guild's channel. * @@ -574,7 +585,8 @@ void read_channels_config(void) int ally_enabled = 0, local_enabled = 0, local_autojoin = 0, ally_autojoin = 0, allow_user_channel_creation = 0, - irc_enabled = 0; + irc_enabled = 0, + irc_autojoin = 0; if( !libconfig->setting_lookup_string(settings, "map_local_channel_name", &local_name) ) local_name = "map"; @@ -655,11 +667,14 @@ void read_channels_config(void) libconfig->setting_lookup_bool(settings, "map_local_channel_autojoin", &local_autojoin); libconfig->setting_lookup_bool(settings, "ally_channel_autojoin", &ally_autojoin); + libconfig->setting_lookup_bool(settings, "irc_channel_autojoin", &irc_autojoin); if (local_autojoin) channel->config->local_autojoin = true; if (ally_autojoin) channel->config->ally_autojoin = true; + if (irc_autojoin) + channel->config->irc_autojoin = true; libconfig->setting_lookup_bool(settings, "allow_user_channel_creation", &allow_user_channel_creation); @@ -768,7 +783,7 @@ int do_init_channel(bool minimal) return 0; channel->db = stridb_alloc(DB_OPT_DUP_KEY|DB_OPT_RELEASE_DATA, HCS_NAME_LENGTH); - channel->config->ally = channel->config->local = channel->config->irc = channel->config->ally_autojoin = channel->config->local_autojoin = false; + channel->config->ally = channel->config->local = channel->config->irc = channel->config->ally_autojoin = channel->config->local_autojoin = channel->config->irc_autojoin = false; channel->config_read(); return 0; @@ -828,6 +843,7 @@ void channel_defaults(void) channel->guild_join_alliance = channel_guild_join_alliance; channel->guild_leave_alliance = channel_guild_leave_alliance; channel->quit_guild = channel_quit_guild; + channel->irc_join = channel_irc_join; channel->config_read = read_channels_config; } diff --git a/src/map/channel.h b/src/map/channel.h index ba6aafc79..8fbf08d42 100644 --- a/src/map/channel.h +++ b/src/map/channel.h @@ -51,7 +51,7 @@ struct Channel_Config { char **colors_name; unsigned char colors_count; bool local, ally, irc; - bool local_autojoin, ally_autojoin; + bool local_autojoin, ally_autojoin, irc_autojoin; char local_name[HCS_NAME_LENGTH], ally_name[HCS_NAME_LENGTH], irc_name[HCS_NAME_LENGTH]; unsigned char local_color, ally_color, irc_color; bool closing; @@ -106,6 +106,7 @@ struct channel_interface { void (*guild_join_alliance) (const struct guild *g_source, const struct guild *g_ally); void (*guild_leave_alliance) (const struct guild *g_source, const struct guild *g_ally); void (*quit_guild) (struct map_session_data *sd); + void (*irc_join) (struct map_session_data *sd); void (*config_read) (void); }; diff --git a/src/map/clif.c b/src/map/clif.c index 22d259006..d28e64cd3 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -9265,6 +9265,9 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) { if (channel->config->local && channel->config->local_autojoin) { channel->map_join(sd); } + if (channel->config->irc && channel->config->irc_autojoin) { + channel->irc_join(sd); + } } mail->clear(sd); |