summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-02 17:49:01 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-02 17:49:01 +0000
commitc56cb50770ced6f99cef48ef6e8e355fac3364d0 (patch)
tree580017d106023f06bf6785ea6fc30179750e837b /src/map
parent00d6ee1a22acada2f57a948b3e2a80d0de8f88ab (diff)
downloadhercules-c56cb50770ced6f99cef48ef6e8e355fac3364d0.tar.gz
hercules-c56cb50770ced6f99cef48ef6e8e355fac3364d0.tar.bz2
hercules-c56cb50770ced6f99cef48ef6e8e355fac3364d0.tar.xz
hercules-c56cb50770ced6f99cef48ef6e8e355fac3364d0.zip
- Fixed Martyr's Reckoning having a cap damage of 32k.
- Changed Scream and Hammerfall's stun duration to 5 seconds. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8064 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/battle.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 6c0f57651..4e4126831 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -1130,11 +1130,9 @@ static struct Damage battle_calc_weapon_attack(
status_set_hp(src, 1, 0);
break;
case PA_SACRIFICE:
- skill = sstatus->max_hp* 9/100;
- status_zap(src, skill, 0);//Damage to self is always 9%
- clif_damage(src,src, gettick(), 0, 0, skill, 0 , 0, 0);
-
- wd.damage = skill;
+ wd.damage = sstatus->max_hp* 9/100;
+ status_zap(src, wd.damage, 0);//Damage to self is always 9%
+ clif_damage(src,src, gettick(), 0, 0, wd.damage, 0 , 0, 0);
wd.damage2 = 0;
if (sc && sc->data[SC_SACRIFICE].timer != -1)