summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-13 22:44:01 +0000
committereathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-13 22:44:01 +0000
commit4c5e3668433a0a6d63c0777f451f270f06e57fb7 (patch)
treeb0dd057ef28d2fc04bfe9700c613ef45dd38b4f5
parent938038f8e34ab93e1f38f1999534270238845194 (diff)
downloadhercules-4c5e3668433a0a6d63c0777f451f270f06e57fb7.tar.gz
hercules-4c5e3668433a0a6d63c0777f451f270f06e57fb7.tar.bz2
hercules-4c5e3668433a0a6d63c0777f451f270f06e57fb7.tar.xz
hercules-4c5e3668433a0a6d63c0777f451f270f06e57fb7.zip
* Merged changes up to eAthena 15033.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15098 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/mercenary.c2
-rw-r--r--src/map/script.c3
3 files changed, 4 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 82b4831c0..8dcbcaef7 100644
--- a/Changelog-Trunk.txt
+++ b/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]
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index f6fa6bdaa..6e4ff24a5 100644
--- a/src/map/mercenary.c
+++ b/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;
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;
}