From f8d41a2b96c2188e2146219d683c6fae0b7f88e4 Mon Sep 17 00:00:00 2001 From: Azaezel Date: Fri, 24 Apr 2015 11:43:42 -0500 Subject: [PATCH] Merge pull request #1283 from Azaezel/randiiiiiii corrects getrandom to behave as documented. --- Engine/source/math/mathTypes.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Engine/source/math/mathTypes.cpp b/Engine/source/math/mathTypes.cpp index ce0f198d1..7498cc8fc 100644 --- a/Engine/source/math/mathTypes.cpp +++ b/Engine/source/math/mathTypes.cpp @@ -1019,7 +1019,7 @@ F32 mRandF() return gRandGen.randF(); } -DefineConsoleFunction( getRandom, F32, (S32 a, S32 b), (1, 0), +DefineConsoleFunction(getRandom, F32, (S32 a, S32 b), (S32_MAX, S32_MAX), "( int a, int b ) " "@brief Returns a random number based on parameters passed in..\n\n" "If no parameters are passed in, getRandom() will return a float between 0.0 and 1.0. If one " @@ -1033,21 +1033,21 @@ DefineConsoleFunction( getRandom, F32, (S32 a, S32 b), (1, 0), "@see setRandomSeed\n" "@ingroup Random" ) { - if (b == 0) - return F32(gRandGen.randI(0,getMax( a, 0 ))); - else + if (a != S32_MAX) { - if (b != 0) + if (b == S32_MAX) + return F32(gRandGen.randI(0, getMax(a, 0))); + else { S32 min = a; S32 max = b; - if (min > max) + if (min > max) { S32 t = min; min = max; max = t; } - return F32(gRandGen.randI(min,max)); + return F32(gRandGen.randI(min, max)); } } return gRandGen.randF();