zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-11 07:11:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Implemented Gez's suggestion for disable autoload checkbox on the IWAD selection box.

Browse source 
(cherry picked from commit 578e3270e2)
This commit is contained in:
Rachael Alexanderson 2016-12-20 23:03:06 -05:00 committed by Christoph Oelckers
parent 8a9ea2eda8
commit 240f973f0c
4 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/d_main.cpp
View file

@ -205,6 +205,8 @@ CUSTOM_CVAR (String, vid_cursor, "None", CVAR_ARCHIVE | CVAR_NOINITCALL)
} }
} }
bool disableautoload = false; // [SP] No auto load
bool wantToRestart; bool wantToRestart;
bool DrawFSHUD; // [RH] Draw fullscreen HUD? bool DrawFSHUD; // [RH] Draw fullscreen HUD?
TArray<FString> allwads; TArray<FString> allwads;
@ -2038,7 +2040,7 @@ static void AddAutoloadFiles(const char *autoname)
{ {
LumpFilterIWAD.Format("%s.", autoname); // The '.' is appened to simplify parsing the string LumpFilterIWAD.Format("%s.", autoname); // The '.' is appened to simplify parsing the string
if (!(gameinfo.flags & GI_SHAREWARE) && !Args->CheckParm("-noautoload")) if (!(gameinfo.flags & GI_SHAREWARE) && !Args->CheckParm("-noautoload") && !disableautoload)
{ {
FString file; FString file;

6
src/win32/i_system.cpp
View file

@ -130,6 +130,7 @@ EXTERN_CVAR (Bool, queryiwad);
// Used on welcome/IWAD screen. // Used on welcome/IWAD screen.
EXTERN_CVAR (Int, vid_renderer) EXTERN_CVAR (Int, vid_renderer)
EXTERN_CVAR (Bool, fullscreen) EXTERN_CVAR (Bool, fullscreen)
extern bool disableautoload;
extern HWND Window, ConWindow, GameTitleWindow; extern HWND Window, ConWindow, GameTitleWindow;
extern HANDLE StdOut; extern HANDLE StdOut;
@ -1169,6 +1170,7 @@ BOOL CALLBACK IWADBoxCallback(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa
// Check the current video settings. // Check the current video settings.
SendDlgItemMessage( hDlg, vid_renderer ? IDC_WELCOME_OPENGL : IDC_WELCOME_SOFTWARE, BM_SETCHECK, BST_CHECKED, 0 ); SendDlgItemMessage( hDlg, vid_renderer ? IDC_WELCOME_OPENGL : IDC_WELCOME_SOFTWARE, BM_SETCHECK, BST_CHECKED, 0 );
SendDlgItemMessage( hDlg, IDC_WELCOME_FULLSCREEN, BM_SETCHECK, fullscreen ? BST_CHECKED : BST_UNCHECKED, 0 ); SendDlgItemMessage( hDlg, IDC_WELCOME_FULLSCREEN, BM_SETCHECK, fullscreen ? BST_CHECKED : BST_UNCHECKED, 0 );
SendDlgItemMessage( hDlg, IDC_WELCOME_NOAUTOLOAD, BM_SETCHECK, disableautoload ? BST_CHECKED : BST_UNCHECKED, 0 );
// Set up our version string. // Set up our version string.
sprintf(szString, "Version %s.", GetVersionString()); sprintf(szString, "Version %s.", GetVersionString());
@ -1210,6 +1212,10 @@ BOOL CALLBACK IWADBoxCallback(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa
// [SP] Upstreamed from Zandronum // [SP] Upstreamed from Zandronum
vid_renderer = SendDlgItemMessage( hDlg, IDC_WELCOME_OPENGL, BM_GETCHECK, 0, 0 ) == BST_CHECKED; vid_renderer = SendDlgItemMessage( hDlg, IDC_WELCOME_OPENGL, BM_GETCHECK, 0, 0 ) == BST_CHECKED;
fullscreen = SendDlgItemMessage( hDlg, IDC_WELCOME_FULLSCREEN, BM_GETCHECK, 0, 0 ) == BST_CHECKED; fullscreen = SendDlgItemMessage( hDlg, IDC_WELCOME_FULLSCREEN, BM_GETCHECK, 0, 0 ) == BST_CHECKED;
// [SP] This is our's.
disableautoload = SendDlgItemMessage( hDlg, IDC_WELCOME_NOAUTOLOAD, BM_GETCHECK, 0, 0 ) == BST_CHECKED;
ctrl = GetDlgItem (hDlg, IDC_IWADLIST); ctrl = GetDlgItem (hDlg, IDC_IWADLIST);
EndDialog(hDlg, SendMessage (ctrl, LB_GETCURSEL, 0, 0)); EndDialog(hDlg, SendMessage (ctrl, LB_GETCURSEL, 0, 0));
} }

3
src/win32/resource.h
View file

@ -171,3 +171,6 @@
#define IDC_WELCOME_SOFTWARE 4021 #define IDC_WELCOME_SOFTWARE 4021
#define IDC_WELCOME_FULLSCREEN 4022 #define IDC_WELCOME_FULLSCREEN 4022
#define IDI_ICONST 151 #define IDI_ICONST 151
// [SP] This is our's.
#define IDC_WELCOME_NOAUTOLOAD 4023

11
src/win32/zdoom.rc
View file

@ -236,7 +236,7 @@ BEGIN
END END
*/ */
// [SP] Upstreamed from Zandronum // [SP] Upstreamed from Zandronum
IDD_IWADDIALOG DIALOGEX 0, 0, 224, 236 IDD_IWADDIALOG DIALOGEX 0, 0, 224, 246
STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION |
WS_SYSMENU WS_SYSMENU
EXSTYLE WS_EX_APPWINDOW EXSTYLE WS_EX_APPWINDOW
@ -258,11 +258,12 @@ BEGIN
BS_AUTORADIOBUTTON,12,160,93,10 BS_AUTORADIOBUTTON,12,160,93,10
CONTROL "Fullscreen",IDC_WELCOME_FULLSCREEN,"Button", CONTROL "Fullscreen",IDC_WELCOME_FULLSCREEN,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP, 124,160,48,10 BS_AUTOCHECKBOX | WS_TABSTOP, 124,160,48,10
CONTROL "Don't ask me this again",IDC_DONTASKIWAD,"Button", CONTROL "Disable autoload",IDC_WELCOME_NOAUTOLOAD,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,72,192,87,10 BS_AUTOCHECKBOX | WS_TABSTOP,72,192,87,10
DEFPUSHBUTTON "Play QZDoom",IDOK,8,236-18,90,14 CONTROL "Don't ask me this again",IDC_DONTASKIWAD,"Button",
PUSHBUTTON "Exit",IDCANCEL,224-58,236-18,50,14 BS_AUTOCHECKBOX | WS_TABSTOP,72,202,87,10
DEFPUSHBUTTON "Play QZDoom",IDOK,8,246-18,90,14
PUSHBUTTON "Exit",IDCANCEL,224-58,246-18,50,14
END END
IDD_EAXPROPERTYLIST DIALOGEX 0, 0, 265, 404 IDD_EAXPROPERTYLIST DIALOGEX 0, 0, 265, 404