From e92b471b40723f3093269aa2e7804408b4bffb96 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson <eruanna@drdteam.org> Date: Mon, 6 Mar 2017 22:32:21 -0500 Subject: [PATCH] Revert "Temporarily disable the software renderer in the IWAD picker" This reverts commit 9a2b7d8230335371ee53467728ce3ce84ec39533. # Conflicts: # src/win32/zdoom.rc --- src/win32/zdoom.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/win32/zdoom.rc b/src/win32/zdoom.rc index 77c256704..087bd1f2f 100644 --- a/src/win32/zdoom.rc +++ b/src/win32/zdoom.rc @@ -236,7 +236,7 @@ FONT 8, "MS Shell Dlg" CONTROL "", IDC_IWADLIST, LISTBOX, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 12, 56, 200, 87 CONTROL "Video settings", IDC_STATIC, BUTTON, BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 8, 155, 109, 52 CONTROL "Hardware (OpenGL)", IDC_WELCOME_OPENGL, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 12, 170, 93, 10 - CONTROL "Software (Doom)", IDC_WELCOME_SOFTWARE, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_DISABLED, 12, 180, 93, 10 + CONTROL "Software (Doom)", IDC_WELCOME_SOFTWARE, BUTTON, BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 12, 180, 93, 10 CONTROL "Fullscreen", IDC_WELCOME_FULLSCREEN, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 190, 48, 10 CONTROL "Resource settings", IDC_STATIC, BUTTON, BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 123, 155, 95, 52 CONTROL "Disable autoload", IDC_WELCOME_NOAUTOLOAD, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 130, 170, 65, 10