Refactor: USE_TRANSPARENCY compile-time flag always set

1 files changed, 0 insertions, 30 deletions

diff --git a/src/main-x11.c b/src/main-x11.c
index 4f03b396..e32e2617 100644
--- a/src/main-x11.c
+++ b/src/main-x11.c
@@ -1547,15 +1547,11 @@ struct term_data
 
 	XImage *tiles;
 
-#ifdef USE_TRANSPARENCY
-
 	/* Tempory storage for overlaying tiles. */
 	XImage *TmpImage;
 
 #endif
 
-#endif
-
 };
 
 
@@ -2563,20 +2559,14 @@ static errr Term_text_x11(int x, int y, int n, byte a, cptr s)
 /*
  * Draw some graphical characters.
  */
-# ifdef USE_TRANSPARENCY
 static errr Term_pict_x11(int x, int y, int n, const byte *ap, const char *cp,
                           const byte *tap, const char *tcp, const byte *eap, const char *ecp)
-# else /* USE_TRANSPARENCY */
-static errr Term_pict_x11(int x, int y, int n, const byte *ap, const char *cp)
-# endif  /* USE_TRANSPARENCY */
 {
 	int i, x1, y1;
 
 	byte a;
 	char c;
 
-
-#ifdef USE_TRANSPARENCY
 	byte ta;
 	char tc;
 	int x2, y2;
@@ -2589,7 +2579,6 @@ static errr Term_pict_x11(int x, int y, int n, const byte *ap, const char *cp)
 	int k, l;
 
 	unsigned long pixel, blank;
-#endif /* USE_TRANSPARENCY */
 
 	term_data *td = (term_data*)(Term->data);
 
@@ -2609,8 +2598,6 @@ static errr Term_pict_x11(int x, int y, int n, const byte *ap, const char *cp)
 		x1 = (c & 0x7F) * td->fnt->twid;
 		y1 = (a & 0x7F) * td->fnt->hgt;
 
-#ifdef USE_TRANSPARENCY
-
 		ta = *tap++;
 		tc = *tcp++;
 
@@ -2720,17 +2707,6 @@ static errr Term_pict_x11(int x, int y, int n, const byte *ap, const char *cp)
 			          td->fnt->twid, td->fnt->hgt);
 		}
 
-#else /* USE_TRANSPARENCY */
-
-/* Draw object / terrain */
-		XPutImage(Metadpy->dpy, td->win->win,
-		          clr[0]->gc,
-		          td->tiles,
-		          x1, y1,
-		          x, y,
-		          td->fnt->twid, td->fnt->hgt);
-
-#endif /* USE_TRANSPARENCY */
 		x += td->fnt->wid;
 	}
 
@@ -3017,10 +2993,7 @@ errr init_x11(int argc, char *argv[])
 	int pict_hgt = 0;
 	bool_ force_old_graphics = FALSE;
 
-#ifdef USE_TRANSPARENCY
-
 	char *TmpData;
-#endif /* USE_TRANSPARENCY */
 
 #endif /* USE_GRAPHICS */
 
@@ -3198,7 +3171,6 @@ errr init_x11(int argc, char *argv[])
 			                    td->fnt->twid, td->fnt->hgt);
 		}
 
-#ifdef USE_TRANSPARENCY
 		/* Initialize the transparency masks */
 		for (i = 0; i < num_term; i++)
 		{
@@ -3223,8 +3195,6 @@ errr init_x11(int argc, char *argv[])
 			                            td->fnt->twid, td->fnt->hgt, 8, 0);
 
 		}
-#endif /* USE_TRANSPARENCY */
-
 
 		/* Free tiles_raw? XXX XXX */
 	}