1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-25 05:47:17 +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:
Zeno Rogue 2021-07-04 09:38:04 +02:00 committed by GitHub
commit a8c6c8f240
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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;