mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2024-11-28 22:59:54 +00:00
Merge pull request #177 from jruderman/phaser_flags
Yellow Frogs no longer phase into the player's sword
This commit is contained in:
commit
a8c6c8f240
2
orbs.cpp
2
orbs.cpp
@ -1189,7 +1189,7 @@ EX int check_phase(cell *cf, cell *ct, flagtype flags, cell*& jumpthru) {
|
|||||||
forCellCM(c2, cf) {
|
forCellCM(c2, cf) {
|
||||||
if(isNeighbor(c2, ct) && !nonAdjacent(cf, c2) && !nonAdjacent(c2, ct)) {
|
if(isNeighbor(c2, ct) && !nonAdjacent(cf, c2) && !nonAdjacent(c2, ct)) {
|
||||||
jumpthru = c2;
|
jumpthru = c2;
|
||||||
if(passable(ct, cf, P_ISPLAYER | P_PHASE)) {
|
if(passable(ct, cf, flags | P_PHASE)) {
|
||||||
partial = 2;
|
partial = 2;
|
||||||
if(c2->monst || (isWall(c2) && c2->wall != waShrub)) {
|
if(c2->monst || (isWall(c2) && c2->wall != waShrub)) {
|
||||||
return 3;
|
return 3;
|
||||||
|
Loading…
Reference in New Issue
Block a user