- Fixed txt-converter compilation.

- Added my_global.h include to login converter
- Removed sd->char_id since we can use sd->status.char_id instead.
- Small speedup in STRECOVERY, and made it not unlock a mob's target.
- Fixed GS_GROUNDDRIFT consuming ammo when it's time expires (so it was consuming 2 grenades instead of one). Also added a "explosion effect" when their time runs out.
- gvg_dungeon mapflag won't set pvp related mapflags anymore, pc_dead will force pvp ranking gain/loss on gvg_dungeon maps now.
- Now when coming out of hiding land-effects will trigger on the character.
- Made the pc_setpos message when being placed on an unwalkable tile tell you which player triggered it.
- Fixed land effects not taking effect inmediately on map-load when the invincible timer is disabled.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9374 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 2 insertions, 2 deletions

diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index ccdc24361..f83d3673c 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -622,10 +622,10 @@ int merc_hom_recv_data(int account_id, struct s_homunculus *sh, int flag)
 	sd = map_id2sd(account_id);

 	if(!sd)

 		return 0;

-	if (sd->char_id != sh->char_id)

+	if (sd->status.char_id != sh->char_id)

 	{

 		if (sd->status.hom_id == sh->hom_id)

-			sh->char_id = sd->char_id; //Correct char id.

+			sh->char_id = sd->status.char_id; //Correct char id.

 		else

 			return 0;

 	}