From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 20 Jan 2004 21:03:38 +0000 (+0000)
Subject: -safe now implies -window and disables all GL extensions that offer a disable option
X-Git-Tag: xonotic-v0.1.0preview~6153
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=55abe703f6485a13ec9aa74038f162d55b2d7be1

-safe now implies -window and disables all GL extensions that offer a disable option


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3818 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/vid_shared.c b/vid_shared.c
index eb0cc856..39beea54 100644
--- a/vid_shared.c
+++ b/vid_shared.c
@@ -241,7 +241,7 @@ int GL_CheckExtension(const char *name, const dllfunction_t *funcs, const char *
 	for (func = funcs;func && func->name;func++)
 		*func->funcvariable = NULL;
 
-	if (disableparm && COM_CheckParm(disableparm))
+	if (disableparm && (COM_CheckParm(disableparm) || COM_CheckParm("-safe")))
 	{
 		Con_DPrintf("disabled by commandline\n");
 		return false;
@@ -823,9 +823,9 @@ void VID_Open(void)
 	{
 		// interpret command-line parameters
 		vid_commandlinecheck = false;
-		if ((i = COM_CheckParm("-window")) != 0)
+		if (COM_CheckParm("-window") || COM_CheckParm("-safe"))
 			Cvar_SetValueQuick(&vid_fullscreen, false);
-		if ((i = COM_CheckParm("-fullscreen")) != 0)
+		if (COM_CheckParm("-fullscreen"))
 			Cvar_SetValueQuick(&vid_fullscreen, true);
 		width = 0;
 		height = 0;