From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 12 Jul 2010 18:02:44 +0000 (+0000)
Subject: Use independent cycle float
X-Git-Tag: xonotic-v0.1.0preview~383
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cd3cd85b632e75e9ee1ec85b9656a8453a0a864e;p=xonotic%2Fdarkplaces.git

Use independent cycle float

From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10279 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=9b794c6c2fd84f72b5af95640b57f0253bafb27d
---

diff --git a/view.c b/view.c
index fc20b6eb..22ccda2c 100644
--- a/view.c
+++ b/view.c
@@ -589,7 +589,7 @@ void V_CalcRefdef (void)
 				if (cl.stats[STAT_HEALTH] > 0)
 				{
 					double xyspeed, bob, bobroll;
-					float cycle;
+					float cycle, cycle2;
 					vec_t frametime;
 
 					frametime = cl.realframetime * cl.movevars_timescale;
@@ -672,15 +672,15 @@ void V_CalcRefdef (void)
 					if (cl_bobroll.value && cl_bobrollcycle.value)
 					if (cl.onground)
 					{
-						cycle = cl.time / cl_bobrollcycle.value;
-						cycle -= (int) cycle;
-						if (cycle < cl_bobrollup.value)
-							cycle = sin(M_PI * cycle / cl_bobrollup.value);
+						cycle2 = cl.time / cl_bobrollcycle.value;
+						cycle2 -= (int) cycle2;
+						if (cycle2 < cl_bobrollup.value)
+							cycle2 = sin(M_PI * cycle2 / cl_bobrollup.value);
 						else
-							cycle = sin(M_PI + M_PI * (cycle-cl_bobrollup.value)/(1.0 - cl_bobrollup.value));
+							cycle2 = sin(M_PI + M_PI * (cycle2-cl_bobrollup.value)/(1.0 - cl_bobrollup.value));
 
 						bobroll = xyspeed * cl_bobroll.value;
-						bobroll = bobroll*0.3 + bobroll*0.7*cycle;
+						bobroll = bobroll*0.3 + bobroll*0.7*cycle2;
 						viewangles[2] = bound(-5, bobroll, 5);
 					}