diff options
Diffstat (limited to 'src/map/mercenary.c')
| -rw-r--r-- | src/map/mercenary.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/map/mercenary.c b/src/map/mercenary.c index dc49f5e21..740b8d85e 100644 --- a/src/map/mercenary.c +++ b/src/map/mercenary.c @@ -132,10 +132,10 @@ int merc_delete(struct mercenary_data *md, int reply) merc_contract_stop(md); if( !sd ) - return unit_free(&md->bl, 1); + return unit_free(&md->bl, 0); clif_mercenary_message(sd->fd, reply); - return unit_remove_map(&md->bl, 1); + return unit_remove_map(&md->bl, 0); } void merc_contract_stop(struct mercenary_data *md) @@ -213,6 +213,17 @@ 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) +{ + clif_mercenary_updatestatus(md->master, SP_HP); +} + +int mercenary_dead(struct mercenary_data *md, struct block_list *src) +{ + merc_delete(md, 1); + return 0; +} + int read_mercenarydb(void) { FILE *fp; @@ -292,6 +303,7 @@ int read_mercenarydb(void) status->ele_lv = 1; } + status->aspd_rate = 1000; status->speed = atoi(str[22]); status->adelay = atoi(str[23]); status->amotion = atoi(str[24]); |