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-04-02 12:25:16 -04:00
parent 680008c79d d11d91a072
commit abfd80d3d7
33 changed files with 1126 additions and 660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sys/amiga/winfuncs.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 winfuncs.c $NHDT-Date: 1433806596 2015/06/08 23:36:36 $ $NHDT-Branch: master $:$NHDT-Revision: 1.15 $ */
/* NetHack 3.6 winfuncs.c $NHDT-Date: 1553895320 2019/03/29 21:35:20 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.16 $ */
/* Copyright (c) Gregg Wonderly, Naperville, Illinois, 1991,1992,1993,1996.
*/
/* NetHack may be freely redistributed. See license for details. */
@@ -2131,13 +2131,13 @@ void
amii_cliparound(x, y)
register int x, y;
{
extern boolean restoring;
#ifdef CLIPPING
int oldx = clipx, oldy = clipy;
int oldxmax = clipxmax, oldymax = clipymax;
int COx, LIx;
#define SCROLLCNT 1 /* Get there in 3 moves... */
int scrollcnt = SCROLLCNT; /* ...or 1 if we changed level */
if (!clipping) /* And 1 in anycase, cleaner, simpler, quicker */
return;
@@ -2306,8 +2306,7 @@ register int x, y;
clipymax += incy;
/* Draw the exposed portion */
if (on_level(&u.uz0, &u.uz) && !restoring)
(void) doredraw();
redraw_map();
flush_glyph_buffer(amii_wins[WIN_MAP]->win);
}
}
@@ -2317,8 +2316,7 @@ register int x, y;
clipymax = saveymax;
clipxmax = savexmax;
#endif
if (on_level(&u.uz0, &u.uz) && !restoring && g.moves > 1)
(void) doredraw();
redraw_map();
flush_glyph_buffer(amii_wins[WIN_MAP]->win);
}
reclip = 0;

9
sys/mac/mttymain.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 mttymain.c $NHDT-Date: 1432512797 2015/05/25 00:13:17 $ $NHDT-Branch: master $:$NHDT-Revision: 1.12 $ */
/* NetHack 3.6 mttymain.c $NHDT-Date: 1554215928 2019/04/02 14:38:48 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.13 $ */
/* Copyright (c) Jon W{tte, 1993 */
/* NetHack may be freely redistributed. See license for details. */
@@ -369,6 +369,13 @@ _mt_set_colors(long *colors)
err = set_tty_attrib(_mt_window, TTY_ATTRIB_BACKGROUND, colors[1]);
}
int
term_attr_fixup(int attrmask)
{
attrmask &= ~ATR_DIM;
return attrmask;
}
void
term_end_attr(int attr)
{

8
sys/msdos/video.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 video.c $NHDT-Date: 1457207042 2016/03/05 19:44:02 $ $NHDT-Branch: chasonr $:$NHDT-Revision: 1.11 $ */
/* NetHack 3.6 video.c $NHDT-Date: 1554215931 2019/04/02 14:38:51 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.12 $ */
/* Copyright (c) NetHack PC Development Team 1993, 1994, 2001 */
/* NetHack may be freely redistributed. See license for details. */
/* */
@@ -285,6 +285,12 @@ standoutend()
g_attribute = iflags.grmode ? attrib_gr_normal : attrib_text_normal;
}
int
term_attr_fixup(int attrmask)
{
return attrmask;
}
void
term_end_attr(int attr)
{

8
sys/winnt/nttty.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 nttty.c $NHDT-Date: 1524931557 2018/04/28 16:05:57 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.71 $ */
/* NetHack 3.6 nttty.c $NHDT-Date: 1554215932 2019/04/02 14:38:52 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.99 $ */
/* Copyright (c) NetHack PC Development Team 1993 */
/* NetHack may be freely redistributed. See license for details. */
@@ -802,6 +802,12 @@ has_color(int color)
return 0;
}
int
term_attr_fixup(int attrmask)
{
return attrmask;
}
void
term_start_attr(int attrib)
{