From af7c92046af55175cee59297e4759bd0d3913df7 Mon Sep 17 00:00:00 2001 From: momacabu Date: Sun, 9 Dec 2012 00:46:08 +0000 Subject: * 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 --- src/map/skill.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/map/skill.c') 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); -- cgit v1.2.3-70-g09d2