Browse Source

Lua: Fix Math.max with the same Math.NaN fix as Math.min

Justin Donaldson 9 years ago
parent
commit
60208719f4
1 changed files with 3 additions and 1 deletions
  1. 3 1
      std/lua/_std/Math.hx

+ 3 - 1
std/lua/_std/Math.hx

@@ -60,7 +60,9 @@ class Math
 	public static inline function random() : Float    return lua.Math.random();
 
 	public static inline function atan2(y:Float, x:Float):Float return lua.Math.atan2(y,x);
-	public static inline function max(a:Float, b:Float):Float   return lua.Math.max(a,b);
+	public static inline function max(a:Float, b:Float):Float {
+		return Math.isNaN(a) || Math.isNaN(b) ? Math.NaN : lua.Math.max(a,b);
+	}
 	public static inline function min(a:Float, b:Float):Float {
 		return Math.isNaN(a) || Math.isNaN(b) ? Math.NaN : lua.Math.min(a,b);
 	}