(SHIPNAMES, opt_SHIPNAMES, Options, carg, name, sorde, qorde)

(show_sail, shi, att_get_combat, pr_com, satdisp, satmap, prship):
Remove nooption SHIPNAMES.

diff --git a/include/options.h b/include/options.h
index 9f00ab5cca3195a2abce072e2ea64f0aa0e9d3a6..5b2b49305a3968b6ba0fd420d115b372bcd38b07 100644 (file)
--- a/include/options.h
+++ b/include/options.h
@@ -87,7 +87,6 @@
 #define        PINPOINTMISSILE /**/
 #define        FALLOUT                 /* Enables secondary effects caused by radiation */
 #define        SAIL                    /* A update routine to move ships */
-#define        SHIPNAMES               /* Name your ships, removing this option saves space */
 #define        NEUTRON                 /* Enables Neurton Warheads */
 #define NOMOBCOST              /* No mob cost for firing from ships */
 /*#define SUPER_BARS *//* Bars can't be destroyed by fire */

diff --git a/include/optlist.h b/include/optlist.h
index 19d03d63ed24d6d2167051fb0c2b2726a253276a..e81902439a04346ca92a49f3dd75ace0c6cd535e 100644 (file)
--- a/include/optlist.h
+++ b/include/optlist.h
@@ -81,7 +81,6 @@ extern int opt_PINPOINTMISSILE;
 extern int opt_RES_POP;
 extern int opt_ROLLOVER_AVAIL;
 extern int opt_SAIL;
-extern int opt_SHIPNAMES;
 extern int opt_SHOWPLANE;
 extern int opt_SLOW_WAR;
 extern int opt_SNEAK_ATTACK;

diff --git a/info/Server/Options.t b/info/Server/Options.t
index 03e66905ba9c2164d01d3ef08dc165a74f8140db..40ca8e67218ae93b8ae666f8f92f677268e7aeb6 100644 (file)
--- a/info/Server/Options.t
+++ b/info/Server/Options.t
@@ -8,7 +8,6 @@ SHOWPLANE:      planes/units on ships/units up for trade are shown
 PINPOINT(etc): Missile exist which target ships instead of sectors
 SAIL:          another way to automatically move ships (may also be buggy)
 NUKEFAIL(etc): nukes on missiles that explode in launching may detonate
-SHIPNAMES:     ships may be named
 DEMANDUPDATE:  updates may be allowed on player demand
 UPDATESCHED:   updates can be controlled by the 'hours' file. NITP
 

diff --git a/src/lib/commands/carg.c b/src/lib/commands/carg.c
index 46dca5ae4ec1e97efd70d9c004a450f1886bbbd8..25b01b40b0f1d386f846c2dbb37d056801910294 100644 (file)
--- a/src/lib/commands/carg.c
+++ b/src/lib/commands/carg.c
@@ -77,11 +77,8 @@ carg(void)
        pr("%4d", ship.shp_item[I_LCM]);
        pr("%4d", ship.shp_item[I_HCM]);
        pr("%4d\n", ship.shp_item[I_RAD]);
-       if (opt_SHIPNAMES) {
-           if (ship.shp_name[0] != 0) {
-               pr("       %s\n", ship.shp_name);
-           }
-       }
+       if (ship.shp_name[0] != 0)
+           pr("       %s\n", ship.shp_name);
     }
     if (nships == 0) {
        if (player->argp[1])

diff --git a/src/lib/commands/name.c b/src/lib/commands/name.c
index 8a01326dbce92316080bf9d6dd61f1a5a642c78f..ceb9f03b67ce01ac1f118e96ab45aeff88865eb4 100644 (file)
--- a/src/lib/commands/name.c
+++ b/src/lib/commands/name.c
@@ -51,10 +51,6 @@ name(void)
     struct nstr_item nb;
     s_char buf[1024];
 
-    if (!opt_SHIPNAMES) {
-       pr("Ship naming is not enabled.\n");
-       return RET_FAIL;
-    }
     if (!snxtitem(&nb, EF_SHIP, player->argp[1]))
        return RET_SYN;
     while (nxtitem(&nb, &ship)) {

diff --git a/src/lib/commands/orde.c b/src/lib/commands/orde.c
index ae1409968734d874f46f3dfa60daf39326c5d2c9..114cc27b98851bd6e8be41b62330fa174c01cdae 100644 (file)
--- a/src/lib/commands/orde.c
+++ b/src/lib/commands/orde.c
@@ -403,7 +403,7 @@ qorde(void)
        } else
            pr(" has a sail path\n");
 
-       if (opt_SHIPNAMES && ship.shp_name[0] != 0) {
+       if (ship.shp_name[0] != 0) {
            if (player->god)
                pr("    ");
            pr("       %s\n", ship.shp_name);
@@ -494,7 +494,7 @@ sorde(void)
        } else
            pr(" has a sail path\n");
 
-       if (opt_SHIPNAMES && ship.shp_name[0] != 0) {
+       if (ship.shp_name[0] != 0) {
            if (player->god)
                pr("    ");
            pr("       %s\n", ship.shp_name);

diff --git a/src/lib/commands/sail.c b/src/lib/commands/sail.c
index 23b5ed870acecd75cefe30905d2341c6e059fd70..ac2a4f554a0432167fd930b9115c9096d1bfb24d 100644 (file)
--- a/src/lib/commands/sail.c
+++ b/src/lib/commands/sail.c
@@ -75,12 +75,10 @@ show_sail(struct nstr_item *nstr)
            pr("Has orders");
        }
        pr("\n");
-       if (opt_SHIPNAMES) {
-           if (ship.shp_name[0] != 0) {
-               if (player->god)
-                   pr("    ");
-               pr("       %s\n", ship.shp_name);
-           }
+       if (ship.shp_name[0] != 0) {
+           if (player->god)
+               pr("    ");
+           pr("       %s\n", ship.shp_name);
        }
     }
     if (count == 0) {

diff --git a/src/lib/commands/shi.c b/src/lib/commands/shi.c
index 1188cbab29223e0b105514256893b7d21de257ba..505a34b45fd984bab9a7097d269a31f6c8f5b7a2 100644 (file)
--- a/src/lib/commands/shi.c
+++ b/src/lib/commands/shi.c
@@ -94,12 +94,10 @@ shi(void)
        if (opt_FUEL)
            pr("%5d", ship.shp_fuel);
        pr("%5d\n", ship.shp_tech);
-       if (opt_SHIPNAMES) {
-           if (ship.shp_name[0] != 0) {
-               if (player->god)
-                   pr("    ");
-               pr("       %s\n", ship.shp_name);
-           }
+       if (ship.shp_name[0] != 0) {
+           if (player->god)
+               pr("    ");
+           pr("       %s\n", ship.shp_name);
        }
     }
     if (nships == 0) {

diff --git a/src/lib/global/options.c b/src/lib/global/options.c
index 666f05dc312e62271236341162f48583370da134..e447cd1fd5dbdb3b0283d869d8a90fe8e390d31a 100644 (file)
--- a/src/lib/global/options.c
+++ b/src/lib/global/options.c
@@ -243,12 +243,6 @@ int opt_SAIL = 1;
 int opt_SAIL = 0;
 #endif
 
-#ifdef SHIPNAMES
-int opt_SHIPNAMES = 1;
-#else
-int opt_SHIPNAMES = 0;
-#endif
-
 #ifdef NEUTRON
 int opt_NEUTRON = 1;
 #else
@@ -318,7 +312,6 @@ struct option_list Options[] = {
     {"PINPOINTMISSILE", &opt_PINPOINTMISSILE},
     {"RES_POP", &opt_RES_POP},
     {"SAIL", &opt_SAIL},
-    {"SHIPNAMES", &opt_SHIPNAMES},
     {"SHOWPLANE", &opt_SHOWPLANE},
     {"SLOW_WAR", &opt_SLOW_WAR},
     {"SNEAK_ATTACK", &opt_SNEAK_ATTACK},

diff --git a/src/lib/subs/attsub.c b/src/lib/subs/attsub.c
index 5758c9b620968694c6d8e250488f43b501d4540e..e20b8d495d9098328e8a3b3589a46b427ed6b7d9 100644 (file)
--- a/src/lib/subs/attsub.c
+++ b/src/lib/subs/attsub.c
@@ -133,16 +133,10 @@ pr_com(int inon, struct combat *com, natid who)
                     inon ? inon == 1 ? "in " : "into " : "",
                     xyas(com->x, com->y, who));
     } else if (com->type == EF_SHIP) {
-       if (opt_SHIPNAMES) {
-           return prbuf("%s%s %s(#%d)",
-                        inon ? inon == 1 ? "on " : "onto " : "",
-                        com->shp_mcp->m_name, com->shp_name,
-                        com->shp_uid);
-       } else {
-           return prbuf("%s%s #%d",
-                        inon ? inon == 1 ? "on " : "onto " : "",
-                        com->shp_mcp->m_name, com->shp_uid);
-       }
+       return prbuf("%s%s %s(#%d)",
+                    inon ? inon == 1 ? "on " : "onto " : "",
+                    com->shp_mcp->m_name, com->shp_name,
+                    com->shp_uid);
     } else if (com->type == EF_LAND) {
        return prbuf("%s%s #%d",
                     inon ? inon == 1 ? "on " : "onto " : "",
@@ -266,8 +260,7 @@ att_get_combat(struct combat *com, int isdef)
            return att_combat_init(com, EF_BAD);
        }
        com->shp_mcp = &mchr[(int)ship.shp_type];
-       if (opt_SHIPNAMES)
-           strncpy(com->shp_name, ship.shp_name, MAXSHPNAMLEN);
+       strncpy(com->shp_name, ship.shp_name, MAXSHPNAMLEN);
        if (!isdef && !player->owner) {
            if (com->set)
                pr("%s was just sunk!\n", prcom(0, com));

diff --git a/src/lib/subs/satmap.c b/src/lib/subs/satmap.c
index 569a5637a1c80764da4dcf4b18f583240be0969f..b9c2088e192e10ce01b1453cfed738c4aa64f152 100644 (file)
--- a/src/lib/subs/satmap.c
+++ b/src/lib/subs/satmap.c
@@ -152,11 +152,7 @@ satmap(int x, int y, int eff, int range, int flags, int type)
        if (flags & P_S) {
            pr("Satellite ship report\n");
            prdate();
-           if (opt_SHIPNAMES) {
-               pr(" own  shp# ship type                                  sector   eff\n");
-           } else {
-               pr(" own  shp# ship type         sector   eff\n");
-           }
+           pr(" own  shp# ship type                                  sector   eff\n");
        }
        while (nxtitem(&ni, &ship)) {
            if (ship.shp_own == 0)
@@ -169,11 +165,9 @@ satmap(int x, int y, int eff, int range, int flags, int type)
            if (noise[crackle])
                continue;
            if (flags & P_S) {
-               pr("%4d %4d %-16.16s ",
+               pr("%4d %4d %-16.16s %-25.25s ",
                   ship.shp_own, ship.shp_uid,
-                  mchr[(int)ship.shp_type].m_name);
-               if (opt_SHIPNAMES)
-                   pr("%-25.25s ", ship.shp_name);
+                  mchr[(int)ship.shp_type].m_name, ship.shp_name);
                prxy("%4d,%-4d ", ship.shp_x, ship.shp_y, player->cnum);
                pr("%3d%%\n", ship.shp_effic);
                ++count;
@@ -313,17 +307,12 @@ satdisp(struct sctstr *sp, int acc, int showstuff)
        if (mchr[(int)ship.shp_type].m_flags & M_SUB)
            continue;
        if (first) {
-           if (opt_SHIPNAMES) {
-               pr("\t own  shp# ship type                                  sector   eff\n");
-           } else {
-               pr("\t own  shp# ship type         sector   eff\n");
-           }
+           pr("\t own  shp# ship type                                  sector   eff\n");
            first = 0;
        }
-       pr("\t%4d %4d %-16.16s ", ship.shp_own, ship.shp_uid,
-          mchr[(int)ship.shp_type].m_name);
-       if (opt_SHIPNAMES)
-           pr("%-25.25s ", ship.shp_name);
+       pr("\t%4d %4d %-16.16s %-25.25s ",
+          ship.shp_own, ship.shp_uid,
+          mchr[(int)ship.shp_type].m_name, ship.shp_name);
        prxy("%4d,%-4d ", ship.shp_x, ship.shp_y, player->cnum);
        pr("%3d%%\n", ship.shp_effic);
     }

diff --git a/src/lib/subs/ship.c b/src/lib/subs/ship.c
index 4295a47e4ec9d3db4ed8474bfc768f8ce3582477..e42e20042bee5da7cff2f9846c4da264747f27a6 100644 (file)
--- a/src/lib/subs/ship.c
+++ b/src/lib/subs/ship.c
@@ -126,12 +126,7 @@ shp_init(int n, s_char *ptr)
 s_char *
 prship(struct shpstr *sp)
 {
-    if (opt_SHIPNAMES) {
-       return prbuf("%s %s(#%d)",
-                    mchr[(int)sp->shp_type].m_name, sp->shp_name,
-                    sp->shp_uid);
-    } else {
-       return prbuf("%s #%d", mchr[(int)sp->shp_type].m_name,
-                    sp->shp_uid);
-    }
+    return prbuf("%s %s(#%d)",
+                mchr[(int)sp->shp_type].m_name, sp->shp_name,
+                sp->shp_uid);
 }