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

ships mentioning terrain-types that don't exist.

This commit is contained in:
Enno Rehling 2005-10-25 13:11:50 +00:00
parent b6160f32ac
commit 3c749d4121
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/kernel/xmlreader.c
View File

@ -471,7 +471,7 @@ parse_ships(xmlDocPtr doc)
xmlChar * property; xmlChar * property;
ship_type * st = calloc(sizeof(ship_type), 1); ship_type * st = calloc(sizeof(ship_type), 1);
xmlXPathObjectPtr result; xmlXPathObjectPtr result;
int k; int k, c;
property = xmlGetProp(node, BAD_CAST "name"); property = xmlGetProp(node, BAD_CAST "name");
assert(property!=NULL); assert(property!=NULL);
@ -500,7 +500,7 @@ parse_ships(xmlDocPtr doc)
/* reading eressea/ships/ship/coast */ /* reading eressea/ships/ship/coast */
xpath->node = node; xpath->node = node;
result = xmlXPathEvalExpression(BAD_CAST "coast", xpath); result = xmlXPathEvalExpression(BAD_CAST "coast", xpath);
for (k=0;k!=result->nodesetval->nodeNr;) { for (c=0,k=0;k!=result->nodesetval->nodeNr;++k) {
xmlNodePtr node = result->nodesetval->nodeTab[k]; xmlNodePtr node = result->nodesetval->nodeTab[k];
if (k==0) { if (k==0) {
@ -511,8 +511,8 @@ parse_ships(xmlDocPtr doc)
property = xmlGetProp(node, BAD_CAST "terrain"); property = xmlGetProp(node, BAD_CAST "terrain");
assert(property!=NULL); assert(property!=NULL);
st->coasts[k] = get_terrain((const char*)property); st->coasts[c] = get_terrain((const char*)property);
if (st->coasts[k]!=NULL) ++k; if (st->coasts[c]!=NULL) ++c;
else { else {
log_warning(("ship %s mentions a non-existing terrain %s.\n", st->name[0], property)); log_warning(("ship %s mentions a non-existing terrain %s.\n", st->name[0], property));
} }