summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZido <Zido@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-17 23:17:24 +0000
committerZido <Zido@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-17 23:17:24 +0000
commitb48816ba37affa20998a64300af083faa6c70127 (patch)
tree4a664ba6887afa385720f9aa934163eacf56e184
parentf14c4c6e1c603640792e09164cb0ed7be9dae32f (diff)
downloadhercules-b48816ba37affa20998a64300af083faa6c70127.tar.gz
hercules-b48816ba37affa20998a64300af083faa6c70127.tar.bz2
hercules-b48816ba37affa20998a64300af083faa6c70127.tar.xz
hercules-b48816ba37affa20998a64300af083faa6c70127.zip
Refer to changelog
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6144 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/irc.c5
2 files changed, 3 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 56d3eb575..c5dcd73c4 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/17
+ * I seem to have broken @kami with my last commit, fixed. [Zido]
* Added @users to the IRC Bot, outputs the # of users online. [Zido]
* The baby check when wearing a tuxedo/dress now works [Zido]
* Fixed pet being incorrectly removed when it had intimacy 0. [Skotlex]
diff --git a/src/map/irc.c b/src/map/irc.c
index 4712acf3f..6fef716fb 100644
--- a/src/map/irc.c
+++ b/src/map/irc.c
@@ -269,13 +269,12 @@ void irc_parse_sub(int fd, char *incoming_string)
else if((strcmpi(target,irc_channel)==0)||(strcmpi(target,irc_channel+1)==0)) {
// Broadcast [Zido] (Work in Progress)
- if((strcmpi(command,"privmsg")==0)&&(sscanf(message,"@%s[^ ] %255[^\r\n]",cmdname,cmdargs)>0)&&(target[0]=='#')) {
+ if((strcmpi(command,"privmsg")==0)&&(sscanf(message,"@%255s %255[^\r\n]",cmdname,cmdargs)>0)&&(target[0]=='#')) {
if(strcmpi(cmdname,"kami")==0) {
if(get_access(source_nick)<ACCESS_OP)
sprintf(send_string,"NOTICE %s :Access Denied",source_nick);
else {
- sscanf(cmdargs,"%255[^\r\n]",cmd1);
- sprintf(send_string,"%s: %s",source_nick,cmd1);
+ sprintf(send_string,"%s: %s",source_nick,cmdargs);
intif_GMmessage(send_string,strlen(send_string)+1,0);
sprintf(send_string,"NOTICE %s :Message Sent",source_nick);
}