[Glide64] Remove clock settings

Source/Glide64/Config.cpp

@@ -308,8 +308,6 @@ public:
         COMMAND_HANDLER_EX(IDC_CMB_WINDOW_RES, CBN_SELCHANGE, ItemChanged)
         COMMAND_HANDLER_EX(IDC_CMB_FS_RESOLUTION, CBN_SELCHANGE, ItemChanged)
         COMMAND_HANDLER_EX(IDC_CHK_VERTICAL_SYNC, BN_CLICKED, ItemChanged)
-        COMMAND_HANDLER_EX(IDC_CHK_CLOCK_ENABLED, BN_CLICKED, ItemChanged)
-        COMMAND_HANDLER_EX(IDC_CHK_CLOCK_24, BN_CLICKED, ItemChanged)
         COMMAND_HANDLER_EX(IDC_CBXANISOTROPIC, BN_CLICKED, ItemChanged)
         COMMAND_HANDLER_EX(IDC_CHK_SHOW_TEXTURE_ENHANCEMENT, BN_CLICKED, ItemChanged)
         COMMAND_HANDLER_EX(IDC_CHK_AUTODETECT_VRAM, BN_CLICKED, ItemChanged)
@@ -357,14 +355,6 @@ public:
         m_cbxTextureSettings.Attach(GetDlgItem(IDC_CHK_SHOW_TEXTURE_ENHANCEMENT));
         m_cbxTextureSettings.SetCheck(g_settings->texenh_options ? BST_CHECKED : BST_UNCHECKED);
 
-        m_cbxClockEnabled.Attach(GetDlgItem(IDC_CHK_CLOCK_ENABLED));
-        m_cbxClockEnabled.SetCheck(g_settings->clock > 0 ? BST_CHECKED : BST_UNCHECKED);
-        TTSetTxt(IDC_CHK_CLOCK_ENABLED, "Clock enabled:\n\nThis option will put a clock in the lower right corner of the screen, showing the current time.\n\n[Recommended: your preference]");
-
-        m_cbxClock24.Attach(GetDlgItem(IDC_CHK_CLOCK_24));
-        m_cbxClock24.SetCheck(g_settings->clock_24_hr > 0 ? BST_CHECKED : BST_UNCHECKED);
-        TTSetTxt(IDC_CHK_CLOCK_24, "Display hours as 24-hour clock.\n\n[Recommended: your preference]");
-
         m_cmbFSResolution.Attach(GetDlgItem(IDC_CMB_FS_RESOLUTION));
         int32_t size = 0;
         char ** aRes = grQueryResolutionsExt(&size);
@@ -405,8 +395,6 @@ public:
         g_settings->res_data = m_WindowRes.GetCurSel();
         g_settings->vsync = m_cbxVSync.GetCheck() == BST_CHECKED;
         g_settings->texenh_options = m_cbxTextureSettings.GetCheck() == BST_CHECKED;
-        g_settings->clock = m_cbxClockEnabled.GetCheck() == BST_CHECKED;
-        g_settings->clock_24_hr = m_cbxClock24.GetCheck() == BST_CHECKED;
         g_settings->wrpResolution = m_cmbFSResolution.GetCurSel();
         g_settings->wrpAnisotropic = m_cbxAnisotropic.GetCheck() == BST_CHECKED;
         g_settings->wrpVRAM = m_cbxVRAM.GetCheck() == BST_CHECKED ? 0 : atoi(spinVRAM);
@@ -441,7 +429,6 @@ private:
     CComboBox m_WindowRes, m_cmbFSResolution;
     CButton m_cbxVSync;
     CButton m_cbxTextureSettings;
-    CButton m_cbxClockEnabled, m_cbxClock24;
     CButton m_cbxAnisotropic;
     CButton m_cbxFBO;
     CButton m_cbxVRAM;

Source/Glide64/Glide64.rc

@@ -84,7 +84,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CAPTION
 CAPTION "Basic Settings"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    GROUPBOX        "Rendering",IDC_STATIC,6,2,161,128
+    GROUPBOX        "Rendering",IDC_STATIC,7,2,303,128
     LTEXT           "Windowed Resolution",IDC_STATIC,11,17,75,8
     COMBOBOX        IDC_CMB_WINDOW_RES,86,15,77,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Vertical sync",IDC_CHK_VERTICAL_SYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,30,120,10
@@ -99,10 +99,6 @@ BEGIN
     GROUPBOX        "Frame buffer emulation",IDC_STATIC,14,103,146,23
     CONTROL         "Use frame buffer objects",IDC_CHK_USE_FRAME_BUFFER_OBJECT,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,113,133,10
-    GROUPBOX        "On screen display",IDC_STATIC,174,2,135,128
-    GROUPBOX        "Time",IDC_STATIC,179,13,124,36
-    CONTROL         "Clock enabled",IDC_CHK_CLOCK_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,186,24,59,10
-    CONTROL         "Clock is 24-hour",IDC_CHK_CLOCK_24,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,186,37,52,8
     GROUPBOX        "Other",IDC_STATIC,7,132,303,36
     CONTROL         "Show texture enhancement options",IDC_CHK_SHOW_TEXTURE_ENHANCEMENT,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,140,123,11

Source/Glide64/Main.cpp

@@ -1579,19 +1579,6 @@ void newSwapBuffers()
     grDepthMask(FXFALSE);
     grCullMode(GR_CULL_DISABLE);
 
-    if (g_settings->clock)
-    {
-        set_message_combiner();
-        if (g_settings->clock_24_hr)
-        {
-            output(956.0f, 0, 1, CDateTime().SetToNow().Format("%H:%M:%S").c_str(), 0);
-        }
-        else
-        {
-            output(930.0f, 0, 1, CDateTime().SetToNow().Format("%I:%M:%S %p").c_str(), 0);
-        }
-    }
-
     if (capture_screen)
     {
         CPath path(capture_path);

Source/Glide64/Settings.cpp

@@ -20,8 +20,6 @@ advanced_options(0),
 texenh_options(0),
 vsync(0),
 
-clock(0),
-clock_24_hr(0),
 rotate(0),
 
 filtering(0),
@@ -122,8 +120,6 @@ void CSettings::RegisterSettings(void)
     general_setting(Set_wrpResolution, "wrpResolution", GetCurrentResIndex());
 #endif
     general_setting(Set_vsync, "vsync", 1);
-    general_setting(Set_clock, "clock", 0);
-    general_setting(Set_clock_24_hr, "clock_24_hr", 0);
     general_setting(Set_texenh_options, "texenh_options", 0);
     general_setting(Set_hotkeys, "hotkeys", 1);
     general_setting(Set_wrpVRAM, "wrpVRAM", 0);
@@ -278,8 +274,6 @@ void CSettings::ReadSettings()
     this->wrpResolution = GetSetting(Set_wrpResolution);
 #endif
     this->vsync = GetSetting(Set_vsync);
-    this->clock = GetSetting(Set_clock);
-    this->clock_24_hr = GetSetting(Set_clock_24_hr);
     this->rotate = GetSetting(Set_Rotate);
     this->advanced_options = Set_basic_mode ? !GetSystemSetting(Set_basic_mode) : 0;
     this->texenh_options = GetSetting(Set_texenh_options);
@@ -514,8 +508,6 @@ void CSettings::WriteSettings(void)
     SetSetting(Set_wrpResolution, g_settings->wrpResolution);
 #endif
     SetSetting(Set_vsync, g_settings->vsync);
-    SetSetting(Set_clock, g_settings->clock);
-    SetSetting(Set_clock_24_hr, g_settings->clock_24_hr);
     SetSetting(Set_Rotate, g_settings->rotate);
     //SetSetting(Set_advanced_options,g_settings->advanced_options);
     SetSetting(Set_texenh_options, g_settings->texenh_options);

Source/Glide64/Settings.h

@@ -35,8 +35,6 @@ public:
     int texenh_options;
     int vsync;
 
-    int clock;
-    int clock_24_hr;
     int rotate;
 
     int filtering;

Source/Glide64/SettingsID.h

@@ -13,8 +13,7 @@
 enum
 {
     // General Settings
-    Set_vsync, Set_clock,
+    Set_vsync, Set_Rotate, Set_texenh_options, Set_hotkeys, Set_wrpVRAM,
-    Set_clock_24_hr, Set_Rotate, Set_texenh_options, Set_hotkeys, Set_wrpVRAM,
     Set_wrpFBO, Set_wrpAnisotropic, Set_autodetect_ucode, Set_ucode, Set_wireframe,
     Set_wfmode, Set_logging, Set_log_clear, Set_elogging, Set_run_in_window,
     Set_filter_cache, Set_unk_as_red, Set_log_unk, Set_unk_clear, Set_ghq_fltr,

Source/Glide64/resource.h

@@ -17,8 +17,6 @@
 #define IDC_SPIN_TEXTURE_CACHE          1006
 #define IDC_EDIT1                       1007
 #define IDC_CHK_USE_FRAME_BUFFER_OBJECT 1008
-#define IDC_CHK_CLOCK_ENABLED           1012
-#define IDC_CHK_CLOCK_24                1013
 #define IDC_CHK_SHOW_TEXTURE_ENHANCEMENT 1016
 #define IDC_INFO                        1017
 #define IDC_CMB_FILTERING_MODE          1018