summaryrefslogtreecommitdiff
path: root/src/map/skill.c
diff options
context:
space:
mode:
authormomacabu <momacabu@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-12-09 00:46:08 +0000
committermomacabu <momacabu@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-12-09 00:46:08 +0000
commitaf7c92046af55175cee59297e4759bd0d3913df7 (patch)
tree5cb72c4fd06b3955c56d9c6ac9c97cf157638070 /src/map/skill.c
parent25bc83e9604be9fef4f3b70ab40e698b10bd08e0 (diff)
downloadhercules-af7c92046af55175cee59297e4759bd0d3913df7.tar.gz
hercules-af7c92046af55175cee59297e4759bd0d3913df7.tar.bz2
hercules-af7c92046af55175cee59297e4759bd0d3913df7.tar.xz
hercules-af7c92046af55175cee59297e4759bd0d3913df7.zip
* Small improvement in case someone uses logarithmic drops with 1x rate, saving 19.4ms on start in that case;
* Fixed bugreport:6606 (follow up to r16881), another issue regarding to dancing skills delay. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17011 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
-rw-r--r--src/map/skill.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 718bf7faa..ad7749828 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -12103,8 +12103,13 @@ static int skill_unit_effect (struct block_list* bl, va_list ap)
//Target-type check.
if( !(group->bl_flag&bl->type && battle_check_target(&unit->bl,bl,group->target_flag)>0) ) {
- if( flag&4 && ((group->src_id == bl->id && group->state.song_dance&0x2) || skill_get_inf2(skill_id)&INF2_SONG_DANCE) )
+ if( flag&4 && group->src_id == bl->id && group->state.song_dance&0x2 ) {
skill_unit_onleft(skill_id, bl, tick);//Ensemble check to terminate it.
+ } else {
+ if ( flag&4 && skill_get_inf2(skill_id)&INF2_SONG_DANCE) { // Make a exception for song/dance skill
+ skill_unit_onleft(unit->val1, bl, tick); //TODO: fix skill_dance_switch
+ }
+ }
} else {
if( flag&1 )
skill_unit_onplace(unit,bl,tick);