瀏覽代碼

fixed asura targetting, bugreport:5052
fixed a typo in a bug report number, for bugreport:4629

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

shennetsind 13 年之前
父節點
當前提交
d7a7f60dde
共有 2 個文件被更改,包括 4 次插入4 次删除
  1. 1 1
      src/map/pc.h
  2. 3 3
      src/map/unit.c

+ 1 - 1
src/map/pc.h

@@ -452,7 +452,7 @@ struct map_session_data {
 #endif
 
 	/**
-	 * Guarantees your friend request is legit (for bugreport:6429)
+	 * Guarantees your friend request is legit (for bugreport:4629)
 	 **/
 	int friend_req;
 

+ 3 - 3
src/map/unit.c

@@ -1019,7 +1019,7 @@ 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.
-	if (sc && sc->data[SC_COMBO] && sc->data[SC_COMBO]->val1 == skill_num)
+	if (sc && sc->data[SC_COMBO] && (sc->data[SC_COMBO]->val1 == skill_num || skill_num == MO_EXTREMITYFIST))
 	{
 		if (sc->data[SC_COMBO]->val2)
 			target_id = sc->data[SC_COMBO]->val2;
@@ -1027,9 +1027,9 @@ int unit_skilluse_id2(struct block_list *src, int target_id, short skill_num, sh
 			target_id = ud->target;
 		temp = 1;
 	} else
-	if ( target_id == src->id && (
+	if ( target_id == src->id &&
 		skill_get_inf(skill_num)&INF_SELF_SKILL &&
-		skill_get_inf2(skill_num)&INF2_NO_TARGET_SELF ) || skill_num == MO_EXTREMITYFIST ) //Asura due to combo.
+		skill_get_inf2(skill_num)&INF2_NO_TARGET_SELF )
 	{
 		target_id = ud->target; //Auto-select target. [Skotlex]
 		temp = 1;