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

* Reading the itemDB checks for extra columns.

Browse Source 
* Fixed a typo in mobDB reading followup r15531. (bugreport:5482)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15784 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
xazax-hun 2012-03-23 12:20:51 +00:00
parent c48133cf47
commit 2a8d609fd5
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/map/itemdb.c
View File

@ -959,6 +959,12 @@ static int itemdb_readdb(void)
} }
str[21] = p; str[21] = p;
p = strstr(p+1,"}");
if ( strchr(p,',') != NULL )
{
ShowError("itemdb_readdb: Extra columns in line %d of \"%s\" (item with id %d), skipping.\n", lines, path, atoi(str[0]));
continue;
}
if (!itemdb_parse_dbrow(str, path, lines, 0)) if (!itemdb_parse_dbrow(str, path, lines, 0))
continue; continue;

2
src/map/mob.c
View File

@ -3753,7 +3753,7 @@ static void mob_readdb(void)
} }
} }
sv_readdb(db_path, filename[fi], ',', 31+2*MAX_MVP_DROP+2*MAX_MOB_DROP, 38+2*MAX_MVP_DROP+2*MAX_MOB_DROP, -1, &mob_readdb_sub); sv_readdb(db_path, filename[fi], ',', 31+2*MAX_MVP_DROP+2*MAX_MOB_DROP, 31+2*MAX_MVP_DROP+2*MAX_MOB_DROP, -1, &mob_readdb_sub);
} }
} }