From: PatR <rankin@nethack.org>
Date: Tue, 30 Nov 2021 22:04:00 +0000 (-0800)
Subject: miscellaneous tweaks
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=35ac9a09e26cbb3859f7b58870504af969b53076;p=nethack

miscellaneous tweaks

Simplify a glob handling bit in a recent shrink_glob change used when
catching for lost time upon returning to a level.

Revise a clumsily worded fixes entry.

Fix a comment typo in makedefs that's been there for a bunch of years
now.  It's been within the diff context for several recent patches
and I still hadn't noticed it until just now.
---

diff --git a/doc/fixes37.0 b/doc/fixes37.0
index 37507c97a..91acc8615 100644
--- a/doc/fixes37.0
+++ b/doc/fixes37.0
@@ -680,7 +680,7 @@ prevent normal monster activity from picking up the mines' luckstone or the
 proceed a little further into dochat() if hero is deaf
 stacks of 1 to 49 gold pieces weighed 0
 the chance for #untrap to free a monster stuck in a web was very unlikely
-	unless was poly'd into spider form; make it less hard
+	unless hero was poly'd into spider form; make it less hard
 if #untrap monst-from-web failure happened while hero was standing on a spot
 	where a new web couldn't be created (furniture, grave, magic portal),
 	the expected "<monst> remains entangled" feedback wasn't delivered
diff --git a/src/mkobj.c b/src/mkobj.c
index 9fd078bb7..d3456dcd5 100644
--- a/src/mkobj.c
+++ b/src/mkobj.c
@@ -1369,13 +1369,8 @@ shrink_glob(
         if (delta >= (long) obj->owt) {
             /* no newsym() or message here; forthcoming map update for
                level arrival is all that's needed */
-            obj_extract_self(obj);
+            obj_extract_self(obj); /* if contained, updates container's owt */
             obfree(obj, (struct obj *) 0);
-
-            /* won't be a container carried by hero but might be a floor
-               one or one carried by a monster */
-            if (contnr)
-                container_weight(contnr);
         } else {
             obj->owt -= (unsigned) delta;
             start_glob_timeout(obj, moddelta);
diff --git a/util/makedefs.c b/util/makedefs.c
index 3316f5613..af385a07f 100644
--- a/util/makedefs.c
+++ b/util/makedefs.c
@@ -317,7 +317,7 @@ do_makedefs(char *options)
                                MD_PAD_RUMORS); /* '_RUMORS' is correct here */
             do_rnd_access_file(ENGRAVEFILE,
                 /* default engraving:  popularized by "The Adventures of
-                   Buckaroo Bonzai Across the 8th Dimenstion" but predates
+                   Buckaroo Bonzai Across the 8th Dimension" but predates
                    that 1984 movie; some attribute it to Confucius */
                                "No matter where you go, there you are.",
                                MD_PAD_RUMORS); /* '_RUMORS' used here too */