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 37507c97a897226f67e189b56171de2b77e7e570..91acc8615007018d5f0a7e5441262e876ac8dc22 100644 (file)
--- 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 9fd078bb7bb040ca371f9f19ff613cc0780c2eb7..d3456dcd5cdf612b5249cf9a169505e51386a95b 100644 (file)
--- 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 3316f5613f2b8c13eeecf6c9ff0a8dab33483da6..af385a07fb1afb4371b8bc384b1b638fb9802b97 100644 (file)
--- 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 */