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

refactor repotring items

Browse source
This commit is contained in:
Enno Rehling 2018-02-25 17:21:09 +01:00
parent 72daecd27e
commit 5d9d299e68
2 changed files with 29 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
s/cppcheck
View file

@ -1,3 +1,4 @@
#!/bin/sh #!/bin/sh
cppcheck -U_MSC_VER --enable=all -IcJSON -Isrc -Iclibs -Istorage src cppcheck --enable=all -U_MSC_VER -UCLEANUP_CODE \
-IcJSON -Isrc -Iclibs -Istorage src

53
src/creport.c
View file

@ -1509,6 +1509,31 @@ static void cr_output_region(FILE * F, report_context * ctx, region * r)
} }
} }
static void report_itemtype(FILE *F, faction *f, const item_type *itype) {
const char *ch;
const char *description = NULL;
const char *pname = resourcename(itype->rtype, 0);
const char *potiontext = mkname("potion", pname);
ch = resourcename(itype->rtype, 0);
fprintf(F, "TRANK %d\n", str_hash(ch));
fprintf(F, "\"%s\";Name\n", translate(ch, LOC(f->locale, ch)));
fprintf(F, "%d;Stufe\n", potion_level(itype));
description = LOC(f->locale, potiontext);
fprintf(F, "\"%s\";Beschr\n", description);
if (itype->construction) {
requirement *m = itype->construction->materials;
fprintf(F, "ZUTATEN\n");
while (m->number) {
ch = resourcename(m->rtype, 0);
fprintf(F, "\"%s\"\n", translate(ch, LOC(f->locale, ch)));
m++;
}
}
}
/* main function of the creport. creates the header and traverses all regions */ /* main function of the creport. creates the header and traverses all regions */
static int static int
report_computer(const char *filename, report_context * ctx, const char *bom) report_computer(const char *filename, report_context * ctx, const char *bom)
@ -1653,33 +1678,9 @@ report_computer(const char *filename, report_context * ctx, const char *bom)
for (a = a_find(f->attribs, &at_showitem); a && a->type == &at_showitem; for (a = a_find(f->attribs, &at_showitem); a && a->type == &at_showitem;
a = a->next) { a = a->next) {
const item_type *itype = (const item_type *)a->data.v; const item_type *itype = (const item_type *)a->data.v;
const char *ch;
const char *description = NULL;
if (itype == NULL) if (itype) {
continue; report_itemtype(F, f, itype);
ch = resourcename(itype->rtype, 0);
fprintf(F, "TRANK %d\n", str_hash(ch));
fprintf(F, "\"%s\";Name\n", translate(ch, LOC(f->locale, ch)));
fprintf(F, "%d;Stufe\n", potion_level(itype));
if (description == NULL) {
const char *pname = resourcename(itype->rtype, 0);
const char *potiontext = mkname("potion", pname);
description = LOC(f->locale, potiontext);
}
fprintf(F, "\"%s\";Beschr\n", description);
if (itype->construction) {
requirement *m = itype->construction->materials;
fprintf(F, "ZUTATEN\n");
while (m->number) {
ch = resourcename(m->rtype, 0);
fprintf(F, "\"%s\"\n", translate(ch, LOC(f->locale, ch)));
m++;
}
} }
} }