diff options
| author | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-08-31 21:05:35 +0000 |
|---|---|---|
| committer | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-08-31 21:05:35 +0000 |
| commit | 0c3fe037b7df653d91b03bc19526dbc8b7e641cb (patch) | |
| tree | e1b4f575caec62050d264de5abdf28f078c7a192 /src/map/mercenary.c | |
| parent | 690ef2ae18deedd44bf4670eaf751c3888cb5a37 (diff) | |
| download | hercules-0c3fe037b7df653d91b03bc19526dbc8b7e641cb.tar.gz hercules-0c3fe037b7df653d91b03bc19526dbc8b7e641cb.tar.bz2 hercules-0c3fe037b7df653d91b03bc19526dbc8b7e641cb.tar.xz hercules-0c3fe037b7df653d91b03bc19526dbc8b7e641cb.zip | |
- 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
Diffstat (limited to 'src/map/mercenary.c')
| -rw-r--r-- | src/map/mercenary.c | 8 |
1 files changed, 8 insertions, 0 deletions
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); |