(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 d5da11fc8994e1ed81d8c54a62c4a38486f68799..56438ea0efb36f2dca8fc8662382dd2f24ffddf0 100644 (file)
--- a/include/nuke.h
+++ b/include/nuke.h
@@ -80,6 +80,4 @@ struct nchrstr {
 
 extern struct nchrstr nchr[N_MAXNUKE + 1];
 
 
 extern struct nchrstr nchr[N_MAXNUKE + 1];
 

-extern int nuk_maxno;
-

 #endif /* _NUKE_H_ */
 #endif /* _NUKE_H_ */

diff --git a/src/lib/global/nuke.c b/src/lib/global/nuke.c
index e82575c188feb28322df150b04937934a9f9e3f0..04d79594b50da8302246aa6e583f3ca533a595b9 100644 (file)
--- 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},
     {"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 bec77d3d7e9350b57f032ec4aaf49490a43b70fe..7e040f1fb0ac44c722df4973e8994f44940dde28 100644 (file)
--- 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;
     }
        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)
        if (opt_NO_HCMS)
            nchr[i].n_hcm = 0;
        if (opt_NO_LCMS)