- Added all the missing FIFOHEADs in the login/sql servers (required for TURBO support)

- Fixed the fact that the TURBO code breaks when you attempt to handle more than one connection at a time within the same function. However this broke map-server compilation, therefore, don't use TURBO yet! It needs more fixing (and I need more time to fix it)
- While at it, cleaned a few packet implementations in the char/login servers which were not only ugly, but had some really stupid flaws within (stuff like escaping a string, and then using the non-escaped variable to insert to SQL? T_T) And will someone explain me why the TXT servers are coded much more cleanly, and without such horribly broken code as I find in the SQL ones? T_T;


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

1 files changed, 5 insertions, 3 deletions

diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 2beccb554..1b7a3100c 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -186,9 +186,11 @@ void merc_hom_skillup(struct homun_data *hd,int skillnum)
 			hd->homunculus.hskill[i].lv++ ;

 			hd->homunculus.skillpts-- ;

 			status_calc_homunculus(hd,0) ;

-			clif_homskillup(hd->master, skillnum) ;

-			clif_hominfo(hd->master,hd,0) ;

-			clif_homskillinfoblock(hd->master) ;

+			if (hd->master) {

+				clif_homskillup(hd->master, skillnum);

+				clif_hominfo(hd->master,hd,0);

+				clif_homskillinfoblock(hd->master);

+			}

 		}

 	}

 }