Fix: zombie_maker and hero or monster race

zombie_maker wasn't checking mplayer/monster race, and the attempt to
check the hero's race was inappropriately applying the hero's draugr
race to all non-zombie monsters.  This ends up turning it into just a
wrapper for the racial_zombie macro, but I left it as a function in case
there needs to be more complex logic or special exceptions introduced in
there in the future.

Author: entrez

include/extern.h

@@ -1527,7 +1527,7 @@ E int FDECL(cmap_to_type, (int));
 
 E void NDECL(mon_sanity_check);
 E int FDECL(m_poisongas_ok, (struct monst *));
-E boolean FDECL(zombie_maker, (struct permonst *));
+E boolean FDECL(zombie_maker, (struct monst *));
 E int FDECL(zombie_form, (struct permonst *));
 E void FDECL(become_flayer, (struct monst *));
 E int FDECL(undead_to_corpse, (int));

src/end.c

@@ -640,7 +640,7 @@ int how;
         u.ugrave_arise = PM_WRAITH;
     else if (mptr->mlet == S_MUMMY && urace.mummynum != NON_PM)
         u.ugrave_arise = urace.mummynum;
-    else if (zombie_maker(mptr) && urace.zombienum != NON_PM)
+    else if (zombie_maker(mtmp) && urace.zombienum != NON_PM)
         u.ugrave_arise = urace.zombienum;
     /* Vampire Mages can produce more of their kind if
        conditions are just right */

src/mhitm.c

@@ -2723,7 +2723,7 @@ struct obj **ootmp; /* to return worn armor for caller to disintegrate */
             mdef->mhp = 0;
         }
 
-        zombify = !mwep && zombie_maker(r_data(magr))
+        zombify = !mwep && zombie_maker(magr)
             && can_become_zombie(r_data(mdef))
             && ((mattk->aatyp == AT_TUCH
                  || mattk->aatyp == AT_CLAW

src/mon.c

@@ -230,19 +230,13 @@ struct monst *mtmp;
 /* Return TRUE if this monster is capable of converting other monsters into
  * zombies. */
 boolean
-zombie_maker(pm)
-struct permonst * pm;
+zombie_maker(mon)
+struct monst *mon;
 {
-    switch(pm->mlet) {
-    case S_ZOMBIE:
-        /* Z-class monsters that aren't actually zombies go here */
-        return is_zombie(pm);
-    }
-
-    if (!Upolyd && Race_if(PM_DRAUGR))
-        return TRUE;
-
-    return FALSE;
+    /* NB: right now, this is literally just a wrapper around racial_zombie,
+     * but maybe in the future there will be more complicated rules or
+     * exceptions about when zombies will be created -- esp. by the hero */
+    return racial_zombie(mon);
 }
 
 /* From xNetHack: return the monster index of the zombie monster which this monster could be
@@ -4189,7 +4183,7 @@ int xkill_flags; /* XKILL_GIVEMSG, XKILL_NOMSG, XKILL_NOCORPSE,
              * can figure it out here */
             if (!indirect) {
                 zombify = (!thrownobj && !stoned && !uwep
-                           && zombie_maker(youmonst.data)
+                           && zombie_maker(&youmonst)
                            && zombie_form(r_data(mtmp)) != NON_PM);
             }
             cadaver = make_corpse(mtmp, burycorpse ? CORPSTAT_BURIED