diff options
| author | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-08-23 19:08:54 +0000 |
|---|---|---|
| committer | zephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-08-23 19:08:54 +0000 |
| commit | ac96c8dbde939dc367afe734f3452590e154475c (patch) | |
| tree | ad6b2ec838d199f6875ec331727b4a25249e0f9b /src/map/chrif.c | |
| parent | c45d93d9d873996f99829dfc506c7875ea13d24c (diff) | |
| download | hercules-ac96c8dbde939dc367afe734f3452590e154475c.tar.gz hercules-ac96c8dbde939dc367afe734f3452590e154475c.tar.bz2 hercules-ac96c8dbde939dc367afe734f3452590e154475c.tar.xz hercules-ac96c8dbde939dc367afe734f3452590e154475c.zip | |
- 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
Diffstat (limited to 'src/map/chrif.c')
| -rw-r--r-- | src/map/chrif.c | 7 |
1 files changed, 4 insertions, 3 deletions
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; } |