From: Dean Luick <dean@nethack.org>
Date: Fri, 29 Jan 2021 03:09:28 +0000 (-0600)
Subject: Fix set but not used warnings
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ddab09cabf048853632abfe781f31eab5b9368a;p=nethack

Fix set but not used warnings
---

diff --git a/src/mhitm.c b/src/mhitm.c
index a164f4d75..9c396ff6c 100644
--- a/src/mhitm.c
+++ b/src/mhitm.c
@@ -839,9 +839,6 @@ mdamagem(struct monst *magr, struct monst *mdef,
          struct attack *mattk, struct obj *mwep, int dieroll)
 {
     struct permonst *pa = magr->data, *pd = mdef->data;
-    int armpro;
-    /* this was moved downstream during a 2020 refactor */
-    /* boolean cancelled; */
     struct mhitm_data mhm;
     mhm.damage = d((int) mattk->damn, (int) mattk->damd);
     mhm.hitflags = MM_MISS;
@@ -877,10 +874,6 @@ mdamagem(struct monst *magr, struct monst *mdef,
         }
     }
 
-    /* cancellation factor is the same as when attacking the hero */
-    armpro = magic_negation(mdef);
-    /* cancelled = magr->mcan || !(rn2(10) >= 3 * armpro); */
-
     mhitm_adtyping(magr, mattk, mdef, &mhm);
     if (mhm.done)
         return mhm.hitflags;
diff --git a/src/mhitu.c b/src/mhitu.c
index a17f2462c..664c7cd4e 100644
--- a/src/mhitu.c
+++ b/src/mhitu.c
@@ -940,8 +940,6 @@ static int
 hitmu(register struct monst *mtmp, register struct attack *mattk)
 {
     struct permonst *mdat = mtmp->data;
-    /* int uncancelled; */
-    int armpro;
     struct permonst *olduasmon = g.youmonst.data;
     int res;
     struct mhitm_data mhm;
@@ -981,14 +979,6 @@ hitmu(register struct monst *mtmp, register struct attack *mattk)
     if ((is_undead(mdat) || is_vampshifter(mtmp)) && midnight())
         mhm.damage += d((int) mattk->damn, (int) mattk->damd); /* extra damage */
 
-    /*  Next a cancellation factor.
-     *  Use uncancelled when cancellation factor takes into account certain
-     *  armor's special magic protection.  Otherwise just use !mtmp->mcan.
-     */
-    armpro = magic_negation(&g.youmonst);
-    /* this was moved downstream during a 2020 refactor */
-    /* uncancelled = !mtmp->mcan && (rn2(10) >= 3 * armpro); */
-
     mhitm_adtyping(mtmp, mattk, &g.youmonst, &mhm);
     if (mhm.done)
         return mhm.hitflags;