Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved item_combo_db error message so it makes it easier to identify which item causes the error. for bugreport:6213

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16410 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
shennetsind 2012-07-12 14:44:44 +00:00
parent b8a9fab037
commit dd659028a3
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/map/itemdb.c
View File

@ -848,9 +848,11 @@ void itemdb_read_combos(DBMap* item_combo_db) {
safestrncpy(ic->script + slen, combo_out, len); safestrncpy(ic->script + slen, combo_out, len);
if (!exists) if (!exists) {
ic->nameid = items[0];
idb_put(item_combo_db, items[0], ic); idb_put(item_combo_db, items[0], ic);
} }
}
count++; count++;
} }
@ -1181,8 +1183,17 @@ static int itemdb_readdb(void)
} }
if( db_size(item_combo_db) ) { if( db_size(item_combo_db) ) {
DBIterator * iter = db_iterator(item_combo_db);
struct item_combo * ic = NULL;
int icount = 1;
/* non-processed entries */ /* non-processed entries */
ShowWarning("item_combo_db: There are %d unused entries in the file (combo(s) with non-available item IDs)\n",db_size(item_combo_db)); ShowWarning("item_combo_db: There are %d unused entries in the file (combo(s) with non-available item IDs)\n",db_size(item_combo_db));
for( ic = dbi_first(iter); dbi_exists(iter); ic = dbi_next(iter) ) {
ShowWarning("item_combo_db(%d): (ID:%d) \"%s\" combo unused\n",icount++,ic->nameid,ic->script);
}
dbi_destroy(iter);
} }
db_destroy(item_combo_db); db_destroy(item_combo_db);

1
src/map/itemdb.h
View File

@ -147,6 +147,7 @@ struct item_group {
struct item_combo { struct item_combo {
char script[2048]; /* combo script */ char script[2048]; /* combo script */
short nameid;/* id of the first */
}; };
struct item_data* itemdb_searchname(const char *name); struct item_data* itemdb_searchname(const char *name);