summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-05-04 16:00:54 -0300
committershennetsind <ind@henn.et>2013-05-04 16:00:54 -0300
commitad9a13be6ef115de1d5e124283a1d63a0bc5cd4d (patch)
tree71cd5f4e1661bb23f833de3649f74a1f420ee201 /src/map
parentc5986ba47dbd5034018ab288c39feee7ff5d7d1f (diff)
downloadhercules-ad9a13be6ef115de1d5e124283a1d63a0bc5cd4d.tar.gz
hercules-ad9a13be6ef115de1d5e124283a1d63a0bc5cd4d.tar.bz2
hercules-ad9a13be6ef115de1d5e124283a1d63a0bc5cd4d.tar.xz
hercules-ad9a13be6ef115de1d5e124283a1d63a0bc5cd4d.zip
Fixed Bug #7210
http://hercules.ws/board/tracker/issue-7210-itemskill-command-does-not-check-for-required-items/ Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map')
-rw-r--r--src/map/script.c2
-rw-r--r--src/map/skill.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/map/script.c b/src/map/script.c
index 250ffeb93..61996b414 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -8260,7 +8260,7 @@ BUILDIN(itemskill) {
lv = script_getnum(st,3);
if( !script_hasdata(st, 4) ) {
- if( !skill->check_condition_castbegin(sd,id,lv) )
+ if( !skill->check_condition_castbegin(sd,id,lv) || !skill->check_condition_castend(sd,id,lv) )
return true;
}
diff --git a/src/map/skill.c b/src/map/skill.c
index c705d1425..a1a8d84bc 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -13208,7 +13208,7 @@ int skill_check_condition_castend(struct map_session_data* sd, uint16 skill_id,
break;
}
- if( sd->skillitem == skill_id ) // Casting finished (Item skill or Hocus-Pocus)
+ if( sd->state.abra_flag ) // Casting finished (Hocus-Pocus)
return 1;
if( pc_is90overweight(sd) ) {
@@ -13413,8 +13413,8 @@ struct skill_condition skill_get_requirement(struct map_session_data* sd, uint16
if( !sd )
return req;
- if( sd->skillitem == skill_id )
- return req; // Item skills and Hocus-Pocus don't have requirements.[Inkfish]
+ if( sd->state.abra_flag )
+ return req; // Hocus-Pocus don't have requirements.
sc = &sd->sc;
if( !sc->count )