summaryrefslogtreecommitdiff
path: root/src/map/skill.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-13 14:49:16 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-13 14:49:16 +0000
commit5b1bc8778474458ee6993d9d124b13e4cf5af3dc (patch)
treec4d1d1205b5ef9ae35bb28f8e4b1041d76ac22ce /src/map/skill.c
parentb6741a82e54a01f417b52267ddadb205f08ac3f5 (diff)
downloadhercules-5b1bc8778474458ee6993d9d124b13e4cf5af3dc.tar.gz
hercules-5b1bc8778474458ee6993d9d124b13e4cf5af3dc.tar.bz2
hercules-5b1bc8778474458ee6993d9d124b13e4cf5af3dc.tar.xz
hercules-5b1bc8778474458ee6993d9d124b13e4cf5af3dc.zip
- Corrected char-server parameters so that the subnet config file is the third parameter, not the second (which was conflicting with inter_athena.conf's argument), thanks to foobar.
- Fixed TK and Soul Linker's position of their job entry in exp2.txt, thanks to Coltaro. - Fixed NPC_GRANDDARKNESS targetting the enemy instead of yourself in mob_skill_db. - Fixed Grandcross's hit and range entries in the skill_db (it had hit 5? that wasn't even a valid value from the description) - PR_BENEDICTIO now ignores mdef - Removed the status_isdead checks from status_check_skilluse, they are now done only on the skill_castend_* functions. - Fixed NPC_SELFDESTRUCTION not doing the correct damage to oneself. - Fixed chatlog's x/y column capacity. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5584 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
-rw-r--r--src/map/skill.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index d05e845ec..716d6ef17 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -4097,7 +4097,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
skill_get_splash(skillid, skilllv), BL_CHAR,
src, skillid, skilllv, tick, flag|BCT_ENEMY,
skill_castend_damage_id);
- battle_damage(src, src, skill_area_temp[2], 0);
+ battle_damage(src, src, status_get_max_hp(src), 0);
break;
/* パ?ティスキル */
@@ -5978,6 +5978,9 @@ int skill_castend_pos2( struct block_list *src, int x,int y,int skillid,int skil
nullpo_retr(0, src);
+ if(status_isdead(src))
+ return 0;
+
if(src->type==BL_PC)
sd=(struct map_session_data *)src;