r4239 - trunk/data/qcsrc/client

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-08-29 13:06:30 -0400 (Fri, 29 Aug 2008)
New Revision: 4239

Modified:
   trunk/data/qcsrc/client/Main.qc
   trunk/data/qcsrc/client/View.qc
Log:
slightly better +zoom handling; still misses DP's magic to support two keys at once


Modified: trunk/data/qcsrc/client/Main.qc
===================================================================
--- trunk/data/qcsrc/client/Main.qc	2008-08-29 16:58:10 UTC (rev 4238)
+++ trunk/data/qcsrc/client/Main.qc	2008-08-29 17:06:30 UTC (rev 4239)
@@ -224,7 +224,7 @@
 			return false;
 		}
 		button_zoom = 1;
-		return false;
+		return true;
 	} else if(strCmd == "-button4") { // zoom
 		if(ignore_minus_zoom)
 		{
@@ -232,7 +232,7 @@
 			return false;
 		}
 		button_zoom = 0;
-		return false;
+		return true;
 	} else if(strCmd == "+button3") { // secondary
 		button_attack2 = 1;
 		return false;

Modified: trunk/data/qcsrc/client/View.qc
===================================================================
--- trunk/data/qcsrc/client/View.qc	2008-08-29 16:58:10 UTC (rev 4238)
+++ trunk/data/qcsrc/client/View.qc	2008-08-29 17:06:30 UTC (rev 4239)
@@ -100,7 +100,7 @@
 		PostInit();
 
 	fov = cvar("fov");
-	if(fov < 50)
+	if(button_zoom || fov < 50)
 	{
 		if(!zoomscript_caught)
 		{