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

fix reading items in xmlreader (still has no tests)

This commit is contained in:
Enno Rehling 2014-06-29 17:29:41 -07:00
parent 5d32896407
commit 062ba71bd7
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/kernel/xmlreader.c
View File

@ -803,9 +803,6 @@ static item_type *xml_readitem(xmlXPathContextPtr xpath, resource_type * rtype)
xmlXPathObjectPtr result; xmlXPathObjectPtr result;
int k; int k;
int weight = xml_ivalue(node, "weight", 0);
int capacity = xml_ivalue(node, "capacity", 0);
if (xml_bvalue(node, "cursed", false)) if (xml_bvalue(node, "cursed", false))
flags |= ITF_CURSED; flags |= ITF_CURSED;
if (xml_bvalue(node, "notlost", false)) if (xml_bvalue(node, "notlost", false))
@ -818,7 +815,10 @@ static item_type *xml_readitem(xmlXPathContextPtr xpath, resource_type * rtype)
flags |= ITF_ANIMAL; flags |= ITF_ANIMAL;
if (xml_bvalue(node, "vehicle", false)) if (xml_bvalue(node, "vehicle", false))
flags |= ITF_VEHICLE; flags |= ITF_VEHICLE;
itype = new_itemtype(rtype, flags, weight, capacity); itype = rtype->itype ? rtype->itype : it_get_or_create(rtype);
itype->weight = xml_ivalue(node, "weight", 0);
itype->capacity = xml_ivalue(node, "capacity", 0);
itype->flags |= flags;
#if SCORE_MODULE #if SCORE_MODULE
itype->score = xml_ivalue(node, "score", 0); itype->score = xml_ivalue(node, "score", 0);
#endif #endif
@ -963,8 +963,7 @@ static int parse_resources(xmlDocPtr doc)
xmlNodePtr node = nodes->nodeTab[i]; xmlNodePtr node = nodes->nodeTab[i];
xmlChar *propValue, *name, *appearance; xmlChar *propValue, *name, *appearance;
resource_type *rtype; resource_type *rtype;
item_type *itype; unsigned int flags = RTF_NONE;
unsigned int flags = RTF_ITEM;
xmlXPathObjectPtr result; xmlXPathObjectPtr result;
int k; int k;
@ -974,18 +973,12 @@ static int parse_resources(xmlDocPtr doc)
flags |= RTF_LIMITED; flags |= RTF_LIMITED;
name = xmlGetProp(node, BAD_CAST "name"); name = xmlGetProp(node, BAD_CAST "name");
appearance = xmlGetProp(node, BAD_CAST "appearance");
assert(name != NULL); assert(name != NULL);
rtype = rt_get_or_create((const char *)name); rtype = rt_get_or_create((const char *)name);
rtype->flags |= flags; rtype->flags |= flags;
itype = rtype->itype ? rtype->itype : it_get_or_create(rtype);
if (appearance) {
it_set_appearance(itype, (const char *)appearance);
}
if (name) xmlFree(name); if (name) xmlFree(name);
if (appearance) xmlFree(appearance);
name = xmlGetProp(node, BAD_CAST "material"); name = xmlGetProp(node, BAD_CAST "material");
if (name) { if (name) {
@ -1151,6 +1144,11 @@ static int parse_resources(xmlDocPtr doc)
rtype->flags |= RTF_ITEM; rtype->flags |= RTF_ITEM;
xpath->node = result->nodesetval->nodeTab[0]; xpath->node = result->nodesetval->nodeTab[0];
rtype->itype = xml_readitem(xpath, rtype); rtype->itype = xml_readitem(xpath, rtype);
appearance = xmlGetProp(node, BAD_CAST "appearance");
if (appearance) {
it_set_appearance(rtype->itype, (const char *)appearance);
xmlFree(appearance);
}
} }
xmlXPathFreeObject(result); xmlXPathFreeObject(result);
} }