chameleon behaviour

- restore intended behaviour of kill_genocided_monsters().
  It has been incorrect since  the chameleon overhaul in June 2004.
- eliminate CHAM_ORDINARY and use NON_PM instead.
This commit is contained in:
nethack.allison
2006-03-12 04:43:28 +00:00
parent e1ef0f1042
commit 0b88609133
15 changed files with 48 additions and 51 deletions
+3 -3
View File
@@ -1506,11 +1506,11 @@ struct monst *mon;
struct permonst *ptr;
{
int reslt = 0;
if (mon->cham != CHAM_ORDINARY) {
if (mon->cham >= LOW_PM) {
if (ptr == &mons[mon->cham])
mon->cham = CHAM_ORDINARY;
mon->cham = NON_PM;
reslt = newcham(mon, ptr, FALSE, FALSE);
} else if (mon->cham == CHAM_ORDINARY && ptr != mon->data) {
} else if (mon->cham == NON_PM && ptr != mon->data) {
mon->cham = monsndx(mon->data);
reslt = newcham(mon, ptr, FALSE, FALSE);
}