From aa5e5be5cb646e1e8071557e11eb31b26cfb7073 Mon Sep 17 00:00:00 2001
From: shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Mon, 27 Feb 2012 22:29:59 +0000
Subject: Fixed PA_SACRIFICE crash, bugreport:5371, present since r15277
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15635 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
src/map/battle.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
(limited to 'src')
diff --git a/src/map/battle.c b/src/map/battle.c
index aa9bdbb62..e777b4507 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -4019,23 +4019,22 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t
return (damage_lv)skill_attack(BF_WEAPON,src,src,target,MO_TRIPLEATTACK,skillv,tick,0);
}
- if (sc)
- {
- if (sc->data[SC_SACRIFICE])
- {
+ if (sc) {
+ if (sc->data[SC_SACRIFICE]) {
int skilllv = sc->data[SC_SACRIFICE]->val1;
- /**
- * We need to calculate the DMG before the hp reduction, because it can kill the source.
- * For futher information: bugreport:4950
- **/
- damage_lv ret_val = (damage_lv)skill_attack(BF_WEAPON,src,src,target,PA_SACRIFICE,skilllv,tick,0);
+ damage_lv ret_val;
if( --sc->data[SC_SACRIFICE]->val2 <= 0 )
status_change_end(src, SC_SACRIFICE, INVALID_TIMER);
+ /**
+ * We need to calculate the DMG before the hp reduction, because it can kill the source.
+ * For futher information: bugreport:4950
+ **/
+ ret_val = (damage_lv)skill_attack(BF_WEAPON,src,src,target,PA_SACRIFICE,skilllv,tick,0);
+
status_zap(src, sstatus->max_hp*9/100, 0);//Damage to self is always 9%
- //FIXME: invalid return type!
return ret_val;
}
if (sc->data[SC_MAGICALATTACK])
--
cgit v1.2.3-70-g09d2