From e16ea21dc8a710237ade8413207f58d403c616a3 Mon Sep 17 00:00:00 2001
From: Joe Ludwig <joe@valvesoftware.com>
Date: Wed, 17 Jul 2013 18:26:59 -0700
Subject: * Added support for building shaders in your mod * Added nav mesh
 support * fixed many warnings and misc bugs * Fixed the create*projects
 scripts in mp * Added a bunch of stuff to .gitignore

---
 mp/src/public/mathlib/mathlib.h | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'mp/src/public/mathlib/mathlib.h')

diff --git a/mp/src/public/mathlib/mathlib.h b/mp/src/public/mathlib/mathlib.h
index 83fdb6a0..e1873cd0 100644
--- a/mp/src/public/mathlib/mathlib.h
+++ b/mp/src/public/mathlib/mathlib.h
@@ -97,7 +97,9 @@ private:
 #ifdef DEBUG  // stop crashing edit-and-continue
 FORCEINLINE float clamp( float val, float minVal, float maxVal )
 {
-	if( val < minVal )
+	if ( maxVal < minVal )
+		return maxVal;
+	else if( val < minVal )
 		return minVal;
 	else if( val > maxVal )
 		return maxVal;
@@ -115,8 +117,8 @@ FORCEINLINE float clamp( float val, float minVal, float maxVal )
 				_mm_load_ss(&minVal) ),
 			_mm_load_ss(&maxVal) ) );
 #else
-	val = fpmin(maxVal, val);
 	val = fpmax(minVal, val);
+	val = fpmin(maxVal, val);
 #endif
 	return val;
 }
@@ -128,7 +130,9 @@ FORCEINLINE float clamp( float val, float minVal, float maxVal )
 template< class T >
 inline T clamp( T const &val, T const &minVal, T const &maxVal )
 {
-	if( val < minVal )
+	if ( maxVal < minVal )
+		return maxVal;
+	else if( val < minVal )
 		return minVal;
 	else if( val > maxVal )
 		return maxVal;
@@ -2172,9 +2176,9 @@ bool AlmostEqual(float a, float b, int maxUlps = 10);
 
 inline bool AlmostEqual( const Vector &a, const Vector &b, int maxUlps = 10)
 {
-	return AlmostEqual( a.x, a.x, maxUlps ) &&
-		AlmostEqual( a.y, a.y, maxUlps ) &&
-		AlmostEqual( a.z, a.z, maxUlps );
+	return AlmostEqual( a.x, b.x, maxUlps ) &&
+		AlmostEqual( a.y, b.y, maxUlps ) &&
+		AlmostEqual( a.z, b.z, maxUlps );
 }
 
 
-- 
cgit v1.2.3