Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity

Do not assert on unknown skills, but log them as an error.

Browse source
This commit is contained in:
Enno Rehling 2011-03-06 19:56:20 -08:00
parent d75ee1a057
commit 3677e899af
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/kernel/xmlreader.c
View file

@ -1271,12 +1271,16 @@ add_skills(equipment * eq, xmlNodeSetPtr nsetSkills)
propValue = xmlGetProp(node, BAD_CAST "name");
assert(propValue!=NULL);
sk = sk_find((const char*)propValue);
assert(sk!=NOSKILL);
xmlFree(propValue);
propValue = xmlGetProp(node, BAD_CAST "level");
if (propValue!=NULL) {
equipment_setskill(eq, sk, (const char*)propValue);
if (sk==NOSKILL) {
log_error(("unknown skill '%s' in equipment-set %s\n", (const char*)propValue, eq->name));
xmlFree(propValue);
} else {
xmlFree(propValue);
propValue = xmlGetProp(node, BAD_CAST "level");
if (propValue!=NULL) {
equipment_setskill(eq, sk, (const char*)propValue);
xmlFree(propValue);
}
}
}
}