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

domove_ variables did not need to be in saved context

Browse Source
This commit is contained in:
nhmall
2019-01-27 15:12:55 -05:00
parent 96f1d0e207
commit d9b11e791c
6 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/context.h
View File

@@ -117,10 +117,6 @@ struct context_info {
int rndencode; /* randomized escape sequence introducer */
long next_attrib_check; /* next attribute check */
long stethoscope_move;
long domove_attempting;
long domove_succeeded;
#define DOMOVE_WALK 0x00000001
#define DOMOVE_RUSH 0x00000002
short stethoscope_movement;
boolean travel; /* find way automatically to u.tx,u.ty */
boolean travel1; /* first travel step */

4
include/decl.h
View File

@@ -691,6 +691,10 @@ struct instance_globals {
int doorindex;
char *save_cm;
long done_money;
long domove_attempting;
long domove_succeeded;
#define DOMOVE_WALK 0x00000001
#define DOMOVE_RUSH 0x00000002
const char *nomovemsg;
char plname[PL_NSIZ]; /* player name */
char pl_character[PL_CSIZ];

1
src/allmain.c
View File

@@ -579,7 +579,6 @@ newgame()
g.context.botlx = 1;
g.context.ident = 1;
g.context.stethoscope_move = -1L;
g.context.domove_attempting = 0L;
g.context.warnlevel = 1;
g.context.next_attrib_check = 600L; /* arbitrary first setting */
g.context.tribute.enabled = TRUE; /* turn on 3.6 tributes */

24
src/cmd.c
View File

@@ -4562,7 +4562,7 @@ register char *cmd;
case NHKF_RUSH:
if (movecmd(cmd[1])) {
g.context.run = 2;
g.context.domove_attempting |= DOMOVE_RUSH;
g.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;
g.context.domove_attempting |= DOMOVE_RUSH;
g.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;
g.context.domove_attempting |= DOMOVE_WALK;
g.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)
g.context.domove_attempting |= DOMOVE_WALK;
g.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;
g.context.domove_attempting |= DOMOVE_RUSH;
g.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;
g.context.domove_attempting |= DOMOVE_RUSH;
g.domove_attempting |= DOMOVE_RUSH;
break;
}
/*FALLTHRU*/
default:
if (movecmd(*cmd)) { /* ordinary movement */
g.context.run = 0; /* only matters here if it was 8 */
g.context.domove_attempting |= DOMOVE_WALK;
g.domove_attempting |= DOMOVE_WALK;
} else if (movecmd(g.Cmd.num_pad ? unmeta(*cmd) : lowc(*cmd))) {
g.context.run = 1;
g.context.domove_attempting |= DOMOVE_RUSH;
g.domove_attempting |= DOMOVE_RUSH;
} else if (movecmd(unctrl(*cmd))) {
g.context.run = 3;
g.context.domove_attempting |= DOMOVE_RUSH;
g.domove_attempting |= DOMOVE_RUSH;
}
break;
}
@@ -4662,7 +4662,7 @@ register char *cmd;
}
}
if (((g.context.domove_attempting & (DOMOVE_RUSH | DOMOVE_WALK)) != 0L)
if (((g.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
@@ -4677,13 +4677,13 @@ register char *cmd;
return;
}
if ((g.context.domove_attempting & DOMOVE_WALK) != 0L) {
if ((g.domove_attempting & DOMOVE_WALK) != 0L) {
if (g.multi)
g.context.mv = TRUE;
domove();
g.context.forcefight = 0;
return;
} else if ((g.context.domove_attempting & DOMOVE_RUSH) != 0L) {
} else if ((g.domove_attempting & DOMOVE_RUSH) != 0L) {
if (firsttime) {
if (!g.multi)
g.multi = max(COLNO, ROWNO);

2
src/decl.c
View File

@@ -262,6 +262,8 @@ const struct instance_globals g_init = {
0, /* doorindex */
NULL, /* save_cm */
0, /* done_money */
0L, /* domove_attempting */
0L, /* domove_succeeded */
NULL, /* nomovemsg */
DUMMY, /* plname */
DUMMY, /* pl_character */

12
src/hack.c
View File

@@ -1332,12 +1332,12 @@ domove()
{
int ux1 = u.ux, uy1 = u.uy;
g.context.domove_succeeded = 0L;
g.domove_succeeded = 0L;
domove_core();
/* g.context.domove_succeeded is available to make assessments now */
if ((g.context.domove_succeeded & (DOMOVE_RUSH | DOMOVE_WALK)) != 0)
/* g.domove_succeeded is available to make assessments now */
if ((g.domove_succeeded & (DOMOVE_RUSH | DOMOVE_WALK)) != 0)
maybe_smudge_engr(ux1, uy1, u.ux, u.uy);
g.context.domove_attempting = 0L;
g.domove_attempting = 0L;
}
void
@@ -1872,8 +1872,8 @@ domove_core()
if (u.ux0 != u.ux || u.uy0 != u.uy) {
/* let caller know so that an evaluation may take place */
g.context.domove_succeeded |=
(g.context.domove_attempting & (DOMOVE_RUSH | DOMOVE_WALK));
g.domove_succeeded |=
(g.domove_attempting & (DOMOVE_RUSH | DOMOVE_WALK));
u.umoved = TRUE;
/* Clean old position -- vision_recalc() will print our new one. */
newsym(u.ux0, u.uy0);