add missing "#ifdef X11LARGETILE"

[jnethack/source.git] / win / X11 / winmap.c

diff --git a/win/X11/winmap.c b/win/X11/winmap.c
index 7250ef7..d732027 100644 (file)
--- a/win/X11/winmap.c
+++ b/win/X11/winmap.c
@@ -120,7 +120,7 @@ int bkglyph UNUSED;
 #endif
 
         /* map glyph to character and color */
-        (void) mapglyph(glyph, &och, &color, &special, x, y);
+        (void) mapglyph(glyph, &och, &color, &special, x, y, 0);
         ch = (uchar) och;
 
         if (special != map_info->tile_map.glyphs[y][x].special) {
@@ -247,7 +247,7 @@ void
 post_process_tiles()
 {
     Display *dpy = XtDisplay(toplevel);
-#if 0 /*JP*/
+#ifndef X11LARGETILE
     unsigned int width, height;
 
     if (tile_image == 0)
@@ -309,7 +309,7 @@ post_process_tiles()
       XpmFreeXpmImage(&tile_image);
     }
 # endif
-#endif /*JP*/
+#endif
 
     init_annotation(&pet_annotation, appResources.pet_mark_bitmap,
                     appResources.pet_mark_color);
@@ -369,7 +369,7 @@ struct xwindow *wp;
     attributes.valuemask = XpmCloseness;
     attributes.closeness = 25000;
 
-# if 0 /*JP*/
+# ifndef X11LARGETILE
     errorcode = XpmReadFileToImage(dpy, appResources.tile_file, &tile_image,
                                    0, &attributes);
 # else
@@ -377,7 +377,7 @@ struct xwindow *wp;
                     NULL);
 # endif
 
-# if 0 /*JP*/
+# ifndef X11LARGETILE
     if (errorcode == XpmColorFailed) {
         Sprintf(buf, "Insufficient colors available to load %s.",
                 appResources.tile_file);
@@ -1130,6 +1130,9 @@ Cardinal *num_params;
 
     switch (event->type) {
     case ButtonPress:
+        if (!iflags.wc_mouse_support)
+            return;
+
         button = (XButtonEvent *) event;
 #ifdef VERBOSE_INPUT
         printf("button press\n");