nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'nopushmsg' of https://github.com/argrath/NetHack into NetHack-3.7

Browse Source
This commit is contained in:
nhmall
2024-09-29 09:27:15 -04:00
parent 357082956f 387b23f633
commit d7434e5b3a
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/hack.c
View File

@@ -9,6 +9,7 @@
/* #define DEBUG */ /* uncomment for debugging */
staticfn boolean could_move_onto_boulder(coordxy, coordxy);
staticfn void cannot_push_msg(struct obj *, coordxy, coordxy);
staticfn int cannot_push(struct obj *, coordxy, coordxy);
staticfn void moverock_done(coordxy, coordxy);
staticfn int moverock(void);
@@ -156,6 +157,21 @@ could_move_onto_boulder(coordxy sx, coordxy sy)
return squeezeablylightinvent();
}
staticfn void
cannot_push_msg(struct obj *otmp, coordxy sx, coordxy sy)
{
const char *what;
what = the(xname(otmp));
if (u.usteed)
pline("%s tries to move %s, but cannot.",
YMonnam(u.usteed), what);
else
You("try to move %s, but in vain.", what);
if (Blind)
feel_location(sx, sy);
}
staticfn int
cannot_push(struct obj *otmp, coordxy sx, coordxy sy)
{
@@ -369,8 +385,10 @@ moverock_core(coordxy sx, coordxy sy)
return cannot_push(otmp, sx, sy);
}
if (closed_door(rx, ry))
goto nopushmsg;
if (closed_door(rx, ry)) {
cannot_push_msg(otmp, sx, sy);
return cannot_push(otmp, sx, sy);
}
/* at this point the boulder should be able to move (though
potentially into something like a trap, pool, or lava) */
@@ -565,15 +583,7 @@ moverock_core(coordxy sx, coordxy sy)
stolen_value(otmp, sx, sy, TRUE, FALSE);
}
} else {
nopushmsg:
what = the(xname(otmp));
if (u.usteed)
pline("%s tries to move %s, but cannot.",
YMonnam(u.usteed), what);
else
You("try to move %s, but in vain.", what);
if (Blind)
feel_location(sx, sy);
cannot_push_msg(otmp, sx, sy);
return cannot_push(otmp, sx, sy);
}
}