- 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

1 files changed, 1 insertions, 4 deletions

diff --git a/src/map/pc.c b/src/map/pc.c
index baf7c7dcc..a5cacfea8 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -5248,9 +5248,6 @@ int pc_heal(struct map_session_data *sd,int hp,int sp)
 //	if(sp > 0 && pc_checkoversp(sd))

 //		sp = 0;

 

-	if(sd->sc.count && sd->sc.data[SC_BERSERK].timer!=-1 && hp+sp>0)

-		return 0;

-

 	if(hp > sd->status.max_hp - sd->status.hp)

 		hp = sd->status.max_hp - sd->status.hp;

 	sd->status.hp+=hp;

@@ -6407,7 +6404,7 @@ int pc_unequipitem(struct map_session_data *sd,int n,int flag)
 			hp = sd->status.hp;

 		if (sp > sd->status.sp)

 			sp = sd->status.sp;

-		pc_heal(sd,-hp,-sp);

+		pc_heal(sd, -hp, -sp);

 	}

 

 	return 0;