mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-23 21:07:17 +00:00
Code Issues Releases Wiki Activity

isThorny using flags

Browse Source
This commit is contained in:
Zeno Rogue 2019-03-23 16:40:02 +01:00
parent ad5884e29f
commit 9a072cdb62
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
flags.cpp
View File

@ -57,6 +57,7 @@ WALLFLAGCHECK(isStandardTree, flag & WF_STDTREE)
WALLFLAGCHECK(isGrave, flag & WF_GRAVE) WALLFLAGCHECK(isGrave, flag & WF_GRAVE)
WALLFLAGCHECK(isReptile, flag & WF_REPTILE) WALLFLAGCHECK(isReptile, flag & WF_REPTILE)
WALLFLAGCHECK(useHeatColoring, flag & WF_HEATCOLOR) WALLFLAGCHECK(useHeatColoring, flag & WF_HEATCOLOR)
WALLFLAGCHECK(isThorny, flag & WF_THORNY)
LANDFLAGCHECK(generateAll, flag & LF_GENERATE_ALL) LANDFLAGCHECK(generateAll, flag & LF_GENERATE_ALL)
LANDFLAGCHECK(isIcyLand, flag & LF_ICY) LANDFLAGCHECK(isIcyLand, flag & LF_ICY)
@ -312,8 +313,6 @@ bool survivesFall(eMonster m) {
return isBird(m) || m == moAirElemental || m == moSkeleton || isDragon(m) || m == moShadow || isGhost(m); return isBird(m) || m == moAirElemental || m == moSkeleton || isDragon(m) || m == moShadow || isGhost(m);
} }
bool isThorny(eWall w) { return w == waRose; }
bool checkOrb(eMonster m1, eItem orb) { bool checkOrb(eMonster m1, eItem orb) {
if(m1 == moPlayer) return markOrb(orb); if(m1 == moPlayer) return markOrb(orb);
if(isFriendly(m1)) return markEmpathy(orb); if(isFriendly(m1)) return markEmpathy(orb);