diff options
| author | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-05-30 02:43:44 +0000 |
|---|---|---|
| committer | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-05-30 02:43:44 +0000 |
| commit | 4deb54014e1f9a0dcd0713cea056d840ba34ef5c (patch) | |
| tree | 7e8e215a3e8c3f0e5c0000347636f5f000300b89 | |
| parent | 73d46ae81f20e7638147cd8912e0919db098a3d9 (diff) | |
| download | hercules-4deb54014e1f9a0dcd0713cea056d840ba34ef5c.tar.gz hercules-4deb54014e1f9a0dcd0713cea056d840ba34ef5c.tar.bz2 hercules-4deb54014e1f9a0dcd0713cea056d840ba34ef5c.tar.xz hercules-4deb54014e1f9a0dcd0713cea056d840ba34ef5c.zip | |
* Fixed Hocus-pocus always fails. (bugreport:3143, follow up to: r13815)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13826 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 13 |
2 files changed, 11 insertions, 4 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 51b2e3c36..934e46758 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/05/30 + * Fixed Hocus-pocus always fails. (bugreport:3143, follow up to: r13815) [Inkfish] 09/05/29 * Added new bonuses bHealPower and bHealPower2. [Inkfish] * Heal skills code clean up. [Inkfish] diff --git a/src/map/skill.c b/src/map/skill.c index 1546bcb47..3243eefa6 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -8060,8 +8060,12 @@ int skill_check_condition_castbegin(struct map_session_data* sd, short skill, sh return 0; } - if( sd->state.abra_flag && sd->skillitem != skill ) // Cancelled, using a different skill. - sd->skillitem = sd->skillitemlv = sd->state.abra_flag = 0; + if( sd->state.abra_flag ) + { + if( sd->skillitem == skill ) + return 1; + sd->skillitem = sd->skillitemlv = sd->state.abra_flag = 0; // Cancelled, using a different skill + } if (sd->menuskill_id == AM_PHARMACY && (skill == AM_PHARMACY || skill == AC_MAKINGARROW || skill == BS_REPAIRWEAPON || @@ -8558,8 +8562,9 @@ int skill_check_condition_castend(struct map_session_data* sd, short skill, shor if( sd->state.abra_flag ) { // Abracadabra skill, skip requisites! - sd->skillitem = sd->skillitemlv = sd->state.abra_flag = 0; - return 1; + sd->skillitem = sd->skillitemlv = sd->state.abra_flag = 0; // Clear out the data. + if( sd->skillitem == skill ) + return 1; } if( sd->menuskill_id == AM_PHARMACY ) |