diff --git a/win32/rsrc/snes9x.rc b/win32/rsrc/snes9x.rc index da6acf05..bf45bf73 100644 --- a/win32/rsrc/snes9x.rc +++ b/win32/rsrc/snes9x.rc @@ -194,16 +194,15 @@ BEGIN LTEXT "Resolution",IDC_CURRMODE,187,76,41,8 COMBOBOX IDC_RESOLUTION,234,74,105,95,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Enable Triple Buffering",IDC_DBLBUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,187,88,87,10 - CONTROL "Transparency Effects",IDC_TRANS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,187,113,153,10 - CONTROL "Hi Resolution Support",IDC_HIRES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,187,124,85,10 - CONTROL "Extend Height of SNES Image",IDC_HEIGHT_EXTEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,187,146,111,10 + CONTROL "Transparency Effects",IDC_TRANS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,187,118,153,10 + CONTROL "Extend Height of SNES Image",IDC_HEIGHT_EXTEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,187,140,153,10 CONTROL "Display messages before applying filters",IDC_MESSAGES_IN_IMAGE, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,187,157,140,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,187,151,153,10 GROUPBOX "",IDC_SHADER_GROUP,8,184,338,71,0,WS_EX_TRANSPARENT EDITTEXT IDC_SHADER_HLSL_FILE,13,206,306,14,ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "...",IDC_SHADER_HLSL_BROWSE,322,206,19,14,WS_DISABLED GROUPBOX "Frame Skipping:",IDC_STATIC,7,132,167,46,0,WS_EX_TRANSPARENT - GROUPBOX "SNES Image",IDC_STATIC,180,103,166,79,0,WS_EX_TRANSPARENT + GROUPBOX "SNES Image",IDC_STATIC,180,106,166,72,0,WS_EX_TRANSPARENT GROUPBOX "Output Image Processing",IDC_STATIC,179,7,166,53,0,WS_EX_TRANSPARENT GROUPBOX "Fullscreen Display Settings",IDC_STATIC,179,63,166,39,0,WS_EX_TRANSPARENT LTEXT "Hi Res:",IDC_HIRESLABEL,186,36,31,8 @@ -216,11 +215,11 @@ BEGIN EDITTEXT IDC_SHADER_GLSL_FILE,13,235,306,14,ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "...",IDC_SHADER_GLSL_BROWSE,322,235,19,14,WS_DISABLED LTEXT "OpenGL Shader File",IDC_STATIC,13,224,104,8 - CONTROL "Blend Hi-Res Images",IDC_HIRESBLEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,187,135,82,10 + CONTROL "Blend Hi-Res Images",IDC_HIRESBLEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,187,129,153,10 CONTROL "VSync",IDC_VSYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,107,37,10 CONTROL "Reduce Input Lag",IDC_REDUCEINPUTLAG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,118,76,10 CONTROL "Scale messages with EPX if possible",IDC_MESSAGES_SCALE, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,187,168,131,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,187,162,153,10 PUSHBUTTON "Parameters",IDC_SHADER_GLSL_PARAMETERS,112,222,49,12,WS_DISABLED END diff --git a/win32/wconfig.cpp b/win32/wconfig.cpp index 9a07c28e..a3d3606b 100644 --- a/win32/wconfig.cpp +++ b/win32/wconfig.cpp @@ -290,6 +290,8 @@ void WinSetDefaultValues () // CPU options Settings.Paused = false; + Settings.SupportHiRes = true; + #ifdef NETPLAY_SUPPORT Settings.Port = 1996; NetPlay.MaxFrameSkip = 10; @@ -895,7 +897,6 @@ void WinRegisterConfigItems() AddBoolC("Lock", readOnlyConfig, false, "if true, prevents Snes9x from editing this configuration file (or making it read-only while it is running)"); #undef CATEGORY #define CATEGORY "Display" - AddBool2C("HiRes", Settings.SupportHiRes, true, "on to support the hi-res mode that a few games use, off to render them in low-res"); AddBool2("Transparency", Settings.Transparency, true); AddBoolC("MessagesInImage", Settings.AutoDisplayMessages, false, "true to draw text inside the SNES image (will get into AVIs, screenshots, and filters)"); AddBool2C("FrameRate", Settings.DisplayFrameRate, false, "on to display the framerate (will be inaccurate if AutoMaxSkipFrames is too small)"); diff --git a/win32/wsnes9x.cpp b/win32/wsnes9x.cpp index 665566d3..fe6978ec 100644 --- a/win32/wsnes9x.cpp +++ b/win32/wsnes9x.cpp @@ -7554,8 +7554,6 @@ INT_PTR CALLBACK DlgFunky(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) if (Settings.Transparency) SendDlgItemMessage(hDlg, IDC_TRANS, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); - if (Settings.SupportHiRes) - SendDlgItemMessage(hDlg, IDC_HIRES, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); if (GUI.BlendHiRes) SendDlgItemMessage(hDlg, IDC_HIRESBLEND, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); if (GUI.HeightExtend) @@ -7977,10 +7975,6 @@ updateFilterBox2: bool fullscreenWanted; Settings.Transparency = IsDlgButtonChecked(hDlg, IDC_TRANS); Settings.BilinearFilter = (bool)(IsDlgButtonChecked(hDlg,IDC_BILINEAR)==BST_CHECKED); - if(!GUI.FullScreen || (GUI.FullscreenMode.width >= 512 && GUI.FullscreenMode.height >= 478) || GUI.Stretch) - Settings.SupportHiRes = IsDlgButtonChecked(hDlg, IDC_HIRES); - else - Settings.SupportHiRes = false; GUI.HeightExtend = IsDlgButtonChecked(hDlg, IDC_HEIGHT_EXTEND)!=0; Settings.AutoDisplayMessages = IsDlgButtonChecked(hDlg, IDC_MESSAGES_IN_IMAGE); GUI.filterMessagFont = IsDlgButtonChecked(hDlg, IDC_MESSAGES_SCALE);