WebSVN – Games.Chess Giants – Diff – /dialog/dialog_options.cpp

       SetWindowText (TabControl_GetItem (tab_control, STATICTEXT_ENGINESEARCHDEPTHVALUE), value_string);
       SetWindowText (TabControl_GetItem (tab_control, CHECKBOX_OPTIONS_ALLOWENGINEBLUNDERS), LOCALIZE (L"Options_AllowEngineBlunders"));
       SetWindowText (TabControl_GetItem (tab_control, STATICTEXT_1PCCHANCE), LOCALIZE (L"Options_1PercentChance"));
       SetWindowText (TabControl_GetItem (tab_control, STATICTEXT_100PCCHANCE), LOCALIZE (L"Options_100PercentChance"));
-      if (options.engine.blunder_chances != 0)
+      if (options.engine.blunder_chances > 0)
          swprintf_s (value_string, WCHAR_SIZEOF (value_string), L"%d %%", options.engine.blunder_chances);
       else
          value_string[0] = 0;
       SetWindowText (TabControl_GetItem (tab_control, STATICTEXT_ENGINEBLUNDERSVALUE), value_string);
                                    | ((selectedcolor_history & 0x0000ff00) << 8)
                                    | ((selectedcolor_history & 0x00ff0000) >> 8); // convert from GDI BGR to RGBA
          options.want_sepiafilter = (Button_GetCheck (TabControl_GetItem (tab_control, CHECKBOX_OPTIONS_USESEPIAFORHISTORY)) != 0);
          options.want_autorotateon1vs1 = (Button_GetCheck (TabControl_GetItem (tab_control, CHECKBOX_OPTIONS_ROTATEBOARD)) != 0);
          options.want_sounds = (Button_GetCheck (TabControl_GetItem (tab_control, CHECKBOX_OPTIONS_PLAYSOUNDS)) != 0);
+         options.rotate_speed = SendMessage (TabControl_GetItem (tab_control, SLIDER_OPTIONS_ROTATESPEED), TBM_GETPOS, 0, 0);
+         // engine options
+         ComboBox_GetLBText (TabControl_GetItem (tab_control, COMBOBOX_ENGINE), ComboBox_GetCurSel (TabControl_GetItem (tab_control, COMBOBOX_ENGINE)), temp_string);
+         if (wcscmp (temp_string, options.engine.program) != 0)
+         {
+            wcscpy_s (options.engine.program, temp_string);
+            MessageBox (hWnd, LOCALIZE (L"Options_ChessEngineChangeWillAffectNextGame"), LOCALIZE (L"ImportantMessage"), MB_ICONINFORMATION | MB_OK);
+         }
          options.engine.depth = SendMessage (TabControl_GetItem (tab_control, SLIDER_ENGINE_DIFFICULTYLEVEL), TBM_GETPOS, 0, 0);
+         if (Button_GetCheck (TabControl_GetItem (tab_control, CHECKBOX_OPTIONS_ALLOWENGINEBLUNDERS)))
+            options.engine.blunder_chances = SendMessage (TabControl_GetItem (tab_control, SLIDER_ENGINE_BLUNDERCHANCE), TBM_GETPOS, 0, 0);
+         else
+            options.engine.blunder_chances = 0;
+         if (Button_GetCheck (TabControl_GetItem (tab_control, CHECKBOX_OPTIONS_ALLOWENGINERESIGNS)))
-         options.rotate_speed = SendMessage (TabControl_GetItem (tab_control, SLIDER_OPTIONS_ROTATESPEED), TBM_GETPOS, 0, 0);
+            options.engine.obstinacy_level = SendMessage (TabControl_GetItem (tab_control, SLIDER_ENGINE_OBSTINACY), TBM_GETPOS, 0, 0);
+         else
+            options.engine.obstinacy_level = -1;
          EndDialog (hWnd, 0); // close the dialog box
+      }
       // else was it the cancel button ?
          EndDialog (hWnd, 0); // close the dialog box
       // else was it the expert settings button ?
       else if (wParam_loword == BUTTON_EXPERTSETTINGS)
+      {
+         ComboBox_GetLBText (TabControl_GetItem (tab_control, COMBOBOX_ENGINE), ComboBox_GetCurSel (TabControl_GetItem (tab_control, COMBOBOX_ENGINE)), temp_string);
-         swprintf_s (temp_string, WCHAR_SIZEOF (temp_string), L"%s\\engine\\init.txt", app_path);
+         swprintf_s (temp_string, WCHAR_SIZEOF (temp_string), L"%s\\engines\\%s\\init.txt", temp_string, app_path);
          ShellExecute (NULL, L"open", temp_string, NULL, NULL, SW_SHOWNORMAL); // open the engine initialization text file
+      }
       // else is it the rotate board check box ? if so, enable or disable the speed slider
       else if (wParam_loword == CHECKBOX_OPTIONS_ROTATEBOARD)
          is_checked = Button_GetCheck (TabControl_GetItem (tab_control, CHECKBOX_OPTIONS_ALLOWENGINEBLUNDERS));
          EnableWindow (TabControl_GetItem (tab_control, SLIDER_ENGINE_BLUNDERCHANCE), is_checked);
          EnableWindow (TabControl_GetItem (tab_control, STATICTEXT_1PCCHANCE), is_checked);
          EnableWindow (TabControl_GetItem (tab_control, STATICTEXT_100PCCHANCE), is_checked);
          if (is_checked)
-         {
-            options.engine.blunder_chances = SendMessage (TabControl_GetItem (tab_control, SLIDER_ENGINE_BLUNDERCHANCE), TBM_GETPOS, 0, 0);
+            swprintf_s (value_string, WCHAR_SIZEOF (value_string), L"%d %%", SendMessage (TabControl_GetItem (tab_control, SLIDER_ENGINE_BLUNDERCHANCE), TBM_GETPOS, 0, 0));
-            swprintf_s (value_string, WCHAR_SIZEOF (value_string), L"%d %%", options.engine.blunder_chances);
-         }
          else
-         {
-            options.engine.blunder_chances = 0;
             value_string[0] = 0;
-         }
          SetWindowText (TabControl_GetItem (tab_control, STATICTEXT_ENGINEBLUNDERSVALUE), value_string);
+      }
       // else is it the allow engine resigns check box ? if so, enable or disable the blunder chance slider
       else if (wParam_loword == CHECKBOX_OPTIONS_ALLOWENGINERESIGNS)
          is_checked = Button_GetCheck (TabControl_GetItem (tab_control, CHECKBOX_OPTIONS_ALLOWENGINERESIGNS));
          EnableWindow (TabControl_GetItem (tab_control, SLIDER_ENGINE_OBSTINACY), is_checked);
          EnableWindow (TabControl_GetItem (tab_control, STATICTEXT_YIELDING), is_checked);
          EnableWindow (TabControl_GetItem (tab_control, STATICTEXT_OBSTINATE), is_checked);
          if (is_checked)
-         {
-            options.engine.obstinacy_level = SendMessage (TabControl_GetItem (tab_control, SLIDER_ENGINE_OBSTINACY), TBM_GETPOS, 0, 0);
+            swprintf_s (value_string, WCHAR_SIZEOF (value_string), L"%d", 1 + SendMessage (TabControl_GetItem (tab_control, SLIDER_ENGINE_OBSTINACY), TBM_GETPOS, 0, 0));
-            swprintf_s (value_string, WCHAR_SIZEOF (value_string), L"%d", 1 + options.engine.obstinacy_level);
-         }
          else
-         {
-            options.engine.obstinacy_level = -1;
             value_string[0] = 0;
-         }
          SetWindowText (TabControl_GetItem (tab_control, STATICTEXT_ENGINERESIGNVALUE), value_string);
+      }
       // else is it the enable filtering check box ? if so, enable or disable the high quality checkbox
       else if (wParam_loword == CHECKBOX_OPTIONS_TEXTUREFILTERING)
       // else is it the create/manage account hyperlink ?
       else if (wParam_loword == STATICTEXT_OPTIONS_SERVERURL)
+      {
          swprintf_s (temp_string, WCHAR_SIZEOF (temp_string), ACCOUNTCREATION_URL, os_language); // build account creation url
          ShellExecute (NULL, L"open", temp_string, NULL, NULL, SW_MAXIMIZE); // open the accounts page in the default browser, maximized
-      }
-      // else is it a notification for the engine droplist ?
-      else if (wParam_loword == COMBOBOX_ENGINE)
-      {
-         ComboBox_GetLBText (TabControl_GetItem (tab_control, COMBOBOX_ENGINE), ComboBox_GetCurSel (TabControl_GetItem (tab_control, COMBOBOX_ENGINE)), temp_string);
-         if (wcscmp (temp_string, options.engine.program) != 0)
-         {
-            wcscpy_s (options.engine.program, temp_string);
-            MessageBox (hWnd, LOCALIZE (L"Options_RestartNeeded"), LOCALIZE (L"ImportantMessage"), MB_ICONINFORMATION | MB_OK);
-         }
+      }
+   }
    // else is it a notification for a slider moving ?
    else if (message == WM_HSCROLL)

Subversion Repositories Games.Chess Giants

Games.Chess Giants/dialog/dialog_options.cpp – Rev 39 → 40