From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 12 Jul 2010 18:09:19 +0000 (+0000)
Subject: Make cl_bobmodel work if cl_bob2 is enabled too. Although I don't see why bobmodel... 
X-Git-Tag: xonotic-v0.1.0preview~230^2~164
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b3edef339706b5b89ca00b5830e44bc39200ffe0;p=xonotic%2Fdarkplaces.git

Make cl_bobmodel work if cl_bob2 is enabled too. Although I don't see why bobmodel depends on view bobbing, given it has its own cvar.

From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10314 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/view.c b/view.c
index 2acc06fe..615d52bd 100644
--- a/view.c
+++ b/view.c
@@ -714,7 +714,8 @@ void V_CalcRefdef (void)
 					}
 
 					// gun model bobbing code
-					if (cl_bob.value && cl_bobmodel.value)
+					if (cl_bob.value || cl_bob2.value)
+					if (cl_bobmodel.value)
 					{
 						// calculate for swinging gun model
 						// the gun bobs when running on the ground, but doesn't bob when you're in the air.