From: Markus Armbruster <armbru@pond.sub.org>
Date: Sun, 6 Nov 2005 20:37:07 +0000 (+0000)
Subject: (nuk_maxno): Variable's value is well-known constant N_MAXNUKE + 1.
X-Git-Tag: PZ5~472
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=8c6529ded32bf74830d564c3f8895aef16b55603

(nuk_maxno): Variable's value is well-known constant N_MAXNUKE + 1.
Useless, remove.  Users changed to check nchr's sentinel, because
that's clearer than comparing the index to N_MAXNUKE or sizeof(nchr) /
sizeof(*nchr).

(nchr): Change sentinel's n_name to NULL.
---

diff --git a/include/nuke.h b/include/nuke.h
index d5da11fc8..56438ea0e 100644
--- a/include/nuke.h
+++ b/include/nuke.h
@@ -80,6 +80,4 @@ struct nchrstr {
 
 extern struct nchrstr nchr[N_MAXNUKE + 1];
 
-extern int nuk_maxno;
-
 #endif /* _NUKE_H_ */
diff --git a/src/lib/global/nuke.c b/src/lib/global/nuke.c
index e82575c18..04d79594b 100644
--- a/src/lib/global/nuke.c
+++ b/src/lib/global/nuke.c
@@ -50,8 +50,5 @@ struct nchrstr nchr[] = {
     {"3mt   fusion", 100, 100, 75, 130, 7, 170, 45000, 360, 6, 0},
     {"5mt   fusion", 120, 120, 100, 150, 8, 190, 50000, 370, 8, 0},
     {"120kt neutron", 75, 75, 40, 120, 5, 50, 36000, 375, 3, N_NEUT},
-    {"", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-    {"", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+    {NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
 };
-
-int nuk_maxno = (sizeof(nchr) / sizeof(struct nchrstr)) - 1;
diff --git a/src/server/main.c b/src/server/main.c
index bec77d3d7..7e040f1fb 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -519,7 +519,7 @@ nullify_objects(void)
 	if (opt_NO_OIL)
 	    mchr[i].m_flags &= ~M_OIL;
     }
-    for (i = 0; i < nuk_maxno; i++) {
+    for (i = 0; nchr[i].n_name; i++) {
 	if (opt_NO_HCMS)
 	    nchr[i].n_hcm = 0;
 	if (opt_NO_LCMS)