* 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://svn.code.sf.net/p/rathena/svn/trunk@17011 54d463be-8e91-2dee-dedb-b68131a5f0ec

src/map/mob.c

@@ -3598,7 +3598,7 @@ static unsigned int mob_drop_adjust(int baserate, int rate_adjust, unsigned shor
 {
 	double rate = baserate;
 
-	if (battle_config.logarithmic_drops && rate_adjust > 0 && baserate > 0) //Logarithmic drops equation by Ishizu-Chan
+	if (battle_config.logarithmic_drops && rate_adjust > 0 && rate_adjust != 100 && baserate > 0) //Logarithmic drops equation by Ishizu-Chan
 		//Equation: Droprate(x,y) = x * (5 - log(x)) ^ (ln(y) / ln(5))
 		//x is the normal Droprate, y is the Modificator.
 		rate = rate * pow((5.0 - log10(rate)), (log(rate_adjust/100.) / log(5.0))) + 0.5;

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);