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

fix finding resources if xml is not processed in predetermined order.

Browse source
This commit is contained in:
Enno Rehling 2018-05-04 17:58:26 +02:00
parent 82ba0e62d4
commit 4e2171ace9
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/xmlreader.c
View file

@ -386,7 +386,7 @@ static int parse_buildings(xmlDocPtr doc)
propValue = xmlGetProp(node, BAD_CAST "type"); propValue = xmlGetProp(node, BAD_CAST "type");
assert(propValue != NULL); assert(propValue != NULL);
mt->rtype = rt_find((const char *)propValue); mt->rtype = rt_get_or_create((const char *)propValue);
assert(mt->rtype != NULL); assert(mt->rtype != NULL);
xmlFree(propValue); xmlFree(propValue);
@ -1219,12 +1219,7 @@ static int parse_spells(xmlDocPtr doc)
xmlNodePtr node = result->nodesetval->nodeTab[k]; xmlNodePtr node = result->nodesetval->nodeTab[k];
propValue = xmlGetProp(node, BAD_CAST "name"); propValue = xmlGetProp(node, BAD_CAST "name");
assert(propValue); assert(propValue);
rtype = rt_find((const char *)propValue); rtype = rt_get_or_create((const char *)propValue);
if (!rtype) {
log_error("spell %s uses unknown component %s.\n", sp->sname, (const char *)propValue);
xmlFree(propValue);
continue;
}
component->type = rtype; component->type = rtype;
xmlFree(propValue); xmlFree(propValue);
component->amount = xml_ivalue(node, "amount", 1); component->amount = xml_ivalue(node, "amount", 1);
@ -1708,11 +1703,10 @@ static int parse_strings(xmlDocPtr doc)
void register_xmlreader(void) void register_xmlreader(void)
{ {
xml_register_callback(parse_races);
xml_register_callback(parse_resources); xml_register_callback(parse_resources);
xml_register_callback(parse_buildings); /* requires resources */ xml_register_callback(parse_buildings); /* requires resources */
xml_register_callback(parse_ships); /* requires resources, terrains */ xml_register_callback(parse_ships); /* requires resources, terrains */
xml_register_callback(parse_races);
xml_register_callback(parse_equipment); /* requires resources */ xml_register_callback(parse_equipment); /* requires resources */
xml_register_callback(parse_spells); /* requires resources */ xml_register_callback(parse_spells); /* requires resources */