From ac96c8dbde939dc367afe734f3452590e154475c Mon Sep 17 00:00:00 2001 From: zephyrus Date: Sat, 23 Aug 2008 19:08:54 +0000 Subject: - Completed Mercenary Create, Delete, Save. Tests OK. - Incremented MAX_SKILL required for a proper load of Mercenary Skills. - Some fixes. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13118 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/chrif.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/map/chrif.c') diff --git a/src/map/chrif.c b/src/map/chrif.c index a46186fc1..8ebb88226 100644 --- a/src/map/chrif.c +++ b/src/map/chrif.c @@ -281,11 +281,12 @@ int chrif_save(struct map_session_data *sd, int flag) WFIFOSET(char_fd, WFIFOW(char_fd,2)); - if(sd->status.pet_id > 0 && sd->pd) + if( sd->status.pet_id > 0 && sd->pd ) intif_save_petdata(sd->status.account_id,&sd->pd->pet); - - if (sd->hd && merc_is_hom_active(sd->hd)) + if( sd->hd && merc_is_hom_active(sd->hd) ) merc_save(sd->hd); + if( sd->md && sd->md->mercenary.remain_life_time > 0 ) + mercenary_save(sd->md); return 0; } -- cgit v1.2.3-60-g2f50