From 53aec0d4386ef092ae719b342c92c2234ef2d808 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 5 Mar 2011 19:34:51 +0100 Subject: [PATCH] do not silently fail on unknown skill --- src/kernel/xmlreader.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/kernel/xmlreader.c b/src/kernel/xmlreader.c index 3ee54780d..887d04337 100644 --- a/src/kernel/xmlreader.c +++ b/src/kernel/xmlreader.c @@ -1271,13 +1271,12 @@ 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); - if (sk!=NOSKILL) { - propValue = xmlGetProp(node, BAD_CAST "level"); - if (propValue!=NULL) { - equipment_setskill(eq, sk, (const char*)propValue); - xmlFree(propValue); - } + propValue = xmlGetProp(node, BAD_CAST "level"); + if (propValue!=NULL) { + equipment_setskill(eq, sk, (const char*)propValue); + xmlFree(propValue); } } }