diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-01-16 19:49:33 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-01-16 19:49:33 +0000 |
| commit | 9a274a0fdb76313ff46861682d1eda67898548e6 (patch) | |
| tree | 20c2849399783f6e985be5d3307fb4645999d7a4 /src/map | |
| parent | d4e1028f77e7b03023901c16f6329414a8a3c24c (diff) | |
| download | hercules-9a274a0fdb76313ff46861682d1eda67898548e6.tar.gz hercules-9a274a0fdb76313ff46861682d1eda67898548e6.tar.bz2 hercules-9a274a0fdb76313ff46861682d1eda67898548e6.tar.xz hercules-9a274a0fdb76313ff46861682d1eda67898548e6.zip | |
- Fixed the next invoked skill after AbraCadabra not having requirements even when it is a different skill than the one chosen by AbraCadabra.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9661 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/skill.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index ba4c51cc0..c31ec78cf 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -7866,9 +7866,18 @@ int skill_check_condition (struct map_session_data *sd, int skill, int lv, int t if (sd->state.abra_flag) { - sd->skillitem = sd->skillitemlv = 0; - if(type&1) sd->state.abra_flag = 0; - return 1; + if (sd->skillitem != skill) + { //Cancelled, using a different skill. + sd->skillitem = sd->skillitemlv = sd->state.abra_flag = 0; + } else { + //Abracadabra skill, skip requisites! + if(type&1) + { //Clear out the data. + sd->skillitem = sd->skillitemlv = 0; + sd->state.abra_flag = 0; + } + return 1; + } } if (sd->menuskill_id == AM_PHARMACY && |