diff --git a/stepmania/src/RageUtil.cpp b/stepmania/src/RageUtil.cpp index 0872fc949c..7edcb365eb 100644 --- a/stepmania/src/RageUtil.cpp +++ b/stepmania/src/RageUtil.cpp @@ -18,7 +18,7 @@ int randseed = time(NULL); // From "Numerical Recipes in C". -float RandomFloat( int &seed ) +static float RandomFloatFromSeed( int &seed ) { const int MASK = 123459876; seed ^= MASK; @@ -41,6 +41,11 @@ float RandomFloat( int &seed ) return ans; } +float RandomFloat() +{ + return RandomFloatFromSeed( randseed ); +} + RandomGen::RandomGen( unsigned long seed_ ) { seed = seed_; @@ -50,7 +55,7 @@ RandomGen::RandomGen( unsigned long seed_ ) int RandomGen::operator() ( int n ) { - float f = RandomFloat(seed) * (n); + float f = RandomFloatFromSeed(seed) * (n); int ans = int(f); return ans; } diff --git a/stepmania/src/RageUtil.h b/stepmania/src/RageUtil.h index 62f01ab07e..4e885d3e22 100644 --- a/stepmania/src/RageUtil.h +++ b/stepmania/src/RageUtil.h @@ -227,14 +227,8 @@ inline uint32_t Swap24LE( uint32_t n ) { return Swap24( n ); } inline uint16_t Swap16LE( uint16_t n ) { return Swap16( n ); } #endif -extern int randseed; - -float RandomFloat( int &seed ); // [0.0f,1.0f) - -inline float RandomFloat() -{ - return RandomFloat( randseed ); -} +// [0.0f,1.0f) +float RandomFloat(); // Returns a float between dLow and dHigh inclusive inline float RandomFloat( float fLow, float fHigh )