summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-27 11:30:00 +0000
committercelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-27 11:30:00 +0000
commit8c2ca9dd3280891eb88425dac31a0a76dc4b078f (patch)
treee4acca7a9281709b13eb5e0cba4e01250470befa
parente925f36d7c4cd764f271ed9b601b9986486bf2db (diff)
downloadhercules-8c2ca9dd3280891eb88425dac31a0a76dc4b078f.tar.gz
hercules-8c2ca9dd3280891eb88425dac31a0a76dc4b078f.tar.bz2
hercules-8c2ca9dd3280891eb88425dac31a0a76dc4b078f.tar.xz
hercules-8c2ca9dd3280891eb88425dac31a0a76dc4b078f.zip
Corrected a bad error in itemdb_read_itemslottable
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@813 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog.txt1
-rw-r--r--src/map/itemdb.c8
2 files changed, 7 insertions, 2 deletions
diff --git a/Changelog.txt b/Changelog.txt
index afdfb1b3a..61dc1a64d 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,6 @@
Date Added
12/27
+ * Corrected a bad error in itemdb_read_itemslottable [celest]
* Corrected wrong logging of text in int_guild.c, thanks to Alex14 [celest]
* Summoned monsters will not give exp and items [celest]
* Added the 6 new Yuno fields to maps_athena.conf [celest]
diff --git a/src/map/itemdb.c b/src/map/itemdb.c
index ee1e95ac7..92afe32fb 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.c
@@ -592,10 +592,14 @@ static int itemdb_read_itemslottable(void)
buf[s]=0;
for(p=buf;p-buf<s;){
int nameid,equip;
- struct item_data* item = itemdb_search(nameid);
+ struct item_data* item;
sscanf(p,"%d#%d#",&nameid,&equip);
- if (item && itemdb_isequip2(item))
+ item = itemdb_search(nameid);
+ if (item && itemdb_isequip2(item)) {
+ if (item->equip != equip)
+ printf ("%s - %d > %d\n", item->name, item->equip, equip);
item->equip=equip;
+ }
p=strchr(p,10);
if(!p) break;
p++;