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

Merge branch 'NetHack-3.6.2'

Browse Source
This commit is contained in:
nhmall
2019-01-27 12:39:52 -05:00
parent befa1d94e9 fd92ecf74a
commit 96f1d0e207
7 changed files with 65 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/cmd.c
View File

@@ -4523,7 +4523,7 @@ rhack(cmd)
register char *cmd;
{
int spkey;
boolean do_walk, do_rush, prefix_seen, bad_command,
boolean prefix_seen, bad_command,
firsttime = (cmd == 0);
iflags.menu_requested = FALSE;
@@ -4554,7 +4554,7 @@ register char *cmd;
}
/* handle most movement commands */
do_walk = do_rush = prefix_seen = FALSE;
prefix_seen = FALSE;
g.context.travel = g.context.travel1 = 0;
spkey = ch2spkeys(*cmd, NHKF_RUN, NHKF_CLICKLOOK);
@@ -4562,7 +4562,7 @@ register char *cmd;
case NHKF_RUSH:
if (movecmd(cmd[1])) {
g.context.run = 2;
do_rush = TRUE;
g.context.domove_attempting |= DOMOVE_RUSH;
} else
prefix_seen = TRUE;
break;
@@ -4573,7 +4573,7 @@ register char *cmd;
case NHKF_RUN:
if (movecmd(lowc(cmd[1]))) {
g.context.run = 3;
do_rush = TRUE;
g.context.domove_attempting |= DOMOVE_RUSH;
} else
prefix_seen = TRUE;
break;
@@ -4589,7 +4589,7 @@ register char *cmd;
case NHKF_FIGHT:
if (movecmd(cmd[1])) {
g.context.forcefight = 1;
do_walk = TRUE;
g.context.domove_attempting |= DOMOVE_WALK;
} else
prefix_seen = TRUE;
break;
@@ -4598,7 +4598,7 @@ register char *cmd;
g.context.run = 0;
g.context.nopick = 1;
if (!u.dz)
do_walk = TRUE;
g.context.domove_attempting |= DOMOVE_WALK;
else
cmd[0] = cmd[1]; /* "m<" or "m>" */
} else
@@ -4608,7 +4608,7 @@ register char *cmd;
if (movecmd(lowc(cmd[1]))) {
g.context.run = 1;
g.context.nopick = 1;
do_rush = TRUE;
g.context.domove_attempting |= DOMOVE_RUSH;
} else
prefix_seen = TRUE;
break;
@@ -4631,20 +4631,20 @@ register char *cmd;
g.context.travel1 = 1;
g.context.run = 8;
g.context.nopick = 1;
do_rush = TRUE;
g.context.domove_attempting |= DOMOVE_RUSH;
break;
}
/*FALLTHRU*/
default:
if (movecmd(*cmd)) { /* ordinary movement */
g.context.run = 0; /* only matters here if it was 8 */
do_walk = TRUE;
g.context.domove_attempting |= DOMOVE_WALK;
} else if (movecmd(g.Cmd.num_pad ? unmeta(*cmd) : lowc(*cmd))) {
g.context.run = 1;
do_rush = TRUE;
g.context.domove_attempting |= DOMOVE_RUSH;
} else if (movecmd(unctrl(*cmd))) {
g.context.run = 3;
do_rush = TRUE;
g.context.domove_attempting |= DOMOVE_RUSH;
}
break;
}
@@ -4662,7 +4662,8 @@ register char *cmd;
}
}
if ((do_walk || do_rush) && !g.context.travel && !dxdy_moveok()) {
if (((g.context.domove_attempting & (DOMOVE_RUSH | DOMOVE_WALK)) != 0L)
&& !g.context.travel && !dxdy_moveok()) {
/* trying to move diagonally as a grid bug;
this used to be treated by movecmd() as not being
a movement attempt, but that didn't provide for any
@@ -4676,13 +4677,13 @@ register char *cmd;
return;
}
if (do_walk) {
if ((g.context.domove_attempting & DOMOVE_WALK) != 0L) {
if (g.multi)
g.context.mv = TRUE;
domove();
g.context.forcefight = 0;
return;
} else if (do_rush) {
} else if ((g.context.domove_attempting & DOMOVE_RUSH) != 0L) {
if (firsttime) {
if (!g.multi)
g.multi = max(COLNO, ROWNO);