From ec4ebd2e3ced237dc0ee870165945bb57faa34fb Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Sat, 27 Jan 2018 02:03:21 +0200 Subject: [PATCH] Merge pull request #34952 from ninjanomnom/its-hard-to-see-under-the-wraps Left out a closing parenthesis in LERP --- code/__DEFINES/maths.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__DEFINES/maths.dm b/code/__DEFINES/maths.dm index 0ff3ade369..6ca1107619 100644 --- a/code/__DEFINES/maths.dm +++ b/code/__DEFINES/maths.dm @@ -86,7 +86,7 @@ // Performs a linear interpolation between a and b. // Note that amount=0 returns a, amount=1 returns b, and // amount=0.5 returns the mean of a and b. -#define LERP(a, b, amount) (amount ? ((a) + ((b) - (a)) * (amount)) : ((a) + ((b) - (a)) * 0.5) +#define LERP(a, b, amount) ( amount ? ((a) + ((b) - (a)) * (amount)) : a ) // Returns the nth root of x. #define ROOT(n, x) ((x) ** (1 / (n)))