summaryrefslogtreecommitdiff
path: root/src/map/mercenary.h
diff options
context:
space:
mode:
authorzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-31 21:05:35 +0000
committerzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-31 21:05:35 +0000
commit0c3fe037b7df653d91b03bc19526dbc8b7e641cb (patch)
treee1b4f575caec62050d264de5abdf28f078c7a192 /src/map/mercenary.h
parent690ef2ae18deedd44bf4670eaf751c3888cb5a37 (diff)
downloadhercules-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.h')
-rw-r--r--src/map/mercenary.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/map/mercenary.h b/src/map/mercenary.h
index 93c894dda..0579cc2bf 100644
--- a/src/map/mercenary.h
+++ b/src/map/mercenary.h
@@ -42,6 +42,7 @@ int merc_create(struct map_session_data *sd, int class_, unsigned int lifetime);
int merc_data_received(struct s_mercenary *merc, bool flag);
int mercenary_save(struct mercenary_data *md);
void mercenary_damage(struct mercenary_data *md, struct block_list *src, int hp, int sp);
+void mercenary_heal(struct mercenary_data *md, int hp, int sp);
int mercenary_dead(struct mercenary_data *md, struct block_list *src);
int do_init_mercenary(void);
int merc_delete(struct mercenary_data *md, int reply);