mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2025-09-08 13:25:59 +00:00
renamed MF_* to CF_* to prevent the collision with movement flags; also added the missing CF_INACTIVE
This commit is contained in:
Zeno Rogue
94
flags.cpp
94
flags.cpp
@@ -76,53 +76,53 @@ LANDFLAGCHECK(isTrollLand, flag & LF_TROLL)
|
||||
LANDFLAGCHECK(inmirror, flag & LF_INMIRROR)
|
||||
LANDFLAGCHECK(inmirrororwall, flag & LF_INMIRRORORWALL)
|
||||
|
||||
MONFLAGCHECK(isGhostable, !(flag & MF_NOGHOST))
|
||||
MONFLAGCHECK(isRaider, flag & MF_RAIDER)
|
||||
MONFLAGCHECK(isMimic, flag & MF_MIMIC)
|
||||
MONFLAGCHECK(isPrincess, flag & MF_PRINCESS)
|
||||
MONFLAGCHECK(isGolemOrKnight, flag & MF_GOK)
|
||||
MONFLAGCHECK(isNonliving, flag & MF_NONLIVING)
|
||||
MONFLAGCHECK(isMetalBeast, flag & MF_METAL)
|
||||
MONFLAGCHECK(isStunnable, flag & MF_STUNNABLE)
|
||||
MONFLAGCHECK(hasHitpoints, flag & MF_HP)
|
||||
MONFLAGCHECK(isMountable, flag & MF_MOUNTABLE)
|
||||
MONFLAGCHECK(isFriendlyType, flag & MF_FRIENDLY)
|
||||
MONFLAGCHECK(isFriendlyOrPlayer, flag & (MF_FRIENDLY | MF_PLAYER))
|
||||
MONFLAGCHECK(isBug, flag & MF_BUG)
|
||||
MONFLAGCHECK(isIvy, flag & MF_IVY)
|
||||
MONFLAGCHECK(isMonsterPart, flag & MF_PART)
|
||||
MONFLAGCHECK(isMutantIvy, flag & MF_MUTANTIVY)
|
||||
MONFLAGCHECK(isAnyIvy, flag & MF_ANYIVY)
|
||||
MONFLAGCHECK(isBulletType, flag & MF_BULLET)
|
||||
MONFLAGCHECK(isDemon, flag & MF_DEMON)
|
||||
MONFLAGCHECK(isWorm, flag & MF_WORM)
|
||||
MONFLAGCHECK(isWitch, flag & MF_WITCH)
|
||||
MONFLAGCHECK(isAngryBird, (flag & MF_BIRD) && !(flag & MF_FRIENDLY))
|
||||
MONFLAGCHECK(isBird, flag & MF_BIRD)
|
||||
MONFLAGCHECK(slowMover, flag & MF_SLOWMOVER)
|
||||
MONFLAGCHECK(isMagneticPole, flag & MF_MAGNETIC)
|
||||
MONFLAGCHECK(isSwitch, flag & MF_SWITCH)
|
||||
MONFLAGCHECK(isGhost, flag & MF_GHOST)
|
||||
MONFLAGCHECK(isShark, flag & MF_SHARK)
|
||||
MONFLAGCHECK(isSlimeMover, flag & MF_SLIME)
|
||||
MONFLAGCHECK(isDragon, flag & MF_DRAGON)
|
||||
MONFLAGCHECK(isKraken, flag & MF_KRAKEN)
|
||||
MONFLAGCHECK(isBlowableMonster, !(flag & MF_NOBLOW))
|
||||
MONFLAGCHECK(isMultitile, flag & MF_MULTITILE)
|
||||
MONFLAGCHECK(isLeader, flag & MF_LEADER)
|
||||
MONFLAGCHECK(isFlyingType, flag & MF_FLYING)
|
||||
MONFLAGCHECK(attackThruVine, flag & MF_ATTACK_THRU_VINE)
|
||||
MONFLAGCHECK(attackNonAdjacent, flag & MF_ATTACK_NONADJACENT)
|
||||
MONFLAGCHECK(noHighlight, flag & MF_NOHIGHLIGHT)
|
||||
MONFLAGCHECK(isInactiveEnemyType, flag & MF_INACTIVE)
|
||||
MONFLAGCHECK(isUnarmed, flag & MF_UNARMED)
|
||||
MONFLAGCHECK(ignoresPlatesType, flag & MF_IGNORE_PLATE)
|
||||
MONFLAGCHECK(isBull, flag & MF_BULL)
|
||||
MONFLAGCHECK(isTroll, flag & MF_TROLL)
|
||||
MONFLAGCHECK(ignoresSmellType, flag & MF_IGNORE_SMELL)
|
||||
MONFLAGCHECK(isRatling, flag & MF_RATLING)
|
||||
MONFLAGCHECK(isGhostMover, flag & MF_GHOSTMOVER)
|
||||
MONFLAGCHECK(isPowerMonster, flag & MF_POWER)
|
||||
MONFLAGCHECK(isGhostable, !(flag & CF_NOGHOST))
|
||||
MONFLAGCHECK(isRaider, flag & CF_RAIDER)
|
||||
MONFLAGCHECK(isMimic, flag & CF_MIMIC)
|
||||
MONFLAGCHECK(isPrincess, flag & CF_PRINCESS)
|
||||
MONFLAGCHECK(isGolemOrKnight, flag & CF_GOK)
|
||||
MONFLAGCHECK(isNonliving, flag & CF_NONLIVING)
|
||||
MONFLAGCHECK(isMetalBeast, flag & CF_METAL)
|
||||
MONFLAGCHECK(isStunnable, flag & CF_STUNNABLE)
|
||||
MONFLAGCHECK(hasHitpoints, flag & CF_HP)
|
||||
MONFLAGCHECK(isMountable, flag & CF_MOUNTABLE)
|
||||
MONFLAGCHECK(isFriendlyType, flag & CF_FRIENDLY)
|
||||
MONFLAGCHECK(isFriendlyOrPlayer, flag & (CF_FRIENDLY | CF_PLAYER))
|
||||
MONFLAGCHECK(isBug, flag & CF_BUG)
|
||||
MONFLAGCHECK(isIvy, flag & CF_IVY)
|
||||
MONFLAGCHECK(isMonsterPart, flag & CF_PART)
|
||||
MONFLAGCHECK(isMutantIvy, flag & CF_MUTANTIVY)
|
||||
MONFLAGCHECK(isAnyIvy, flag & CF_ANYIVY)
|
||||
MONFLAGCHECK(isBulletType, flag & CF_BULLET)
|
||||
MONFLAGCHECK(isDemon, flag & CF_DEMON)
|
||||
MONFLAGCHECK(isWorm, flag & CF_WORM)
|
||||
MONFLAGCHECK(isWitch, flag & CF_WITCH)
|
||||
MONFLAGCHECK(isAngryBird, (flag & CF_BIRD) && !(flag & CF_FRIENDLY))
|
||||
MONFLAGCHECK(isBird, flag & CF_BIRD)
|
||||
MONFLAGCHECK(slowMover, flag & CF_SLOWMOVER)
|
||||
MONFLAGCHECK(isMagneticPole, flag & CF_MAGNETIC)
|
||||
MONFLAGCHECK(isSwitch, flag & CF_SWITCH)
|
||||
MONFLAGCHECK(isGhost, flag & CF_GHOST)
|
||||
MONFLAGCHECK(isShark, flag & CF_SHARK)
|
||||
MONFLAGCHECK(isSlimeMover, flag & CF_SLIME)
|
||||
MONFLAGCHECK(isDragon, flag & CF_DRAGON)
|
||||
MONFLAGCHECK(isKraken, flag & CF_KRAKEN)
|
||||
MONFLAGCHECK(isBlowableMonster, !(flag & CF_NOBLOW))
|
||||
MONFLAGCHECK(isMultitile, flag & CF_MULTITILE)
|
||||
MONFLAGCHECK(isLeader, flag & CF_LEADER)
|
||||
MONFLAGCHECK(isFlyingType, flag & CF_FLYING)
|
||||
MONFLAGCHECK(attackThruVine, flag & CF_ATTACK_THRU_VINE)
|
||||
MONFLAGCHECK(attackNonAdjacent, flag & CF_ATTACK_NONADJACENT)
|
||||
MONFLAGCHECK(noHighlight, flag & CF_NOHIGHLIGHT)
|
||||
MONFLAGCHECK(isInactiveEnemyType, flag & CF_INACTIVE)
|
||||
MONFLAGCHECK(isUnarmed, flag & CF_UNARMED)
|
||||
MONFLAGCHECK(ignoresPlatesType, flag & CF_IGNORE_PLATE)
|
||||
MONFLAGCHECK(isBull, flag & CF_BULL)
|
||||
MONFLAGCHECK(isTroll, flag & CF_TROLL)
|
||||
MONFLAGCHECK(ignoresSmellType, flag & CF_IGNORE_SMELL)
|
||||
MONFLAGCHECK(isRatling, flag & CF_RATLING)
|
||||
MONFLAGCHECK(isGhostMover, flag & CF_GHOSTMOVER)
|
||||
MONFLAGCHECK(isPowerMonster, flag & CF_POWER)
|
||||
|
||||
ITEMFLAGCHECK(isElementalShard, flag & IF_SHARD)
|
||||
ITEMFLAGCHECK(itemBurns, !(flag & IF_FIREPROOF))
|
||||
|
||||
Reference in New Issue
Block a user