diff --git a/classes.h b/classes.h index c9f48064..f7a54a83 100644 --- a/classes.h +++ b/classes.h @@ -91,6 +91,7 @@ static const flagtype IF_PROTECTION = Flag(2); static const flagtype IF_EMPATHY = Flag(3); static const flagtype IF_RANGED = Flag(4); static const flagtype IF_SHMUPLIFE = Flag(5); +static const flagtype IF_REVIVAL = Flag(6); struct itemtype { char glyph; diff --git a/flags.cpp b/flags.cpp index 0246f358..bea7b2d8 100644 --- a/flags.cpp +++ b/flags.cpp @@ -129,6 +129,7 @@ ITEMFLAGCHECK(itemBurns, !(flag & IF_FIREPROOF)) ITEMFLAGCHECK(isProtectionOrb, flag & IF_PROTECTION) ITEMFLAGCHECK(isEmpathyOrb, flag & IF_EMPATHY) ITEMFLAGCHECK(isRangedOrb, flag & IF_RANGED) +ITEMFLAGCHECK(isRevivalOrb, flag & IF_REVIVAL) eMonster movegroup(eMonster m); @@ -262,10 +263,6 @@ bool haveRangedOrb() { items[itOrbMorph] || items[itOrbPhasing]; } -bool isRevivalOrb(eItem i) { - return i == itOrbLife || i == itOrbFriend || i == itOrbUndeath; - } - bool isFriendlyGhost(eMonster m) { return m == moFriendlyGhost || (markEmpathy(itOrbAether) && isFriendly(m)); }