From f2032627d29d92f59b80d9b2437a1af6ad53964a Mon Sep 17 00:00:00 2001
From: Gh0stBlade <misternightmare@live.com>
Date: Sat, 26 Nov 2016 10:42:21 +0000
Subject: [PATCH] Fix building under VS2017.

Fixed some type conversion warnings.
---
 src/controller.h          | 2 +-
 src/enemy.h               | 2 +-
 src/platform/win/main.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/controller.h b/src/controller.h
index 2dc7e0e..9a0d2bc 100644
--- a/src/controller.h
+++ b/src/controller.h
@@ -71,7 +71,7 @@ struct Controller {
             mat4 m = animation.getJoints(getMatrix(), joint);
             vec3 delta = (m.inverse() * t).normal();
 
-            float angleY = clampAngle(atan2(delta.x, delta.z));
+            float angleY = clampAngle(atan2f(delta.x, delta.z));
             float angleX = clampAngle(asinf(delta.y));
 
             if (angleX > angleRange.x && angleX <= angleRange.y &&
diff --git a/src/enemy.h b/src/enemy.h
index 158e473..b2d4faf 100644
--- a/src/enemy.h
+++ b/src/enemy.h
@@ -100,7 +100,7 @@ struct Enemy : Character {
             vec3 b = getDir();
             vec3 n = vec3(0, 1, 0);
             if (angleX) *angleX = 0.0f;
-            if (angleY) *angleY = atan2(b.cross(a).dot(n), a.dot(b));
+            if (angleY) *angleY = atan2f(b.cross(a).dot(n), a.dot(b));
         }
         return true;
     }
diff --git a/src/platform/win/main.cpp b/src/platform/win/main.cpp
index 193901c..87de054 100644
--- a/src/platform/win/main.cpp
+++ b/src/platform/win/main.cpp
@@ -3,7 +3,7 @@
 #endif
 
 #ifdef MINIMAL
-    #if _MSC_VER == 1900 // VS2015
+    #if _MSC_VER >= 1900 // VS2015 (1900) VS2017 (1910)
         #include <malloc.h>
         void __cdecl operator delete(void *ptr, unsigned int size) { free(ptr); }
         // add "/d2noftol3" to compiler additional options