diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-22 18:47:01 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-22 18:47:01 +0000 |
| commit | 2e2f6aff261555ae5eaee6b7777d5844b7d20544 (patch) | |
| tree | bdce427e38e52ed922f4ce3ad5c1f734255941d0 /src/map/status.c | |
| parent | f379acdcc7a7ecdc6ccd7ea2c6f8673d147450b4 (diff) | |
| download | hercules-2e2f6aff261555ae5eaee6b7777d5844b7d20544.tar.gz hercules-2e2f6aff261555ae5eaee6b7777d5844b7d20544.tar.bz2 hercules-2e2f6aff261555ae5eaee6b7777d5844b7d20544.tar.xz hercules-2e2f6aff261555ae5eaee6b7777d5844b7d20544.zip | |
- status_check_skilluse won't block skill-specific checks (silence, berserk, steel-body, etc) when the skill in use is an item-invoked skill.
- Merged LittleWolf's function to read the map-height directly from the rsw file.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5706 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map/status.c b/src/map/status.c index eb7f3eff2..32fd92d98 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -419,8 +419,9 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, int default: return 0;
}
}
- if (skill_num)
- { //Skills blocked through status changes...
+ if (skill_num && //Do not block item-casted skills.
+ (src->type != BL_PC || ((TBL_PC*)src)->skillitem != skill_num)
+ ) { //Skills blocked through status changes...
if (!flag && ( //Blocked only from using the skill (stuff like autospell may still go through
(sc->data[SC_MARIONETTE].timer != -1 && skill_num != CG_MARIONETTE) ||
(sc->data[SC_MARIONETTE2].timer != -1 && skill_num == CG_MARIONETTE) ||
|