merge branch NetHack-3.6 part 2

This commit is contained in:
nhmall
2019-06-17 15:25:10 -04:00
parent 4fdc78fce1
commit 8562c6839e
2 changed files with 3 additions and 3 deletions

View File

@@ -4559,9 +4559,9 @@ randomkey()
case 10: case 10:
case 11: case 11:
case 12: case 12:
c = Cmd.dirchars[rn2(8)]; c = g.Cmd.dirchars[rn2(8)];
if (!rn2(7)) if (!rn2(7))
c = !Cmd.num_pad ? (!rn2(3) ? C(c) : (c + 'A' - 'a')) : M(c); c = !g.Cmd.num_pad ? (!rn2(3) ? C(c) : (c + 'A' - 'a')) : M(c);
break; break;
case 13: case 13:
c = (char) rn1('9' - '0' + 1, '0'); c = (char) rn1('9' - '0' + 1, '0');

View File

@@ -3979,7 +3979,7 @@ boolean tinitial, tfrom_file;
return FALSE; return FALSE;
} }
} }
if (iflags.debug_fuzzer && !initial) { if (iflags.debug_fuzzer && !g.opt_initial) {
/* don't randomly toggle this/these */ /* don't randomly toggle this/these */
if (boolopt[i].addr == &flags.silent) if (boolopt[i].addr == &flags.silent)
return TRUE; return TRUE;