X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=gl_rmain.c;h=064bda61cb1baa38ea84f301ce8609b7cc66e454;hp=ca11e9642f6e82570c36f71126945cfe1319a815;hb=b2f7fe6f3ec6934b89161592c5df77b3932f2698;hpb=ea7c24e1fb41f3b1df984ac0eed6881c9fde16f5

diff --git a/gl_rmain.c b/gl_rmain.c
index ca11e964..064bda61 100644
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -65,7 +65,7 @@ cvar_t	gl_fogblue = {0, "gl_fogblue","0.3"};
 cvar_t	gl_fogstart = {0, "gl_fogstart", "0"};
 cvar_t	gl_fogend = {0, "gl_fogend","0"};
 
-cvar_t	r_ser = {CVAR_SAVE, "r_ser", "1"};
+cvar_t	r_ser = {CVAR_SAVE, "r_ser", "0"};
 
 cvar_t r_multitexture = {0, "r_multitexture", "1"};
 
@@ -310,16 +310,6 @@ GL_Init
 extern char *ENGINE_EXTENSIONS;
 void GL_Init (void)
 {
-	gl_vendor = glGetString (GL_VENDOR);
-	Con_Printf ("GL_VENDOR: %s\n", gl_vendor);
-	gl_renderer = glGetString (GL_RENDERER);
-	Con_Printf ("GL_RENDERER: %s\n", gl_renderer);
-
-	gl_version = glGetString (GL_VERSION);
-	Con_Printf ("GL_VERSION: %s\n", gl_version);
-	gl_extensions = glGetString (GL_EXTENSIONS);
-	Con_Printf ("GL_EXTENSIONS: %s\n", gl_extensions);
-
 	VID_CheckExtensions();
 
 	// LordHavoc: report supported extensions
@@ -509,16 +499,13 @@ static void R_BlendView(void)
 	rmeshinfo_t m;
 	float tvxyz[3][4], r;
 
-	if (!r_render.integer)
-		return;
-
 	if (r_refdef.viewblend[3] < 0.01f)
 		return;
 
 	memset(&m, 0, sizeof(m));
 	m.transparent = false;
 	m.blendfunc1 = GL_SRC_ALPHA;
-	m.blendfunc2 = GL_ONE;
+	m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
 	m.depthdisable = true; // magic
 	m.numtriangles = 1;
 	m.numverts = 3;
@@ -640,6 +627,9 @@ void R_RenderView (void)
 	R_BlendView();
 	R_TimeReport("blendview");
 
+	R_DrawCrosshair();
+	R_TimeReport("crosshair");
+
 	// render any queued meshs
 	R_Mesh_Finish();
 	R_TimeReport("meshfinish");