X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwoptions.c;h=b2bbf0a8b0539cdc8c41fe520614fa3aa4182580;hb=refs%2Ftags%2Fv4.3.14;hp=4f9182244401952f5feea49e9a4a106763a666de;hpb=062fb2bd92324706eed1fba8d5f7b4015ef2b058;p=xboard.git

diff --git a/winboard/woptions.c b/winboard/woptions.c
index 4f91822..b2bbf0a 100644
--- a/winboard/woptions.c
+++ b/winboard/woptions.c
@@ -65,6 +65,7 @@ extern char installDir[];
 extern HWND hCommPort;    /* currently open comm port */
 extern DCB dcb;
 extern BOOLEAN chessProgram;
+extern startedFromPositionFile; /* [HGM] loadPos */
 
 /* types */
 
@@ -707,7 +708,11 @@ BoardOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       hsc = ParseColorName(HIGHLIGHT_SQUARE_COLOR);
       phc = ParseColorName(PREMOVE_HIGHLIGHT_COLOR);
       mono = FALSE;
+      white= FALSE;
+      flip = FALSE;
       CheckDlgButton(hDlg, OPT_Monochrome, FALSE);
+      CheckDlgButton(hDlg, OPT_AllWhite,   FALSE);
+      CheckDlgButton(hDlg, OPT_UpsideDown, FALSE);
       PaintColorBlock(hDlg, OPT_LightSquareColor, lsc);
       PaintColorBlock(hDlg, OPT_DarkSquareColor,  dsc);
       PaintColorBlock(hDlg, OPT_WhitePieceColor,  wpc);
@@ -769,7 +774,16 @@ VariantWhichRadio(HWND hDlg)
          (IsDlgButtonChecked(hDlg, OPT_VariantSuicide) ? VariantSuicide :
          (IsDlgButtonChecked(hDlg, OPT_VariantAtomic) ? VariantAtomic :
          (IsDlgButtonChecked(hDlg, OPT_VariantShatranj) ? VariantShatranj :
-          VariantNormal )))))))))))))));
+         (IsDlgButtonChecked(hDlg, OPT_VariantFRC) ? VariantFischeRandom :
+         (IsDlgButtonChecked(hDlg, OPT_VariantCylinder) ? VariantCylinder :
+         (IsDlgButtonChecked(hDlg, OPT_VariantFalcon) ? VariantFalcon :
+         (IsDlgButtonChecked(hDlg, OPT_VariantCRC) ? VariantCapaRandom :
+         (IsDlgButtonChecked(hDlg, OPT_Variant3Checks) ? Variant3Check :
+         (IsDlgButtonChecked(hDlg, OPT_VariantBerolina) ? VariantBerolina :
+         (IsDlgButtonChecked(hDlg, OPT_VariantJanus) ? VariantJanus :
+         (IsDlgButtonChecked(hDlg, OPT_VariantWildcastle) ? VariantWildCastle :
+         (IsDlgButtonChecked(hDlg, OPT_VariantNocastle) ? VariantNoCastle :
+          VariantNormal ))))))))))))))))))))))));
 }
 
 LRESULT CALLBACK
@@ -832,6 +846,33 @@ NewVariantDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     case VariantShatranj:
       CheckDlgButton(hDlg, OPT_VariantShatranj, TRUE);
       break;
+    case VariantFischeRandom:
+      CheckDlgButton(hDlg, OPT_VariantFRC, TRUE);
+      break;
+    case VariantCapaRandom:
+      CheckDlgButton(hDlg, OPT_VariantCRC, TRUE);
+      break;
+    case VariantFalcon:
+      CheckDlgButton(hDlg, OPT_VariantFalcon, TRUE);
+      break;
+    case VariantCylinder:
+      CheckDlgButton(hDlg, OPT_VariantCylinder, TRUE);
+      break;
+    case Variant3Check:
+      CheckDlgButton(hDlg, OPT_Variant3Checks, TRUE);
+      break;
+    case VariantBerolina:
+      CheckDlgButton(hDlg, OPT_VariantBerolina, TRUE);
+      break;
+    case VariantJanus:
+      CheckDlgButton(hDlg, OPT_VariantJanus, TRUE);
+      break;
+    case VariantWildCastle:
+      CheckDlgButton(hDlg, OPT_VariantWildcastle, TRUE);
+      break;
+    case VariantNoCastle:
+      CheckDlgButton(hDlg, OPT_VariantNocastle, TRUE);
+      break;
     }
 
     SetDlgItemInt( hDlg, IDC_Files, -1, TRUE );
@@ -870,6 +911,9 @@ NewVariantDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       if(!n2_ok) appData.NrRanks = -1;
       if(!n3_ok) appData.holdingsSize = -1;
 
+      shuffleOpenings = FALSE; /* [HGM] shuffle: possible shuffle reset when we switch */
+      startedFromPositionFile = FALSE; /* [HGM] loadPos: no longer valid in new variant */
+      appData.pieceToCharTable = NULL;
       Reset(TRUE, TRUE);
 
       return TRUE;
@@ -1941,7 +1985,7 @@ SoundOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       return TRUE;
 
     case OPT_BrowseSound:
-      f = OpenFileDialog(hDlg, FALSE, NULL, "wav", SOUND_FILT,
+      f = OpenFileDialog(hDlg, "rb", NULL, "wav", SOUND_FILT,
 	"Browse for Sound File", NULL, NULL, buf);
       if (f != NULL) {
 	fclose(f);
@@ -2485,7 +2529,7 @@ SaveOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       return TRUE;
 
     case OPT_AVBrowse:
-      f = OpenFileDialog(hDlg, TRUE, NULL, 
+      f = OpenFileDialog(hDlg, "a", NULL, 
 	                 appData.oldSaveStyle ? "gam" : "pgn", 
    	                 GAME_FILT, "Browse for Auto Save File", 
 			 NULL, NULL, buf);