From 55b95e68db29e3c1074269b47200e6fa05202f13 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Thu, 16 Mar 2017 13:54:21 -0400 Subject: [PATCH] - Restored a file that apparently worked fine back at a certain commit (0176c29). --- src/p_user.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/p_user.cpp b/src/p_user.cpp index 23fdcd865..e1940548c 100644 --- a/src/p_user.cpp +++ b/src/p_user.cpp @@ -2039,12 +2039,11 @@ void P_CalcHeight (player_t *player) return; } - //[SP] Added (x*player->mo->ViewBob) to allow DECORATE changes to view bobbing speed. if (still) { if (player->health > 0) { - angle = level.time / (120 * TICRATE / 35.) * 360. * player->mo->ViewBob; + angle = level.time / (120 * TICRATE / 35.) * 360.; bob = player->userinfo.GetStillBob() * angle.Sin(); } else @@ -2054,7 +2053,7 @@ void P_CalcHeight (player_t *player) } else { - angle = level.time / (20 * TICRATE / 35.) * 360. * player->mo->ViewBob; + angle = level.time / (20 * TICRATE / 35.) * 360.; bob = player->bob * angle.Sin() * (player->mo->waterlevel > 1 ? 0.25f : 0.5f); }