From 690ef2ae18deedd44bf4670eaf751c3888cb5a37 Mon Sep 17 00:00:00 2001 From: zephyrus Date: Sun, 31 Aug 2008 18:37:00 +0000 Subject: * More mercenary updates. - Implemented Mercenary Die, Damage, Run Away when master dies. - Log mercenary damage and gives exp to Master. - Some little bugs. * Fixed Bubble Gums effect works on mvp_sd not sd (according to Doddler). NOTE: Now you can summon a mercenary, make it attack (not skills), follow you even on map change. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13158 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/mercenary.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/map/mercenary.h') diff --git a/src/map/mercenary.h b/src/map/mercenary.h index bc2046dc7..93c894dda 100644 --- a/src/map/mercenary.h +++ b/src/map/mercenary.h @@ -41,6 +41,8 @@ struct view_data * merc_get_viewdata(int class_); 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); +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); void merc_contract_stop(struct mercenary_data *md); -- cgit v1.2.3-70-g09d2