r5574 - trunk/data/qcsrc/client

[DONOTREPLY at icculus.org]

Author: mand1nga
Date: 2009-01-16 12:08:56 -0500 (Fri, 16 Jan 2009)
New Revision: 5574

Modified:
   trunk/data/qcsrc/client/View.qc
Log:
Disabled weapon zoom while using the demo camera

Modified: trunk/data/qcsrc/client/View.qc
===================================================================
--- trunk/data/qcsrc/client/View.qc	2009-01-16 15:21:04 UTC (rev 5573)
+++ trunk/data/qcsrc/client/View.qc	2009-01-16 17:08:56 UTC (rev 5574)
@@ -111,6 +111,7 @@
 	return v_y * 0.01745329251994329576;
 }
 
+float camera_active;
 vector GetCurrentFov(float fov)
 {
 	float zoomsensitivity, zoomspeed, zoomfactor, zoomdir;
@@ -139,7 +140,7 @@
 	if(zoomdir)
 		zoomin_effect = 0;
 
-	if(zoomin_effect)
+	if(zoomin_effect || camera_active)
 	{
 		current_viewzoom = min(1, current_viewzoom + drawframetime);
 	}
@@ -316,6 +317,9 @@
 		float speed, attenuation;
 		vector new_origin, m;
 
+		if(!camera_active)
+			camera_active = TRUE;
+		
 		if(cvar("camera_free"))
 			speed = cvar("camera_speed_free");
 		else
@@ -353,6 +357,7 @@
 		{
 			camera_offset_x += cvar("camera_direction_x") * speed * cos(new_angles_y * DEG2RAD);
 			camera_offset_y += cvar("camera_direction_x") * speed * sin(new_angles_y * DEG2RAD);
+		//	camera_offset_z += cvar("camera_direction_x") * speed * -sin(new_angles_x * DEG2RAD);			
 		}
 
 		if( cvar("camera_direction_y") )
@@ -401,6 +406,11 @@
 		R_SetView(VF_ANGLES, new_angles);
 		R_SetView(VF_ORIGIN, new_origin);
 	}
+	else
+	{
+		if(camera_active)
+			camera_active = FALSE;
+	}
 	
 	// Draw the Crosshair
 	float scoreboard_active;