summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-15 14:43:22 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-15 14:43:22 +0000
commit8a2da0cdd5e7e28a8119442b4b9da816a9985250 (patch)
tree5d6a08abe2d15765a93253cdc7228394d4e3bc4f
parent422a0536cfc1074f534cf31885b18807cdff6d80 (diff)
downloadhercules-8a2da0cdd5e7e28a8119442b4b9da816a9985250.tar.gz
hercules-8a2da0cdd5e7e28a8119442b4b9da816a9985250.tar.bz2
hercules-8a2da0cdd5e7e28a8119442b4b9da816a9985250.tar.xz
hercules-8a2da0cdd5e7e28a8119442b4b9da816a9985250.zip
- Fixed clif_GlobalMessage being the exact same function as clif_message (the fiirst should send to ALL_CLIENT and the later should send to AREA_CHAT_WOS). Should fix globalmes script command.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6596 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt3
-rw-r--r--src/map/clif.c2
-rw-r--r--src/map/skill.c2
3 files changed, 5 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index ef5d0723a..a796f3326 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,9 @@ 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/05/15
+ * Fixed clif_GlobalMessage being the exact same function as clif_message
+ (the first should send to ALL_CLIENT and the later should send to
+ AREA_CHAT_WOS). Should fix globalmes script command. [Skotlex]
* Added SC_BLADESTOP to the switch listing in status_change_start [Skotlex]
* Characters in vending are now always considered "idle" if the
idle_no_share setting is active. [Skotlex]
diff --git a/src/map/clif.c b/src/map/clif.c
index fa243eb1e..4ea64c473 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -4938,7 +4938,7 @@ void clif_GlobalMessage(struct block_list *bl,char *message)
WBUFW(buf,2)=len+8;
WBUFL(buf,4)=bl->id;
strncpy((char *) WBUFP(buf,8),message,len);
- clif_send((unsigned char *) buf,WBUFW(buf,2),bl,AREA_CHAT_WOC);
+ clif_send((unsigned char *) buf,WBUFW(buf,2),bl,ALL_CLIENT);
}
/*==========================================
diff --git a/src/map/skill.c b/src/map/skill.c
index bf9c7668e..878436381 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -4173,7 +4173,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
if (strlen(md->name) + strlen(skill_db[skillid].desc) > 120)
break; //Message won't fit on buffer. [Skotlex]
sprintf(temp,"%s : %s !!",md->name,skill_db[skillid].desc);
- clif_GlobalMessage(&md->bl,temp);
+ clif_message(&md->bl,temp);
}
break;