From 6df3ef28ba8db77bd78e41b5d03a5502c6ae5a60 Mon Sep 17 00:00:00 2001
From: William McBrine <wmcbrine@gmail.com>
Date: Sat, 24 Nov 2018 14:00:36 -0500
Subject: [PATCH] pdc_fthick now needed for narrow (bitmapped) SDL -- currently
 always 1.

---
 sdl1/pdcscrn.c | 4 ++--
 sdl1/pdcsdl.h  | 2 --
 sdl2/pdcscrn.c | 4 ++--
 sdl2/pdcsdl.h  | 2 --
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/sdl1/pdcscrn.c b/sdl1/pdcscrn.c
index 7418ee4a..41377efe 100644
--- a/sdl1/pdcscrn.c
+++ b/sdl1/pdcscrn.c
@@ -14,7 +14,6 @@
 # endif
 TTF_Font *pdc_ttffont = NULL;
 int pdc_font_size = 17;
-int pdc_fthick;
 #endif
 
 SDL_Surface *pdc_screen = NULL, *pdc_font = NULL, *pdc_icon = NULL,
@@ -23,7 +22,7 @@ int pdc_sheight = 0, pdc_swidth = 0, pdc_yoffset = 0, pdc_xoffset = 0;
 
 SDL_Color pdc_color[256];
 Uint32 pdc_mapped[256];
-int pdc_fheight, pdc_fwidth, pdc_flastc;
+int pdc_fheight, pdc_fwidth, pdc_fthick, pdc_flastc;
 bool pdc_own_screen;
 
 static int max_height, max_width;
@@ -223,6 +222,7 @@ int PDC_scr_open(int argc, char **argv)
 #else
     pdc_fheight = pdc_font->h / 8;
     pdc_fwidth = pdc_font->w / 32;
+    pdc_fthick = 1;
 
     if (!SP->mono)
         pdc_flastc = pdc_font->format->palette->ncolors - 1;
diff --git a/sdl1/pdcsdl.h b/sdl1/pdcsdl.h
index 28ef1cc7..6c91e0c8 100644
--- a/sdl1/pdcsdl.h
+++ b/sdl1/pdcsdl.h
@@ -20,10 +20,8 @@ extern SDL_Color pdc_color[256];     /* colors for font palette */
 extern Uint32 pdc_mapped[256];       /* colors for FillRect(), as
                                         used in _highlight() */
 extern int pdc_fheight, pdc_fwidth;  /* font height and width */
-#ifdef PDC_WIDE
 extern int pdc_fthick;               /* thickness for highlights and
                                         rendered ACS glyphs */
-#endif
 extern int pdc_flastc;               /* font palette's last color
                                         (treated as the foreground) */
 extern bool pdc_own_screen;          /* if pdc_screen was not set
diff --git a/sdl2/pdcscrn.c b/sdl2/pdcscrn.c
index 85e3d392..b3f9b471 100644
--- a/sdl2/pdcscrn.c
+++ b/sdl2/pdcscrn.c
@@ -25,7 +25,6 @@ int pdc_font_size =
 # else
  17;
 # endif
-int pdc_fthick;
 #endif
 
 SDL_Window *pdc_window = NULL;
@@ -35,7 +34,7 @@ int pdc_sheight = 0, pdc_swidth = 0, pdc_yoffset = 0, pdc_xoffset = 0;
 
 SDL_Color pdc_color[256];
 Uint32 pdc_mapped[256];
-int pdc_fheight, pdc_fwidth, pdc_flastc;
+int pdc_fheight, pdc_fwidth, pdc_fthick, pdc_flastc;
 bool pdc_own_window;
 
 /* COLOR_PAIR to attribute encoding table. */
@@ -233,6 +232,7 @@ int PDC_scr_open(int argc, char **argv)
 #else
     pdc_fheight = pdc_font->h / 8;
     pdc_fwidth = pdc_font->w / 32;
+    pdc_fthick = 1;
 
     if (!SP->mono)
         pdc_flastc = pdc_font->format->palette->ncolors - 1;
diff --git a/sdl2/pdcsdl.h b/sdl2/pdcsdl.h
index 2c815f0f..230e2932 100644
--- a/sdl2/pdcsdl.h
+++ b/sdl2/pdcsdl.h
@@ -21,10 +21,8 @@ extern SDL_Color pdc_color[256];     /* colors for font palette */
 extern Uint32 pdc_mapped[256];       /* colors for FillRect(), as
                                         used in _highlight() */
 extern int pdc_fheight, pdc_fwidth;  /* font height and width */
-#ifdef PDC_WIDE
 extern int pdc_fthick;               /* thickness for highlights and
                                         rendered ACS glyphs */
-#endif
 extern int pdc_flastc;               /* font palette's last color
                                         (treated as the foreground) */
 extern bool pdc_own_window;          /* if pdc_window was not set