X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwoptions.c;h=93dde9ef2e7438580192b4938ca23db4d4fdfaae;hb=a8aa209e5f4ae95e54ebe54d6cf23fccfe75d1a8;hp=2913b685a81bd4f18a7356ba742835d2041900e2;hpb=e80c98c04e951e5026a24531cd6316be962636b9;p=xboard.git

diff --git a/winboard/woptions.c b/winboard/woptions.c
index 2913b68..93dde9e 100644
--- a/winboard/woptions.c
+++ b/winboard/woptions.c
@@ -187,6 +187,7 @@ GeneralOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     CHECK_BOX(OPT_ExtraInfoInMoveHistory, appData.showEvalInMoveHistory);
     CHECK_BOX(OPT_HighlightMoveArrow, appData.highlightMoveWithArrow);
     CHECK_BOX(OPT_AutoLogo, appData.autoLogo); // [HGM] logo
+    CHECK_BOX(OPT_SmartMove, appData.oneClick); // [HGM] one-click
 
 #undef CHECK_BOX
 
@@ -235,6 +236,7 @@ GeneralOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       appData.testLegality         = IS_CHECKED(OPT_TestLegality);
       appData.highlightMoveWithArrow=IS_CHECKED(OPT_HighlightMoveArrow);
       appData.autoLogo             =IS_CHECKED(OPT_AutoLogo); // [HGM] logo
+      appData.oneClick             =IS_CHECKED(OPT_SmartMove); // [HGM] one-click
 
 #undef IS_CHECKED
 
@@ -784,9 +786,10 @@ VariantWhichRadio(HWND hDlg)
          (IsDlgButtonChecked(hDlg, OPT_Variant3Check) ? Variant3Check :
          (IsDlgButtonChecked(hDlg, OPT_VariantGreat) ? VariantGreat :
          (IsDlgButtonChecked(hDlg, OPT_VariantGiveaway) ? VariantGiveaway :
-         (IsDlgButtonChecked(hDlg, OPT_VariantTwilight) ? VariantTwilight :
+         (IsDlgButtonChecked(hDlg, OPT_VariantTwilight) ? VariantSpartan :
          (IsDlgButtonChecked(hDlg, OPT_VariantMakruk) ? VariantMakruk :
-          VariantNormal )))))))))))))))))))))))))))));
+         (IsDlgButtonChecked(hDlg, OPT_VariantSChess) ? VariantSChess :
+          VariantNormal ))))))))))))))))))))))))))))));
 }
 
 LRESULT CALLBACK
@@ -883,12 +886,15 @@ NewVariantDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     case VariantGiveaway:
       CheckDlgButton(hDlg, OPT_VariantGiveaway, TRUE);
       break;
-    case VariantTwilight:
+    case VariantSpartan:
       CheckDlgButton(hDlg, OPT_VariantTwilight, TRUE);
       break;
     case VariantMakruk:
       CheckDlgButton(hDlg, OPT_VariantMakruk, TRUE);
       break;
+    case VariantSChess:
+      CheckDlgButton(hDlg, OPT_VariantSChess, TRUE);
+      break;
     default: ;
     }
 
@@ -925,7 +931,7 @@ NewVariantDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 	  return TRUE; /* treat as _("Cancel") if first engine does not support it */
 	} else
 	if (second.initDone && second.protocolVersion > 1 && StrStr(second.variants, name) == NULL) {
-	  snprintf(buf, MSG_SIZ, r_("Warning: second engine (%s) does not support this!"), second.tidy);
+	  snprintf(buf, MSG_SIZ, _("Warning: second engine (%s) does not support this!"), second.tidy);
 	  DisplayError(buf, 0);   /* use of second engine is optional; only warn user */
 	}
       }
@@ -1534,7 +1540,7 @@ CopyFont(MyFont *dest, const MyFont *src)
   dest->mfp.underline = src->mfp.underline;
   dest->mfp.strikeout = src->mfp.strikeout;
   dest->mfp.charset   = src->mfp.charset;
-  lsafeStrCpy(dest->mfp.faceName, src->mfp.faceName, sizeof(dest->mfp.faceName)/sizeof(dest->mfp.faceName[0]) );
+  safeStrCpy(dest->mfp.faceName, src->mfp.faceName, sizeof(dest->mfp.faceName)/sizeof(dest->mfp.faceName[0]) );
   CreateFontInMF(dest);
 }