* Merged changes up to eAthena 15033.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15098 54d463be-8e91-2dee-dedb-b68131a5f0ec

Changelog-Trunk.txt

@@ -1,6 +1,7 @@
 Date	Added
 
 2011-12-10
+	* Disabled creation of merceneries on TXT until charmerge is done, since the current char-server does not support it (bugreport:2502, since r13116). [Ai4rei]
 	* Updated pcre3.dll and related files from 7.0 to 8.20 (bugreport:4948). [Ai4rei]
 2011-12-09
 	* Updated PACKETVER and packet_db_ver to the most recent fully supported and stable client (2010-07-28aRagexeRE). [Ai4rei]

src/map/mercenary.c

@@ -65,7 +65,7 @@ int merc_create(struct map_session_data *sd, int class_, unsigned int lifetime)
 	struct s_mercenary merc;
 	struct s_mercenary_db *db;
 	int i;
-	nullpo_retr(1,sd);
+	nullpo_retr(0,sd);
 
 	if( (i = merc_search_index(class_)) < 0 )
 		return 0;

src/map/script.c

@@ -14828,6 +14828,7 @@ BUILDIN_FUNC(setcell)
  *------------------------------------------*/
 BUILDIN_FUNC(mercenary_create)
 {
+#ifndef TXT_ONLY
 	struct map_session_data *sd;
 	int class_, contract_time;
 
@@ -14841,7 +14842,7 @@ BUILDIN_FUNC(mercenary_create)
 
 	contract_time = script_getnum(st,3);
 	merc_create(sd, class_, contract_time);
-
+#endif
 	return 0;
 }