From 015fa17628f0bb03c86016864fe6868a1c6f93c3 Mon Sep 17 00:00:00 2001
From: Adam <893184+NotAdam@users.noreply.github.com>
Date: Tue, 8 Aug 2017 21:01:09 +0900
Subject: [PATCH] Add gitignore and fix UtilMath::clamp

---
 .gitignore                           |  2 ++
 src/servers/Server_Common/UtilMath.h | 12 +++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..0a055e60
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+bin
+.vs
diff --git a/src/servers/Server_Common/UtilMath.h b/src/servers/Server_Common/UtilMath.h
index 326c54e6..6c9f4668 100644
--- a/src/servers/Server_Common/UtilMath.h
+++ b/src/servers/Server_Common/UtilMath.h
@@ -29,7 +29,17 @@ template
 <typename T>
 T clamp( T val, T minimum, T maximum )
 {
-   return std::max( std::min( val, maximum ), minimum );
+   if (val > maximum)
+   {
+      return maximum;
+   }
+   
+   if (val < minimum)
+   {
+      return minimum;
+   }
+
+   return val;
 }
 }
 }