revert box naming

diff --git a/doc/fixes36.1 b/doc/fixes36.1
index fc7fbaa958eb797497614a99fe38f617a7f5a551..73c66e65d6403d542e2ca0090a3ce38cb9940795 100644 (file)
--- a/doc/fixes36.1
+++ b/doc/fixes36.1
@@ -609,8 +609,6 @@ when clairvoyance lets you move the cursor to examine the map (if it occurs
 prevent Mjollnir from being auto-quivered if it's been thrown without return
        and then picked back up while quiver slot is empty
 plural of "fox" is not "foxen"
-change wording from "broken chest" to "chest with a broken lock" and during
-       #force" suppress redundant info when lock state is already known
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/lock.c b/src/lock.c
index 1e3e43d061d4ae8cb306beadfc63964a4d4d06e2..996784ca7e9a848828e65a5e49795cdb6ec38aa2 100644 (file)
--- a/src/lock.c
+++ b/src/lock.c
@@ -548,18 +548,9 @@ doforce()
     xlock.box = (struct obj *) 0;
     for (otmp = level.objects[u.ux][u.uy]; otmp; otmp = otmp->nexthere)
         if (Is_box(otmp)) {
-            if (otmp->obroken) {
-                There("is %s here%s.", doname(otmp),
-                      /* The displayed name will have already stated
-                       * "with a broken lock" if otmp->lknown is already set
-                       * so suppress the additional notification about the
-                       * lock in that case. */
-                      !otmp->lknown ? ", but its lock is already broken" : "");
-                otmp->lknown = 1;
-                continue;
-            } else if (!otmp->olocked) {
-                There("is %s here, but its lock is already unlocked.",
-                      doname(otmp));
+            if (otmp->obroken || !otmp->olocked) {
+                There("is %s here, but its lock is already %s.", doname(otmp),
+                      otmp->obroken ? "broken" : "unlocked");
                 otmp->lknown = 1;
                 continue;
             }

diff --git a/src/objnam.c b/src/objnam.c
index d453d564e57ffe3dc5b1516506614dab427bbe4b..120aaef553715bcfceceb9fa50d93b3180864c0c 100644 (file)
--- a/src/objnam.c
+++ b/src/objnam.c
@@ -995,10 +995,10 @@ unsigned doname_flags;
 
     if (lknown && Is_box(obj)) {
         if (obj->obroken)
-            /* 3.6.0 used an "unlockable" prefix here but that could be
-               misunderstood to mean "capable of being unlocked" rather
-               than the intended "not capable of being locked" */
-            Strcat(bp, " with a broken lock");
+            /* 3.6.0 used "unlockable" here but that could be misunderstood
+               to mean "capable of being unlocked" rather than the intended
+               "not capable of being locked" */
+            Strcat(prefix, "broken ");
         else if (obj->olocked)
             Strcat(prefix, "locked ");
         else