summaryrefslogtreecommitdiff
path: root/src/map/status.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-14 14:23:59 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-14 14:23:59 +0000
commit3f8b52f6d673b3e5d259a9bb10004375d7647533 (patch)
treef0ba225918e30910109a972412ecdec99da20217 /src/map/status.c
parenteadab5ba5011a8b999c9a5674081df81c2d0b5a2 (diff)
downloadhercules-3f8b52f6d673b3e5d259a9bb10004375d7647533.tar.gz
hercules-3f8b52f6d673b3e5d259a9bb10004375d7647533.tar.bz2
hercules-3f8b52f6d673b3e5d259a9bb10004375d7647533.tar.xz
hercules-3f8b52f6d673b3e5d259a9bb10004375d7647533.zip
- Status_check_skilluse again does the status_isdead check, but only on non-skills checks.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5597 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
-rw-r--r--src/map/status.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/map/status.c b/src/map/status.c
index 5b44f6ba4..548be4d1f 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -355,12 +355,20 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, int
struct status_change *sc=NULL, *tsc;
mode = src?status_get_mode(src):MD_CANATTACK;
-
- if (!skill_num && !(mode&MD_CANATTACK))
- return 0; //This mode is only needed for melee attacking.
+
+ if (!skill_num) { //Normal attack checks.
+ if (!(mode&MD_CANATTACK))
+ return 0; //This mode is only needed for melee attacking.
+ //Dead state is not checked for skills as some skills can be used
+ //by/on dead characters, said checks are left to skill.c [Skotlex]
+ if (src && status_isdead(src))
+ return 0;
+ if (target && status_isdead(target))
+ return 0;
+ }
if (skill_num == PA_PRESSURE && flag) {
- //Gloria Avoids pretty much everythng....
+ //Gloria Avoids pretty much everything....
tsc = target?status_get_sc(target):NULL;
if(tsc) {
if (tsc->option&OPTION_HIDE)