diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-15 20:32:06 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-15 20:32:06 +0000 |
| commit | a228f0d083df0e7839884371e772f89087641cf5 (patch) | |
| tree | fcf39ceb985b6ae2b18bd10c8d2e8c48e2665d71 /src/map | |
| parent | 8aac2b7d32e68cf3ebbb8502ee15fafb7da7e94b (diff) | |
| download | hercules-a228f0d083df0e7839884371e772f89087641cf5.tar.gz hercules-a228f0d083df0e7839884371e772f89087641cf5.tar.bz2 hercules-a228f0d083df0e7839884371e772f89087641cf5.tar.xz hercules-a228f0d083df0e7839884371e772f89087641cf5.zip | |
fixed asura targetting, bugreport:5052
fixed a typo in a bug report number, for bugreport:4629
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15136 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/pc.h | 2 | ||||
| -rw-r--r-- | src/map/unit.c | 6 |
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; |