1 files changed, 8 insertions, 1 deletions

diff --git a/src/functionrandom.cpp b/src/functionrandom.cpp
index 2665a14..ec302b3 100644
--- a/src/functionrandom.cpp
+++ b/src/functionrandom.cpp
@@ -20,10 +20,17 @@ void FunctionRandom::call( class GameState &gState )
         if( vHigh.getType() != vLow.getType() )
                 throw Bu::ExceptionBase("Different types in random!");
 
+        double dRand = random()/(double)(RAND_MAX-1);
         if( vLow.getType() == Variable::tInt )
         {
                 gState.push( Variable( (int64_t)(
-                        (random()%(vHigh.getInt()-vLow.getInt()+1ll))+vLow.getInt()
+                        (dRand*(vHigh.getInt()-vLow.getInt()+1ll))+vLow.getInt()
+                        ) ) );
+        }
+        else if( vLow.getType() == Variable::tFloat )
+        {
+                gState.push( Variable( (double)(
+                        (dRand*(vHigh.getFloat()-vLow.getFloat()))+vLow.getFloat()
                         ) ) );
         }
 }