Merge branch 'NetHack-3.6.0'
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
/* NetHack 3.6 display.c $NHDT-Date: 1496101037 2017/05/29 23:37:17 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.87 $ */
|
||||
/* NetHack 3.6 display.c $NHDT-Date: 1524780381 2018/04/26 22:06:21 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.90 $ */
|
||||
/* Copyright (c) Dean Luick, with acknowledgements to Kevin Darcy */
|
||||
/* and Dave Cohrs, 1990. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
@@ -496,6 +496,13 @@ register struct monst *mon;
|
||||
impossible("display_warning did not match warning type?");
|
||||
return;
|
||||
}
|
||||
/* warning glyph is drawn on the monster layer; unseen
|
||||
monster glyph is drawn on the object/trap/floor layer;
|
||||
if we see a 'warning' move onto 'remembered, unseen' we
|
||||
need to explicitly remove that in order for it to not
|
||||
reappear when the warned-of monster moves off that spot */
|
||||
if (glyph_is_invisible(levl[x][y].glyph))
|
||||
unmap_object(x, y);
|
||||
show_glyph(x, y, glyph);
|
||||
}
|
||||
|
||||
|
||||
16
src/files.c
16
src/files.c
@@ -665,13 +665,17 @@ int lev, oflag;
|
||||
void
|
||||
really_close()
|
||||
{
|
||||
int fd = lftrack.fd;
|
||||
int fd;
|
||||
|
||||
if (lftrack.init) {
|
||||
fd = lftrack.fd;
|
||||
|
||||
lftrack.nethack_thinks_it_is_open = FALSE;
|
||||
lftrack.fd = -1;
|
||||
lftrack.oflag = 0;
|
||||
if (fd != -1)
|
||||
(void) close(fd);
|
||||
lftrack.nethack_thinks_it_is_open = FALSE;
|
||||
lftrack.fd = -1;
|
||||
lftrack.oflag = 0;
|
||||
if (fd != -1)
|
||||
(void) close(fd);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user