Fixed self skills affecting target unit when used within combo delay for Asura and Flying Kick. (bugreport:3495) (follow up to r13900)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14007 54d463be-8e91-2dee-dedb-b68131a5f0ec

Changelog-Trunk.txt

@@ -3,6 +3,8 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+09/08/14
+	* Fixed self skills affecting target unit when used within combo delay for Asura and Flying Kick. (bugreport:3495) [Inkfish]
 09/08/11
 	* Fixed changequest behavior(before: completequest+setquest, now: erasequest+setquest) [Inkfish]
 09/08/10

src/map/unit.c

@@ -847,8 +847,12 @@ int unit_skilluse_id2(struct block_list *src, int target_id, short skill_num, sh
 		sc = NULL; //Unneeded
 
 	//temp: used to signal combo-skills right now.
-	temp = ( target_id == src->id && 
-		   ( (sd && sd->state.combo) || (skill_get_inf(skill_num)&INF_SELF_SKILL && skill_get_inf2(skill_num)&INF2_NO_TARGET_SELF) ) );
+	temp =	( target_id == src->id && 
+				( 
+					( !(skill_get_inf(skill_num)&INF_SELF_SKILL) && sd && sd->state.combo ) || 
+					( skill_get_inf(skill_num)&INF_SELF_SKILL && skill_get_inf2(skill_num)&INF2_NO_TARGET_SELF ) 
+				) 
+			);
 	if (temp)
 		target_id = ud->target; //Auto-select skills. [Skotlex]