[nexuiz-commits] r7240 - trunk/data/qcsrc/client

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-07-19 15:24:50 -0400 (Sun, 19 Jul 2009)
New Revision: 7240

Modified:
   trunk/data/qcsrc/client/Main.qc
   trunk/data/qcsrc/client/View.qc
   trunk/data/qcsrc/client/miscfunctions.qc
Log:
fix autodetection of cs_project behaviour


Modified: trunk/data/qcsrc/client/Main.qc
===================================================================
--- trunk/data/qcsrc/client/Main.qc	2009-07-19 15:43:11 UTC (rev 7239)
+++ trunk/data/qcsrc/client/Main.qc	2009-07-19 19:24:50 UTC (rev 7240)
@@ -122,29 +122,6 @@
 
 	cvar_clientsettemp("_supports_weaponpriority", "1");
 
-
-
-
-	string w0, h0;
-	w0 = cvar_string("vid_conwidth");
-	h0 = cvar_string("vid_conheight");
-	//R_SetView(VF_VIEWPORT, '0 0 0', '640 480 0');
-	//R_SetView(VF_FOV, '90 90 0');
-	R_SetView(VF_ORIGIN, '0 0 0');
-	R_SetView(VF_ANGLES, '0 0 0');
-	R_SetView(VF_PERSPECTIVE, 1);
-	makevectors('0 0 0');
-	vector v1, v2;
-	cvar_set("vid_conwidth", "800");
-	cvar_set("vid_conheight", "600");
-	v1 = cs_project(v_forward);
-	cvar_set("vid_conwidth", "640");
-	cvar_set("vid_conheight", "480");
-	v2 = cs_project(v_forward);
-	cs_project_is_b0rked = (v1 == v2);
-	cvar_set("vid_conwidth", w0);
-	cvar_set("vid_conheight", h0);
-
 	RegisterWeapons();
 
 	WaypointSprite_Load();

Modified: trunk/data/qcsrc/client/View.qc
===================================================================
--- trunk/data/qcsrc/client/View.qc	2009-07-19 15:43:11 UTC (rev 7239)
+++ trunk/data/qcsrc/client/View.qc	2009-07-19 19:24:50 UTC (rev 7240)
@@ -650,6 +650,33 @@
 		localcmd("\n", NextFrameCommand, "\n");
 		NextFrameCommand = string_null;
 	}
+
+	// we must do this check AFTER a frame was rendered, or it won't work
+	if(cs_project_is_b0rked == 0)
+	{
+		string w0, h0;
+		w0 = cvar_string("vid_conwidth");
+		h0 = cvar_string("vid_conheight");
+		//R_SetView(VF_VIEWPORT, '0 0 0', '640 480 0');
+		//R_SetView(VF_FOV, '90 90 0');
+		R_SetView(VF_ORIGIN, '0 0 0');
+		R_SetView(VF_ANGLES, '0 0 0');
+		R_SetView(VF_PERSPECTIVE, 1);
+		makevectors('0 0 0');
+		vector v1, v2;
+		cvar_set("vid_conwidth", "800");
+		cvar_set("vid_conheight", "600");
+		v1 = cs_project(v_forward);
+		cvar_set("vid_conwidth", "640");
+		cvar_set("vid_conheight", "480");
+		v2 = cs_project(v_forward);
+		if(v1 == v2)
+			cs_project_is_b0rked = 1;
+		else
+			cs_project_is_b0rked = -1;
+		cvar_set("vid_conwidth", w0);
+		cvar_set("vid_conheight", h0);
+	}
 }
 
 void Sbar_Draw();

Modified: trunk/data/qcsrc/client/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/client/miscfunctions.qc	2009-07-19 15:43:11 UTC (rev 7239)
+++ trunk/data/qcsrc/client/miscfunctions.qc	2009-07-19 19:24:50 UTC (rev 7240)
@@ -291,7 +291,7 @@
 vector project_3d_to_2d(vector vec)
 { 
 	vec = cs_project(vec);
-	if(cs_project_is_b0rked)
+	if(cs_project_is_b0rked > 0)
 	{
 		vec_x *= vid_conwidth / vid_width;
 		vec_y *= vid_conheight / vid_height;