diff options
| author | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-08-15 02:22:24 +0000 |
|---|---|---|
| committer | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-08-15 02:22:24 +0000 |
| commit | 0e6910bc23d657be1d52fa8b58d24c74b70b41ca (patch) | |
| tree | 9141cc04dbaa1e2f6d4160b464eaae0cf96e29f7 | |
| parent | 174ade9a45988abf053cf45f30775fc6a76e706e (diff) | |
| download | hercules-0e6910bc23d657be1d52fa8b58d24c74b70b41ca.tar.gz hercules-0e6910bc23d657be1d52fa8b58d24c74b70b41ca.tar.bz2 hercules-0e6910bc23d657be1d52fa8b58d24c74b70b41ca.tar.xz hercules-0e6910bc23d657be1d52fa8b58d24c74b70b41ca.zip | |
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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14007 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/unit.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index c5799766a..6c6f34ec7 100644 --- a/Changelog-Trunk.txt +++ b/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 diff --git a/src/map/unit.c b/src/map/unit.c index 878c1c934..0ba48b32b 100644 --- a/src/map/unit.c +++ b/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] |