From 4c5e3668433a0a6d63c0777f451f270f06e57fb7 Mon Sep 17 00:00:00 2001
From: eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Tue, 13 Dec 2011 22:44:01 +0000
Subject: * Merged changes up to eAthena 15033.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15098 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/script.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/map/script.c')

diff --git a/src/map/script.c b/src/map/script.c
index 6b051dba0..ea8e26c23 100644
--- a/src/map/script.c
+++ b/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;
 }
 
-- 
cgit v1.2.3-70-g09d2