summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-21 15:28:09 +0000
committerzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-21 15:28:09 +0000
commit6b671e8d02cdb4bf5b36773ae8fe0081eca8a72d (patch)
treec6e6f01b1b3ae65454e2542b3b6903de5471989d
parenta12a32c6596478917331d1985cb4cea1a722343c (diff)
downloadhercules-6b671e8d02cdb4bf5b36773ae8fe0081eca8a72d.tar.gz
hercules-6b671e8d02cdb4bf5b36773ae8fe0081eca8a72d.tar.bz2
hercules-6b671e8d02cdb4bf5b36773ae8fe0081eca8a72d.tar.xz
hercules-6b671e8d02cdb4bf5b36773ae8fe0081eca8a72d.zip
- Fixed a bug. Warp portal cannot be casted on dead players.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13104 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/skill.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 284e64f47..44e720834 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1858,14 +1858,15 @@ static int skill_check_unit_range2_sub (struct block_list *bl, va_list ap)
if(bl->prev == NULL)
return 0;
- if(status_isdead(bl))
+ skillid = va_arg(ap,int);
+
+ if( status_isdead(bl) && skillid != AL_WARP )
return 0;
- skillid = va_arg(ap,int);
- if (skillid==HP_BASILICA && bl->type==BL_PC)
+ if( skillid == HP_BASILICA && bl->type == BL_PC )
return 0;
- if (skillid==AM_DEMONSTRATION && bl->type==BL_MOB && ((TBL_MOB*)bl)->class_ == MOBID_EMPERIUM)
+ if( skillid == AM_DEMONSTRATION && bl->type == BL_MOB && ((TBL_MOB*)bl)->class_ == MOBID_EMPERIUM )
return 0; //Allow casting Bomb/Demonstration Right under emperium [Skotlex]
return 1;
}