From de69d13259f3c2c0b116b9aa7915d08613154536 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Fri, 18 May 2001 07:06:47 +0000 Subject: [PATCH] broken format string for strftime --- src/common/gamecode/report.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c index a51a16e42..b9ac74a8b 100644 --- a/src/common/gamecode/report.c +++ b/src/common/gamecode/report.c @@ -712,7 +712,7 @@ rpunit(FILE * F, const faction * f, const unit * u, int indent, int mode) for(i=0; imembers; i++) { print_curses(F, u, TYP_UNIT, ug->unit_array[i]->attribs, (u->faction == f)? 1 : 0, indent); } - } else + } else #endif /* USE_UGROUPS */ print_curses(F, u, TYP_UNIT, u->attribs, (u->faction == f)? 1 : 0, indent); } @@ -2019,18 +2019,18 @@ report(FILE *F, faction * f, const char * pzTime) (w + 99) / 100, /* +99 weil sonst die Nachkommastellen ignoriert würden */ shipcapacity(sh) / 100); } else { - sprintf(buf, "%s, %s", shipname(sh), + sprintf(buf, "%s, %s", shipname(sh), LOC(f->locale, sh->type->name[0])); } assert(sh->type->construction->improvement==NULL); /* sonst ist construction::size nicht ship_type::maxsize */ if (sh->size!=sh->type->construction->maxsize) { - sprintf(buf+strlen(buf), ", %s (%d/%d)", - LOC(f->locale, "nr_undercons"), sh->size, + sprintf(buf+strlen(buf), ", %s (%d/%d)", + LOC(f->locale, "nr_undercons"), sh->size, sh->type->construction->maxsize); } if (sh->damage) { - sprintf(buf+strlen(buf), ", %d%% %s", + sprintf(buf+strlen(buf), ", %d%% %s", sh->damage*100/(sh->size*DAMAGE_SCALE), LOC(f->locale, "nr_damaged")); } @@ -2580,9 +2580,9 @@ reports(void) #ifdef _GNU_SOURCE strftime(pzTime, 64, "%A, %-e. %B %Y, %-k:%M", localtime(<ime)); #else - strftime(pzTime, 64, "%A, %e. %B %Y, %k:%M", localtime(<ime)); + strftime(pzTime, 64, "%A, %d. %B %Y, %H:%M", localtime(<ime)); #endif - + nmr_warnings(); #ifdef DMALLOC assert(dmalloc_verify ( NULL ));