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

fix movement prefixes

Browse Source 
My earlier change resulted in rejecting all commands entered after
a movement prefix key, rather than just ones that aren't supposed to
take any prefix.

This fixes that and also restores the ability to use 'm>' or 'm<' on
stairs to change levels without auto-pickup at the destination.
This commit is contained in:
PatR
2022-02-06 17:46:31 -08:00
parent f233f1d18c
commit b3c5d68399
4 changed files with 45 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/do.c
View File

@@ -981,6 +981,8 @@ dodown(void)
boolean stairs_down = (stway && !stway->up && !stway->isladder),
ladder_down = (stway && !stway->up && stway->isladder);
set_move_cmd(DIR_DOWN, 0);
if (u_rooted())
return ECMD_TIME;
@@ -1051,7 +1053,7 @@ dodown(void)
dotrap(trap, TOOKPLUNGE);
}
}
return ECMD_TIME; /* came out of hiding; might need '>' again to go down */
return ECMD_TIME; /* came out of hiding; need '>' again to go down */
}
if (u.ustuck) {
@@ -1070,7 +1072,6 @@ dodown(void)
} else if (!trap || !is_hole(trap->ttyp)
|| !Can_fall_thru(&u.uz) || !trap->tseen) {
if (flags.autodig && !g.context.nopick && uwep && is_pick(uwep)) {
u.dz = 1; /* the #down command doesn't call set_move_cmd() */
return use_pick_axe2(uwep);
} else {
You_cant("go down here.");
@@ -1121,8 +1122,6 @@ dodown(void)
if (trap && Is_stronghold(&u.uz)) {
goto_hell(FALSE, TRUE);
} else {
if (!trap)
u.dz = 1;
g.at_ladder = (boolean) (levl[u.ux][u.uy].typ == LADDER);
next_level(!trap);
g.at_ladder = FALSE;
@@ -1136,6 +1135,8 @@ doup(void)
{
stairway *stway = stairway_at(u.ux,u.uy);
set_move_cmd(DIR_UP, 0);
if (u_rooted())
return ECMD_TIME;
@@ -1176,7 +1177,6 @@ doup(void)
return ECMD_OK;
}
g.at_ladder = (boolean) (levl[u.ux][u.uy].typ == LADDER);
u.dz = -1;
prev_level(TRUE);
g.at_ladder = FALSE;
return ECMD_TIME;