]> git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
Make cl_bobmodel work if cl_bob2 is enabled too. Although I don't see why bobmodel...
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Mon, 12 Jul 2010 18:09:19 +0000 (18:09 +0000)
committerdivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Mon, 12 Jul 2010 18:09:19 +0000 (18:09 +0000)
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>

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

view.c

diff --git a/view.c b/view.c
index 2acc06fe366043f880d37461c9fff05eeda81182..615d52bd181dc1d92fa5e1b353fd06110ee166c3 100644 (file)
--- 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.