diff options
author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-20 21:05:12 +0000 |
---|---|---|
committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-07-20 21:05:12 +0000 |
commit | 7ad5e84ef5c3c3d1192f07ee77a5a7d04a94c3bf (patch) | |
tree | 2e7149310776cfa9c9c6e55288db933f85421cd3 /src/map/pc.c | |
parent | 2a0f10a6f77e1df9490f0181fb84f91e7591c412 (diff) | |
download | hercules-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/pc.c')
-rw-r--r-- | src/map/pc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index cfb3d86b7..75fc34b7e 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -3474,8 +3474,10 @@ int pc_checkallowskill(struct map_session_data *sd) for (i = 0; i < sizeof(scw_list)/sizeof(scw_list[0]); i++) { // Skills requiring specific weapon types - if(sd->sc.data[scw_list[i]].timer!=-1 && !(skill_get_weapontype(StatusSkillChangeTable[scw_list[i]])&(1<<sd->status.weapon))) - status_change_end(&sd->bl,scw_list[i],-1); + if(sd->sc.data[scw_list[i]].timer!=-1 && + !pc_check_weapontype(sd, + skill_get_weapontype(StatusSkillChangeTable[scw_list[i]]))) + status_change_end(&sd->bl,scw_list[i],-1); } if(sd->sc.data[SC_SPURT].timer!=-1 && sd->status.weapon) |