compile fixes, report fixes

This commit is contained in:
Enno Rehling 2007-03-09 23:38:13 +00:00
parent 9370a34190
commit 41a9ffb7b3
4 changed files with 4 additions and 4 deletions

View File

@ -253,7 +253,7 @@ print_curses(FILE * F, const faction * viewer, const void * obj, typ_t typ)
header = 1; header = 1;
fputs("EFFECTS\n", F); fputs("EFFECTS\n", F);
} }
nr_render(msg, viewer->locale, buf, sizeof(buf), NULL); nr_render(msg, viewer->locale, buf, sizeof(buf), viewer);
fprintf(F, "\"%s\"\n", buf); fprintf(F, "\"%s\"\n", buf);
msg_release(msg); msg_release(msg);
} }

View File

@ -507,7 +507,7 @@ print_curses(FILE *F, const faction *viewer, const void * obj, typ_t typ, int in
if (msg) { if (msg) {
rnl(F); rnl(F);
nr_render(msg, viewer->locale, buf, sizeof(buf), NULL); nr_render(msg, viewer->locale, buf, sizeof(buf), viewer);
rparagraph(F, buf, indent, 2, 0); rparagraph(F, buf, indent, 2, 0);
msg_release(msg); msg_release(msg);
} }

View File

@ -816,7 +816,7 @@ msg_curse(const struct curse * c, const void * obj, typ_t typ, int self)
/* if curseinfo returns NULL, then we don't want to tell the viewer anything. */ /* if curseinfo returns NULL, then we don't want to tell the viewer anything. */
return c->type->curseinfo(obj, typ, c, self); return c->type->curseinfo(obj, typ, c, self);
} else if (c->type->info_str!=NULL) { } else if (c->type->info_str!=NULL) {
return msg_message(mkname("curseinfo", "info_str"), "info, id", c->type->info_str, c->no); return msg_message("curseinfo::info_str", "text id", c->type->info_str, c->no);
} else { } else {
const char * unknown[] = { "unit_unknown", "region_unknown", "building_unknown", "ship_unknown" }; const char * unknown[] = { "unit_unknown", "region_unknown", "building_unknown", "ship_unknown" };
log_error(("no curseinfo for %s\n", c->type->cname)); log_error(("no curseinfo for %s\n", c->type->cname));

View File

@ -99,7 +99,7 @@
<arg name="text" type="string"/> <arg name="text" type="string"/>
<arg name="id" type="int"/> <arg name="id" type="int"/>
</type> </type>
<text locale="de">"${info}. ($int36($id))"</text> <text locale="de">"${text}. ($int36($id))"</text>
</message> </message>
<message name="curseinfo::ship_unknown" section="events"> <message name="curseinfo::ship_unknown" section="events">
<type> <type>