From: PatR <rankin@nethack.org>
Date: Fri, 11 Mar 2022 17:58:40 +0000 (-0800)
Subject: github PR #694 - redundant null check
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0fab87500eb790b361f2909c1f3e9d20d507b461;p=nethack

github PR #694 - redundant null check

Pull request from argrath:  a check for null trap in untrap_prob()
comes after an unconditional use of that trap so doesn't server any
useful purpose.

Redo a couple of comments too.  No fixes entry necessary.

Closes #694
---

diff --git a/src/trap.c b/src/trap.c
index 09af868f1..98da044f2 100644
--- a/src/trap.c
+++ b/src/trap.c
@@ -4463,12 +4463,12 @@ dountrap(void)
 
 /* Probability of disabling a trap.  Helge Hafting */
 static int
-untrap_prob(struct trap *ttmp)
+untrap_prob(
+    struct trap *ttmp) /* must not be Null */
 {
     int chance = 3;
 
-    /* Only spiders know how to deal with webs reliably */
-    /* Assume ttmp is not NULL */
+    /* non-spiders are less adept at dealing with webs */
     if (ttmp->ttyp == WEB && !webmaker(g.youmonst.data))
         chance = 7; /* 3.7: used to be 30 */
     if (Confusion || Hallucination)