From bf01d51f8f77e37c098899e10abc4f51dff59baa Mon Sep 17 00:00:00 2001 From: havoc Date: Sat, 14 Apr 2007 01:11:00 +0000 Subject: [PATCH] removed all commandline checks for the option "-safe" except for the OpenGL extension checks, this makes -safe actually playable git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7093 d7cf8633-e32d-0410-b094-e92efae38249 --- cd_shared.c | 2 +- snd_main.c | 2 +- vid_agl.c | 2 +- vid_glx.c | 2 +- vid_wgl.c | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cd_shared.c b/cd_shared.c index 319e6fac..afca524a 100644 --- a/cd_shared.c +++ b/cd_shared.c @@ -407,7 +407,7 @@ int CDAudio_Init (void) return -1; // COMMANDLINEOPTION: Sound: -nocdaudio disables CD audio support - if (COM_CheckParm("-nocdaudio") || COM_CheckParm("-safe")) + if (COM_CheckParm("-nocdaudio")) return -1; CDAudio_SysInit(); diff --git a/snd_main.c b/snd_main.c index 14e2a6a8..d3f16b11 100644 --- a/snd_main.c +++ b/snd_main.c @@ -708,7 +708,7 @@ void S_Init(void) Cvar_RegisterVariable(&snd_channels); // COMMANDLINEOPTION: Sound: -nosound disables sound (including CD audio) - if (COM_CheckParm("-nosound") || COM_CheckParm("-safe")) + if (COM_CheckParm("-nosound")) return; snd_mempool = Mem_AllocPool("sound", 0, NULL); diff --git a/vid_agl.c b/vid_agl.c index cd62ab07..482c40f7 100644 --- a/vid_agl.c +++ b/vid_agl.c @@ -261,7 +261,7 @@ void VID_Init(void) InitSig(); // trap evil signals Cvar_RegisterVariable(&apple_multithreadedgl); // COMMANDLINEOPTION: Input: -nomouse disables mouse support (see also vid_mouse cvar) - if (COM_CheckParm ("-nomouse") || COM_CheckParm("-safe")) + if (COM_CheckParm ("-nomouse")) mouse_avail = false; } diff --git a/vid_glx.c b/vid_glx.c index 32edd056..4c3d710c 100644 --- a/vid_glx.c +++ b/vid_glx.c @@ -609,7 +609,7 @@ void VID_Init(void) #endif InitSig(); // trap evil signals // COMMANDLINEOPTION: Input: -nomouse disables mouse support (see also vid_mouse cvar) - if (COM_CheckParm ("-nomouse") || COM_CheckParm("-safe")) + if (COM_CheckParm ("-nomouse")) mouse_avail = false; } diff --git a/vid_wgl.c b/vid_wgl.c index d0954d01..104f2837 100644 --- a/vid_wgl.c +++ b/vid_wgl.c @@ -1174,7 +1174,7 @@ IN_StartupMouse */ static void IN_StartupMouse (void) { - if (COM_CheckParm ("-nomouse") || COM_CheckParm("-safe")) + if (COM_CheckParm ("-nomouse")) return; mouseinitialized = true; @@ -1351,7 +1351,7 @@ static void IN_StartupJoystick (void) // abort startup if user requests no joystick // COMMANDLINEOPTION: Windows Input: -nojoy disables joystick support, may be a small speed increase - if (COM_CheckParm ("-nojoy") || COM_CheckParm("-safe")) + if (COM_CheckParm ("-nojoy")) return; // verify joystick driver is present -- 2.39.2