]> git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
view: Use bob_limit again. Ignore the cvar with classic.
authorcloudwalk <cloudwalk@d7cf8633-e32d-0410-b094-e92efae38249>
Sat, 26 Sep 2020 21:11:35 +0000 (21:11 +0000)
committercloudwalk <cloudwalk@d7cf8633-e32d-0410-b094-e92efae38249>
Sat, 26 Sep 2020 21:11:35 +0000 (21:11 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12948 d7cf8633-e32d-0410-b094-e92efae38249

view.c

diff --git a/view.c b/view.c
index fe561ea8b6c1042681883cab2effc54c30d3ca6a..4aba2954edc95bce1c8a72885625dd31bce458be 100644 (file)
--- a/view.c
+++ b/view.c
@@ -711,7 +711,7 @@ void V_CalcRefdefUsing (const matrix4x4_t *entrendermatrix, const vec3_t clviewa
                                // vertical view bobbing code
                                if (cl_bob.value && cl_bobcycle.value)
                                {
-                                       float bob_limit = cl_bob_limit.value;
+                                       float bob_limit = cl_bobmodel_classic.integer ? 4 : cl_bob_limit.value;
 
                                        if (cl_bob_limit_heightcheck.integer)
                                        {
@@ -750,7 +750,7 @@ void V_CalcRefdefUsing (const matrix4x4_t *entrendermatrix, const vec3_t clviewa
                                        // (don't count Z, or jumping messes it up)
                                        bob = xyspeed * cl_bob.value;
                                        bob = bob*0.3 + bob*0.7*sin(cycle);
-                                       bob = bound(-7, bob, 4);
+                                       bob = bound(-7, bob, bob_limit);
 
                                        vieworg[2] += bob;