Index: main-gcu.c
===================================================================
RCS file: /home/rr9/angband/angband/src/main-gcu.c,v
retrieving revision 1.20
diff -u -r1.20 main-gcu.c
--- main-gcu.c	20 Mar 2004 08:25:15 -0000	1.20
+++ main-gcu.c	11 Feb 2006 14:29:33 -0000
@@ -33,11 +33,7 @@
  *
  * This file will attempt to redefine the screen colors to conform to
  * standard Angband colors.  It will only do so if the terminal type
- * indicates that it can do so.  See the page:
- *
- *     http://www.umr.edu/~keldon/ang-patch/ncurses_color.html
- *
- * for information on this.
+ * indicates that it can do so.
  *
  * Consider the use of "savetty()" and "resetty()".  XXX XXX XXX
  */
@@ -819,6 +815,7 @@
 static errr Term_wipe_gcu(int x, int y, int n)
 {
 	term_data *td = (term_data *)(Term->data);
+	char buf[1024];
 
 	/* Place cursor */
 	wmove(td->win, y, x);
@@ -832,7 +829,11 @@
 	/* Clear some characters */
 	else
 	{
-		while (n-- > 0) waddch(td->win, ' ');
+		/* Format a buffer */
+		strnfmt(buf, sizeof(buf), "%*c", n, ' ');
+
+		/* Output */
+		waddstr(td->win, buf);
 	}
 
 	/* Success */
@@ -846,8 +847,7 @@
 static errr Term_text_gcu(int x, int y, int n, byte a, cptr s)
 {
 	term_data *td = (term_data *)(Term->data);
-
-	int i;
+	char buf[1024];
 
 #ifdef A_COLOR
 	/* Set the color */
@@ -857,50 +857,16 @@
 	/* Move the cursor */
 	wmove(td->win, y, x);
 
-	/* Draw each character */
-	for (i = 0; i < n; i++)
-	{
-#ifdef USE_GRAPHICS
-		int pic;
+	/* Format to appropriate size */
+	strnfmt(buf, sizeof buf, "%.*s", n, s);
 
-		/* Special character */
-		if (use_graphics && (s[i] & 0x80))
-		{
-			/* Determine picture to use */
-			switch (s[i] & 0x7F)
-			{
+	/* Write to screen */
+	waddstr(td->win, buf);
 
-#ifdef ACS_CKBOARD
-				/* Wall */
-				case '#':
-					pic = ACS_CKBOARD;
-					break;
-#endif /* ACS_CKBOARD */
-
-#ifdef ACS_BOARD
-				/* Mineral vein */
-				case '%':
-					pic = ACS_BOARD;
-					break;
-#endif /* ACS_BOARD */
-
-				/* XXX */
-				default:
-					pic = '?';
-					break;
-			}
-
-			/* Draw the picture */
-			waddch(td->win, pic);
-
-			/* Next character */
-			continue;
-		}
-#endif /* USE_GRAPHICS */
-
-		/* Draw a normal character */
-		waddch(td->win, (byte)s[i]);
-	}
+#ifdef A_COLOR
+	/* Unset the color */
+	if (can_use_color) wattrset(td->win, 0);
+#endif
 
 	/* Success */
 	return (0);
@@ -1014,17 +980,6 @@
 	}
 
 
-#ifdef USE_GRAPHICS
-
-	/* Set graphics */
-	if (arg_graphics)
-	{
-		use_graphics = GRAPHICS_PSEUDO;
-		ANGBAND_GRAF = "pseudo";
-	}
-
-#endif /* USE_GRAPHICS */
-
 #ifdef A_COLOR
 
 	/*** Init the Color-pairs and set up a translation table ***/