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

tty: panning while clipped

Browse Source 
Noticed while testing statuslines on a small terminal window.  Using
the cursor to pick locations that panned the map to view a new subset
would end up showing a new view of the regular map rather than a
different section of what was currently displayed.  For farlook that
caused monsters to take on new hallucinatory forms which was fairly
inconsequential, but for #terrain and various forms of detection it
reverted to the ordinary map instead of showing the map features that
the player requested or the temporarily revealed monsters and such.

Most interfaces keep track of the whole map and just show their view
of the new subset when panning, similar to redisplay after being
covered up and then re-exposed, but tty isn't doing that.  I made
same change to Amiga as to tty since the code it was using was very
similar.  I haven't touched any of the other interfaces and assume
that they don't need this.  I've verified that curses and X11 don't.
This commit is contained in:
PatR
2019-03-29 14:35:36 -07:00
parent 25a456bb2a
commit 14d8ed199e
5 changed files with 58 additions and 26 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 && moves > 1)
(void) doredraw();
redraw_map();
flush_glyph_buffer(amii_wins[WIN_MAP]->win);
}
reclip = 0;