diff options
| -rw-r--r-- | src/map/elemental.c | 2 | ||||
| -rw-r--r-- | src/map/elemental.h | 2 | ||||
| -rw-r--r-- | src/map/homunculus.c | 6 | ||||
| -rw-r--r-- | src/map/homunculus.h | 4 | ||||
| -rw-r--r-- | src/map/mercenary.c | 2 | ||||
| -rw-r--r-- | src/map/mercenary.h | 2 | ||||
| -rw-r--r-- | src/map/status.c | 8 |
7 files changed, 12 insertions, 14 deletions
diff --git a/src/map/elemental.c b/src/map/elemental.c index 677ca5ec0..c8788002e 100644 --- a/src/map/elemental.c +++ b/src/map/elemental.c @@ -457,7 +457,7 @@ int elemental_change_mode(struct elemental_data *ed, int mode) { return 1; } -void elemental_damage(struct elemental_data *ed, struct block_list *src, int hp, int sp) { +void elemental_damage(struct elemental_data *ed, int hp, int sp) { if( hp ) clif_elemental_updatestatus(ed->master, SP_HP); if( sp ) diff --git a/src/map/elemental.h b/src/map/elemental.h index 9f8ef1e22..124c7ff83 100644 --- a/src/map/elemental.h +++ b/src/map/elemental.h @@ -67,7 +67,7 @@ int elemental_save(struct elemental_data *ed); int elemental_change_mode_ack(struct elemental_data *ed, int mode); int elemental_change_mode(struct elemental_data *ed, int mode); -void elemental_damage(struct elemental_data *ed, struct block_list *src, int hp, int sp); +void elemental_damage(struct elemental_data *ed, int hp, int sp); void elemental_heal(struct elemental_data *ed, int hp, int sp); int elemental_dead(struct elemental_data *ed, struct block_list *src); diff --git a/src/map/homunculus.c b/src/map/homunculus.c index 06b7343cd..46da045a4 100644 --- a/src/map/homunculus.c +++ b/src/map/homunculus.c @@ -81,8 +81,7 @@ int hom_class2mapid(int hom_class) } } -void merc_damage(struct homun_data *hd,struct block_list *src,int hp,int sp) -{ +void merc_damage(struct homun_data *hd) { clif_hominfo(hd->master,hd,0); } @@ -499,8 +498,7 @@ int merc_hom_decrease_intimacy(struct homun_data * hd, unsigned int value) return hd->homunculus.intimacy; } -void merc_hom_heal(struct homun_data *hd,int hp,int sp) -{ +void merc_hom_heal(struct homun_data *hd) { clif_hominfo(hd->master,hd,0); } diff --git a/src/map/homunculus.h b/src/map/homunculus.h index cb209144a..3470cd5f5 100644 --- a/src/map/homunculus.h +++ b/src/map/homunculus.h @@ -79,7 +79,7 @@ int do_init_merc(void); int merc_hom_recv_data(int account_id, struct s_homunculus *sh, int flag); //albator struct view_data* merc_get_hom_viewdata(int class_); int hom_class2mapid(int hom_class); -void merc_damage(struct homun_data *hd,struct block_list *src,int hp,int sp); +void merc_damage(struct homun_data *hd); int merc_hom_dead(struct homun_data *hd, struct block_list *src); void merc_hom_skillup(struct homun_data *hd,int skillnum); int merc_hom_calc_skilltree(struct homun_data *hd); @@ -88,7 +88,7 @@ int merc_hom_gainexp(struct homun_data *hd,int exp); int merc_hom_levelup(struct homun_data *hd); int merc_hom_evolution(struct homun_data *hd); int hom_mutate(struct homun_data *hd,int homun_id); -void merc_hom_heal(struct homun_data *hd,int hp,int sp); +void merc_hom_heal(struct homun_data *hd); int merc_hom_vaporize(struct map_session_data *sd, int flag); int merc_resurrect_homunculus(struct map_session_data *sd, unsigned char per, short x, short y); void merc_hom_revive(struct homun_data *hd, unsigned int hp, unsigned int sp); diff --git a/src/map/mercenary.c b/src/map/mercenary.c index be1660046..b9e42aeae 100644 --- a/src/map/mercenary.c +++ b/src/map/mercenary.c @@ -344,7 +344,7 @@ int merc_data_received(struct s_mercenary *merc, bool flag) return 1; } -void mercenary_damage(struct mercenary_data *md, struct block_list *src, int hp, int sp) +void mercenary_damage(struct mercenary_data *md, int hp, int sp) { if( hp ) clif_mercenary_updatestatus(md->master, SP_HP); diff --git a/src/map/mercenary.h b/src/map/mercenary.h index 402a4e0ab..340ab1462 100644 --- a/src/map/mercenary.h +++ b/src/map/mercenary.h @@ -56,7 +56,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_damage(struct mercenary_data *md, 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); diff --git a/src/map/status.c b/src/map/status.c index 3b8d19114..e3bca4513 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -1216,9 +1216,9 @@ int status_damage(struct block_list *src,struct block_list *target,int hp, int s switch (target->type) { case BL_PC: pc_damage((TBL_PC*)target,src,hp,sp); break; case BL_MOB: mob_damage((TBL_MOB*)target, src, hp); break; - case BL_HOM: merc_damage((TBL_HOM*)target,src,hp,sp); break; - case BL_MER: mercenary_damage((TBL_MER*)target,src,hp,sp); break; - case BL_ELEM: elemental_damage((TBL_ELEM*)target,src,hp,sp); break; + case BL_HOM: merc_damage((TBL_HOM*)target); break; + case BL_MER: mercenary_damage((TBL_MER*)target,hp,sp); break; + case BL_ELEM: elemental_damage((TBL_ELEM*)target,hp,sp); break; } if( src && target->type == BL_PC && ((TBL_PC*)target)->disguise ) {// stop walking when attacked in disguise to prevent walk-delay bug @@ -1379,7 +1379,7 @@ int status_heal(struct block_list *bl,int hp,int sp, int flag) switch(bl->type) { 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_HOM: merc_hom_heal((TBL_HOM*)bl); break; case BL_MER: mercenary_heal((TBL_MER*)bl,hp,sp); break; case BL_ELEM: elemental_heal((TBL_ELEM*)bl,hp,sp); break; } |