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

Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2

Browse Source
This commit is contained in:
nhmall
2018-12-23 15:35:14 -05:00
parent eb0506fe96 df5dc6050d
commit 99f589b15d
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/fixes36.2
+1
View File
@@ -336,6 +336,7 @@ a config file line with OPTIONS=symset:default, roguesymset:RogueEpyx
meant to have color; that was due to an errant init_symbols() call meant to have color; that was due to an errant init_symbols() call
during the processing of symset:default done after RogueEpyx had during the processing of symset:default done after RogueEpyx had
already been processed already been processed
avoid potential segfault when doing 'more information' lookup
tty: turn off an optimization that is the suspected cause of Windows reported tty: turn off an optimization that is the suspected cause of Windows reported
partial status lines following level changes partial status lines following level changes
tty: ensure that current status fields are always copied to prior status tty: ensure that current status fields are always copied to prior status
src/monmove.c
+5 -3
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 monmove.c $NHDT-Date: 1545525307 2018/12/23 00:35:07 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.110 $ */ /* NetHack 3.6 monmove.c $NHDT-Date: 1545596010 2018/12/23 20:13:30 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.111 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Michael Allison, 2006. */ /*-Copyright (c) Michael Allison, 2006. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -1279,14 +1279,16 @@ register int after;
&& ((levl[nix][niy].doormask & (D_LOCKED | D_CLOSED)) != 0) && ((levl[nix][niy].doormask & (D_LOCKED | D_CLOSED)) != 0)
&& can_fog(mtmp)) { && can_fog(mtmp)) {
if (sawmon) { if (sawmon) {
remove_monster(nix, niy), place_monster(mtmp, omx, omy); remove_monster(nix, niy);
place_monster(mtmp, omx, omy);
newsym(nix, niy), newsym(omx, omy); newsym(nix, niy), newsym(omx, omy);
} }
if (vamp_shift(mtmp, &mons[PM_FOG_CLOUD], sawmon)) { if (vamp_shift(mtmp, &mons[PM_FOG_CLOUD], sawmon)) {
ptr = mtmp->data; /* update cached value */ ptr = mtmp->data; /* update cached value */
} }
if (sawmon) { if (sawmon) {
remove_monster(omx, omy), place_monster(mtmp, nix, niy); remove_monster(omx, omy);
place_monster(mtmp, nix, niy);
newsym(omx, omy), newsym(nix, niy); newsym(omx, omy), newsym(nix, niy);
} }
} }
src/pager.c
+4 -4
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 pager.c $NHDT-Date: 1545361111 2018/12/21 02:58:31 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.143 $ */ /* NetHack 3.6 pager.c $NHDT-Date: 1545595360 2018/12/23 20:02:40 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.144 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2018. */ /*-Copyright (c) Robert Patrick Rankin, 2018. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -646,9 +646,9 @@ char *supplemental_name;
The Eyes of the Overworld" simplified above to "lenses named The Eyes of the Overworld" simplified above to "lenses named
The Eyes of the Overworld", now reduced to "The Eyes of the The Eyes of the Overworld", now reduced to "The Eyes of the
Overworld", skip "The" as with base name processing) */ Overworld", skip "The" as with base name processing) */
if (!strncmpi(alt, "a ", 2) if (alt && (!strncmpi(alt, "a ", 2)
|| !strncmpi(alt, "an ", 3) || !strncmpi(alt, "an ", 3)
|| !strncmpi(alt, "the ", 4)) || !strncmpi(alt, "the ", 4)))
alt = index(alt, ' ') + 1; alt = index(alt, ' ') + 1;
/* remove charges or "(lit)" or wizmode "(N aum)" */ /* remove charges or "(lit)" or wizmode "(N aum)" */
if ((ep = strstri(dbase_str, " (")) != 0 && ep > dbase_str) if ((ep = strstri(dbase_str, " (")) != 0 && ep > dbase_str)