From: Markus Armbruster <armbru@pond.sub.org>
Date: Sun, 6 Nov 2005 20:37:57 +0000 (+0000)
Subject: (show_nuke_build, show_nuke_capab): Simplify.
X-Git-Tag: PZ5~471
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=a7aea6c468e931e3bd1b3e27d98ba4015b0e205a

(show_nuke_build, show_nuke_capab): Simplify.
---

diff --git a/src/lib/subs/show.c b/src/lib/subs/show.c
index 83749cce6..77559666a 100644
--- a/src/lib/subs/show.c
+++ b/src/lib/subs/show.c
@@ -186,7 +186,6 @@ void
 show_nuke_build(int tlev)
 {
     struct nchrstr *np;
-    int n;
     int avail;
 
     if (opt_DRNUKE)
@@ -196,12 +195,10 @@ show_nuke_build(int tlev)
 
     if (opt_NONUKES)
 	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);
 	if (np->n_tech > tlev)
 	    continue;
-	if (np->n_name == 0 || np->n_name[0] == '\0')
-	    continue;
 	if (opt_NEUTRON == 0 && (np->n_flags & N_NEUT))
 	    continue;
 	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_rad, avail, np->n_tech,
 	       (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",
 	       np->n_name, np->n_lcm, np->n_hcm, np->n_oil,
 	       np->n_rad, avail, np->n_tech, np->n_cost);
@@ -220,7 +217,7 @@ void
 show_nuke_capab(int tlev)
 {
     struct nchrstr *np;
-    int i, j, n;
+    int i, j;
     char *p;
 
     if (opt_DRNUKE)
@@ -230,13 +227,11 @@ show_nuke_capab(int tlev)
 
     if (opt_NONUKES)
 	return;
-    for (np = nchr, n = 0; n < N_MAXNUKE; np++, n++) {
+    for (np = nchr; np->n_name; np++) {
 	if (np->n_tech > tlev)
 	    continue;
 	if (opt_NEUTRON == 0 && (np->n_flags & N_NEUT))
 	    continue;
-	if (np->n_name == 0 || np->n_name[0] == '\0')
-	    continue;
 	if (opt_DRNUKE)
 	    pr("%-13.13s %4d %3d %3d %4d %3d $%7d ",
 	       np->n_name, np->n_blast, np->n_dam,