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/status.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/status.c')
| -rw-r--r-- | src/map/status.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/map/status.c b/src/map/status.c index 5f05296cc..eb8e3b3f1 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -836,6 +836,7 @@ int status_heal(struct block_list *bl,int hp,int sp, int flag) case BL_PC: pc_heal((TBL_PC*)bl,hp,sp,flag&2?1:0); break; case BL_MOB: mob_heal((TBL_MOB*)bl,hp); break; case BL_HOM: merc_hom_heal((TBL_HOM*)bl,hp,sp); break; + case BL_MER: mercenary_heal((TBL_MER*)bl,hp,sp); break; } return hp+sp; |