summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-12-12 13:48:14 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-12-12 13:48:14 +0000
commit2486b455b32116d23b62ba9ffeed18fc64feac48 (patch)
tree5e9b8e91453147f1475e3f121e3cd2baebbca731
parent64324150783c2b822e5263e0e0a9ae0cc23d7ff1 (diff)
downloadhercules-2486b455b32116d23b62ba9ffeed18fc64feac48.tar.gz
hercules-2486b455b32116d23b62ba9ffeed18fc64feac48.tar.bz2
hercules-2486b455b32116d23b62ba9ffeed18fc64feac48.tar.xz
hercules-2486b455b32116d23b62ba9ffeed18fc64feac48.zip
* Fixed impossible condition in soundeffect script command (since athena-dev-2.1.1-mod1046, related r5841).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14583 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/script.c5
2 files changed, 2 insertions, 4 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index c2681fecc..4c6450257 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,6 +1,7 @@
Date Added
2010/12/12
+ * Fixed impossible condition in soundeffect script command (since athena-dev-2.1.1-mod1046, related r5841). [Ai4rei]
* Updates to the playBGM functionality (since r14335). [Ai4rei]
- Removed impossible condition in playBGM script command (from soundeffect).
- Removed unused code (retrieving of a bl) in playBGMall (from soundeffectall).
diff --git a/src/map/script.c b/src/map/script.c
index 8989aa37e..2a308c524 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -10876,10 +10876,7 @@ BUILDIN_FUNC(soundeffect)
if(sd)
{
- if(!st->rid)
- clif_soundeffect(sd,map_id2bl(st->oid),name,type);
- else
- clif_soundeffect(sd,&sd->bl,name,type);
+ clif_soundeffect(sd,&sd->bl,name,type);
}
return 0;
}