From 0c3fe037b7df653d91b03bc19526dbc8b7e641cb Mon Sep 17 00:00:00 2001 From: zephyrus Date: Sun, 31 Aug 2008 21:05:35 +0000 Subject: - Implemented script commands for mercenary items (mercenary_heal and mercenary_sc_start). - Fixed a bug crashing server with mercenary. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13159 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/mercenary.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/map/mercenary.c') diff --git a/src/map/mercenary.c b/src/map/mercenary.c index 740b8d85e..08a640275 100644 --- a/src/map/mercenary.c +++ b/src/map/mercenary.c @@ -218,6 +218,14 @@ void mercenary_damage(struct mercenary_data *md, struct block_list *src, int hp, clif_mercenary_updatestatus(md->master, SP_HP); } +void mercenary_heal(struct mercenary_data *md, int hp, int sp) +{ + if( hp ) + clif_mercenary_updatestatus(md->master, SP_HP); + if( sp ) + clif_mercenary_updatestatus(md->master, SP_SP); +} + int mercenary_dead(struct mercenary_data *md, struct block_list *src) { merc_delete(md, 1); -- cgit v1.2.3-60-g2f50