From f55cacb9d23e9622afd7fcb525339eea82003fea Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 11 Jul 2016 22:47:00 +1000 Subject: [PATCH] Rename GeomLerp's lerp parameter (conflicts with a soon-to-be-added lib function) --- qcsrc/common/physics/player.qc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qcsrc/common/physics/player.qc b/qcsrc/common/physics/player.qc index c09601255..8ab8a1380 100644 --- a/qcsrc/common/physics/player.qc +++ b/qcsrc/common/physics/player.qc @@ -73,11 +73,11 @@ float IsMoveInDirection(vector mv, float ang) // key mix factor return ang > 1 ? 0 : ang < -1 ? 0 : 1 - fabs(ang); } -float GeomLerp(float a, float lerp, float b) +float GeomLerp(float a, float _lerp, float b) { - return a == 0 ? (lerp < 1 ? 0 : b) - : b == 0 ? (lerp > 0 ? 0 : a) - : a * pow(fabs(b / a), lerp); + return a == 0 ? (_lerp < 1 ? 0 : b) + : b == 0 ? (_lerp > 0 ? 0 : a) + : a * pow(fabs(b / a), _lerp); } #define unstick_offsets(X) \ -- 2.39.2