summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-11 06:22:51 +0000
committerLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-11 06:22:51 +0000
commit93fcb74029252a194664e7498b1d3ca8f5d802c3 (patch)
tree114d3b0914ed7767730a3ca6943d10da58728052
parent96145e78a56a090e60a77c09147d2cb0991fda2d (diff)
downloadhercules-93fcb74029252a194664e7498b1d3ca8f5d802c3.tar.gz
hercules-93fcb74029252a194664e7498b1d3ca8f5d802c3.tar.bz2
hercules-93fcb74029252a194664e7498b1d3ca8f5d802c3.tar.xz
hercules-93fcb74029252a194664e7498b1d3ca8f5d802c3.zip
* Temperory replaced strtoll to strtoul until the function changes.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5983 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/itemdb.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index c5f24e9b6..f9df450aa 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/04/10
+ * Temperory replaced strtoll to strtoul until the function changes. [Lance]
* Multiple optimizations to the unit_data auto-chase upgrade, also
simplified the mob and pet ai routines. [Skotlex]
* Simplified the walk routines to half the number of timers required for
diff --git a/src/map/itemdb.c b/src/map/itemdb.c
index 5771ec66d..eaea7f1f2 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.c
@@ -914,7 +914,7 @@ static int itemdb_read_sqldb(void)
ShowWarning("itemdb_read_sqldb: Item %d (%s) specifies %d slots, but the server only supports up to %d\n", nameid, id->jname, id->slot, MAX_SLOTS);
id->slot = MAX_SLOTS;
}
- itemdb_jobid2mapid(id->class_base, (sql_row[11] != NULL) ? (unsigned int)strtoll(sql_row[11], NULL, 0) : 0);
+ itemdb_jobid2mapid(id->class_base, (sql_row[11] != NULL) ? (unsigned int)strtoul(sql_row[11], NULL, 0) : 0);
id->class_upper= (sql_row[12] != NULL) ? atoi(sql_row[12]) : 0;
id->sex = (sql_row[13] != NULL) ? atoi(sql_row[13]) : 0;
id->equip = (sql_row[14] != NULL) ? atoi(sql_row[14]) : 0;
@@ -1057,7 +1057,7 @@ static int itemdb_readdb(void)
ShowWarning("itemdb_readdb: Item %d (%s) specifies %d slots, but the server only supports up to %d\n", nameid, id->jname, id->slot, MAX_SLOTS);
id->slot = MAX_SLOTS;
}
- itemdb_jobid2mapid(id->class_base, (unsigned int)strtoll(str[11],NULL,0));
+ itemdb_jobid2mapid(id->class_base, (unsigned int)strtoul(str[11],NULL,0));
id->class_upper = atoi(str[12]);
id->sex = atoi(str[13]);
if(id->equip != atoi(str[14])){