From 46da4b5e9045e66afef6cf1bbc8a47bc95ddd1e5 Mon Sep 17 00:00:00 2001 From: PatR Date: Sun, 31 Dec 2017 03:38:29 -0800 Subject: [PATCH] fix #H6704 - appearance of mimic's replacement If mimics were genocided before loading a special level which contained mimics with specific appearances, whatever random monsters took their place also end up having their intended appearance. monst->cham uses NON_PM rather than 0 to mean "not a shapechanger". --- doc/fixes36.1 | 3 +++ src/sp_lev.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/fixes36.1 b/doc/fixes36.1 index 3a3e33464..77e524f7d 100644 --- a/doc/fixes36.1 +++ b/doc/fixes36.1 @@ -494,6 +494,9 @@ hero polymorphed into form which can't wear armor via 'W' (eliciting "don't even bother") could wear it via 'P' make multi-shot missiles fired by monsters be less verbose when they miss can no longer play controlled notes on musical instrument if impaired +if a special level specified the appearance of a mimic and mimics had been + genocided prior to creating the level, whatever random monster took + the mimic's place got its intended appearance Fixes to Post-3.6.0 Problems that Were Exposed Via git Repository diff --git a/src/sp_lev.c b/src/sp_lev.c index 5981a1b5e..170a6e251 100644 --- a/src/sp_lev.c +++ b/src/sp_lev.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 sp_lev.c $NHDT-Date: 1513879435 2017/12/21 18:03:55 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.93 $ */ +/* NetHack 3.6 sp_lev.c $NHDT-Date: 1514720301 2017/12/31 11:38:21 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.94 $ */ /* Copyright (c) 1989 by Jean-Christophe Collet */ /* NetHack may be freely redistributed. See license for details. */ @@ -1593,7 +1593,7 @@ struct mkroom *croom; * eventually be expanded. */ if (m->appear_as.str - && ((mtmp->data->mlet == S_MIMIC) || mtmp->cham) + && ((mtmp->data->mlet == S_MIMIC) || mtmp->cham >= LOW_PM) && !Protection_from_shape_changers) { int i;