diff --git a/conf/e2/config.xml b/conf/e2/config.xml index 0441a46f6..9e32218da 100644 --- a/conf/e2/config.xml +++ b/conf/e2/config.xml @@ -53,10 +53,6 @@ - - eressea-server@eressea.kn-bremen.de - eressea-server@eressea.kn-bremen.de - Bitte denke daran, deine Befehle mit dem Betreff ERESSEA 2 BEFEHLE an eressea-server@eressea.kn-bremen.de zu senden. diff --git a/conf/e3/config.xml b/conf/e3/config.xml index c8c5dbb06..6a5b18b84 100644 --- a/conf/e3/config.xml +++ b/conf/e3/config.xml @@ -45,10 +45,6 @@ - - eressea-server@eressea.kn-bremen.de - eressea-server@eressea.kn-bremen.de - Bitte denke daran, deine Befehle mit dem Betreff ERESSEA 3 BEFEHLE an eressea-server@eressea.kn-bremen.de zu senden. diff --git a/conf/e4/config.xml b/conf/e4/config.xml index b188f7d79..3209c8eed 100644 --- a/conf/e4/config.xml +++ b/conf/e4/config.xml @@ -46,10 +46,6 @@ - - eressea-server@eressea.kn-bremen.de - eressea-server@eressea.kn-bremen.de - Bitte denke daran, deine Befehle mit dem Betreff ERESSEA 4 BEFEHLE an eressea-server@eressea.kn-bremen.de zu senden. diff --git a/src/creport.c b/src/creport.c index bd9c97ec6..34cff9de3 100644 --- a/src/creport.c +++ b/src/creport.c @@ -1475,7 +1475,7 @@ report_computer(const char *filename, report_context * ctx, const char *bom) faction *f = ctx->f; const char *prefix; region *r; - const char *mailto = LOC(f->locale, "mailto"); + const char *mailto = config_get("game.email"); const attrib *a; FILE *F = fopen(filename, "w"); static const race *rc_human; @@ -1510,8 +1510,11 @@ report_computer(const char *filename, report_context * ctx, const char *bom) fprintf(F, "%d;Zeitalter\n", era); fprintf(F, "\"%s\";Build\n", eressea_version()); if (mailto != NULL) { + // char mailcmd[64]; + // snprintf(mailcmd, sizeof(mailcmd), "%s %d, %s", game_name(), game_id(), LOC(f->locale, "mailcmd")); + const char * mailcmd = LOC(f->locale, "mailcmd"); fprintf(F, "\"%s\";mailto\n", mailto); - fprintf(F, "\"%s\";mailcmd\n", LOC(f->locale, "mailcmd")); + fprintf(F, "\"%s\";mailcmd\n", mailcmd); } show_alliances_cr(F, f);