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=274 

- potion text not correct when seen in CR
This commit is contained in:
Enno Rehling 2004-09-22 23:17:15 +00:00
parent bbf0841695
commit b226d11340
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/common/gamecode/creport.c
View File

@ -1194,14 +1194,27 @@ report_computer(FILE * F, faction * f, const faction_list * addresses,
for (a=a_find(f->attribs, &at_showitem);a;a=a->nexttype) {
const potion_type * ptype = resource2potion(((const item_type*)a->data.v)->rtype);
requirement * m;
const char * ch;
const char * ch, * description;
if (ptype==NULL) continue;
m = ptype->itype->construction->materials;
ch = resourcename(ptype->itype->rtype, 0);
fprintf(F, "TRANK %d\n", hashstring(ch));
fprintf(F, "\"%s\";Name\n", add_translation(ch, locale_string(f->locale, ch)));
fprintf(F, "%d;Stufe\n", ptype->level);
fprintf(F, "\"%s\";Beschr\n", ptype->text);
description = ptype->text;
if (description==NULL || f->locale!=find_locale("de")) {
const char * pname = resourcename(ptype->itype->rtype, 0);
const char * potiontext = mkname("potion", pname);
description = LOC(f->locale, potiontext);
if (strcmp(description, potiontext)==0) {
/* string not found */
description = ptype->text;
}
}
fprintf(F, "\"%s\";Beschr\n", description);
fprintf(F, "ZUTATEN\n");
while (m->number) {

2
src/common/gamecode/report.c
View File

@ -2140,7 +2140,6 @@ report(FILE *F, faction * f, const faction_list * addresses,
requirement * m;
if (ptype!=NULL) {
const char * pname = resourcename(ptype->itype->rtype, 0);
const char * potiontext = mkname("potion", pname);
m = ptype->itype->construction->materials;
if (ch==0) {
rnl(F);
@ -2163,6 +2162,7 @@ report(FILE *F, faction * f, const faction_list * addresses,
rnl(F);
description = ptype->text;
if (description==NULL || f->locale!=find_locale("de")) {
const char * potiontext = mkname("potion", pname);
description = LOC(f->locale, potiontext);
if (strcmp(description, potiontext)==0) {
/* string not found */