X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=src%2Flib%2Fsubs%2Fshow.c;h=79ba622b03bdc9406df746f81938b516b6f0569e;hp=abeb9530700900e447599faab2ba2c09f214b0e2;hb=598669673e8b08a8bdc763a54da3808f2307cf27;hpb=549561ff0332a8e8b2ee4ae2d92e44aa53a2d982 diff --git a/src/lib/subs/show.c b/src/lib/subs/show.c index abeb95307..79ba622b0 100644 --- a/src/lib/subs/show.c +++ b/src/lib/subs/show.c @@ -1,6 +1,6 @@ /* * Empire - A multi-player, client/server Internet based war game. - * Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak, + * Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak, * Ken Stevens, Steve McClure, Markus Armbruster * * Empire is free software: you can redistribute it and/or modify @@ -31,7 +31,7 @@ * Jeff Bailey, 1990 * Steve McClure, 1996 * Ron Koenderink, 2005-2009 - * Markus Armbruster, 2006-2016 + * Markus Armbruster, 2006-2021 */ #include @@ -187,7 +187,7 @@ show_nuke_stats(int tlev) void show_nuke_build(int tlev) { - struct chr_index chridx[sizeof(nchr) / sizeof(*nchr)]; + struct chr_index chridx[ARRAY_SIZE(nchr)]; int n = make_nchr_index(chridx, tlev); int i; struct nchrstr *np; @@ -208,7 +208,7 @@ show_nuke_build(int tlev) void show_nuke_capab(int tlev) { - struct chr_index chridx[sizeof(nchr) / sizeof(*nchr)]; + struct chr_index chridx[ARRAY_SIZE(nchr)]; int n = make_nchr_index(chridx, tlev); int i; struct nchrstr *np; @@ -230,7 +230,7 @@ show_nuke_capab(int tlev) void show_ship_build(int tlev) { - struct chr_index chridx[sizeof(mchr) / sizeof(*mchr)]; + struct chr_index chridx[ARRAY_SIZE(mchr)]; int n = make_mchr_index(chridx, tlev); int i; struct mchrstr *mp; @@ -247,7 +247,7 @@ show_ship_build(int tlev) void show_ship_stats(int tlev) { - struct chr_index chridx[sizeof(mchr) / sizeof(*mchr)]; + struct chr_index chridx[ARRAY_SIZE(mchr)]; int n = make_mchr_index(chridx, tlev); int i; struct mchrstr *mp; @@ -268,12 +268,12 @@ show_ship_stats(int tlev) void show_ship_capab(int tlev) { - struct chr_index chridx[sizeof(mchr) / sizeof(*mchr)]; + struct chr_index chridx[ARRAY_SIZE(mchr)]; int n = make_mchr_index(chridx, tlev); int i; struct mchrstr *mp; - pr("%25s cargos & capabilities\n", ""); + pr("%25s cargoes & capabilities\n", ""); for (i = 0; i < n; i++) { mp = &mchr[chridx[i].type]; pr("%-25.25s ", mp->m_name); @@ -286,7 +286,7 @@ show_ship_capab(int tlev) void show_plane_stats(int tlev) { - struct chr_index chridx[sizeof(plchr) / sizeof(*plchr)]; + struct chr_index chridx[ARRAY_SIZE(plchr)]; int n = make_plchr_index(chridx, tlev); int i; struct plchrstr *pp; @@ -304,7 +304,7 @@ show_plane_stats(int tlev) void show_plane_capab(int tlev) { - struct chr_index chridx[sizeof(plchr) / sizeof(*plchr)]; + struct chr_index chridx[ARRAY_SIZE(plchr)]; int n = make_plchr_index(chridx, tlev); int i; struct plchrstr *pp; @@ -321,7 +321,7 @@ show_plane_capab(int tlev) void show_plane_build(int tlev) { - struct chr_index chridx[sizeof(plchr) / sizeof(*plchr)]; + struct chr_index chridx[ARRAY_SIZE(plchr)]; int n = make_plchr_index(chridx, tlev); int i; struct plchrstr *pp; @@ -339,7 +339,7 @@ show_plane_build(int tlev) void show_land_build(int tlev) { - struct chr_index chridx[sizeof(lchr) / sizeof(*lchr)]; + struct chr_index chridx[ARRAY_SIZE(lchr)]; int n = make_lchr_index(chridx, tlev); int i; struct lchrstr *lp; @@ -358,7 +358,7 @@ show_land_build(int tlev) void show_land_capab(int tlev) { - struct chr_index chridx[sizeof(lchr) / sizeof(*lchr)]; + struct chr_index chridx[ARRAY_SIZE(lchr)]; int n = make_lchr_index(chridx, tlev); int i; struct lchrstr *lcp; @@ -376,7 +376,7 @@ show_land_capab(int tlev) void show_land_stats(int tlev) { - struct chr_index chridx[sizeof(lchr) / sizeof(*lchr)]; + struct chr_index chridx[ARRAY_SIZE(lchr)]; int n = make_lchr_index(chridx, tlev); int i; struct lchrstr *lcp; @@ -425,11 +425,12 @@ show_sect_build(int foo) if (!intrchr[i].in_enable) continue; if (first) - pr("\nInfrastructure building - adding 1 point of efficiency costs:\n" - " type lcms hcms mobility $$$$\n"); - pr("%-20s %4d %4d %8d %4d\n", - intrchr[i].in_name, intrchr[i].in_lcms, intrchr[i].in_hcms, - intrchr[i].in_mcost, intrchr[i].in_dcost); + pr("\n build 100%% efficiency\n" + "infrastructure type lcm hcm mobil $\n"); + pr("%-23.23s %4d %4d %5d %5d\n", + intrchr[i].in_name, + intrchr[i].in_mat[I_LCM], intrchr[i].in_mat[I_HCM], + intrchr[i].in_bmobil, intrchr[i].in_cost); first = 0; } } @@ -507,7 +508,7 @@ show_product(int tlev) int i; char *lev; - pr("product cost raw materials reso dep level p.e.\n"); + pr("product cost raw materials avail reso dep level p.e.\n"); for (pp = pchr; pp->p_sname; pp++) { if (!pp->p_sname[0]) @@ -524,11 +525,12 @@ show_product(int tlev) else pr(" "); } + pr(" %8d", pp->p_bwork); if (pp->p_nrndx) - pr(" %5.5s %3d ", + pr(" %5.5s %3d ", symbol_by_value(pp->p_nrndx, resources), pp->p_nrdep); else - pr(" "); + pr(" "); if (pp->p_nlndx < 0) pr("1.0\n"); else { @@ -545,7 +547,7 @@ show_news(int tlev) int i, j; pr("id category good will\n"); - pr(" messsages\n"); + pr(" messages\n"); for (i = 1; i < N_MAX_VERB + 1; i++) { if (rpt[i].r_newspage == N_NOTUSED) @@ -558,7 +560,7 @@ show_news(int tlev) } /* - * Show update policy and up to N scheduled updates. + * Show update policy and up to @n scheduled updates. */ void show_updates(int n) @@ -613,34 +615,10 @@ static char * fmttime2822(time_t t) { static char buf[32]; -#if defined(_WIN32) - size_t n; - int nn; - TIME_ZONE_INFORMATION tzi; - long time_offset; - struct tm *time; - - time = localtime(&t); - - n = strftime(buf, sizeof(buf), "%a, %d %b %Y %H:%M:%S", time); - if (CANT_HAPPEN(n == 0)) { - buf[0] = 0; - return buf; - } - GetTimeZoneInformation(&tzi); - time_offset = -(tzi.Bias + - (time->tm_isdst ? tzi.DaylightBias : tzi.StandardBias)); - - nn = _snprintf(buf + n, sizeof(buf) - n, " %+03d%02d", - time_offset / 60, abs(time_offset) % 60); - if (CANT_HAPPEN(nn <= 0 || nn + n >= sizeof(buf))) - buf[0] = 0; -#else - size_t n = strftime(buf, sizeof(buf), "%a, %d %b %Y %T %z", + size_t n = strftime(buf, sizeof(buf), "%a, %d %b %Y %H:%M:%S %z", localtime(&t)); if (CANT_HAPPEN(n == 0)) buf[0] = 0; -#endif return buf; }