summaryrefslogtreecommitdiff
path: root/src/map/skill.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-20 21:05:12 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-20 21:05:12 +0000
commit7ad5e84ef5c3c3d1192f07ee77a5a7d04a94c3bf (patch)
tree2e7149310776cfa9c9c6e55288db933f85421cd3 /src/map/skill.c
parent2a0f10a6f77e1df9490f0181fb84f91e7591c412 (diff)
downloadhercules-7ad5e84ef5c3c3d1192f07ee77a5a7d04a94c3bf.tar.gz
hercules-7ad5e84ef5c3c3d1192f07ee77a5a7d04a94c3bf.tar.bz2
hercules-7ad5e84ef5c3c3d1192f07ee77a5a7d04a94c3bf.tar.xz
hercules-7ad5e84ef5c3c3d1192f07ee77a5a7d04a94c3bf.zip
- Added pc_check_weapontype to do a proper skill weapon check that takes into account dual-wielding. That is, if a skill can be used with daggers/axes, you'll be able to use the skill when dual-wielding them.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7779 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
-rw-r--r--src/map/skill.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 47500b7e8..34047b582 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -8362,7 +8362,8 @@ int skill_check_condition (struct map_session_data *sd, int skill, int lv, int t
clif_skill_fail(sd,skill,5,0);
return 0;
}
- if(!(weapon & (1<<sd->status.weapon) ) ) {
+
+ if(!pc_check_weapontype(sd,weapon)) {
clif_skill_fail(sd,skill,6,0);
return 0;
}