* remove old 'threaded 3D' setting from emu settings dialog

* remove 'antialiasing' for now

2 files changed, 8 insertions, 16 deletions

diff --git a/src/libui_sdl/DlgEmuSettings.cpp b/src/libui_sdl/DlgEmuSettings.cpp
index 7d774a0..ad8c047 100644
--- a/src/libui_sdl/DlgEmuSettings.cpp
+++ b/src/libui_sdl/DlgEmuSettings.cpp
@@ -37,7 +37,6 @@ bool opened;
 uiWindow* win;
 
 uiCheckbox* cbDirectBoot;
-uiCheckbox* cbThreaded3D;
 
 
 int OnCloseWindow(uiWindow* window, void* blarg)
@@ -55,14 +54,11 @@ void OnCancel(uiButton* btn, void* blarg)
 void OnOk(uiButton* btn, void* blarg)
 {
     Config::DirectBoot = uiCheckboxChecked(cbDirectBoot);
-    Config::Threaded3D = uiCheckboxChecked(cbThreaded3D);
 
     Config::Save();
 
     uiControlDestroy(uiControl(win));
     opened = false;
-
-    ApplyNewSettings(0);
 }
 
 void Open()
@@ -87,9 +83,6 @@ void Open()
 
         cbDirectBoot = uiNewCheckbox("Boot game directly");
         uiBoxAppend(in_ctrl, uiControl(cbDirectBoot), 0);
-
-        cbThreaded3D = uiNewCheckbox("Threaded 3D renderer");
-        uiBoxAppend(in_ctrl, uiControl(cbThreaded3D), 0);
     }
 
     {
@@ -110,7 +103,6 @@ void Open()
     }
 
     uiCheckboxSetChecked(cbDirectBoot, Config::DirectBoot);
-    uiCheckboxSetChecked(cbThreaded3D, Config::Threaded3D);
 
     uiControlShow(uiControl(win));
 }
diff --git a/src/libui_sdl/DlgVideoSettings.cpp b/src/libui_sdl/DlgVideoSettings.cpp
index 329c79e..69e5ac5 100644
--- a/src/libui_sdl/DlgVideoSettings.cpp
+++ b/src/libui_sdl/DlgVideoSettings.cpp
@@ -59,14 +59,14 @@ void UpdateControls()
         uiControlEnable(uiControl(cbGLDisplay));
         uiControlEnable(uiControl(cbThreaded3D));
         uiControlDisable(uiControl(cbResolution));
-        uiControlDisable(uiControl(cbAntialias));
+        //uiControlDisable(uiControl(cbAntialias));
     }
     else
     {
         uiControlDisable(uiControl(cbGLDisplay));
         uiControlDisable(uiControl(cbThreaded3D));
         uiControlEnable(uiControl(cbResolution));
-        uiControlEnable(uiControl(cbAntialias));
+        //uiControlEnable(uiControl(cbAntialias));
     }
 }
 
@@ -260,12 +260,12 @@ void Open()
         }
         uiBoxAppend(in_ctrl, uiControl(cbResolution), 0);
 
-        lbl = uiNewLabel("");
-        uiBoxAppend(in_ctrl, uiControl(lbl), 0);
+        //lbl = uiNewLabel("");
+        //uiBoxAppend(in_ctrl, uiControl(lbl), 0);
 
-        cbAntialias = uiNewCheckbox("Antialiasing");
-        uiCheckboxOnToggled(cbAntialias, OnAntialiasChanged, NULL);
-        uiBoxAppend(in_ctrl, uiControl(cbAntialias), 0);
+        //cbAntialias = uiNewCheckbox("Antialiasing");
+        //uiCheckboxOnToggled(cbAntialias, OnAntialiasChanged, NULL);
+        //uiBoxAppend(in_ctrl, uiControl(cbAntialias), 0);
     }
 
     {
@@ -299,7 +299,7 @@ void Open()
     uiCheckboxSetChecked(cbGLDisplay, Config::ScreenUseGL);
     uiCheckboxSetChecked(cbThreaded3D, Config::Threaded3D);
     uiComboboxSetSelected(cbResolution, Config::GL_ScaleFactor-1);
-    uiCheckboxSetChecked(cbAntialias, Config::GL_Antialias);
+    //uiCheckboxSetChecked(cbAntialias, Config::GL_Antialias);
     uiRadioButtonsSetSelected(rbRenderer, Config::_3DRenderer);
     UpdateControls();