From: Mario <mario@smbclan.net>
Date: Mon, 11 Jul 2016 12:47:00 +0000 (+1000)
Subject: Rename GeomLerp's lerp parameter (conflicts with a soon-to-be-added lib function)
X-Git-Tag: xonotic-v0.8.2~700^2~86
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f55cacb9d23e9622afd7fcb525339eea82003fea;p=xonotic%2Fxonotic-data.pk3dir.git

Rename GeomLerp's lerp parameter (conflicts with a soon-to-be-added lib function)
---

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) \