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

Modify the window interface for print_glyph

Browse Source 
Changes to be committed:
	modified:   doc/window.doc
	modified:   include/qt_win.h
	modified:   include/trampoli.h
	modified:   include/winX.h
	modified:   include/wingem.h
	modified:   include/winprocs.h
	modified:   include/wintty.h
	modified:   src/display.c
	modified:   src/windows.c
	modified:   sys/amiga/winami.p
	modified:   sys/amiga/winfuncs.c
	modified:   sys/amiga/winproto.h
	modified:   sys/wince/mswproc.c
	modified:   sys/wince/winMS.h
	modified:   win/Qt/qt_win.cpp
	modified:   win/X11/winmap.c
	modified:   win/chain/wc_chainin.c
	modified:   win/chain/wc_chainout.c
	modified:   win/chain/wc_trace.c
	modified:   win/gem/wingem.c
	modified:   win/gem/wingem1.c
	modified:   win/gnome/gnbind.c
	modified:   win/tty/wintty.c
	modified:   win/win32/mswproc.c
	modified:   win/win32/winMS.h

print_glyph now takes a second parameter.

Tiles on tiled ports always looked odd on places like the plane of air
where the background color of the tile didn't match the general background
of the surrounding area.

3.6 made that even worse and more glaringly noticeable with the introduction
of darkened room tiles.

The code to actually send something useful through the new parameter
for window ports to take advantage if they want will follow.
This commit is contained in:
nhmall
2015-06-08 19:37:26 -04:00
parent 9070d129de
commit c3a77914a9
25 changed files with 84 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
win/gem/wingem.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 wingem.c $NHDT-Date: 1432512810 2015/05/25 00:13:30 $ $NHDT-Branch: master $:$NHDT-Revision: 1.24 $ */
/* NetHack 3.6 wingem.c $NHDT-Date: 1433806613 2015/06/08 23:36:53 $ $NHDT-Branch: master $:$NHDT-Revision: 1.25 $ */
/* Copyright (c) Christian Bressler, 1999 */
/* NetHack may be freely redistributed. See license for details. */
@@ -899,10 +899,10 @@ extern int mar_set_rogue(int);
extern void mar_add_pet_sign(winid, int, int);
void
Gem_print_glyph(window, x, y, glyph)
Gem_print_glyph(window, x, y, glyph, bkglyph)
winid window;
xchar x, y;
int glyph;
int glyph, bkglyph;
{
/* Move the cursor. */
Gem_curs(window, x, y);
@@ -911,7 +911,7 @@ int glyph;
x--; /* MAR -- because x ranges from 1 to COLNO */
if (mar_set_tile_mode(-1)) {
mar_print_glyph(window, x, y, glyph2tile[glyph]);
mar_print_glyph(window, x, y, glyph2tile[glyph], glyph2tile[bkglyph]);
if (
#ifdef TEXTCOLOR
iflags.hilite_pet &&

6
win/gem/wingem1.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 wingem1.c $NHDT-Date: 1432512809 2015/05/25 00:13:29 $ $NHDT-Branch: master $:$NHDT-Revision: 1.12 $ */
/* NetHack 3.6 wingem1.c $NHDT-Date: 1433806613 2015/06/08 23:36:53 $ $NHDT-Branch: master $:$NHDT-Revision: 1.13 $ */
/* Copyright (c) Christian Bressler 1999 */
/* NetHack may be freely redistributed. See license for details. */
@@ -2918,9 +2918,9 @@ int x, y;
}
void
mar_print_glyph(window, x, y, gl)
mar_print_glyph(window, x, y, gl, bkgl)
winid window;
int x, y, gl;
int x, y, gl, bkgl;
{
if (window != WIN_ERR && window == WIN_MAP) {
static int pla[8];