From c23aea66ad78acff3914f7b865eeba3adb159b0d Mon Sep 17 00:00:00 2001 From: skotlex Date: Thu, 31 Aug 2006 16:40:37 +0000 Subject: - Moved the intimacy penalty of HFLI_SBR44 and HVAN_EXPLOSION to skill_counter_additional_effect - Simplified skillnotok_hom by using an invocation to skillnotok - Hopefully fixed BD_ADAPTATION - Homun won't lose any intimacy on death now. - Homun will be saved together with the master now (as long as the homun is active) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8564 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/chrif.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/map/chrif.c') diff --git a/src/map/chrif.c b/src/map/chrif.c index 6f3e35c0d..64194c1a2 100644 --- a/src/map/chrif.c +++ b/src/map/chrif.c @@ -209,7 +209,6 @@ int chrif_save(struct map_session_data *sd, int flag) intif_saveregistry(sd, 2); //Save account regs if (sd->state.reg_dirty&1) intif_saveregistry(sd, 1); //Save account2 regs - #ifndef TXT_ONLY if(charsave_method){ //New 'Local' save charsave_savechar(sd->char_id, &sd->status); @@ -228,6 +227,10 @@ int chrif_save(struct map_session_data *sd, int flag) WFIFOB(char_fd,12) = (flag==1)?1:0; //Flag to tell char-server this character is quitting. memcpy(WFIFOP(char_fd,13), &sd->status, sizeof(sd->status)); WFIFOSET(char_fd, WFIFOW(char_fd,2)); + + if (sd->hd && merc_is_hom_active(sd->hd)) + merc_save(sd->hd); + if (flag) sd->state.finalsave = 1; //Mark the last save as done. return 0; -- cgit v1.2.3-70-g09d2