X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xboard.c;h=e711f35720ae637b59a1786eb84c804a5b5fdb1a;hb=bc851d844a0a2607e385baa9cf707a4ad4aaff55;hp=489ef649df1d998413e7993eefe35a4aca109c85;hpb=f8687cd1d6737cb79cd31fc6c6d92971e499792d;p=xboard.git

diff --git a/xboard.c b/xboard.c
index 489ef64..e711f35 100644
--- a/xboard.c
+++ b/xboard.c
@@ -2600,6 +2600,10 @@ XBoard square size (hint): %d\n\
     if (forceMono) {
       fprintf(stderr, _("%s: too few colors available; trying monochrome mode\n"),
 	      programName);
+      
+      if (appData.bitmapDirectory == NULL ||
+	      appData.bitmapDirectory[0] == NULLCHAR)
+	    appData.bitmapDirectory = DEF_BITMAP_DIR;
     }
 
     if (appData.lowTimeWarning && !appData.monoMode) {
@@ -3782,6 +3786,8 @@ void CreateXIMPieces()
     XSynchronize(xDisplay, False); /* Work-around for xlib/xt buffering bug */
 }
 
+char pieceBitmapNames[] = "pnbrqfeacwmohijgdvlsuk";
+
 #if HAVE_LIBXPM
 void CreateXPMPieces()
 {
@@ -3858,7 +3864,7 @@ void CreateXPMPieces()
 	    for (kind=0; kind<4; kind++) {
 	      snprintf(buf, sizeof(buf), "%s/%c%s%u.xpm",
 			ExpandPathName(appData.pixmapDirectory),
-			ToLower(PieceToChar((ChessSquare)piece)),
+			pieceBitmapNames[piece],
 			xpmkind[kind], ss);
 		if (appData.debugMode) {
 		    fprintf(stderr, _("(File:%s:) "), buf);
@@ -3922,7 +3928,7 @@ void CreatePieces()
 
     for (kind = SOLID; kind <= (appData.monoMode ? OUTLINE : SOLID); kind++) {
 	for (piece = (int) WhitePawn; piece <= (int) WhiteKing; piece++) {
-	    sprintf(buf, "%c%u%c.bm", ToLower(PieceToChar((ChessSquare)piece)),
+	    sprintf(buf, "%c%u%c.bm", pieceBitmapNames[piece],
 		    ss, kind == SOLID ? 's' : 'o');
 	    ReadBitmap(&pieceBitmap[kind][piece], buf, NULL, ss, ss);
 	}
@@ -3947,7 +3953,7 @@ void CreatePieces()
 
     for (kind = SOLID; kind <= (appData.monoMode ? OUTLINE : SOLID); kind++) {
 	for (piece = (int) WhitePawn; piece <= (int) WhiteKing; piece++) {
-	    sprintf(buf, "%c%u%c.bm", ToLower(PieceToChar((ChessSquare)piece)),
+	    sprintf(buf, "%c%u%c.bm", pieceBitmapNames[piece],
 		    ss, kind == SOLID ? 's' : 'o');
 	    ReadBitmap(&pieceBitmap[kind][piece], buf,
 		       bib->bits[kind][piece], ss, ss);
@@ -3976,6 +3982,7 @@ void ReadBitmap(pm, name, bits, wreq, hreq)
 	strcat(fullname, name);
 	errcode = XReadBitmapFile(xDisplay, xBoardWindow, fullname,
 				  &w, &h, pm, &x_hot, &y_hot);
+    fprintf(stderr, "load %s\n", name);
 	if (errcode != BitmapSuccess) {
 	    switch (errcode) {
 	      case BitmapOpenFailed:
@@ -7570,7 +7577,7 @@ void DisplayError(message, error)
 	    fprintf(stderr, "%s: %s: %s\n",
 		    programName, message, strerror(error));
 	}
-	snprintf(buf,sizeof(buf), "%s: %s", message, strerror(error));
+	snprintf(buf, sizeof(buf), "%s: %s", message, strerror(error));
 	message = buf;
     }
     ErrorPopUp(_("Error"), message, FALSE);