Fix the shapechanger fix again

src/makemon.c

@@ -1134,11 +1134,11 @@ register int mmflags;
     mtmp->cham = NON_PM; /* default is "not a shapechanger" */
     if ((mcham = pm_to_cham(mndx)) != NON_PM) {
         /* this is a shapechanger after all */
-        mtmp->cham = mcham;
         if (Protection_from_shape_changers
-            || mtmp->cham == PM_VLAD_THE_IMPALER) {
+            || mndx == PM_VLAD_THE_IMPALER) {
             ; /* stuck in its natural form (NON_PM) */
         } else {
+            mtmp->cham = mcham;
             /* Note: shapechanger's initial form used to be
                chosen here with rndmonst(), yielding a monster
                which was approriate to the level's difficulty