Refactor diseasemu() to allow use of racial_zombie().

This allows player monster draugr bite attack to actually cause zombie
sickness instead of regular sickness.

Author: k21971

doc/evilhack-changelog.md

@@ -3440,4 +3440,5 @@ The following changes to date are:
 - Fix: ^X message for being warned of undead
 - Merge & use racial_zombie when applicable
 - Fix: makedefs.c merge from last commit
+- Refactor diseasemu() to allow use of racial_zombie()
 

include/extern.h

@@ -1345,7 +1345,7 @@ E struct monst *NDECL(cloneu);
 E void FDECL(expels, (struct monst *, struct permonst *, BOOLEAN_P));
 E struct attack *FDECL(getmattk, (struct monst *, struct monst *,
                                   int, int *, struct attack *));
-E boolean FDECL(diseasemu, (struct permonst *));
+E boolean FDECL(diseasemu, (struct monst *));
 E int FDECL(mattacku, (struct monst *));
 E int FDECL(magic_negation, (struct monst *));
 E boolean NDECL(gulp_blnd_check);

src/artifact.c

@@ -2218,7 +2218,7 @@ int dieroll; /* needed for Magicbane and vorpal blades */
         }
 
         if (youdefend && !rn2(5)) {
-            diseasemu(mdef->data);
+            diseasemu(mdef);
         } else if (!youdefend) {
             mdef->mdiseasetime = rnd(10) + 5;
             if (!no_sick && !rn2(5)) {

src/mhitu.c

@@ -1216,15 +1216,17 @@ register struct monst *mtmp;
 }
 
 boolean
-diseasemu(mdat)
-struct permonst *mdat;
+diseasemu(mtmp)
+struct monst *mtmp;
 {
     if (Sick_resistance) {
         You_feel("a slight illness.");
         return FALSE;
     } else {
-        make_sick(Sick ? Sick / 3L + 1L : (long) rn1(ACURR(A_CON), 20),
-                  mdat->mname, TRUE, is_zombie(mdat) ? SICK_ZOMBIE : SICK_NONVOMITABLE);
+        make_sick(Sick ? Sick / 3L + 1L
+                       : (long) rn1(ACURR(A_CON), 20),
+                  mtmp->data->mname, TRUE,
+                  racial_zombie(mtmp) ? SICK_ZOMBIE : SICK_NONVOMITABLE);
         return TRUE;
     }
 }
@@ -1645,7 +1647,7 @@ register struct attack *mattk;
         break;
     case AD_DISE:
         hitmsg(mtmp, mattk);
-        if (!diseasemu(r_data(mtmp)))
+        if (!diseasemu(mtmp))
             dmg = 0;
         break;
     case AD_FIRE:
@@ -1797,7 +1799,7 @@ register struct attack *mattk;
                           Monnam(mtmp));
                 else
                     pline("%s eats your brains!", Monnam(mtmp));
-                diseasemu(mdat);
+                diseasemu(mtmp);
             }
             break;
         }
@@ -2402,7 +2404,7 @@ register struct attack *mattk;
         break;
     case AD_PEST:
         pline("%s reaches out, and you feel fever and chills.", Monnam(mtmp));
-        (void) diseasemu(mdat); /* plus the normal damage */
+        (void) diseasemu(mtmp); /* plus the normal damage */
         break;
     case AD_FAMN:
         pline("%s reaches out, and your body shrivels.", Monnam(mtmp));
@@ -2955,7 +2957,7 @@ struct attack *mattk;
             tmp = 0;
         break;
     case AD_DISE:
-        if (!diseasemu(mtmp->data))
+        if (!diseasemu(mtmp))
             tmp = 0;
         break;
     case AD_DREN:

src/uhitm.c

@@ -4806,7 +4806,7 @@ boolean wep_was_destroyed;
             mdamageu(mon, tmp);
 	    break;
 	case AD_DISE: /* specifically gray fungus */
-            diseasemu(ptr);
+            diseasemu(mon);
             break;
         case AD_DRST: /* specifically green dragons */
             if (how_resistant(POISON_RES) == 100) {