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

X11 ant extermination

Browse Source 
The X11 tiled map was being initialized to the tile for giant ant.
Visible during the role/race/&c selection dialog and if you get the
"already a game in progress under your name; destroy it?" prompt.
This commit is contained in:
PatR
2022-01-27 16:10:11 -08:00
parent b50d78231c
commit ea811e7087
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/X11/winmap.c
+22 -7
View File
@@ -1,4 +1,4 @@
/* NetHack 3.7 winmap.c $NHDT-Date: 1596498372 2020/08/03 23:46:12 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.38 $ */ /* NetHack 3.7 winmap.c $NHDT-Date: 1643328598 2022/01/28 00:09:58 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.49 $ */
/* Copyright (c) Dean Luick, 1992 */ /* Copyright (c) Dean Luick, 1992 */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -71,8 +71,11 @@ static void display_cursor(struct xwindow *);
/* Global functions ======================================================= */ /* Global functions ======================================================= */
void void
X11_print_glyph(winid window, xchar x, xchar y, const glyph_info *glyphinfo, X11_print_glyph(
const glyph_info *bkglyphinfo UNUSED) winid window,
xchar x, xchar y,
const glyph_info *glyphinfo,
const glyph_info *bkglyphinfo UNUSED)
{ {
struct map_info_t *map_info; struct map_info_t *map_info;
boolean update_bbox = FALSE; boolean update_bbox = FALSE;
@@ -193,7 +196,10 @@ static struct tile_annotation pet_annotation;
static struct tile_annotation pile_annotation; static struct tile_annotation pile_annotation;
static void static void
init_annotation(struct tile_annotation *annotation, char *filename, Pixel colorpixel) init_annotation(
struct tile_annotation *annotation,
char *filename,
Pixel colorpixel)
{ {
Display *dpy = XtDisplay(toplevel); Display *dpy = XtDisplay(toplevel);
@@ -921,6 +927,8 @@ static void
map_all_unexplored(struct map_info_t *map_info) /* [was map_all_stone()] */ map_all_unexplored(struct map_info_t *map_info) /* [was map_all_stone()] */
{ {
int x, y; int x, y;
glyph_info gi;
short unexp_idx, nothg_idx;
/* unsigned short g_stone = cmap_to_glyph(S_stone); */ /* unsigned short g_stone = cmap_to_glyph(S_stone); */
unsigned short g_unexp = GLYPH_UNEXPLORED, g_nothg = GLYPH_NOTHING; unsigned short g_unexp = GLYPH_UNEXPLORED, g_nothg = GLYPH_NOTHING;
int mgunexp = ' ', mgnothg = ' '; int mgunexp = ' ', mgnothg = ' ';
@@ -930,6 +938,11 @@ map_all_unexplored(struct map_info_t *map_info) /* [was map_all_stone()] */
mgunexp = glyph2ttychar(GLYPH_UNEXPLORED); mgunexp = glyph2ttychar(GLYPH_UNEXPLORED);
mgnothg = glyph2ttychar(GLYPH_NOTHING); mgnothg = glyph2ttychar(GLYPH_NOTHING);
map_glyphinfo(0, 0, g_unexp, 0, &gi);
unexp_idx = gi.gm.tileidx;
map_glyphinfo(0, 0, g_nothg, 0, &gi);
nothg_idx = gi.gm.tileidx;
/* /*
* Tiles map tracks glyphs. * Tiles map tracks glyphs.
* Text map tracks characters derived from glyphs. * Text map tracks characters derived from glyphs.
@@ -938,6 +951,7 @@ map_all_unexplored(struct map_info_t *map_info) /* [was map_all_stone()] */
for (y = 0; y < ROWNO; y++) { for (y = 0; y < ROWNO; y++) {
tile_map->glyphs[y][x].glyph = !x ? g_nothg : g_unexp; tile_map->glyphs[y][x].glyph = !x ? g_nothg : g_unexp;
tile_map->glyphs[y][x].glyphflags = 0; tile_map->glyphs[y][x].glyphflags = 0;
tile_map->glyphs[y][x].tileidx = !x ? nothg_idx : unexp_idx;
text_map->text[y][x] = (uchar) (!x ? mgnothg : mgunexp); text_map->text[y][x] = (uchar) (!x ? mgnothg : mgunexp);
#ifdef TEXTCOLOR #ifdef TEXTCOLOR
@@ -1459,9 +1473,10 @@ static char map_translations[] = "#override\n\
* The map window creation routine. * The map window creation routine.
*/ */
void void
create_map_window(struct xwindow *wp, create_map_window(
boolean create_popup, /* parent is a popup shell that we create */ struct xwindow *wp,
Widget parent) boolean create_popup, /* True: parent is a popup shell that we create */
Widget parent)
{ {
struct map_info_t *map_info; /* map info pointer */ struct map_info_t *map_info; /* map info pointer */
Widget map, viewport; Widget map, viewport;