more artifact name formatting

     killer_xname() was adversely affected by yesterday's change to
obj_is_pname() that required artifacts to be fully identified in order to
use just their name.

diff --git a/src/objnam.c b/src/objnam.c
index 2ce521d1b6af01c45bafdb641501fd2bb2a50eee..d642a08a435d37e4e1ef1028a833f533d9c41358 100644 (file)
--- a/src/objnam.c
+++ b/src/objnam.c
@@ -1028,6 +1028,9 @@ struct obj *obj;
     unsigned save_ocknown;
     char *buf, *save_ocuname, *save_oname = (char *)0;
 
+    /* bypass object twiddling for artifacts */
+    if (obj->oartifact) return bare_artifactname(obj);
+
     /* remember original settings for core of the object;
        oextra structs other than oname don't matter here--since they
        aren't modified they don't need to be saved and restored */
@@ -1579,13 +1582,20 @@ struct obj *obj;
        return the(simpleoname);
 }
 
+/* artifact's name without any object type or known/dknown/&c feedback */
 char *
 bare_artifactname(obj)
 struct obj *obj;
 {
-       char *outbuf = nextobuf();
-       if (obj->oartifact) Strcpy(outbuf, artiname(obj->oartifact));
-       else Strcpy(outbuf, xname(obj));
+       char *outbuf;
+
+       if (obj->oartifact) {
+           outbuf = nextobuf();
+           Strcpy(outbuf, artiname(obj->oartifact));
+           if (!strncmp(outbuf, "The ", 4)) outbuf[0] = lowc(outbuf[0]);
+       } else {
+           outbuf = xname(obj);
+       }
        return outbuf;
 }