diff --git a/src/common/gamecode/creport.c b/src/common/gamecode/creport.c index 087c99a03..90c6ca7ab 100644 --- a/src/common/gamecode/creport.c +++ b/src/common/gamecode/creport.c @@ -380,8 +380,8 @@ void creport_init(void) { tsf_register("report", &cr_ignore); - tsf_register("string", &cr_string); - tsf_register("order", &cr_string); + tsf_register("string", &cr_string); + tsf_register("order", &cr_string); tsf_register("int", &cr_int); tsf_register("unit", &cr_unit); tsf_register("region", &cr_region); diff --git a/src/common/kernel/save.c b/src/common/kernel/save.c index 0e794ed4c..d575fd70c 100644 --- a/src/common/kernel/save.c +++ b/src/common/kernel/save.c @@ -2205,4 +2205,4 @@ writegame(const char *filename, char quiet) fclose(F); printf("\nOk.\n"); return 0; -} \ No newline at end of file +} diff --git a/src/common/kernel/xmlreader.c b/src/common/kernel/xmlreader.c index 450ef4ff8..95d7e3c32 100644 --- a/src/common/kernel/xmlreader.c +++ b/src/common/kernel/xmlreader.c @@ -573,7 +573,7 @@ parse_resources(xmlDocPtr doc) /* reading eressea/resources/resource/function */ xpath->node = node; result = xmlXPathEvalExpression(BAD_CAST "function", xpath); - for (k=0;k!=result->nodesetval->nodeNr;++k) { + if (result->nodesetval!=NULL) for (k=0;k!=result->nodesetval->nodeNr;++k) { xmlNodePtr node = result->nodesetval->nodeTab[k]; pf_generic fun; @@ -607,7 +607,7 @@ parse_resources(xmlDocPtr doc) /* reading eressea/resources/resource/resourcelimit/function */ xpath->node = node; result = xmlXPathEvalExpression(BAD_CAST "resourcelimit/function", xpath); - for (k=0;k!=result->nodesetval->nodeNr;++k) { + if (result->nodesetval!=NULL) for (k=0;k!=result->nodesetval->nodeNr;++k) { attrib * a = a_find(rtype->attribs, &at_resourcelimit); xmlNodePtr node = result->nodesetval->nodeTab[k]; pf_generic fun;