summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/map/pc.h2
-rw-r--r--src/map/unit.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/map/pc.h b/src/map/pc.h
index b6ba70c76..7af04937a 100644
--- a/src/map/pc.h
+++ b/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;
diff --git a/src/map/unit.c b/src/map/unit.c
index e2188811c..7b0820f66 100644
--- a/src/map/unit.c
+++ b/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;