From 0224ba74aa451f4103974ea860815683f70c4ef7 Mon Sep 17 00:00:00 2001 From: skotlex Date: Fri, 7 Apr 2006 20:23:52 +0000 Subject: - Moved the devotion damage reduction to the block that only executes if flag is zero in battle_damage. - skill_castcancel won't trigger on battle_damage when the passed flag is 1 - The flag in battle_heal is now used to determine whether Berserk blocks the healing or not. - Moved the Fusion HP penalty to battle_calc_weapon_attack - Some cleaning to use battle_heal/damage rather than pc_heal/damage where appropiate. - cleaned up the deadly-poison hp reduction code. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5949 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/pet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/map/pet.c') diff --git a/src/map/pet.c b/src/map/pet.c index 25f8274c9..c2c00e106 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -1269,7 +1269,7 @@ int pet_heal_timer(int tid,unsigned int tick,int id,int data) pet_stop_attack(pd); pet_stop_walking(pd,1); clif_skill_nodamage(&pd->bl,&sd->bl,AL_HEAL,pd->s_skill->lv,1); - pc_heal(sd,pd->s_skill->lv,0); + battle_heal(&pd->bl, &sd->bl, pd->s_skill->lv,0, 0); pd->s_skill->timer=add_timer(tick+pd->s_skill->delay*1000,pet_heal_timer,sd->bl.id,0); return 0; } -- cgit v1.2.3-70-g09d2