X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cl_screen.c;h=19e72e96a7b57fdd55c3cacc1ec657ef9fd6ab85;hb=b3895a134a65c7be9ccfe2db7cf7132d5934f316;hp=8d3babe257b10435d7a127386fad317434ea6812;hpb=812ff6ba44c87de88a410e493b8093033867b12c;p=xonotic%2Fdarkplaces.git

diff --git a/cl_screen.c b/cl_screen.c
index 8d3babe2..19e72e96 100644
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -2,10 +2,13 @@
 #include "quakedef.h"
 #include "cl_video.h"
 #include "jpeg.h"
+#include "cl_collision.h"
 
 cvar_t scr_viewsize = {CVAR_SAVE, "viewsize","100"};
 cvar_t scr_fov = {CVAR_SAVE, "fov","90"};	// 10 - 170
 cvar_t scr_conspeed = {CVAR_SAVE, "scr_conspeed","900"}; // LordHavoc: quake used 300
+cvar_t scr_conalpha = {CVAR_SAVE, "scr_conalpha", "1"};
+cvar_t scr_conbrightness = {CVAR_SAVE, "scr_conbrightness", "0.2"};
 cvar_t scr_centertime = {0, "scr_centertime","2"};
 cvar_t scr_showram = {CVAR_SAVE, "showram","1"};
 cvar_t scr_showturtle = {CVAR_SAVE, "showturtle","0"};
@@ -458,6 +461,8 @@ void CL_Screen_Init(void)
 	Cvar_RegisterVariable (&scr_fov);
 	Cvar_RegisterVariable (&scr_viewsize);
 	Cvar_RegisterVariable (&scr_conspeed);
+	Cvar_RegisterVariable (&scr_conalpha);
+	Cvar_RegisterVariable (&scr_conbrightness);
 	Cvar_RegisterVariable (&scr_showram);
 	Cvar_RegisterVariable (&scr_showturtle);
 	Cvar_RegisterVariable (&scr_showpause);
@@ -693,7 +698,7 @@ static void SCR_CalcRefdef (void)
 	if (cl.worldmodel)
 	{
 		Mod_CheckLoaded(cl.worldmodel);
-		contents = Mod_PointContents(r_refdef.vieworg, cl.worldmodel);
+		contents = CL_PointContents(r_refdef.vieworg);
 		if (contents != CONTENTS_EMPTY && contents != CONTENTS_SOLID)
 		{
 			r_refdef.fov_x *= (sin(cl.time * 4.7) * 0.015 + 0.985);
@@ -745,8 +750,14 @@ static int cl_avidemo_frame = 0;
 void SCR_CaptureAVIDemo(void)
 {
 	char filename[32];
-	sprintf(filename, "dpavi%06d.tga", cl_avidemo_frame);
-	if (SCR_ScreenShot(filename, vid.realx, vid.realy, vid.realwidth, vid.realheight, false))
+	qboolean jpeg = (scr_screenshot_jpeg.integer != 0);
+
+	if (jpeg)
+		sprintf(filename, "dpavi%06d.jpg", cl_avidemo_frame);
+	else
+		sprintf(filename, "dpavi%06d.tga", cl_avidemo_frame);
+
+	if (SCR_ScreenShot(filename, vid.realx, vid.realy, vid.realwidth, vid.realheight, jpeg))
 		cl_avidemo_frame++;
 	else
 	{
@@ -961,9 +972,6 @@ void CL_UpdateScreen(void)
 
 	DrawQ_Clear();
 
-	V_UpdateBlends();
-	V_CalcRefdef ();
-
 	if (cls.signon == SIGNONS)
 		R_TimeReport("setup");