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
This commit is contained in:
PatR
2022-03-11 09:58:40 -08:00
parent b82f5fa28f
commit 0fab87500e

View File

@@ -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)