X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=a112d57e86d38f1408dbb6a0bdd25e0a45aa10f7;hb=ca87afb87619efbaa94fe045670bc916e9ffe3ec;hp=6f17d9b5405e2b3181409df709da5e001948563d;hpb=45f6f7e592a1e99a5dfa301e2ab8a52b39a4fd8a;p=xboard.git

diff --git a/backend.c b/backend.c
index 6f17d9b..a112d57 100644
--- a/backend.c
+++ b/backend.c
@@ -1549,6 +1549,10 @@ StringToVariant(e)
         while( *e++ != '_');
     }
 
+    if(StrCaseStr(e, "misc/")) { // [HGM] on FICS, misc/shogi is not shogi
+	v = VariantNormal;
+	found = TRUE;
+    } else
     for (i=0; i<sizeof(variantNames)/sizeof(char*); i++) {
       if (StrCaseStr(e, variantNames[i])) {
 	v = (VariantClass) i;
@@ -2080,7 +2084,7 @@ read_from_ics(isr, closure, data, count, error)
 	for (i = 0; i < count; i++) {
 	    if (data[i] != NULLCHAR && data[i] != '\r')
 	      buf[buf_len++] = data[i];
-	    if(buf_len >= 5 && buf[buf_len-5]=='\n' && buf[buf_len-4]=='\\' && 
+	    if(!appData.noJoin && buf_len >= 5 && buf[buf_len-5]=='\n' && buf[buf_len-4]=='\\' && 
                                buf[buf_len-3]==' '  && buf[buf_len-2]==' '  && buf[buf_len-1]==' ') {
 		buf_len -= 5; // [HGM] ICS: join continuation line of Lasker 2.2.3 server with previous
 		if(buf_len == 0 || buf[buf_len-1] != ' ')
@@ -2214,8 +2218,8 @@ read_from_ics(isr, closure, data, count, error)
 		  sprintf(str,
 			  "/set-quietly interface %s\n/set-quietly style 12\n",
 			  programVersion);
-		  strcat(str, "/set-quietly wrap 0\n");
-
+          if (!appData.noJoin)
+              strcat(str, "/set-quietly wrap 0\n");
 		} else if (ics_type == ICS_CHESSNET) {
 		  sprintf(str, "/style 12\n");
 		} else {
@@ -2225,7 +2229,8 @@ read_from_ics(isr, closure, data, count, error)
 #ifdef WIN32
 		  strcat(str, "$iset nohighlight 1\n");
 #endif
-		  strcat(str, "$iset nowrap 1\n");
+          if (!appData.noJoin)
+              strcat(str, "$iset nowrap 1\n");
 		  strcat(str, "$iset lock 1\n$style 12\n");
 		}
 		SendToICS(str);
@@ -13494,6 +13499,14 @@ PositionToFEN(move, overrideCastling)
 	} else {
 	    *p++ = '-';
 	}
+    } else if(move == backwardMostMove) {
+	// [HGM] perhaps we should always do it like this, and forget the above?
+	if(epStatus[move] >= 0) {
+	    *p++ = epStatus[move] + AAA;
+	    *p++ = whiteToPlay ? '6'+BOARD_HEIGHT-8 : '3';
+	} else {
+	    *p++ = '-';
+	}
     } else {
 	*p++ = '-';
     }