Add a macro to provide universal consistency around the check

for what sort of creatures tend to revive.
This commit is contained in:
nethack.allison
2002-01-26 15:05:00 +00:00
parent 5482d1ab74
commit 69ce21fe0b
3 changed files with 5 additions and 5 deletions

View File

@@ -2155,7 +2155,7 @@ mergable(otmp, obj) /* returns TRUE if obj & otmp can be merged */
/* hatching eggs don't merge; ditto for revivable corpses */
if ((obj->otyp == EGG && (obj->timed || otmp->timed)) ||
(obj->otyp == CORPSE && otmp->corpsenm >= LOW_PM &&
mons[otmp->corpsenm].mlet == S_TROLL))
is_reviver(&mons[otmp->corpsenm])))
return FALSE;
/* allow candle merging only if their ages are close */