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-02-04 18:37:38 -05:00
parent 420629ac3d f1c91dbd75
commit 560ffd711a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/do_name.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 do_name.c $NHDT-Date: 1546987367 2019/01/08 22:42:47 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.140 $ */ /* NetHack 3.6 do_name.c $NHDT-Date: 1549321230 2019/02/04 23:00:30 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.143 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Pasi Kallinen, 2018. */ /*-Copyright (c) Pasi Kallinen, 2018. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -379,7 +379,7 @@ int x, y, gloc;
|| IS_UNEXPLORED_LOC(x, y - 1))); || IS_UNEXPLORED_LOC(x, y - 1)));
case GLOC_VALID: case GLOC_VALID:
if (getpos_getvalid) if (getpos_getvalid)
return (getpos_getvalid(x,y)); return (*getpos_getvalid)(x,y);
/*FALLTHRU*/ /*FALLTHRU*/
case GLOC_INTERESTING: case GLOC_INTERESTING:
return gather_locs_interesting(x,y, GLOC_DOOR) return gather_locs_interesting(x,y, GLOC_DOOR)
@@ -548,7 +548,7 @@ int cx, cy;
custompline(SUPPRESS_HISTORY, custompline(SUPPRESS_HISTORY,
"%s%s%s%s%s", firstmatch, *tmpbuf ? " " : "", tmpbuf, "%s%s%s%s%s", firstmatch, *tmpbuf ? " " : "", tmpbuf,
(iflags.autodescribe (iflags.autodescribe
&& getpos_getvalid && !getpos_getvalid(cx, cy)) && getpos_getvalid && !(*getpos_getvalid)(cx, cy))
? " (illegal)" : "", ? " (illegal)" : "",
(iflags.getloc_travelmode && !is_valid_travelpt(cx, cy)) (iflags.getloc_travelmode && !is_valid_travelpt(cx, cy))
? " (no travel path)" : ""); ? " (no travel path)" : "");

2
sys/amiga/winstr.c
View File

@@ -186,7 +186,7 @@ const char *str;
if (cw->data[cw->cury] == NULL) if (cw->data[cw->cury] == NULL)
panic("NULL pointer for status window"); panic("NULL pointer for status window");
ob = &cw->data[cw->cury][j = cw->curx]; ob = &cw->data[cw->cury][j = cw->curx];
if (flags.botlx) if (context.botlx)
*ob = 0; *ob = 0;
/* Display when beam at top to avoid flicker... */ /* Display when beam at top to avoid flicker... */