summaryrefslogtreecommitdiff
path: root/src/map/skill.c
diff options
context:
space:
mode:
authorzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-09-02 16:29:29 +0000
committerzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-09-02 16:29:29 +0000
commitf4444897e96b9278ca952686e7dc0561a8b30efc (patch)
tree4a77e92c9ca5ac6a0916d79ec336cf143322184b /src/map/skill.c
parentc23a8db0769097ef2aaf25d43b07cd6774a6fd8e (diff)
downloadhercules-f4444897e96b9278ca952686e7dc0561a8b30efc.tar.gz
hercules-f4444897e96b9278ca952686e7dc0561a8b30efc.tar.bz2
hercules-f4444897e96b9278ca952686e7dc0561a8b30efc.tar.xz
hercules-f4444897e96b9278ca952686e7dc0561a8b30efc.zip
- Implementing a correct update of mercenary status window on status change updates.
- Fixed Mercenary Heal is reduced 50%. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13185 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
-rw-r--r--src/map/skill.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index 03f9725d5..b75245a98 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -275,8 +275,8 @@ int skill_calc_heal (struct block_list *src, struct block_list *target, int skil
if(src->type == BL_HOM && (skill = merc_hom_checkskill(((TBL_HOM*)src), HLIF_BRAIN)) > 0)
heal += heal * skill * 2 / 100;
- if(src->type == BL_MER)
- heal /= 2;
+ if(target && target->type == BL_MER)
+ heal >>= 1;
sc = status_get_sc(target);
if( sc && sc->count )