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

http://eressea.upb.de/mantis/view.php?id=528 

- Bei Einheiten mit speziellen Rassen steht keine Rasse mehr
This commit is contained in:
Enno Rehling 2005-05-27 20:22:17 +00:00
parent 3e5bb80b02
commit 6f51f73769
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/kernel/reports.c
View File

@ -261,7 +261,7 @@ bufunit(const faction * f, const unit * u, int indent, int mode)
pzTmp = get_racename(u->attribs); pzTmp = get_racename(u->attribs);
if (pzTmp) { if (pzTmp) {
scat(pzTmp); bufp += strlcpy(bufp, pzTmp, sizeof(buf)-(bufp-buf));
if (u->faction==f && fval(u->race, RCF_SHAPESHIFTANY)) { if (u->faction==f && fval(u->race, RCF_SHAPESHIFTANY)) {
bufp += strlcpy(bufp, " (", sizeof(buf)-(bufp-buf)); bufp += strlcpy(bufp, " (", sizeof(buf)-(bufp-buf));
bufp += strlcpy(bufp, racename(f->locale, u, u->race), sizeof(buf)-(bufp-buf)); bufp += strlcpy(bufp, racename(f->locale, u, u->race), sizeof(buf)-(bufp-buf));

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

@ -287,7 +287,7 @@ parse_buildings(xmlDocPtr doc)
property = xmlGetProp(node, BAD_CAST "type"); property = xmlGetProp(node, BAD_CAST "type");
assert(property!=NULL); assert(property!=NULL);
mt->rtype = rt_find((const char*)property); mt->rtype = rt_find((const char*)property);
assert(mt->rtype!=NULL); assert(mt->rtype!=NULL);
xmlFree(property); xmlFree(property);
if (xml_bvalue(node, "variable", false)) mt->flags |= MTF_VARIABLE; if (xml_bvalue(node, "variable", false)) mt->flags |= MTF_VARIABLE;
@ -1054,7 +1054,7 @@ parse_messages(xmlDocPtr doc)
xmlChar * text; xmlChar * text;
xml_readtext(node, &lang, &text); xml_readtext(node, &lang, &text);
xml_cleanup_string(text); xml_cleanup_string(text);
nrt_register(mtype, lang, xml_to_locale(text), 0, (const char*)section); nrt_register(mtype, lang, xml_to_locale(text), 0, (const char*)section);
xmlFree(text); xmlFree(text);