From: SHIRAKATA Kentaro <argrath@ub32.org>
Date: Tue, 8 Feb 2022 20:50:49 +0000 (+0900)
Subject: remove redundant null-check on untrap_prob()
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b82f5fa28fdec13b60e9bc71d15ab3bcc893692d;p=nethack

remove redundant null-check on untrap_prob()

`ttmp` should not be NULL here, otherwise this function will crash at earlier code.
---

diff --git a/src/trap.c b/src/trap.c
index deeab493f..09af868f1 100644
--- a/src/trap.c
+++ b/src/trap.c
@@ -4468,6 +4468,7 @@ untrap_prob(struct trap *ttmp)
     int chance = 3;
 
     /* Only spiders know how to deal with webs reliably */
+    /* Assume ttmp is not NULL */
     if (ttmp->ttyp == WEB && !webmaker(g.youmonst.data))
         chance = 7; /* 3.7: used to be 30 */
     if (Confusion || Hallucination)
@@ -4479,7 +4480,7 @@ untrap_prob(struct trap *ttmp)
     if (Fumbling)
         chance *= 2;
     /* Your own traps are better known than others. */
-    if (ttmp && ttmp->madeby_u)
+    if (ttmp->madeby_u)
         chance--;
     if (Role_if(PM_ROGUE)) {
         if (rn2(2 * MAXULEV) < u.ulevel)