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/status.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/status.c')
| -rw-r--r-- | src/map/status.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/status.c b/src/map/status.c index ab0ccb0f0..8d24827ff 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -4397,7 +4397,7 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val return 0; //Overthrust can't take effect if under Max Overthrust. [Skotlex] break; case SC_ADRENALINE: - if (sd && !(skill_get_weapontype(BS_ADRENALINE)&(1<<sd->status.weapon))) + if(sd && !pc_check_weapontype(sd,skill_get_weapontype(BS_ADRENALINE))) return 0; if (sc->data[SC_QUAGMIRE].timer!=-1 || sc->data[SC_DONTFORGETME].timer!=-1 || @@ -4406,7 +4406,7 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val return 0; break; case SC_ADRENALINE2: - if (sd && !(skill_get_weapontype(BS_ADRENALINE2)&(1<<sd->status.weapon))) + if(sd && !pc_check_weapontype(sd,skill_get_weapontype(BS_ADRENALINE2))) return 0; if (sc->data[SC_QUAGMIRE].timer!=-1 || sc->data[SC_DONTFORGETME].timer!=-1 || |