diff options
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | conf-tmpl/irc_athena.conf | 3 | ||||
| -rw-r--r-- | src/map/irc.c | 10 |
3 files changed, 14 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 9c1d5e365..7718ebbef 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/04/18
+ * The IRC Bot can now autojoin when kicked, set in irc_athena. [Zido]
* Added @who to the IRC Bot, outputs all online characters. [Zido]
* Changed the memory manager fatal errors when allocating memory to print
out the size request as well as the file and line where they originated.
diff --git a/conf-tmpl/irc_athena.conf b/conf-tmpl/irc_athena.conf index bfe0a0968..25c687720 100644 --- a/conf-tmpl/irc_athena.conf +++ b/conf-tmpl/irc_athena.conf @@ -23,6 +23,9 @@ irc_server: irc.deltaanime.net //IRC Server Port
irc_port: 6667
+//Autojoin channel when kicked (on=1,off=0)
+irc_autojoin: 0
+
//IRC Channel
irc_channel: #
diff --git a/src/map/irc.c b/src/map/irc.c index fa464a33a..4cd57b60d 100644 --- a/src/map/irc.c +++ b/src/map/irc.c @@ -41,6 +41,8 @@ typedef int socklen_t; short use_irc=0;
+short irc_autojoin=0;
+
short irc_announce_flag=1;
short irc_announce_mvp_flag=1;
short irc_announce_jobchange_flag=1;
@@ -313,6 +315,12 @@ void irc_parse_sub(int fd, char *incoming_string) irc_send(send_string);
printf("Done\n");
}
+
+ // Autojoin on kick [Zido]
+ else if((strcmpi(command,"kick")==0)&&(irc_autojoin==1)) {
+ sprintf(send_string,"JOIN %s",target);
+ irc_send(send_string);
+ }
}
// Names Reply [Zido]
@@ -526,6 +534,8 @@ int irc_read_conf(char *file) { strcpy(irc_ip_str,w2);
else if(strcmpi(w1,"irc_port")==0)
irc_port=atoi(w2);
+ else if(strcmpi(w1,"irc_autojoin")==0)
+ irc_autojoin=atoi(w2);
else if(strcmpi(w1,"irc_channel")==0)
strcpy(irc_channel,w2);
else if(strcmpi(w1,"irc_trade_channel")==0)
|