empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(show_nuke_build, show_nuke_capab): Simplify.

Browse source
This commit is contained in:
Markus Armbruster 2005-11-06 20:37:57 +00:00
parent 8c6529ded3
commit a7aea6c468
1 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/lib/subs/show.c
View file

@ -186,7 +186,6 @@ void
show_nuke_build(int tlev) show_nuke_build(int tlev)
{ {
struct nchrstr *np; struct nchrstr *np;
int n;
int avail; int avail;
if (opt_DRNUKE) if (opt_DRNUKE)
@ -196,12 +195,10 @@ show_nuke_build(int tlev)
if (opt_NONUKES) if (opt_NONUKES)
return; return;
for (np = nchr, n = 0; n < N_MAXNUKE; np++, n++) { for (np = nchr; np->n_name; np++) {
avail = NUK_BLD_WORK(np->n_lcm, np->n_hcm, np->n_oil, np->n_rad); avail = NUK_BLD_WORK(np->n_lcm, np->n_hcm, np->n_oil, np->n_rad);
if (np->n_tech > tlev) if (np->n_tech > tlev)
continue; continue;
if (np->n_name == 0 || np->n_name[0] == '\0')
continue;
if (opt_NEUTRON == 0 && (np->n_flags & N_NEUT)) if (opt_NEUTRON == 0 && (np->n_flags & N_NEUT))
continue; continue;
if (opt_DRNUKE) if (opt_DRNUKE)
@ -209,7 +206,7 @@ show_nuke_build(int tlev)
np->n_name, np->n_lcm, np->n_hcm, np->n_oil, np->n_name, np->n_lcm, np->n_hcm, np->n_oil,
np->n_rad, avail, np->n_tech, np->n_rad, avail, np->n_tech,
(int)(np->n_tech * drnuke_const) + 1, np->n_cost); (int)(np->n_tech * drnuke_const) + 1, np->n_cost);
else /* not DRNUKE */ else
pr("%-13.13s %3d %3d %4d %4d %5d %4d $%6d\n", pr("%-13.13s %3d %3d %4d %4d %5d %4d $%6d\n",
np->n_name, np->n_lcm, np->n_hcm, np->n_oil, np->n_name, np->n_lcm, np->n_hcm, np->n_oil,
np->n_rad, avail, np->n_tech, np->n_cost); np->n_rad, avail, np->n_tech, np->n_cost);
@ -220,7 +217,7 @@ void
show_nuke_capab(int tlev) show_nuke_capab(int tlev)
{ {
struct nchrstr *np; struct nchrstr *np;
int i, j, n; int i, j;
char *p; char *p;
if (opt_DRNUKE) if (opt_DRNUKE)
@ -230,13 +227,11 @@ show_nuke_capab(int tlev)
if (opt_NONUKES) if (opt_NONUKES)
return; return;
for (np = nchr, n = 0; n < N_MAXNUKE; np++, n++) { for (np = nchr; np->n_name; np++) {
if (np->n_tech > tlev) if (np->n_tech > tlev)
continue; continue;
if (opt_NEUTRON == 0 && (np->n_flags & N_NEUT)) if (opt_NEUTRON == 0 && (np->n_flags & N_NEUT))
continue; continue;
if (np->n_name == 0 || np->n_name[0] == '\0')
continue;
if (opt_DRNUKE) if (opt_DRNUKE)
pr("%-13.13s %4d %3d %3d %4d %3d $%7d ", pr("%-13.13s %4d %3d %3d %4d %3d $%7d ",
np->n_name, np->n_blast, np->n_dam, np->n_name, np->n_blast, np->n_dam,